diff --git a/package.json b/package.json index 4ed49f89c2f73..7c2cd971afec5 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,12 @@ "checkformat": "prettier \"./**/*.{ts,js,json,css,md}\" \"!./**/{__name__,__directory__}/**\" --list-different" }, "devDependencies": { - "@angular-devkit/architect": "0.8.3", - "@angular-devkit/build-angular": "0.8.3", - "@angular-devkit/build-webpack": "0.8.3", - "@angular-devkit/core": "0.8.3", - "@angular-devkit/schematics": "0.8.3", - "@angular/cli": "6.2.3", + "@angular-devkit/architect": "0.8.4", + "@angular-devkit/build-angular": "0.8.4", + "@angular-devkit/build-webpack": "0.8.4", + "@angular-devkit/core": "0.8.4", + "@angular-devkit/schematics": "0.8.4", + "@angular/cli": "6.2.4", "@angular/common": "6.1.8", "@angular/compiler": "6.1.8", "@angular/compiler-cli": "6.1.8", @@ -38,7 +38,7 @@ "@ngrx/schematics": "6.1.0", "@ngrx/store": "6.1.0", "@ngrx/store-devtools": "6.1.0", - "@schematics/angular": "0.8.3", + "@schematics/angular": "0.8.4", "@types/jasmine": "~2.8.6", "@types/jasminewd2": "~2.0.3", "@types/jest": "^23.3.2", diff --git a/packages/schematics/bin/create-nx-workspace.ts b/packages/schematics/bin/create-nx-workspace.ts index dbc919f5227cf..21269665fd498 100644 --- a/packages/schematics/bin/create-nx-workspace.ts +++ b/packages/schematics/bin/create-nx-workspace.ts @@ -8,6 +8,7 @@ import * as path from 'path'; import * as yargsParser from 'yargs-parser'; import { readJsonFile } from '../src/utils/fileutils'; +import { angularCliVersion } from '../src/lib-versions'; const parsedArgs = yargsParser(process.argv, { string: ['directory'], @@ -91,7 +92,7 @@ const nxVersion = parsedArgs.bazel ? '1.0.3' : readJsonFile(path.join(path.dirname(__dirname), 'package.json')).version; -const cliVersion = parsedArgs.bazel ? '1.7.2' : '6.1.1'; +const cliVersion = parsedArgs.bazel ? '1.7.2' : angularCliVersion; writeFileSync( path.join(tmpDir, 'package.json'), JSON.stringify({ diff --git a/packages/schematics/migrations/update-6-4-0/update-6-4-0.spec.ts b/packages/schematics/migrations/update-6-4-0/update-6-4-0.spec.ts index 4f69a5ce01837..11fe4b2fe92d1 100644 --- a/packages/schematics/migrations/update-6-4-0/update-6-4-0.spec.ts +++ b/packages/schematics/migrations/update-6-4-0/update-6-4-0.spec.ts @@ -91,7 +91,7 @@ describe('Update 6.4.0', () => { '@ngrx/router-store': '6.1.0' }, devDependencies: { - '@angular/cli': '6.2.3', + '@angular/cli': '6.2.4', '@angular/compiler-cli': '^6.1.0', '@angular/language-service': '^6.1.0', '@angular-devkit/build-angular': '~0.8.0', diff --git a/packages/schematics/migrations/update-6-4-0/update-6-4-0.ts b/packages/schematics/migrations/update-6-4-0/update-6-4-0.ts index cc3386af93412..bfc7f8983cdef 100644 --- a/packages/schematics/migrations/update-6-4-0/update-6-4-0.ts +++ b/packages/schematics/migrations/update-6-4-0/update-6-4-0.ts @@ -23,7 +23,7 @@ function updateDependencies() { json.devDependencies = json.devDependencies || {}; json.devDependencies = { ...json.devDependencies, - '@angular/cli': '6.2.3', + '@angular/cli': '6.2.4', '@angular-devkit/build-angular': '~0.8.0', '@ngrx/store-devtools': '6.1.0', karma: '~3.0.0', diff --git a/packages/schematics/src/lib-versions.ts b/packages/schematics/src/lib-versions.ts index 5a2165ba1495c..b3ae64c68925b 100644 --- a/packages/schematics/src/lib-versions.ts +++ b/packages/schematics/src/lib-versions.ts @@ -1,4 +1,4 @@ -export const angularCliVersion = '6.2.3'; +export const angularCliVersion = '6.2.4'; export const angularVersion = '^6.1.0'; export const angularDevkitVersion = '~0.8.0'; export const angularJsVersion = '1.6.6'; diff --git a/yarn.lock b/yarn.lock index 129dfa2d6dc83..8ca7c83ededfe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,22 +2,22 @@ # yarn lockfile v1 -"@angular-devkit/architect@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.8.3.tgz#320c7de2e2e7b984a0e4be51dc60dfe12d4c973e" +"@angular-devkit/architect@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.8.4.tgz#095b382908d7dfaa2f64edfe93555dfac42957aa" dependencies: - "@angular-devkit/core" "0.8.3" + "@angular-devkit/core" "0.8.4" rxjs "~6.2.0" -"@angular-devkit/build-angular@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.8.3.tgz#e302fdf0f11d589bc518f93afaa7fe5f967bde94" +"@angular-devkit/build-angular@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.8.4.tgz#15e15a5026a6cd51dcf99d989379b6603e9d96ea" dependencies: - "@angular-devkit/architect" "0.8.3" - "@angular-devkit/build-optimizer" "0.8.3" - "@angular-devkit/build-webpack" "0.8.3" - "@angular-devkit/core" "0.8.3" - "@ngtools/webpack" "6.2.3" + "@angular-devkit/architect" "0.8.4" + "@angular-devkit/build-optimizer" "0.8.4" + "@angular-devkit/build-webpack" "0.8.4" + "@angular-devkit/core" "0.8.4" + "@ngtools/webpack" "6.2.4" ajv "~6.4.0" autoprefixer "^8.4.1" circular-dependency-plugin "^5.0.2" @@ -64,48 +64,48 @@ optionalDependencies: node-sass "^4.9.3" -"@angular-devkit/build-optimizer@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.8.3.tgz#6fdc56bc29313ef9f80af095d5234af750b3277e" +"@angular-devkit/build-optimizer@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.8.4.tgz#3131eb5a53b51f9914df5ea73ba8b6dca6b401a1" dependencies: loader-utils "^1.1.0" source-map "^0.5.6" typescript "~2.9.2" webpack-sources "^1.1.0" -"@angular-devkit/build-webpack@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.8.3.tgz#df8fd2195b0304acfd0c64c8af95ec543ec28593" +"@angular-devkit/build-webpack@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.8.4.tgz#44dbd6f7b181d4f58d87cd6f3926ed7bed621b93" dependencies: - "@angular-devkit/architect" "0.8.3" - "@angular-devkit/core" "0.8.3" + "@angular-devkit/architect" "0.8.4" + "@angular-devkit/core" "0.8.4" rxjs "~6.2.0" -"@angular-devkit/core@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.8.3.tgz#a7158195dc90997de62ec0b12af3325870182c3b" +"@angular-devkit/core@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.8.4.tgz#ccc73308990c7bc912e2f2759bf29e069eabf42f" dependencies: ajv "~6.4.0" chokidar "^2.0.3" rxjs "~6.2.0" source-map "^0.5.6" -"@angular-devkit/schematics@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.8.3.tgz#32f2e99b43c39864ec63301963329c9190d7c5d2" +"@angular-devkit/schematics@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.8.4.tgz#e19f6fc8b1e88277d921a286914dc9d01f139738" dependencies: - "@angular-devkit/core" "0.8.3" + "@angular-devkit/core" "0.8.4" rxjs "~6.2.0" -"@angular/cli@6.2.3": - version "6.2.3" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.2.3.tgz#212e11cd5e2eed994b33feb93c550a84a0e38ba8" +"@angular/cli@6.2.4": + version "6.2.4" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.2.4.tgz#e292a5e4d3184a40caec0337d8bc3cd597c5f292" dependencies: - "@angular-devkit/architect" "0.8.3" - "@angular-devkit/core" "0.8.3" - "@angular-devkit/schematics" "0.8.3" - "@schematics/angular" "0.8.3" - "@schematics/update" "0.8.3" + "@angular-devkit/architect" "0.8.4" + "@angular-devkit/core" "0.8.4" + "@angular-devkit/schematics" "0.8.4" + "@schematics/angular" "0.8.4" + "@schematics/update" "0.8.4" json-schema-traverse "^0.4.1" opn "^5.3.0" rxjs "~6.2.0" @@ -209,11 +209,11 @@ version "1.1.0" resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922" -"@ngtools/webpack@6.2.3": - version "6.2.3" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.2.3.tgz#88313131079d14f6c7e07940e807bb445db6a0aa" +"@ngtools/webpack@6.2.4": + version "6.2.4" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.2.4.tgz#68f97eba33400df0604b7ec33532ec49c3cebfda" dependencies: - "@angular-devkit/core" "0.8.3" + "@angular-devkit/core" "0.8.4" rxjs "~6.2.0" tree-kill "^1.0.0" webpack-sources "^1.1.0" @@ -241,20 +241,20 @@ dependencies: any-observable "^0.3.0" -"@schematics/angular@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.8.3.tgz#f4b661c5a196a06c050c0ae56809e6dbcfbf9f98" +"@schematics/angular@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.8.4.tgz#ee3c8535476d7b49b1a5676f4a5eee3fc158506f" dependencies: - "@angular-devkit/core" "0.8.3" - "@angular-devkit/schematics" "0.8.3" + "@angular-devkit/core" "0.8.4" + "@angular-devkit/schematics" "0.8.4" typescript ">=2.6.2 <2.10" -"@schematics/update@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.8.3.tgz#e8ca76066fa14a9db732e20cf41ec540c8ee7a13" +"@schematics/update@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.8.4.tgz#dddd0f278a21db8d97be102f42ced8b37ba9be7b" dependencies: - "@angular-devkit/core" "0.8.3" - "@angular-devkit/schematics" "0.8.3" + "@angular-devkit/core" "0.8.4" + "@angular-devkit/schematics" "0.8.4" npm-registry-client "^8.5.1" rxjs "~6.2.0" semver "^5.3.0"