Skip to content

Commit

Permalink
chore(core): update @angular-devkit/* deps to fix browserslist out of…
Browse files Browse the repository at this point in the history
… date issue

see angular/angular-cli#16560
  • Loading branch information
juristr committed Jan 15, 2020
1 parent 0b77072 commit 744e281
Show file tree
Hide file tree
Showing 15 changed files with 648 additions and 239 deletions.
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
"prepush": "yarn checkcommit && yarn documentation && yarn checkformat"
},
"devDependencies": {
"@angular-devkit/architect": "0.803.14",
"@angular-devkit/build-angular": "0.803.14",
"@angular-devkit/build-ng-packagr": "0.803.14",
"@angular-devkit/build-optimizer": "0.803.14",
"@angular-devkit/build-webpack": "0.803.14",
"@angular-devkit/core": "8.3.14",
"@angular-devkit/schematics": "8.3.14",
"@angular-devkit/architect": "0.803.22",
"@angular-devkit/build-angular": "0.803.22",
"@angular-devkit/build-ng-packagr": "0.803.22",
"@angular-devkit/build-optimizer": "0.803.22",
"@angular-devkit/build-webpack": "0.803.22",
"@angular-devkit/core": "8.3.22",
"@angular-devkit/schematics": "8.3.22",
"@angular-eslint/builder": "0.0.1-alpha.18",
"@angular/cli": "8.3.14",
"@angular/cli": "8.3.22",
"@angular/common": "^8.2.12",
"@angular/compiler": "^8.2.12",
"@angular/compiler-cli": "^8.2.12",
Expand Down Expand Up @@ -67,8 +67,8 @@
"@ngrx/schematics": "8.5.0",
"@ngrx/store": "8.5.0",
"@ngrx/store-devtools": "8.5.0",
"@ngtools/webpack": "8.3.14",
"@schematics/angular": "8.3.14",
"@ngtools/webpack": "8.3.22",
"@schematics/angular": "8.3.22",
"@storybook/addon-knobs": "^5.2.5",
"@storybook/angular": "^5.2.5",
"@storybook/core": "^5.2.5",
Expand Down Expand Up @@ -103,9 +103,9 @@
"babel-plugin-const-enum": "^0.0.5",
"babel-plugin-macros": "2.6.1",
"babel-plugin-transform-async-to-promises": "0.8.14",
"browserslist": "4.6.6",
"browserslist": "4.8.3",
"cacache": "12.0.2",
"caniuse-lite": "1.0.30000989",
"caniuse-lite": "1.0.30001019",
"circular-dependency-plugin": "^5.0.2",
"clean-css": "4.2.1",
"codelyzer": "~5.0.1",
Expand Down Expand Up @@ -133,6 +133,7 @@
"fork-ts-checker-webpack-plugin": "^3.1.1",
"fs-extra": "7.0.1",
"glob": "7.1.4",
"hasha": "5.1.0",
"html-webpack-plugin": "^3.2.0",
"husky": "^3.0.3",
"identity-obj-proxy": "3.0.0",
Expand Down Expand Up @@ -164,6 +165,7 @@
"next": "9.1.5",
"ng-packagr": "5.7.0",
"ngrx-store-freeze": "0.2.4",
"npm-run-all": "^4.1.5",
"open": "6.4.0",
"opn": "^5.3.0",
"parse5": "4.0.0",
Expand Down Expand Up @@ -201,6 +203,7 @@
"styled-components": "4.3.2",
"stylus": "0.54.5",
"stylus-loader": "3.0.2",
"tar": "5.0.5",
"terser": "4.3.8",
"terser-webpack-plugin": "2.3.1",
"tmp": "0.0.33",
Expand All @@ -223,10 +226,7 @@
"worker-plugin": "3.2.0",
"yargs": "^11.0.0",
"yargs-parser": "10.0.0",
"zone.js": "^0.9.0",
"tar": "5.0.5",
"npm-run-all": "^4.1.5",
"hasha": "5.1.0"
"zone.js": "^0.9.0"
},
"author": "Victor Savkin",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/utils/versions.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const nxVersion = '*';
export const angularVersion = '^8.2.0';
export const angularDevkitVersion = '^0.803.14';
export const angularDevkitVersion = '^0.803.22';
export const angularJsVersion = '1.6.6';
export const ngrxVersion = '8.5.0';
export const rxjsVersion = '~6.4.0';
Expand Down
4 changes: 2 additions & 2 deletions packages/cypress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"@nrwl/workspace": "*"
},
"dependencies": {
"@angular-devkit/architect": "0.803.14",
"@angular-devkit/core": "8.3.14",
"@angular-devkit/architect": "0.803.22",
"@angular-devkit/core": "8.3.22",
"@cypress/webpack-preprocessor": "~4.1.0",
"tree-kill": "1.2.1",
"ts-loader": "5.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/express/package.json
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.3.14"
"@angular-devkit/schematics": "8.3.22"
}
}
6 changes: 3 additions & 3 deletions packages/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"@nrwl/workspace": "*"
},
"dependencies": {
"@angular-devkit/architect": "0.803.14",
"@angular-devkit/core": "8.3.14",
"@angular-devkit/schematics": "8.3.14"
"@angular-devkit/architect": "0.803.22",
"@angular-devkit/core": "8.3.22",
"@angular-devkit/schematics": "8.3.22"
}
}
2 changes: 1 addition & 1 deletion packages/nest/package.json
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.3.14"
"@angular-devkit/schematics": "8.3.22"
}
}
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
},
"dependencies": {
"@nrwl/react": "*",
"@angular-devkit/schematics": "8.3.14"
"@angular-devkit/schematics": "8.3.22"
}
}
8 changes: 4 additions & 4 deletions packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
"dependencies": {
"@nrwl/jest": "*",
"@nrwl/linter": "*",
"@angular-devkit/architect": "0.803.14",
"@angular-devkit/core": "8.3.14",
"@angular-devkit/schematics": "8.3.14",
"@angular-devkit/build-webpack": "0.803.14",
"@angular-devkit/architect": "0.803.22",
"@angular-devkit/core": "8.3.22",
"@angular-devkit/schematics": "8.3.22",
"@angular-devkit/build-webpack": "0.803.22",
"circular-dependency-plugin": "5.2.0",
"copy-webpack-plugin": "5.1.1",
"fork-ts-checker-webpack-plugin": "^3.1.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/tao/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
},
"homepage": "https://nx.dev",
"dependencies": {
"@angular-devkit/schematics": "8.3.14",
"@angular-devkit/core": "8.3.14",
"@angular-devkit/architect": "0.803.14",
"@angular-devkit/schematics": "8.3.22",
"@angular-devkit/core": "8.3.22",
"@angular-devkit/architect": "0.803.22",
"inquirer": "^6.3.1",
"minimist": "^1.2.0",
"strip-json-comments": "2.0.1",
Expand Down
18 changes: 9 additions & 9 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,28 @@
"@nrwl/jest": "*",
"@nrwl/linter": "*",
"@angular/service-worker": "8.2.12",
"@angular-devkit/architect": "0.803.14",
"@angular-devkit/build-ng-packagr": "0.803.14",
"@angular-devkit/build-optimizer": "0.803.14",
"@angular-devkit/build-webpack": "0.803.14",
"@angular-devkit/core": "8.3.14",
"@angular-devkit/schematics": "8.3.14",
"@angular-devkit/architect": "0.803.22",
"@angular-devkit/build-ng-packagr": "0.803.22",
"@angular-devkit/build-optimizer": "0.803.22",
"@angular-devkit/build-webpack": "0.803.22",
"@angular-devkit/core": "8.3.22",
"@angular-devkit/schematics": "8.3.22",
"@babel/core": "7.5.5",
"@babel/preset-env": "7.5.5",
"@babel/preset-typescript": "7.3.3",
"@babel/plugin-proposal-class-properties": "7.5.5",
"@babel/plugin-proposal-decorators": "7.4.4",
"@babel/plugin-transform-regenerator": "7.4.5",
"@ngtools/webpack": "8.3.14",
"@ngtools/webpack": "8.3.22",
"ajv": "6.10.2",
"autoprefixer": "9.6.1",
"babel-loader": "8.0.6",
"babel-plugin-const-enum": "0.0.5",
"babel-plugin-macros": "2.6.1",
"babel-plugin-transform-async-to-promises": "0.8.14",
"browserslist": "4.6.6",
"browserslist": "4.8.3",
"cacache": "12.0.2",
"caniuse-lite": "1.0.30000989",
"caniuse-lite": "1.0.30001019",
"circular-dependency-plugin": "5.2.0",
"clean-css": "4.2.1",
"copy-webpack-plugin": "5.1.1",
Expand Down
42 changes: 42 additions & 0 deletions packages/workspace/migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
"version": "8.12.0-beta.1",
"description": "Add implicit e2e dependencies",
"factory": "./src/migrations/update-8-12-0/add-implicit-e2e-deps"
},
"update-package-json-deps": {
"version": "8.12.0-beta.1",
"description": "Add implicit e2e dependencies",
"factory": "./src/migrations/update-8-12-0/update-package-json-deps"
}
},
"packageJsonUpdates": {
Expand Down Expand Up @@ -293,6 +298,43 @@
"alwaysAddToPackageJson": false
}
}
},
"8120": {
"version": "8.12.0-beta.1",
"packages": {
"@angular-devkit/architect": {
"version": "0.803.22",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-angular": {
"version": "0.803.22",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-ng-packagr": {
"version": "0.803.22",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-webpack": {
"version": "0.803.22",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-optimizer": {
"version": "0.803.22",
"alwaysAddToPackageJson": false
},
"@angular-devkit/schematics": {
"version": "8.3.22",
"alwaysAddToPackageJson": false
},
"@angular/cli": {
"version": "8.3.22",
"alwaysAddToPackageJson": false
},
"@schematics/angular": {
"version": "8.3.22",
"alwaysAddToPackageJson": false
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { Tree } from '@angular-devkit/schematics';
import { readJsonInTree } from '../../utils/ast-utils';
import { serializeJson } from '../../utils/fileutils';
import { runMigration } from '../../utils/testing';
import { createEmptyWorkspace } from '../../utils/testing-utils';

describe('Update 8.12.0: package.json deps', () => {
let tree: Tree;

beforeEach(async () => {
tree = Tree.empty();
tree = createEmptyWorkspace(tree);
});

describe('Update angular devkit deps', () => {
it('should update the Angular devkit core packages', async () => {
tree.overwrite(
'package.json',
serializeJson({
devDependencies: {
'@angular-devkit/architect': '0.803.14',
'@angular-devkit/build-angular': '0.803.14',
'@angular-devkit/build-ng-packagr': '0.803.14',
'@angular-devkit/build-optimizer': '0.803.14',
'@angular-devkit/build-webpack': '0.803.14',
'@angular-devkit/schematics': '8.3.14',
'@angular/cli': '8.3.14'
}
})
);

const result = await runMigration('update-package-json-deps', {}, tree);

const packageJson = readJsonInTree(result, 'package.json');
expect(packageJson.devDependencies['@angular-devkit/architect']).toEqual(
'0.803.22'
);
expect(
packageJson.devDependencies['@angular-devkit/build-angular']
).toEqual('0.803.22');
expect(
packageJson.devDependencies['@angular-devkit/build-ng-packagr']
).toEqual('0.803.22');
expect(
packageJson.devDependencies['@angular-devkit/build-optimizer']
).toEqual('0.803.22');
expect(
packageJson.devDependencies['@angular-devkit/build-webpack']
).toEqual('0.803.22');
expect(packageJson.devDependencies['@angular-devkit/schematics']).toEqual(
'8.3.22'
);
expect(packageJson.devDependencies['@angular/cli']).toEqual('8.3.22');
});
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { chain, Rule, SchematicContext } from '@angular-devkit/schematics';
import { formatFiles } from '@nrwl/workspace/src/utils/rules/format-files';
import * as path from 'path';
import { updatePackagesInPackageJson } from '../../utils/update-packages-in-package-json';
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';

const addInstall = (_: any, context: SchematicContext) => {
context.addTask(new NodePackageInstallTask());
};

export default function(): Rule {
return chain([
updatePackagesInPackageJson(
path.join(__dirname, '../../..', 'migrations.json'),
'8120'
),
addInstall,
formatFiles()
]);
}
3 changes: 2 additions & 1 deletion scripts/check-imports.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ function check() {
'packages/workspace/src/schematics/init/init.ts',
'packages/workspace/src/utils/update-task.ts',
'packages/workspace/src/migrations/update-8-3-0/update-8-3-0.spec.ts',
'packages/workspace/src/migrations/update-8-3-0/update-ng-cli-8-1.ts'
'packages/workspace/src/migrations/update-8-3-0/update-ng-cli-8-1.ts',
'packages/workspace/src/migrations/update-8-12-0/update-package-json-deps.spec.ts'
];

const files = [
Expand Down
Loading

0 comments on commit 744e281

Please sign in to comment.