Skip to content

Commit adacc77

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #139 from angular/master
Update upstream
2 parents 0a8b075 + 080b359 commit adacc77

File tree

94 files changed

+4063
-1138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+4063
-1138
lines changed

‎.eslintignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@ typings/
55

66
# Ignore all blueprint files. We e2e tests those later on.
77
packages/@angular/cli/blueprints/*/files/
8-
9-
# Ignore ember cli.
10-
packages/@angular/cli/ember-cli/

‎README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
## Angular CLI
2-
### CLI for Angular applications based on the [ember-cli](http://www.ember-cli.com/) project.
32

43
<!-- Badges section here. -->
54
[![Build Status](https://img.shields.io/travis/angular/angular-cli/master.svg?label=travis)][travis-badge-url]
@@ -108,12 +107,12 @@ Scaffold | Usage
108107

109108

110109
angular-cli will add reference to `components`, `directives` and `pipes` automatically in the `app.module.ts`. If you need to add this references to another custom module, follow this steps:
111-
110+
112111
1. `ng g module new-module` to create a new module
113112
2. call `ng g component new-module/new-component`
114-
113+
115114
This should add the new `component`, `directive` or `pipe` reference to the `new-module` you've created.
116-
115+
117116
### Updating Angular CLI
118117

119118
If you're using Angular CLI `1.0.0-beta.28` or less, you need to uninstall `angular-cli` package. It should be done due to changing of package's name and scope from `angular-cli` to `@angular/cli`:

‎docs/documentation/angular-workspace.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@
1818
- *typescriptMismatch* (`boolean`): The name of the project.
1919

2020
- **schematics** (`object`): Workspace configuration options for Schematics.
21-
- *schematic-package:schematic-name* (`string`): Object containing options for this schematic.
21+
- *schematic-package:schematic-name* (`object`): Object containing options for this schematic. JSON Schema for default schematics:
22+
- [@schematics/angular:component](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L74-L144)
23+
- [@schematics/angular:directive](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L145-L186)
24+
- [@schematics/angular:module](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L187-L223)
25+
- [@schematics/angular:service](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L224-L238)
26+
- [@schematics/angular:pipe](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L239-L269)
27+
- [@schematics/angular:class](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L270-L279)
28+
2229

2330
- **projects**: Configuration options for each project in the workspace.
2431
- *root* (`string`): Root of the project files.
@@ -30,5 +37,14 @@
3037
- *targetName* (`string`): Name of this target.
3138
- *builder* (`string`): Builder for this target, in the format `package-name:builder-name`.
3239
- *options* (`string`): Options for this builder.
40+
JSON Schema for default schematics:
41+
- [@angular-devkit/build-angular:app-shell](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L489-L520)
42+
- [@angular-devkit/build-angular:browser](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L521-L906)
43+
- [@angular-devkit/build-angular:dev-server](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L907-L1028)
44+
- [@angular-devkit/build-angular:extract-i18n](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L1029-L1064)
45+
- [@angular-devkit/build-angular:karma](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L1065-L1267)
46+
- [@angular-devkit/build-angular:protractor](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L1268-L1323)
47+
- [@angular-devkit/build-angular:server](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L1324-L1518)
48+
- [@angular-devkit/build-angular:tslint](https://github.com/angular/angular-cli/blob/v6.0.0-rc.8/packages/%40angular/cli/lib/config/schema.json#L1519-L1594)
3349
- *configurations* (`object`): A map of alternative target options.
3450
- *configurationName* (`object`): Partial options override for this builder.

‎docs/documentation/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ If both the `[key]` and `[value]` are provided it will set the value.
1212
<details>
1313
<summary>global</summary>
1414
<p>
15-
<code>--global</code> (alias: <code>-g</code>)
15+
<code>--global</code> (alias: <code>-g</code>)
1616
</p>
1717
<p>
1818
Get/set the value in the global configuration (in your home directory).

‎docs/documentation/doc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<details>
1010
<summary>search</summary>
1111
<p>
12-
<code>--search</code> (alias: <code>-s</code>)
12+
<code>--search</code> (alias: <code>-s</code>)
1313
</p>
1414
<p>
1515
Search whole angular.io instead of just api.

‎docs/documentation/eject.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
2+
3+
# ng eject
4+
5+
## Overview
6+
Temporarily disabled. Ejects your app and output the proper webpack configuration and scripts.
7+
8+
## Options
9+
None.

‎docs/documentation/generate.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<details>
2121
<summary>dry-run</summary>
2222
<p>
23-
<code>--dry-run</code> (alias: <code>-d</code>)
23+
<code>--dry-run</code> (alias: <code>-d</code>)
2424
</p>
2525
<p>
2626
Run through without making any changes.
@@ -29,7 +29,7 @@
2929
<details>
3030
<summary>force</summary>
3131
<p>
32-
<code>--force</code> (alias: <code>-f</code>)
32+
<code>--force</code> (alias: <code>-f</code>)
3333
</p>
3434
<p>
3535
Forces overwriting of files.

‎docs/documentation/generate/app-shell.md

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
<!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
2+
3+
# ng generate app-shell
4+
5+
## Overview
6+
Create an app shell.
7+
8+
## Options
9+
<details>
10+
<summary>dry-run</summary>
11+
<p>
12+
<code>--dry-run</code> (alias: <code>-d</code>)
13+
</p>
14+
<p>
15+
Run through without making any changes.
16+
</p>
17+
</details>
18+
<details>
19+
<summary>force</summary>
20+
<p>
21+
<code>--force</code> (alias: <code>-f</code>)
22+
</p>
23+
<p>
24+
Forces overwriting of files.
25+
</p>
26+
</details>
27+
<details>
28+
<summary>client-project</summary>
29+
<p>
30+
<code>--client-project</code>
31+
</p>
32+
<p>
33+
Name of related client app.
34+
</p>
35+
</details>
36+
<details>
37+
<summary>universal-project</summary>
38+
<p>
39+
<code>--universal-project</code>
40+
</p>
41+
<p>
42+
Name of related universal app.
43+
</p>
44+
</details>
45+
<details>
46+
<summary>route</summary>
47+
<p>
48+
<code>--route</code>
49+
</p>
50+
<p>
51+
Route path used to produce the app shell.
52+
</p>
53+
</details>
54+
<details>
55+
<summary>name</summary>
56+
<p>
57+
<code>--name</code>
58+
</p>
59+
<p>
60+
Name of the universal app
61+
</p>
62+
</details>
63+
<details>
64+
<summary>app-id</summary>
65+
<p>
66+
<code>--app-id</code>
67+
</p>
68+
<p>
69+
The appId to use withServerTransition.
70+
</p>
71+
</details>
72+
<details>
73+
<summary>out-dir</summary>
74+
<p>
75+
<code>--out-dir</code>
76+
</p>
77+
<p>
78+
The output directory for build results.
79+
</p>
80+
</details>
81+
<details>
82+
<summary>root</summary>
83+
<p>
84+
<code>--root</code>
85+
</p>
86+
<p>
87+
The root directory of the app.
88+
</p>
89+
</details>
90+
<details>
91+
<summary>index</summary>
92+
<p>
93+
<code>--index</code>
94+
</p>
95+
<p>
96+
Name of the index file
97+
</p>
98+
</details>
99+
<details>
100+
<summary>main</summary>
101+
<p>
102+
<code>--main</code>
103+
</p>
104+
<p>
105+
The name of the main entry-point file.
106+
</p>
107+
</details>
108+
<details>
109+
<summary>test</summary>
110+
<p>
111+
<code>--test</code>
112+
</p>
113+
<p>
114+
The name of the test entry-point file.
115+
</p>
116+
</details>
117+
<details>
118+
<summary>tsconfig-file-name</summary>
119+
<p>
120+
<code>--tsconfig-file-name</code>
121+
</p>
122+
<p>
123+
The name of the TypeScript configuration file.
124+
</p>
125+
</details>
126+
<details>
127+
<summary>test-tsconfig-file-name</summary>
128+
<p>
129+
<code>--test-tsconfig-file-name</code>
130+
</p>
131+
<p>
132+
The name of the TypeScript configuration file for tests.
133+
</p>
134+
</details>
135+
<details>
136+
<summary>app-dir</summary>
137+
<p>
138+
<code>--app-dir</code>
139+
</p>
140+
<p>
141+
The name of the application directory.
142+
</p>
143+
</details>
144+
<details>
145+
<summary>root-module-file-name</summary>
146+
<p>
147+
<code>--root-module-file-name</code>
148+
</p>
149+
<p>
150+
The name of the root module file
151+
</p>
152+
</details>
153+
<details>
154+
<summary>root-module-class-name</summary>
155+
<p>
156+
<code>--root-module-class-name</code>
157+
</p>
158+
<p>
159+
The name of the root module class.
160+
</p>
161+
</details>
162+
<details>
163+
<summary>source-dir</summary>
164+
<p>
165+
<code>--source-dir</code> (alias: <code>-D</code>)
166+
</p>
167+
<p>
168+
The path of the source directory.
169+
</p>
170+
</details>

‎docs/documentation/generate/application.md

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
2+
3+
# ng generate application
4+
5+
## Overview
6+
Create an Angular application.
7+
8+
## Options
9+
<details>
10+
<summary>dry-run</summary>
11+
<p>
12+
<code>--dry-run</code> (alias: <code>-d</code>)
13+
</p>
14+
<p>
15+
Run through without making any changes.
16+
</p>
17+
</details>
18+
<details>
19+
<summary>force</summary>
20+
<p>
21+
<code>--force</code> (alias: <code>-f</code>)
22+
</p>
23+
<p>
24+
Forces overwriting of files.
25+
</p>
26+
</details>
27+
<details>
28+
<summary>inline-style</summary>
29+
<p>
30+
<code>--inline-style</code> (alias: <code>-s</code>)
31+
</p>
32+
<p>
33+
Specifies if the style will be in the ts file.
34+
</p>
35+
</details>
36+
<details>
37+
<summary>inline-template</summary>
38+
<p>
39+
<code>--inline-template</code> (alias: <code>-t</code>)
40+
</p>
41+
<p>
42+
Specifies if the template will be in the ts file.
43+
</p>
44+
</details>
45+
<details>
46+
<summary>view-encapsulation</summary>
47+
<p>
48+
<code>--view-encapsulation</code>
49+
</p>
50+
<p>
51+
Specifies the view encapsulation strategy.
52+
</p>
53+
</details>
54+
<details>
55+
<summary>routing</summary>
56+
<p>
57+
<code>--routing</code>
58+
</p>
59+
<p>
60+
Generates a routing module.
61+
</p>
62+
</details>
63+
<details>
64+
<summary>prefix</summary>
65+
<p>
66+
<code>--prefix</code> (alias: <code>-p</code>)
67+
</p>
68+
<p>
69+
The prefix to apply to generated selectors.
70+
</p>
71+
</details>
72+
<details>
73+
<summary>style</summary>
74+
<p>
75+
<code>--style</code>
76+
</p>
77+
<p>
78+
The file extension to be used for style files.
79+
</p>
80+
</details>
81+
<details>
82+
<summary>skip-tests</summary>
83+
<p>
84+
<code>--skip-tests</code> (alias: <code>-S</code>)
85+
</p>
86+
<p>
87+
Skip creating spec files.
88+
</p>
89+
</details>
90+
<details>
91+
<summary>skip-package-json</summary>
92+
<p>
93+
<code>--skip-package-json</code>
94+
</p>
95+
<p>
96+
Do not add dependencies to package.json.
97+
</p>
98+
</details>

0 commit comments

Comments
 (0)