Skip to content

Commit

Permalink
feat(angular): support angular v14.0.0 (#10559)
Browse files Browse the repository at this point in the history
  • Loading branch information
@leosvelperez
leosvelperez committed Jun 3, 2022
1 parent 56e0ec5 commit eea2470
Show file tree
Hide file tree
Showing 17 changed files with 649 additions and 153 deletions.
34 changes: 17 additions & 17 deletions package.json
View file
Expand Up @@ -25,24 +25,24 @@
"prepare": "is-ci || husky install"
},
"devDependencies": {
"@angular-devkit/architect": "~0.1400.0-rc.3",
"@angular-devkit/build-angular": "~14.0.0-rc.3",
"@angular-devkit/core": "~14.0.0-rc.3",
"@angular-devkit/schematics": "~14.0.0-rc.3",
"@angular-devkit/architect": "~0.1400.0",
"@angular-devkit/build-angular": "~14.0.0",
"@angular-devkit/core": "~14.0.0",
"@angular-devkit/schematics": "~14.0.0",
"@angular-eslint/eslint-plugin": "~13.2.1",
"@angular-eslint/eslint-plugin-template": "~13.2.1",
"@angular-eslint/template-parser": "~13.2.1",
"@angular/cli": "~14.0.0-rc.3",
"@angular/common": "~14.0.0-rc.3",
"@angular/compiler": "~14.0.0-rc.3",
"@angular/compiler-cli": "~14.0.0-rc.3",
"@angular/core": "~14.0.0-rc.3",
"@angular/forms": "~14.0.0-rc.3",
"@angular/platform-browser": "~14.0.0-rc.3",
"@angular/platform-browser-dynamic": "~14.0.0-rc.3",
"@angular/router": "~14.0.0-rc.3",
"@angular/service-worker": "~14.0.0-rc.3",
"@angular/upgrade": "~14.0.0-rc.3",
"@angular/cli": "~14.0.0",
"@angular/common": "~14.0.0",
"@angular/compiler": "~14.0.0",
"@angular/compiler-cli": "~14.0.0",
"@angular/core": "~14.0.0",
"@angular/forms": "~14.0.0",
"@angular/platform-browser": "~14.0.0",
"@angular/platform-browser-dynamic": "~14.0.0",
"@angular/router": "~14.0.0",
"@angular/service-worker": "~14.0.0",
"@angular/upgrade": "~14.0.0",
"@babel/helper-create-regexp-features-plugin": "^7.14.5",
"@cypress/webpack-preprocessor": "^5.9.1",
"@nestjs/common": "^8.0.0",
Expand Down Expand Up @@ -74,7 +74,7 @@
"@rollup/plugin-image": "^2.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.4",
"@schematics/angular": "~14.0.0-rc.3",
"@schematics/angular": "~14.0.0",
"@storybook/addon-essentials": "~6.5.4",
"@storybook/addon-knobs": "~6.3.0",
"@storybook/angular": "~6.5.4",
Expand Down Expand Up @@ -185,7 +185,7 @@
"mini-css-extract-plugin": "~2.4.7",
"minimatch": "3.0.5",
"next-sitemap": "^1.6.108",
"ng-packagr": "~14.0.0-rc.0",
"ng-packagr": "~14.0.0",
"ngrx-store-freeze": "0.2.4",
"node-fetch": "^2.6.7",
"nx": "14.2.0-beta.2",
Expand Down
72 changes: 47 additions & 25 deletions packages/angular/migrations.json
View file
Expand Up @@ -142,6 +142,12 @@
"version": "14.2.0-beta.0",
"description": "Update TypeScript compilation target to 'ES2020'.",
"factory": "./src/migrations/update-14-2-0/update-tsconfig-target"
},
"update-router-initial-navigation": {
"cli": "nx",
"version": "14.2.0-beta.6",
"description": "Update `initialNavigation: 'enabled'` to `initialNavigation: 'enabledBlocking'`.",
"factory": "./src/migrations/update-14-2-0/update-router-initial-navigation"
}
},
"packageJsonUpdates": {
Expand Down Expand Up @@ -1119,99 +1125,99 @@
}
}
},
"14.2.0-beta.4": {
"version": "14.2.0-beta.4",
"14.2.0": {
"version": "14.2.0-beta.6",
"packages": {
"@angular-devkit/architect": {
"version": "~0.1400.0-rc.3",
"version": "~0.1400.0",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-angular": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular-devkit/build-webpack": {
"version": "~0.1400.0-rc.3",
"version": "~0.1400.0",
"alwaysAddToPackageJson": false
},
"@angular-devkit/core": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular-devkit/schematics": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/core": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": true
},
"@angular/common": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/forms": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/elements": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/compiler": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/compiler-cli": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/localize": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/platform-browser": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/platform-browser-dynamic": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/platform-server": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/router": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/upgrade": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/language-service": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/animations": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/service-worker": {
"version": "~14.0.0-rc.3",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/material": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular/cdk": {
"version": "~14.0.0-rc.2",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"ng-packagr": {
"version": "~14.0.0-rc.0",
"version": "~14.0.0",
"alwaysAddToPackageJson": false
},
"@angular-eslint/eslint-plugin": {
Expand Down Expand Up @@ -1257,6 +1263,22 @@
"jest-preset-angular": {
"version": "~11.1.2",
"alwaysAddToPackageJson": false
},
"karma-jasmine": {
"version": "~5.0.0",
"alwaysAddToPackageJson": false
},
"jasmine-core": {
"version": "~4.1.0",
"alwaysAddToPackageJson": false
},
"jasmine-spec-reporter": {
"version": "~7.0.0",
"alwaysAddToPackageJson": false
},
"@types/jasmine": {
"version": "~4.0.0",
"alwaysAddToPackageJson": false
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/package.json
View file
Expand Up @@ -37,15 +37,15 @@
"migrations": "./migrations.json"
},
"dependencies": {
"@angular-devkit/schematics": "~14.0.0-rc.3",
"@angular-devkit/schematics": "~14.0.0",
"@nrwl/cypress": "file:../cypress",
"@nrwl/devkit": "file:../devkit",
"@nrwl/jest": "file:../jest",
"@nrwl/linter": "file:../linter",
"@nrwl/storybook": "file:../storybook",
"@nrwl/workspace": "file:../workspace",
"@phenomnomnominal/tsquery": "4.1.1",
"@schematics/angular": "~14.0.0-rc.3",
"@schematics/angular": "~14.0.0",
"chalk": "4.1.0",
"chokidar": "^3.5.1",
"http-server": "^14.1.0",
Expand Down
1 change: 1 addition & 0 deletions packages/angular/src/generators/karma/files/karma.conf.js__tmpl__
View file
Expand Up @@ -39,5 +39,6 @@ module.exports = () => {
autoWatch: true,
browsers: ['Chrome'],
singleRun: true,
restartOnFileChange: true
};
};
8 changes: 4 additions & 4 deletions packages/angular/src/generators/karma/karma.ts
View file
Expand Up @@ -26,11 +26,11 @@ export function karmaGenerator(tree: Tree, options: GeneratorOptions) {
karma: '~6.3.0',
'karma-chrome-launcher': '~3.1.0',
'karma-coverage': '~2.2.0',
'karma-jasmine': '~4.0.0',
'karma-jasmine': '~5.0.0',
'karma-jasmine-html-reporter': '~1.7.0',
'jasmine-core': '~3.10.0',
'jasmine-spec-reporter': '~5.0.0',
'@types/jasmine': '~3.5.0',
'jasmine-core': '~4.1.0',
'jasmine-spec-reporter': '~7.0.0',
'@types/jasmine': '~4.0.0',
'@types/node': '16.11.7',
}
);
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/src/migrations/update-14-2-0/update-angular-cli.spec.ts
View file
Expand Up @@ -17,7 +17,7 @@ describe('update-angular-cli migration', () => {
await updateAngularCli(tree);

const { devDependencies } = readJson(tree, 'package.json');
expect(devDependencies['@angular/cli']).toEqual('~14.0.0-rc.3');
expect(devDependencies['@angular/cli']).toEqual('~14.0.0');
});

it('should update @angular/cli version when defined as a dependency', async () => {
Expand All @@ -28,7 +28,7 @@ describe('update-angular-cli migration', () => {
await updateAngularCli(tree);

const { dependencies } = readJson(tree, 'package.json');
expect(dependencies['@angular/cli']).toEqual('~14.0.0-rc.3');
expect(dependencies['@angular/cli']).toEqual('~14.0.0');
});

it('should add @angular/cli to package.json when it is not set', async () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/angular/src/migrations/update-14-2-0/update-angular-cli.ts
View file
@@ -1,14 +1,16 @@
import { formatFiles, Tree, updateJson } from '@nrwl/devkit';

const angularCliVersion = '~14.0.0';

export default async function (tree: Tree) {
let shouldFormat = false;

updateJson(tree, 'package.json', (json) => {
if (json.devDependencies?.['@angular/cli']) {
json.devDependencies['@angular/cli'] = '~14.0.0-rc.3';
json.devDependencies['@angular/cli'] = angularCliVersion;
shouldFormat = true;
} else if (json.dependencies?.['@angular/cli']) {
json.dependencies['@angular/cli'] = '~14.0.0-rc.3';
json.dependencies['@angular/cli'] = angularCliVersion;
shouldFormat = true;
}

Expand Down

1 comment on commit eea2470

@vercel
Copy link

@vercel vercel bot commented on eea2470 Jun 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx-dev-git-master-nrwl.vercel.app
nx-five.vercel.app
nx-dev-nrwl.vercel.app
nx.dev

Please sign in to comment.