-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(schematics): update @angular/cli to 6.2.3 and ngrx 6.1.0
- Loading branch information
1 parent
ac7cc3b
commit c9d3f97
Showing
12 changed files
with
628 additions
and
341 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
packages/schematics/migrations/update-6-4-0/update-6-4-0.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| import { Tree } from '@angular-devkit/schematics'; | ||
| import { SchematicTestRunner } from '@angular-devkit/schematics/testing'; | ||
| import { serializeJson } from '../../src/utils/fileutils'; | ||
|
|
||
| import * as path from 'path'; | ||
|
|
||
| describe('Update 6.4.0', () => { | ||
| let initialTree: Tree; | ||
| let schematicRunner: SchematicTestRunner; | ||
|
|
||
| beforeEach(() => { | ||
| initialTree = Tree.empty(); | ||
| initialTree.create( | ||
| 'package.json', | ||
| serializeJson({ | ||
| dependencies: { | ||
| '@angular/animations': '^6.1.0', | ||
| '@angular/common': '^6.1.0', | ||
| '@angular/compiler': '^6.1.0', | ||
| '@angular/core': '^6.1.0', | ||
| '@angular/forms': '^6.1.0', | ||
| '@angular/platform-browser': '^6.1.0', | ||
| '@angular/platform-browser-dynamic': '^6.1.0', | ||
| '@angular/router': '^6.1.0', | ||
| 'core-js': '^2.5.4', | ||
| rxjs: '^6.0.0', | ||
| 'zone.js': '^0.8.26', | ||
| '@nrwl/nx': '6.1.0', | ||
| '@ngrx/effects': '6.0.1', | ||
| '@ngrx/store': '6.0.1', | ||
| '@ngrx/router-store': '6.0.1' | ||
| }, | ||
| devDependencies: { | ||
| '@angular/cli': '6.1.2', | ||
| '@angular/compiler-cli': '^6.1.0', | ||
| '@angular/language-service': '^6.1.0', | ||
| '@angular-devkit/build-angular': '~0.7.0', | ||
| '@angular-devkit/build-ng-packagr': '~0.7.0', | ||
| '@ngrx/store-devtools': '6.0.1', | ||
| '@nrwl/schematics': '6.1.0', | ||
| 'jasmine-marbles': '0.3.1', | ||
| '@types/jasmine': '~2.8.6', | ||
| '@types/jasminewd2': '~2.0.3', | ||
| '@types/node': '~8.9.4', | ||
| codelyzer: '~4.2.1', | ||
| 'jasmine-core': '~2.99.1', | ||
| 'jasmine-spec-reporter': '~4.2.1', | ||
| karma: '~2.0.0', | ||
| 'karma-chrome-launcher': '~2.2.0', | ||
| 'karma-coverage-istanbul-reporter': '~1.4.2', | ||
| 'karma-jasmine': '~1.1.0', | ||
| 'karma-jasmine-html-reporter': '^0.2.2', | ||
| 'ngrx-store-freeze': '0.2.4', | ||
| protractor: '~5.3.0', | ||
| 'ts-node': '~5.0.1', | ||
| tslint: '~5.9.1', | ||
| typescript: '~2.7.2', | ||
| prettier: '1.10.2' | ||
| } | ||
| }) | ||
| ); | ||
| schematicRunner = new SchematicTestRunner( | ||
| '@nrwl/schematics', | ||
| path.join(__dirname, '../migrations.json') | ||
| ); | ||
| }); | ||
|
|
||
| it('should update dependencies', () => { | ||
| const result = schematicRunner.runSchematic( | ||
| 'update-6.4.0', | ||
| {}, | ||
| initialTree | ||
| ); | ||
|
|
||
| expect(JSON.parse(result.readContent('package.json'))).toEqual({ | ||
| dependencies: { | ||
| '@angular/animations': '^6.1.0', | ||
| '@angular/common': '^6.1.0', | ||
| '@angular/compiler': '^6.1.0', | ||
| '@angular/core': '^6.1.0', | ||
| '@angular/forms': '^6.1.0', | ||
| '@angular/platform-browser': '^6.1.0', | ||
| '@angular/platform-browser-dynamic': '^6.1.0', | ||
| '@angular/router': '^6.1.0', | ||
| 'core-js': '^2.5.4', | ||
| rxjs: '^6.0.0', | ||
| 'zone.js': '^0.8.26', | ||
| '@nrwl/nx': '6.1.0', | ||
| '@ngrx/effects': '6.1.0', | ||
| '@ngrx/store': '6.1.0', | ||
| '@ngrx/router-store': '6.1.0' | ||
| }, | ||
| devDependencies: { | ||
| '@angular/cli': '6.2.3', | ||
| '@angular/compiler-cli': '^6.1.0', | ||
| '@angular/language-service': '^6.1.0', | ||
| '@angular-devkit/build-angular': '~0.8.0', | ||
| '@angular-devkit/build-ng-packagr': '~0.8.0', | ||
| '@ngrx/store-devtools': '6.1.0', | ||
| '@nrwl/schematics': '6.1.0', | ||
| 'jasmine-marbles': '0.3.1', | ||
| '@types/jasmine': '~2.8.6', | ||
| '@types/jasminewd2': '~2.0.3', | ||
| '@types/node': '~8.9.4', | ||
| codelyzer: '~4.2.1', | ||
| 'jasmine-core': '~2.99.1', | ||
| 'jasmine-spec-reporter': '~4.2.1', | ||
| karma: '~3.0.0', | ||
| 'karma-chrome-launcher': '~2.2.0', | ||
| 'karma-coverage-istanbul-reporter': '~2.0.1', | ||
| 'karma-jasmine': '~1.1.0', | ||
| 'karma-jasmine-html-reporter': '^0.2.2', | ||
| 'ngrx-store-freeze': '0.2.4', | ||
| protractor: '~5.4.0', | ||
| 'ts-node': '~7.0.0', | ||
| tslint: '~5.11.0', | ||
| typescript: '~2.9.2', | ||
| prettier: '1.10.2' | ||
| } | ||
| }); | ||
| }); | ||
| }); |
51 changes: 51 additions & 0 deletions
51
packages/schematics/migrations/update-6-4-0/update-6-4-0.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { | ||
| Rule, | ||
| SchematicContext, | ||
| chain, | ||
| template, | ||
| apply, | ||
| mergeWith, | ||
| url | ||
| } from '@angular-devkit/schematics'; | ||
| import { stripIndents } from '@angular-devkit/core/src/utils/literals'; | ||
| import { updateJsonInTree } from '../../src/utils/ast-utils'; | ||
| import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks'; | ||
|
|
||
| function updateDependencies() { | ||
| return updateJsonInTree('package.json', json => { | ||
| json.dependencies = json.dependencies || {}; | ||
| json.dependencies = { | ||
| ...json.dependencies, | ||
| '@ngrx/effects': '6.1.0', | ||
| '@ngrx/store': '6.1.0', | ||
| '@ngrx/router-store': '6.1.0' | ||
| }; | ||
| json.devDependencies = json.devDependencies || {}; | ||
| json.devDependencies = { | ||
| ...json.devDependencies, | ||
| '@angular/cli': '6.2.3', | ||
| '@angular-devkit/build-angular': '~0.8.0', | ||
| '@ngrx/store-devtools': '6.1.0', | ||
| karma: '~3.0.0', | ||
| 'karma-coverage-istanbul-reporter': '~2.0.1', | ||
| protractor: '~5.4.0', | ||
| 'ts-node': '~7.0.0', | ||
| tslint: '~5.11.0', | ||
| typescript: '~2.9.2' | ||
| }; | ||
|
|
||
| if (json.devDependencies['@angular-devkit/build-ng-packagr']) { | ||
| json.devDependencies['@angular-devkit/build-ng-packagr'] = '~0.8.0'; | ||
| } | ||
|
|
||
| return json; | ||
| }); | ||
| } | ||
|
|
||
| const addInstall = (_, context: SchematicContext) => { | ||
| context.addTask(new NodePackageInstallTask()); | ||
| }; | ||
|
|
||
| export default function(): Rule { | ||
| return chain([updateDependencies(), addInstall]); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.