From e7e43a5e458a314252dd9292f3dd0c7281674165 Mon Sep 17 00:00:00 2001 From: Kirill Cherkashin Date: Tue, 11 Apr 2017 07:56:07 -0400 Subject: [PATCH 1/8] docs(@angular/cli): Add `update guide` link to the 'Update" section (#5878) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 570856e76995..a27ef51a5a0b 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,8 @@ npm install --save-dev @angular/cli@latest npm install ``` +If you are updating to 1.0 from a beta or RC version, check out our [1.0 Update Guide](https://github.com/angular/angular-cli/wiki/stories-1.0-update). + You can find more details about changes between versions in [CHANGELOG.md](https://github.com/angular/angular-cli/blob/master/CHANGELOG.md). From 2a903d26fd7e2eb15049ce0e62ff905a98978621 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 7 Apr 2017 17:56:18 -0600 Subject: [PATCH 2/8] fix(@angular/cli): enable dev server history fallback in ejected config --- packages/@angular/cli/tasks/eject.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/@angular/cli/tasks/eject.ts b/packages/@angular/cli/tasks/eject.ts index 53ed0065c2b1..4bf7eecc98f7 100644 --- a/packages/@angular/cli/tasks/eject.ts +++ b/packages/@angular/cli/tasks/eject.ts @@ -320,6 +320,10 @@ class JsonWebpackSerializer { serialize(config: any): string { // config = Object.assign({}, config); config['plugins'] = this._pluginsReplacer(config['plugins']); + // Routes using PathLocationStrategy break without this. + config['devServer'] = { + 'historyApiFallback': true + }; config['resolve'] = this._resolveReplacer(config['resolve']); config['resolveLoader'] = this._resolveReplacer(config['resolveLoader']); config['entry'] = this._entryReplacer(config['entry']); From be7c9b1b8a1950d92437baf1b36d8a951e2e87dc Mon Sep 17 00:00:00 2001 From: Hans Larsen Date: Fri, 7 Apr 2017 17:11:51 -0600 Subject: [PATCH 3/8] fix(@angular/cli): generating service dry run fix Before, generating a service and providing it in a module, the dry run flag was ignored for the providing part. We dont provide the module now if its a dry-run. Fixes #5862. --- packages/@angular/cli/blueprints/service/index.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/@angular/cli/blueprints/service/index.ts b/packages/@angular/cli/blueprints/service/index.ts index e5254aa4f945..23f5cbd34049 100644 --- a/packages/@angular/cli/blueprints/service/index.ts +++ b/packages/@angular/cli/blueprints/service/index.ts @@ -103,6 +103,13 @@ export default Blueprint.extend({ `; this._writeStatusToUI(chalk.yellow, 'WARNING', warningMessage); } else { + if (options.dryRun) { + this._writeStatusToUI(chalk.yellow, + 'update', + path.relative(this.project.root, this.pathToModule)); + return; + } + const className = stringUtils.classify(`${options.entity.name}Service`); const fileName = stringUtils.dasherize(`${options.entity.name}.service`); const fullGeneratePath = path.join(this.project.root, this.generatePath); From f2e684078cbe0658287814cfa2254bb682678b4f Mon Sep 17 00:00:00 2001 From: Hans Larsen Date: Fri, 7 Apr 2017 17:15:35 -0600 Subject: [PATCH 4/8] test: add e2e test for dry run --- tests/e2e/tests/generate/service/service-dry-run.ts | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 tests/e2e/tests/generate/service/service-dry-run.ts diff --git a/tests/e2e/tests/generate/service/service-dry-run.ts b/tests/e2e/tests/generate/service/service-dry-run.ts new file mode 100644 index 000000000000..b429c3e3cb45 --- /dev/null +++ b/tests/e2e/tests/generate/service/service-dry-run.ts @@ -0,0 +1,9 @@ +import {join} from 'path'; +import {ng} from '../../../utils/process'; +import {expectGitToBeClean} from '../../../utils/git'; + + +export default function() { + return ng('generate', 'service', 'test-service', '--module', 'app.module.ts', '--dry-run') + .then(() => expectGitToBeClean()); +} From 28c5302fd3f3e4168cc37ab47a2d3b8a567c0760 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Sat, 8 Apr 2017 08:37:18 -0600 Subject: [PATCH 5/8] docs(@angular/cli): Add specific key example for ng get [key]. --- docs/documentation/config.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/documentation/config.md b/docs/documentation/config.md index 7cad423de2c5..0ed74469eb0f 100644 --- a/docs/documentation/config.md +++ b/docs/documentation/config.md @@ -4,6 +4,7 @@ ## Overview `ng get [key]` Get a value from the configuration. +`[key]` should be in JSON path format. Example: `a[3].foo.bar[2]`. ## Options
@@ -21,6 +22,7 @@ ## Overview `ng set [key]=[value]` Set a value in the configuration. +`[key]` should be in JSON path format. Example: `a[3].foo.bar[2]`. ## Options
From f82da18f8b058cee55989d9ce72284a97390280e Mon Sep 17 00:00:00 2001 From: Charles Lyding Date: Mon, 3 Apr 2017 19:41:39 -0400 Subject: [PATCH 6/8] fix(@angular/cli): set sass precision to bootstrap required value --- packages/@angular/cli/models/webpack-configs/styles.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/@angular/cli/models/webpack-configs/styles.ts b/packages/@angular/cli/models/webpack-configs/styles.ts index 2324dba536f8..c48ff8d121f2 100644 --- a/packages/@angular/cli/models/webpack-configs/styles.ts +++ b/packages/@angular/cli/models/webpack-configs/styles.ts @@ -117,6 +117,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) { loader: 'sass-loader', options: { sourceMap: cssSourceMap, + // bootstrap-sass requires a minimum precision of 8 + precision: 8, includePaths } }] From 9eabfddb640b18ec09f62c5535a3d4d9b9dfda88 Mon Sep 17 00:00:00 2001 From: WilliamKoza Date: Mon, 10 Apr 2017 12:54:20 +0200 Subject: [PATCH 7/8] feat(@angular/cli): add language service in devDependencies section --- packages/@angular/cli/blueprints/ng/files/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json index b12fb3dbd234..497993689998 100644 --- a/packages/@angular/cli/blueprints/ng/files/package.json +++ b/packages/@angular/cli/blueprints/ng/files/package.json @@ -27,6 +27,7 @@ "devDependencies": { "@angular/cli": "<%= version %>", "@angular/compiler-cli": "^4.0.0", + "@angular/language-service": "^4.0.0", "@types/jasmine": "2.5.38", "@types/node": "~6.0.60", "codelyzer": "~2.0.0", From 92a34e2a4b798b36a5c5f0a5971a3886eca3dca7 Mon Sep 17 00:00:00 2001 From: Hans Date: Tue, 11 Apr 2017 16:36:51 -0700 Subject: [PATCH 8/8] Revert "feat(@angular/cli): add language service in devDependencies section" This reverts commit 9eabfddb640b18ec09f62c5535a3d4d9b9dfda88. --- packages/@angular/cli/blueprints/ng/files/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json index 497993689998..b12fb3dbd234 100644 --- a/packages/@angular/cli/blueprints/ng/files/package.json +++ b/packages/@angular/cli/blueprints/ng/files/package.json @@ -27,7 +27,6 @@ "devDependencies": { "@angular/cli": "<%= version %>", "@angular/compiler-cli": "^4.0.0", - "@angular/language-service": "^4.0.0", "@types/jasmine": "2.5.38", "@types/node": "~6.0.60", "codelyzer": "~2.0.0",