Skip to content

Commit

Permalink
feat(nx): update to angular 8
Browse files Browse the repository at this point in the history
  • Loading branch information
@FrozenPandaz @vsavkin
FrozenPandaz authored and vsavkin committed May 29, 2019
1 parent 9d56385 commit 2cd4a72
Show file tree
Hide file tree
Showing 14 changed files with 158 additions and 160 deletions.
32 changes: 16 additions & 16 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
"documentation": "./scripts/documentation/documentation.sh && yarn format && ./scripts/documentation/check-documentation.sh"
},
"devDependencies": {
"@angular-devkit/architect": "~0.800.0-rc.4",
"@angular-devkit/build-angular": "~0.800.0-rc.4",
"@angular-devkit/build-ng-packagr": "~0.800.0-rc.4",
"@angular-devkit/build-webpack": "~0.800.0-rc.4",
"@angular-devkit/core": "8.0.0-rc.4",
"@angular-devkit/schematics": "8.0.0-rc.4",
"@angular/cli": "8.0.0-rc.4",
"@angular/common": "^8.0.0-rc.4",
"@angular/compiler": "^8.0.0-rc.4",
"@angular/compiler-cli": "^8.0.0-rc.4",
"@angular/core": "^8.0.0-rc.4",
"@angular/platform-browser": "^8.0.0-rc.4",
"@angular/platform-browser-dynamic": "^8.0.0-rc.4",
"@angular/router": "^8.0.0-rc.4",
"@angular/upgrade": "^8.0.0-rc.4",
"@angular-devkit/architect": "~0.800.0",
"@angular-devkit/build-angular": "~0.800.0",
"@angular-devkit/build-ng-packagr": "~0.800.0",
"@angular-devkit/build-webpack": "~0.800.0",
"@angular-devkit/core": "8.0.0",
"@angular-devkit/schematics": "8.0.0",
"@angular/cli": "8.0.0",
"@angular/common": "^8.0.0",
"@angular/compiler": "^8.0.0",
"@angular/compiler-cli": "^8.0.0",
"@angular/core": "^8.0.0",
"@angular/platform-browser": "^8.0.0",
"@angular/platform-browser-dynamic": "^8.0.0",
"@angular/router": "^8.0.0",
"@angular/upgrade": "^8.0.0",
"@nestjs/common": "^6.2.4",
"@nestjs/core": "^6.2.4",
"@nestjs/platform-express": "^6.2.4",
Expand All @@ -48,7 +48,7 @@
"@ngrx/schematics": "7.1.0",
"@ngrx/store": "7.1.0",
"@ngrx/store-devtools": "7.1.0",
"@schematics/angular": "8.0.0-rc.4",
"@schematics/angular": "8.0.0",
"@types/express": "4.16.0",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"@nrwl/cypress": "*",
"@nrwl/jest": "*",
"@angular-devkit/schematics": "8.0.0-rc.4",
"@schematics/angular": "8.0.0-rc.4"
"@angular-devkit/schematics": "8.0.0",
"@schematics/angular": "8.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/angular/src/utils/versions.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const nxVersion = '*';
export const angularVersion = '^8.0.0-rc.4';
export const angularDevkitVersion = '^0.800.0-rc.4';
export const angularVersion = '^8.0.0';
export const angularDevkitVersion = '^0.800.0';
export const angularJsVersion = '1.6.6';
export const ngrxVersion = '7.2.0';
export const ngrxStoreFreezeVersion = '0.2.4';
Expand Down
4 changes: 2 additions & 2 deletions packages/cypress/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@nrwl/workspace": "*"
},
"dependencies": {
"@angular-devkit/architect": "0.800.0-rc.4",
"@angular-devkit/core": "8.0.0-rc.4",
"@angular-devkit/architect": "0.800.0",
"@angular-devkit/core": "8.0.0",
"tree-kill": "1.2.1"
}
}
2 changes: 1 addition & 1 deletion packages/express/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"dependencies": {
"@nrwl/node": "*",
"@nrwl/jest": "*",
"@angular-devkit/schematics": "8.0.0-rc.4"
"@angular-devkit/schematics": "8.0.0"
}
}
6 changes: 3 additions & 3 deletions packages/jest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@nrwl/workspace": "*"
},
"dependencies": {
"@angular-devkit/architect": "0.800.0-rc.4",
"@angular-devkit/core": "8.0.0-rc.4",
"@angular-devkit/schematics": "8.0.0-rc.4"
"@angular-devkit/architect": "0.800.0",
"@angular-devkit/core": "8.0.0",
"@angular-devkit/schematics": "8.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/nest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"dependencies": {
"@nrwl/node": "*",
"@nrwl/jest": "*",
"@angular-devkit/schematics": "8.0.0-rc.4"
"@angular-devkit/schematics": "8.0.0"
}
}
8 changes: 4 additions & 4 deletions packages/node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
},
"dependencies": {
"@nrwl/jest": "*",
"@angular-devkit/architect": "0.800.0-rc.4",
"@angular-devkit/core": "8.0.0-rc.4",
"@angular-devkit/schematics": "8.0.0-rc.4",
"@angular-devkit/build-webpack": "0.800.0-rc.4",
"@angular-devkit/architect": "0.800.0",
"@angular-devkit/core": "8.0.0",
"@angular-devkit/schematics": "8.0.0",
"@angular-devkit/build-webpack": "0.800.0",
"circular-dependency-plugin": "^5.0.2",
"copy-webpack-plugin": "4.6.0",
"fork-ts-checker-webpack-plugin": "0.4.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"@nrwl/cypress": "*",
"@nrwl/jest": "*",
"@nrwl/web": "*",
"@angular-devkit/schematics": "8.0.0-rc.4"
"@angular-devkit/schematics": "8.0.0"
}
}
44 changes: 21 additions & 23 deletions packages/schematics/migrations/update-8-0-0/update-8-0-0.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,38 +325,36 @@ export const runAngularMigrations: Rule = (
context.logger.info('Migrating Angular to v8.0.0');
}

return !!packageJson.dependencies['@angular/core']
? chain([
externalSchematic(
'@schematics/update',
'update',
{
packages: ['@angular/cli'],
from: '7.2.2',
to: '8.0.0-rc.3',
force: true,
next: true
},
{
interactive: true
}
),
externalSchematic(
return chain([
externalSchematic(
'@schematics/update',
'update',
{
packages: ['@angular/cli'],
from: '7.2.2',
to: '8.0.0',
force: true
},
{
interactive: true
}
),
!!packageJson.dependencies['@angular/core']
? externalSchematic(
'@schematics/update',
'update',
{
packages: ['@angular/core'],
from: '7.0.0',
to: '8.0.0-rc.3',
force: true,
next: true
to: '8.0.0',
force: true
},
{
interactive: true
}
)
])
: noop();
: noop()
]);
};

const updateNestDependencies = updateJsonInTree('package.json', json => {
Expand Down Expand Up @@ -393,7 +391,7 @@ function filterFiles(host: Tree, context: SchematicContext) {
}
ig.add(host.read('.gitignore').toString());
return filter(file => {
return ig.ignores(relative('/', file));
return !ig.ignores(relative('/', file));
});
}

Expand Down
10 changes: 5 additions & 5 deletions packages/web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
"dependencies": {
"@nrwl/cypress": "*",
"@nrwl/jest": "*",
"@angular-devkit/architect": "~0.800.0-rc.4",
"@angular-devkit/build-angular": "~0.800.0-rc.4",
"@angular-devkit/build-webpack": "~0.800.0-rc.4",
"@angular-devkit/core": "8.0.0-rc.4",
"@angular-devkit/schematics": "8.0.0-rc.4",
"@angular-devkit/architect": "~0.800.0",
"@angular-devkit/build-angular": "~0.800.0",
"@angular-devkit/build-webpack": "~0.800.0",
"@angular-devkit/core": "8.0.0",
"@angular-devkit/schematics": "8.0.0",
"copy-webpack-plugin": "4.6.0",
"fork-ts-checker-webpack-plugin": "0.4.9",
"identity-obj-proxy": "3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/workspace/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
]
},
"dependencies": {
"@angular-devkit/core": "8.0.0-rc.4",
"@angular-devkit/schematics": "8.0.0-rc.4",
"@angular-devkit/core": "8.0.0",
"@angular-devkit/schematics": "8.0.0",
"app-root-path": "^2.0.1",
"cosmiconfig": "4.0.0",
"fs-extra": "6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/workspace/src/utils/versions.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const nxVersion = '*';

export const angularCliVersion = '8.0.0-rc.3';
export const angularCliVersion = '8.0.0';
export const typescriptVersion = '~3.4.5';
export const prettierVersion = '1.16.4';
export const jasmineMarblesVersion = '^0.4.0';
Loading

0 comments on commit 2cd4a72

Please sign in to comment.