Skip to content

Commit 46236d4

Browse files
Merge pull request #189 from angular/master
docs start rewriting docs
2 parents 38158b3 + 248d531 commit 46236d4

File tree

11 files changed

+189
-136
lines changed

11 files changed

+189
-136
lines changed

.monorepo.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@
4242
},
4343
"packages": {
4444
"@_/benchmark": {
45-
"version": "0.9.0-rc.1",
46-
"hash": "a9b1f213a4069f789d20021bda616775"
45+
"version": "0.9.0-rc.2",
46+
"hash": "ed6f2ae751fd3db351a20ae55349e8ad"
4747
},
4848
"@_/builders": {
49-
"version": "0.9.0-rc.1",
50-
"hash": "f34470f978203f13c312094472b0a343"
49+
"version": "0.9.0-rc.2",
50+
"hash": "569aef8bc23693c344e71b9755e62c50"
5151
},
5252
"devkit": {
53-
"version": "0.9.0-rc.1",
54-
"hash": "3552542bc61cedbeab0fd5b9dd6ae44c"
53+
"version": "0.9.0-rc.2",
54+
"hash": "9230702b29c8827fca50617e90f4db62"
5555
},
5656
"@angular/cli": {
5757
"name": "Angular CLI",
@@ -62,15 +62,15 @@
6262
"url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
6363
}
6464
],
65-
"version": "7.0.0-rc.1",
65+
"version": "7.0.0-rc.2",
6666
"snapshotRepo": "angular/cli-builds",
67-
"hash": "71c538637e997e786449b8be2f5549f1"
67+
"hash": "0f0265f67cbd611fe76f9cf2a35eac46"
6868
},
6969
"@angular/pwa": {
7070
"name": "Angular PWA Schematics",
7171
"section": "Schematics",
72-
"version": "0.9.0-rc.1",
73-
"hash": "57add138d13c50761208286b625d8111",
72+
"version": "0.9.0-rc.2",
73+
"hash": "a575d61acf532ea665ac6705e91a0369",
7474
"snapshotRepo": "angular/angular-pwa-builds"
7575
},
7676
"@angular-devkit/architect": {
@@ -81,21 +81,21 @@
8181
"url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
8282
}
8383
],
84-
"version": "0.9.0-rc.1",
85-
"hash": "6bdbfa3a9aed04efa9509be2b553124c",
84+
"version": "0.9.0-rc.2",
85+
"hash": "c644f2be33bdc5068cf74fb4f7c39e29",
8686
"snapshotRepo": "angular/angular-devkit-architect-builds"
8787
},
8888
"@angular-devkit/architect-cli": {
8989
"name": "Architect CLI",
90-
"version": "0.9.0-rc.1",
91-
"hash": "c1eb256f9547fb5c836ec70dd2c408f8",
90+
"version": "0.9.0-rc.2",
91+
"hash": "f0ad25801262bdf4cd4a83f678af7dd6",
9292
"snapshotRepo": "angular/angular-devkit-architect-cli-builds"
9393
},
9494
"@angular-devkit/benchmark": {
9595
"name": "Benchmark",
9696
"section": "Tooling",
97-
"version": "1.0.0-rc.1",
98-
"hash": "c11b907aeab37274a842f73524ec5e73"
97+
"version": "1.0.0-rc.2",
98+
"hash": "4809184dd4ad5a0b8e3e28ff460a2837"
9999
},
100100
"@angular-devkit/build-optimizer": {
101101
"name": "Build Optimizer",
@@ -105,8 +105,8 @@
105105
"url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
106106
}
107107
],
108-
"version": "0.9.0-rc.1",
109-
"hash": "e8feec7840897e25731c34238506deae",
108+
"version": "0.9.0-rc.2",
109+
"hash": "ab55ec940e1f2e84073b45a16d45e3cd",
110110
"snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
111111
},
112112
"@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
117117
"url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
118118
}
119119
],
120-
"version": "0.9.0-rc.1",
121-
"hash": "977f57fe835fac53197d7b288b760268",
120+
"version": "0.9.0-rc.2",
121+
"hash": "a7cb02fd554c0947889e974cb9046d96",
122122
"snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
123123
},
124124
"@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
129129
"url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
130130
}
131131
],
132-
"version": "0.9.0-rc.1",
133-
"hash": "d0909d1a833531ef8b6d986e66a07311",
132+
"version": "0.9.0-rc.2",
133+
"hash": "d7fd8733c5b28f1ef21528b0066f0d1a",
134134
"snapshotRepo": "angular/angular-devkit-build-angular-builds"
135135
},
136136
"@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
141141
"url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
142142
}
143143
],
144-
"version": "0.9.0-rc.1",
144+
"version": "0.9.0-rc.2",
145145
"snapshotRepo": "angular/angular-devkit-build-webpack-builds",
146-
"hash": "a5f928555a349b1e584964911ef55c9a"
146+
"hash": "a2574369237d6b3769f7602ff8fa4a31"
147147
},
148148
"@angular-devkit/core": {
149149
"name": "Core",
@@ -153,8 +153,8 @@
153153
"url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
154154
}
155155
],
156-
"version": "7.0.0-rc.1",
157-
"hash": "a24d7471f344677ee8ca3c8040dfe525",
156+
"version": "7.0.0-rc.2",
157+
"hash": "a5844a4ed97391807c4fd12cb2ef1cf2",
158158
"snapshotRepo": "angular/angular-devkit-core-builds"
159159
},
160160
"@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
165165
"url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
166166
}
167167
],
168-
"version": "7.0.0-rc.1",
169-
"hash": "0aa3a0aade670fd19956e25e2963af54",
168+
"version": "7.0.0-rc.2",
169+
"hash": "c17d545d96ae49c8a80275cfc986eb4c",
170170
"snapshotRepo": "angular/angular-devkit-schematics-builds"
171171
},
172172
"@angular-devkit/schematics-cli": {
173173
"name": "Schematics CLI",
174174
"section": "Tooling",
175-
"version": "0.9.0-rc.1",
176-
"hash": "c6b8c15ed7abad30375f61b1e2ef66c0",
175+
"version": "0.9.0-rc.2",
176+
"hash": "e1fdd7b7f2ea718c3a22d16915a91ff6",
177177
"snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
178178
},
179179
"@ngtools/webpack": {
180180
"name": "Webpack Angular Plugin",
181-
"version": "7.0.0-rc.1",
181+
"version": "7.0.0-rc.2",
182182
"section": "Misc",
183-
"hash": "86d64917c76fb65c37572e7ec2748ccb",
183+
"hash": "780c036bfa14accd80cd0bd4c2c7704d",
184184
"snapshotRepo": "angular/ngtools-webpack-builds"
185185
},
186186
"@schematics/angular": {
187187
"name": "Angular Schematics",
188188
"section": "Schematics",
189-
"version": "7.0.0-rc.1",
190-
"hash": "db9156bfaccc70bac955fb15def05fe3",
189+
"version": "7.0.0-rc.2",
190+
"hash": "f204ff9639c871494ac8fe050e327df0",
191191
"snapshotRepo": "angular/schematics-angular-builds"
192192
},
193193
"@schematics/schematics": {
194194
"name": "Schematics Schematics",
195-
"version": "0.9.0-rc.1",
195+
"version": "0.9.0-rc.2",
196196
"section": "Schematics",
197-
"hash": "1ad492543597cb539b795682c5c3e1bf",
197+
"hash": "4a3e9d9fc64c6efddb0dfba3b745c92a",
198198
"snapshotRepo": "angular/schematics-schematics-builds"
199199
},
200200
"@schematics/update": {
201201
"name": "Package Update Schematics",
202-
"version": "0.9.0-rc.1",
202+
"version": "0.9.0-rc.2",
203203
"section": "Schematics",
204-
"hash": "1126ff9f1093897d184a696b6c72764a",
204+
"hash": "6706dfa9fbc9cdbc892fb6e9ed8026f8",
205205
"snapshotRepo": "angular/schematics-update-builds"
206206
}
207207
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Resources in CSS, such as images and fonts, are automatically written and fingerprinted at the root
2+
of the output folder. If a resource is less than 10kb, it is also included inline.
3+
4+
Uses the Webpack build tool, with environment and build options specified in the CLI configuration
5+
file.

packages/angular/cli/commands/build.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"$schema": "http://json-schema.org/schema",
33
"$id": "ng-cli://commands/build.json",
4-
"description": "Builds your app and places it into the output path (dist/ by default).",
5-
"$longDescription": "",
4+
"description": "Compiles an Angular app into an output directory named dist/ at the given output path. Must be executed from within a workspace directory.",
5+
"$longDescription": "./build-long.md",
66

77
"$aliases": [ "b" ],
88
"$scope": "in",

packages/angular/cli/commands/definitions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
"properties": {
88
"project": {
99
"type": "string",
10-
"description": "The name of the project to build.",
10+
"description": "The name of the project to build. Can be an app or a library.",
1111
"$default": {
1212
"$source": "argv",
1313
"index": 0
1414
}
1515
},
1616
"configuration": {
17-
"description": "Specify the configuration to use.",
17+
"description": "A named configuration environment, as specified in the `configurations` section of `angular.json`.",
1818
"type": "string",
1919
"aliases": [
2020
"c"
2121
]
2222
},
2323
"prod": {
24-
"description": "Flag to set configuration to 'production'.",
24+
"description": "When true, sets the build configuration to the production environment.\nAll builds make use of bundling and limited tree-shaking, A production build also runs limited dead code elimination using UglifyJS.",
2525
"type": "boolean"
2626
}
2727
}

packages/angular_devkit/build_angular/src/browser/schema.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
},
1313
"main": {
1414
"type": "string",
15-
"description": "The name of the main entry-point file."
15+
"description": "The full path for the main entry point to the app, relative to the current workspace.",
16+
"$valueDescription": "fileName"
1617
},
1718
"polyfills": {
1819
"type": "string",
19-
"description": "The name of the polyfills file."
20+
"description": "The full path for the polyfills file, relative to the current workspace."
2021
},
2122
"tsConfig": {
2223
"type": "string",
23-
"description": "The name of the TypeScript configuration file."
24+
"description": "The full path for the TypeScript configuration file, relative to the current workspace."
2425
},
2526
"scripts": {
2627
"description": "Global scripts to be included in the build.",
@@ -55,7 +56,7 @@
5556
},
5657
"optimization": {
5758
"type": "boolean",
58-
"description": "Enables optimization of the build output.",
59+
"description": "When true, uses optimization for the app build.",
5960
"default": false
6061
},
6162
"fileReplacements": {
@@ -68,7 +69,7 @@
6869
},
6970
"outputPath": {
7071
"type": "string",
71-
"description": "Path where output will be placed."
72+
"description": "The full path for the new output directory, relative to the current workspace.\n\nBy default, writes output to a folder named dist/ in the current project."
7273
},
7374
"aot": {
7475
"type": "boolean",
@@ -408,4 +409,4 @@
408409
]
409410
}
410411
}
411-
}
412+
}

packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe('Browser Builder poll', () => {
1515
beforeEach(done => host.initialize().toPromise().then(done, done.fail));
1616
afterEach(done => host.restore().toPromise().then(done, done.fail));
1717

18-
it('works', (done) => {
18+
xit('works', (done) => {
1919
const overrides = { watch: true, poll: 2000 };
2020
const intervals: number[] = [];
2121
let startTime: number | undefined;

packages/angular_devkit/core/src/virtual-fs/host/record.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
HostCapabilities,
2727
HostWatchOptions,
2828
ReadonlyHost,
29+
Stats,
2930
} from './interface';
3031
import { SimpleMemoryHost } from './memory';
3132

@@ -366,6 +367,12 @@ export class CordHost extends SimpleMemoryHost {
366367
: ((this.willDelete(path) || this.willRename(path)) ? of(false) : this._back.isFile(path));
367368
}
368369

370+
stat(path: Path): Observable<Stats | null> | null {
371+
return this._exists(path)
372+
? super.stat(path)
373+
: ((this.willDelete(path) || this.willRename(path)) ? of(null) : this._back.stat(path));
374+
}
375+
369376
watch(path: Path, options?: HostWatchOptions) {
370377
// Watching not supported.
371378
return null;

0 commit comments

Comments
 (0)