FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

integration · angular/angular-cli@8a366c2 · GitHub

integration · angular/angular-cli@8a366c2 · GitHub
Skip to content

Navigation Menu

Sign in
Sign in
Sign up

Commit 8a366c2

Browse files
j-zielinski
committed
integration
2 parents 0d0e612 + bf9c8f1 commit 8a366c2

48 files changed

Lines changed: 933 additions & 415 deletions

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,64 @@
1+
<a name="1.0.0-beta.21"></a>
2+
# [1.0.0-beta.21](https://github.com/angular/angular-cli/compare/v1.0.0-beta.20-1...v1.0.0-beta.21) (2016-11-23)
3+
4+
5+
### Bug Fixes
6+
7+
* **angular-cli:** add necessary dependencies. ([#3152](https://github.com/angular/angular-cli/issues/3152)) ([8f574e4](https://github.com/angular/angular-cli/commit/8f574e4)), closes [#3148](https://github.com/angular/angular-cli/issues/3148)
8+
* **angular-cli:** add necessary dependency. ([f7704b0](https://github.com/angular/angular-cli/commit/f7704b0))
9+
* **angular-cli:** change version of webpack plugin. ([07e96ea](https://github.com/angular/angular-cli/commit/07e96ea))
10+
* **aot:** lock the angular version to 2.2.1. ([#3242](https://github.com/angular/angular-cli/issues/3242)) ([6e8a848](https://github.com/angular/angular-cli/commit/6e8a848))
11+
* **editorconfig:** use off instead of 0 for max line length ([#3186](https://github.com/angular/angular-cli/issues/3186)) ([f833d25](https://github.com/angular/angular-cli/commit/f833d25))
12+
* **generate:** revert change to component dir in generate module, as it caused component declaration to go to parent module ([#3158](https://github.com/angular/angular-cli/issues/3158)) ([71bf855](https://github.com/angular/angular-cli/commit/71bf855))
13+
* **github-pages-deploy:** Show more accurate url ([#3160](https://github.com/angular/angular-cli/issues/3160)) ([a431389](https://github.com/angular/angular-cli/commit/a431389))
14+
15+
16+
### Features
17+
18+
* **build:** add sourcemap option ([#3113](https://github.com/angular/angular-cli/issues/3113)) ([6f9d2c1](https://github.com/angular/angular-cli/commit/6f9d2c1))
19+
20+
21+
22+
<a name="1.0.0-beta.20"></a>
23+
# [1.0.0-beta.20](https://github.com/angular/angular-cli/compare/v1.0.0-beta.19...v1.0.0-beta.20-1) (2016-11-16)
24+
25+
26+
### Bug Fixes
27+
28+
* **@ngtools/webpack:** fixed relative path for AoT. ([#3114](https://github.com/angular/angular-cli/issues/3114)) ([27a034d](https://github.com/angular/angular-cli/commit/27a034d))
29+
* **aot:** exclude spec files from aot ([#2758](https://github.com/angular/angular-cli/issues/2758)) ([215e555](https://github.com/angular/angular-cli/commit/215e555))
30+
* **aot:** output the sources in the sourcemap. ([#3107](https://github.com/angular/angular-cli/issues/3107)) ([7127dba](https://github.com/angular/angular-cli/commit/7127dba))
31+
* **aot:** remove the genDir plugin option. ([0e91dfe](https://github.com/angular/angular-cli/commit/0e91dfe)), closes [#2849](https://github.com/angular/angular-cli/issues/2849) [#2876](https://github.com/angular/angular-cli/issues/2876)
32+
* **aot:** Use the proper path when statically analyzing lazy routes. ([#2992](https://github.com/angular/angular-cli/issues/2992)) ([88131a0](https://github.com/angular/angular-cli/commit/88131a0)), closes [#2452](https://github.com/angular/angular-cli/issues/2452) [#2735](https://github.com/angular/angular-cli/issues/2735) [#2900](https://github.com/angular/angular-cli/issues/2900)
33+
* **build:** correct forkChecker option for ATS. ([#3011](https://github.com/angular/angular-cli/issues/3011)) ([a987cf5](https://github.com/angular/angular-cli/commit/a987cf5))
34+
* **build:** enable chunkhash in inline.js ([30cc482](https://github.com/angular/angular-cli/commit/30cc482)), closes [#2899](https://github.com/angular/angular-cli/issues/2899)
35+
* **build:** show full error stats ([#2879](https://github.com/angular/angular-cli/issues/2879)) ([d59fa1f](https://github.com/angular/angular-cli/commit/d59fa1f))
36+
* **deps:** explicitely add portfinder ([#2831](https://github.com/angular/angular-cli/issues/2831)) ([2d8f162](https://github.com/angular/angular-cli/commit/2d8f162)), closes [#2755](https://github.com/angular/angular-cli/issues/2755) [#2769](https://github.com/angular/angular-cli/issues/2769)
37+
* **e2e:** fix broken test pipeline ([#2999](https://github.com/angular/angular-cli/issues/2999)) ([37a1225](https://github.com/angular/angular-cli/commit/37a1225))
38+
* **generate:** fix module component path if module is created in child folder ([#3066](https://github.com/angular/angular-cli/issues/3066)) ([38d5f2c](https://github.com/angular/angular-cli/commit/38d5f2c)), closes [#3063](https://github.com/angular/angular-cli/issues/3063)
39+
* **generate:** stop default browser error from ng new --routing ([a45a1f2](https://github.com/angular/angular-cli/commit/a45a1f2)), closes [#2794](https://github.com/angular/angular-cli/issues/2794)
40+
* **package:** add some more metadata to webpack package.json ([c2dbf88](https://github.com/angular/angular-cli/commit/c2dbf88)), closes [#2854](https://github.com/angular/angular-cli/issues/2854)
41+
* **serve:** added accept html headers option to webpack-dev-server ([#2990](https://github.com/angular/angular-cli/issues/2990)) ([86f2a1b](https://github.com/angular/angular-cli/commit/86f2a1b)), closes [#2989](https://github.com/angular/angular-cli/issues/2989)
42+
* **test:** catches module loading errors ([f09439c](https://github.com/angular/angular-cli/commit/f09439c)), closes [#2640](https://github.com/angular/angular-cli/issues/2640) [#2785](https://github.com/angular/angular-cli/issues/2785)
43+
* **version:** update version of [@angular](https://github.com/angular) packages. ([#3145](https://github.com/angular/angular-cli/issues/3145)) ([a2f0a1a](https://github.com/angular/angular-cli/commit/a2f0a1a))
44+
* bypass Watchman check ([#2846](https://github.com/angular/angular-cli/issues/2846)) ([9aa1099](https://github.com/angular/angular-cli/commit/9aa1099)), closes [#2791](https://github.com/angular/angular-cli/issues/2791)
45+
46+
47+
### Features
48+
49+
* **build:** add loaders for fonts ([3497373](https://github.com/angular/angular-cli/commit/3497373)), closes [#1765](https://github.com/angular/angular-cli/issues/1765)
50+
* **build:** use appConfig.index to set output index file ([d3fd8b0](https://github.com/angular/angular-cli/commit/d3fd8b0)), closes [#2241](https://github.com/angular/angular-cli/issues/2241) [#2767](https://github.com/angular/angular-cli/issues/2767)
51+
* **build:** use static files for css ([a6415cc](https://github.com/angular/angular-cli/commit/a6415cc)), closes [#2148](https://github.com/angular/angular-cli/issues/2148) [#2020](https://github.com/angular/angular-cli/issues/2020) [#2826](https://github.com/angular/angular-cli/issues/2826) [#2646](https://github.com/angular/angular-cli/issues/2646)
52+
* **serve:** allow CORS access while running ng serve ([#2872](https://github.com/angular/angular-cli/issues/2872)) ([#3009](https://github.com/angular/angular-cli/issues/3009)) ([7c834a8](https://github.com/angular/angular-cli/commit/7c834a8))
53+
54+
55+
### BREAKING CHANGES
56+
57+
* aot: Using relative paths might lead to path clashing. We
58+
now properly output an error in this case.
59+
60+
61+
162
<a name="1.0.0-beta.19"></a>
263
# [1.0.0-beta.19](https://github.com/angular/angular-cli/compare/v1.0.0-beta.18...v1.0.0-beta.19) (2016-10-28)
364

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ Some javascript libraries need to be added to the global scope, and loaded as if
373373
they were in a script tag. We can do this using the `apps[0].scripts` and
374374
`apps[0].styles` properties of `angular-cli.json`.
375375

376-
As an example, to use [Boostrap 4](http://v4-alpha.getbootstrap.com/) this is
376+
As an example, to use [Bootstrap 4](http://v4-alpha.getbootstrap.com/) this is
377377
what you need to do:
378378

379379
First install Bootstrap from `npm`:

‎package.json‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-cli",
3-
"version": "1.0.0-beta.19-3",
3+
"version": "1.0.0-beta.21",
44
"description": "CLI tool for Angular",
55
"main": "packages/angular-cli/lib/cli/index.js",
66
"trackingCode": "UA-8594346-19",
@@ -34,10 +34,6 @@
3434
"npm": ">= 3.0.0"
3535
},
3636
"author": "Angular Authors",
37-
"contributors": [
38-
"Rody Haddad <npm@rodyhaddad.com> (http://rodyhaddad.com/)",
39-
"Igor Minar <igor@angularjs.org>"
40-
],
4137
"license": "MIT",
4238
"bugs": {
4339
"url": "https://github.com/angular/angular-cli/issues"
@@ -46,15 +42,15 @@
4642
"dependencies": {
4743
"@angular-cli/ast-tools": "^1.0.0",
4844
"@angular/common": "~2.1.0",
49-
"@angular/compiler": "~2.1.0",
50-
"@angular/compiler-cli": "~2.1.0",
51-
"@angular/core": "~2.1.0",
45+
"@angular/compiler": "2.2.1",
46+
"@angular/compiler-cli": "2.2.1",
47+
"@angular/core": "2.2.1",
48+
"@angular/tsc-wrapped": "0.4.0",
5249
"@angular/platform-browser": "~2.1.0",
5350
"@angular/platform-server": "~2.1.0",
54-
"@angular/tsc-wrapped": "^0.3.0",
5551
"@angularclass/hmr-loader": "3.0.2",
5652
"angular2-template-loader": "^0.5.0",
57-
"awesome-typescript-loader": "^2.2.3",
53+
"autoprefixer": "^6.5.3",
5854
"chalk": "^1.1.3",
5955
"common-tags": "^1.3.1",
6056
"compression-webpack-plugin": "^0.3.2",
@@ -67,6 +63,7 @@
6763
"ember-cli-normalize-entity-name": "^1.0.0",
6864
"ember-cli-preprocess-registry": "^2.0.0",
6965
"ember-cli-string-utils": "^1.0.0",
66+
"enhanced-resolve": "^2.3.0",
7067
"exists-sync": "0.0.3",
7168
"extract-text-webpack-plugin": "^2.0.0-beta.4",
7269
"file-loader": "^0.8.5",
@@ -88,13 +85,13 @@
8885
"less": "^2.7.1",
8986
"less-loader": "^2.2.3",
9087
"lodash": "^4.11.1",
88+
"magic-string": "^0.16.0",
9189
"markdown-it": "4.3.0",
9290
"markdown-it-terminal": "0.0.3",
9391
"minimatch": "^3.0.0",
9492
"mkdirp": "^0.5.1",
9593
"node-modules-path": "^1.0.0",
9694
"node-sass": "^3.10.1",
97-
"node-uuid": "^1.4.3",
9895
"nopt": "^3.0.1",
9996
"npm-run-all": "^3.0.0",
10097
"offline-plugin": "^3.4.1",
@@ -108,6 +105,7 @@
108105
"quick-temp": "0.1.5",
109106
"raw-loader": "^0.5.1",
110107
"readline2": "0.1.1",
108+
"reflect-metadata": "^0.1.8",
111109
"remap-istanbul": "^0.6.4",
112110
"resolve": "^1.1.7",
113111
"rimraf": "^2.5.3",
@@ -118,6 +116,7 @@
118116
"semver": "^5.1.0",
119117
"silent-error": "^1.0.0",
120118
"sniffr": "1.1.4",
119+
"source-map": "^0.5.6",
121120
"source-map-loader": "^0.1.5",
122121
"sourcemap-istanbul-instrumenter-loader": "^0.2.0",
123122
"string-replace-loader": "^1.0.5",
@@ -132,6 +131,7 @@
132131
"tslint-loader": "^2.1.4",
133132
"typescript": "~2.0.3",
134133
"url-loader": "^0.5.7",
134+
"uuid": "^3.0.0",
135135
"walk-sync": "^0.2.6",
136136
"webpack": "2.1.0-beta.25",
137137
"webpack-dev-server": "2.1.0-beta.9",
@@ -159,6 +159,7 @@
159159
"@types/node": "^6.0.36",
160160
"@types/request": "0.0.30",
161161
"@types/rimraf": "0.0.25-alpha",
162+
"@types/source-map": "^0.5.0",
162163
"@types/webpack": "^1.12.22-alpha",
163164
"chai": "^3.5.0",
164165
"conventional-changelog": "^1.1.0",

‎packages/angular-cli/blueprints/component-test/index.js‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎packages/angular-cli/blueprints/component/index.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ module.exports = {
1818
{ name: 'prefix', type: Boolean, default: true },
1919
{ name: 'spec', type: Boolean },
2020
{ name: 'view-encapsulation', type: String, aliases: ['ve'] },
21-
{ name: 'change-detection', type: String, aliases: ['cd'] }
21+
{ name: 'change-detection', type: String, aliases: ['cd'] },
22+
{ name: 'skip-import', type: Boolean, default: false }
2223
],
2324

24-
beforeInstall: function() {
25+
beforeInstall: function(options) {
2526
try {
2627
this.pathToModule = findParentModule(this.project, this.dynamicPath.dir);
2728
} catch(e) {
28-
throw `Error locating module for declaration\n\t${e}`;
29+
if (!options.skipImport) {
30+
throw `Error locating module for declaration\n\t${e}`;
31+
}
2932
}
3033
},
3134

@@ -139,7 +142,7 @@ module.exports = {
139142
const componentDir = path.relative(path.dirname(this.pathToModule), this.generatePath);
140143
const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
141144

142-
if (!options['skip-import']) {
145+
if (!options.skipImport) {
143146
returns.push(
144147
astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
145148
.then(change => change.apply(NodeHost)));

‎packages/angular-cli/blueprints/directive/index.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ module.exports = {
1313
availableOptions: [
1414
{ name: 'flat', type: Boolean, default: true },
1515
{ name: 'prefix', type: Boolean, default: true },
16-
{ name: 'spec', type: Boolean }
16+
{ name: 'spec', type: Boolean },
17+
{ name: 'skip-import', type: Boolean, default: false }
1718
],
1819

19-
beforeInstall: function() {
20+
beforeInstall: function(options) {
2021
try {
2122
this.pathToModule = findParentModule(this.project, this.dynamicPath.dir);
2223
} catch(e) {
23-
throw `Error locating module for declaration\n\t${e}`;
24+
if (!options.skipImport) {
25+
throw `Error locating module for declaration\n\t${e}`;
26+
}
2427
}
2528
},
2629

@@ -90,7 +93,7 @@ module.exports = {
9093
const relativeDir = path.relative(moduleDir, fullGeneratePath);
9194
const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
9295

93-
if (!options['skip-import']) {
96+
if (!options.skipImport) {
9497
returns.push(
9598
astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
9699
.then(change => change.apply(NodeHost)));

‎packages/angular-cli/blueprints/module/index.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ module.exports = {
5858
},
5959

6060
afterInstall: function (options) {
61-
options.entity.name = path.relative(this.dynamicPath.appRoot, this.generatePath);
62-
options.flat = false;
61+
// Note that `this.generatePath` already contains `this.dasherizedModuleName`
62+
// So, the path will end like `name/name`,
63+
// which is correct for `name.component.ts` created in module `name`
64+
var componentPath = path.join(this.generatePath, this.dasherizedModuleName);
65+
options.entity.name = path.relative(this.dynamicPath.appRoot, componentPath);
66+
options.flat = true;
6367
options.route = false;
6468
options.inlineTemplate = false;
6569
options.inlineStyle = false;

‎packages/angular-cli/blueprints/ng2/files/.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010

1111
[*.md]
12-
max_line_length = 0
12+
max_line_length = off
1313
trim_trailing_whitespace = false

‎packages/angular-cli/blueprints/ng2/files/package.json‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,33 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/common": "~2.1.0",
16-
"@angular/compiler": "~2.1.0",
17-
"@angular/core": "~2.1.0",
18-
"@angular/forms": "~2.1.0",
19-
"@angular/http": "~2.1.0",
20-
"@angular/platform-browser": "~2.1.0",
21-
"@angular/platform-browser-dynamic": "~2.1.0",
22-
"@angular/router": "~3.1.0",
15+
"@angular/common": "2.2.1",
16+
"@angular/compiler": "2.2.1",
17+
"@angular/core": "2.2.1",
18+
"@angular/forms": "2.2.1",
19+
"@angular/http": "2.2.1",
20+
"@angular/platform-browser": "2.2.1",
21+
"@angular/platform-browser-dynamic": "2.2.1",
22+
"@angular/router": "3.2.1",
2323
"core-js": "^2.4.1",
2424
"rxjs": "5.0.0-beta.12",
2525
"ts-helpers": "^1.1.1",
2626
"zone.js": "^0.6.23"
2727
},
2828
"devDependencies": {<% if(isMobile) { %>
29-
"@angular/platform-server": "~2.1.0",
29+
"@angular/platform-server": "2.2.1",
3030
"@angular/service-worker": "0.2.0",
3131
"@angular/app-shell": "0.0.0",
3232
"angular2-universal":"0.104.5",
3333
"angular2-universal-polyfills": "0.4.1",
3434
"preboot": "2.1.2",
3535
"parse5": "1.5.1",<% } %>
36-
"@types/jasmine": "^2.2.30",
36+
"@angular/compiler-cli": "2.2.1",
37+
"@types/jasmine": "2.5.38",
3738
"@types/node": "^6.0.42",
3839
"angular-cli": "<%= version %>",
3940
"codelyzer": "~1.0.0-beta.3",
40-
"jasmine-core": "2.4.1",
41+
"jasmine-core": "2.5.2",
4142
"jasmine-spec-reporter": "2.5.0",
4243
"karma": "1.2.0",
4344
"karma-chrome-launcher": "^2.0.0",

‎packages/angular-cli/blueprints/pipe/index.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ module.exports = {
1212

1313
availableOptions: [
1414
{ name: 'flat', type: Boolean, default: true },
15-
{ name: 'spec', type: Boolean }
15+
{ name: 'spec', type: Boolean },
16+
{ name: 'skip-import', type: Boolean, default: false }
1617
],
1718

18-
beforeInstall: function() {
19+
beforeInstall: function(options) {
1920
try {
2021
this.pathToModule = findParentModule(this.project, this.dynamicPath.dir);
2122
} catch(e) {
22-
throw `Error locating module for declaration\n\t${e}`;
23+
if (!options.skipImport) {
24+
throw `Error locating module for declaration\n\t${e}`;
25+
}
2326
}
2427
},
2528

@@ -78,7 +81,7 @@ module.exports = {
7881
const relativeDir = path.relative(moduleDir, fullGeneratePath);
7982
const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
8083

81-
if (!options['skip-import']) {
84+
if (!options.skipImport) {
8285
returns.push(
8386
astUtils.addDeclarationToModule(this.pathToModule, className, importPath)
8487
.then(change => change.apply(NodeHost)));

0 commit comments

Comments
 (0)

Footer

© 2026 GitHub, Inc.
Back | FazBrowse Home | New Git URL