Skip to content

Commit d7d3ebc

Browse files
Coly010Coly010
authored
feat(angular): support angular 16.2.0 RC (#17879)
1 parent 8be2a26 commit d7d3ebc

File tree

8 files changed

+765
-1855
lines changed

8 files changed

+765
-1855
lines changed

‎package.json

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727
},
2828
"devDependencies": {
2929
"@actions/core": "^1.10.0",
30-
"@angular-devkit/architect": "~0.1601.0",
31-
"@angular-devkit/build-angular": "~16.1.0",
32-
"@angular-devkit/core": "~16.1.0",
33-
"@angular-devkit/schematics": "~16.1.0",
30+
"@angular-devkit/architect": "~0.1602.0-rc.1",
31+
"@angular-devkit/build-angular": "~16.2.0-rc.1",
32+
"@angular-devkit/core": "~16.2.0-rc.1",
33+
"@angular-devkit/schematics": "~16.2.0-rc.1",
3434
"@angular-eslint/eslint-plugin": "~16.0.0",
3535
"@angular-eslint/eslint-plugin-template": "~16.0.0",
3636
"@angular-eslint/template-parser": "~16.0.0",
37-
"@angular/cli": "~16.1.0",
38-
"@angular/common": "~16.1.0",
39-
"@angular/compiler": "~16.1.0",
40-
"@angular/compiler-cli": "~16.1.0",
41-
"@angular/core": "~16.1.0",
42-
"@angular/router": "~16.1.0",
37+
"@angular/cli": "~16.2.0-rc.1",
38+
"@angular/common": "~16.2.0-rc.0",
39+
"@angular/compiler": "~16.2.0-rc.0",
40+
"@angular/compiler-cli": "~16.2.0-rc.0",
41+
"@angular/core": "~16.2.0-rc.0",
42+
"@angular/router": "~16.2.0-rc.0",
4343
"@babel/core": "^7.22.9",
4444
"@babel/helper-create-regexp-features-plugin": "^7.22.9",
4545
"@babel/plugin-transform-runtime": "^7.22.9",
@@ -62,7 +62,7 @@
6262
"@ngrx/effects": "~16.0.0",
6363
"@ngrx/router-store": "~16.0.0",
6464
"@ngrx/store": "~16.0.0",
65-
"@nguniversal/builders": "~16.1.0",
65+
"@nguniversal/builders": "~16.2.0-rc.0",
6666
"@nx/cypress": "16.6.0-beta.8",
6767
"@nx/devkit": "16.6.0-beta.8",
6868
"@nx/eslint-plugin": "16.6.0-beta.8",
@@ -86,7 +86,7 @@
8686
"@rollup/plugin-json": "^4.1.0",
8787
"@rollup/plugin-node-resolve": "^13.0.4",
8888
"@rollup/plugin-url": "^7.0.0",
89-
"@schematics/angular": "~16.1.0",
89+
"@schematics/angular": "~16.2.0-rc.1",
9090
"@side/jest-runtime": "^1.1.0",
9191
"@storybook/addon-essentials": "^7.1.1",
9292
"@storybook/core-server": "^7.1.1",
@@ -217,7 +217,7 @@
217217
"mini-css-extract-plugin": "~2.4.7",
218218
"minimatch": "3.0.5",
219219
"next-sitemap": "^3.1.10",
220-
"ng-packagr": "~16.1.0",
220+
"ng-packagr": "~16.2.0-next.1",
221221
"node-fetch": "^2.6.7",
222222
"nx": "16.6.0-beta.8",
223223
"nx-cloud": "16.3.0-beta.7",
@@ -362,6 +362,10 @@
362362
"pnpm": {
363363
"patchedDependencies": {
364364
"lerna@6.6.2": "patches/lerna@6.6.2.patch"
365+
},
366+
"overrides": {
367+
"@angular-devkit/core": "$@angular-devkit/core"
365368
}
366369
}
367370
}
371+

‎packages/angular/migrations.json

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,15 @@
269269
"version": "16.6.0-beta.0",
270270
"description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
271271
"factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps"
272+
},
273+
"update-angular-cli-version-16-2-0-rc-1": {
274+
"cli": "nx",
275+
"version": "16.7.0-beta.0",
276+
"requires": {
277+
"@angular/core": ">=16.2.0-rc.0"
278+
},
279+
"description": "Update the @angular/cli package version to ~16.2.0-rc.1.",
280+
"factory": "./src/migrations/update-16-7-0/update-angular-cli"
272281
}
273282
},
274283
"packageJsonUpdates": {
@@ -1235,6 +1244,67 @@
12351244
"alwaysAddToPackageJson": false
12361245
}
12371246
}
1247+
},
1248+
"16.7.0": {
1249+
"version": "16.7.0-beta.2",
1250+
"packages": {
1251+
"@angular-devkit/architect": {
1252+
"version": "~0.1602.0-rc.1",
1253+
"alwaysAddToPackageJson": false
1254+
},
1255+
"@angular-devkit/build-angular": {
1256+
"version": "~16.2.0-rc.1",
1257+
"alwaysAddToPackageJson": false
1258+
},
1259+
"@angular-devkit/build-webpack": {
1260+
"version": "~0.1602.0-rc.1",
1261+
"alwaysAddToPackageJson": false
1262+
},
1263+
"@angular-devkit/core": {
1264+
"version": "~16.2.0-rc.1",
1265+
"alwaysAddToPackageJson": false
1266+
},
1267+
"@angular-devkit/schematics": {
1268+
"version": "~16.2.0-rc.1",
1269+
"alwaysAddToPackageJson": false
1270+
},
1271+
"@angular/core": {
1272+
"version": "~16.2.0-rc.0",
1273+
"alwaysAddToPackageJson": true
1274+
},
1275+
"@angular/material": {
1276+
"version": "~16.2.0-rc.0",
1277+
"alwaysAddToPackageJson": false
1278+
},
1279+
"@angular/cdk": {
1280+
"version": "~16.2.0-rc.0",
1281+
"alwaysAddToPackageJson": false
1282+
},
1283+
"@nguniversal/builders": {
1284+
"version": "~16.2.0-rc.0",
1285+
"alwaysAddToPackageJson": false
1286+
},
1287+
"@nguniversal/common": {
1288+
"version": "~16.2.0-rc.0",
1289+
"alwaysAddToPackageJson": false
1290+
},
1291+
"@nguniversal/express-engine": {
1292+
"version": "~16.2.0-rc.0",
1293+
"alwaysAddToPackageJson": false
1294+
},
1295+
"@schematics/angular": {
1296+
"version": "~16.2.0-rc.1",
1297+
"alwaysAddToPackageJson": false
1298+
},
1299+
"ng-packagr": {
1300+
"version": "~16.2.0-next.1",
1301+
"alwaysAddToPackageJson": false
1302+
}
1303+
},
1304+
"x-prompt": "Do you want to update the Angular version to v16.2?",
1305+
"requires": {
1306+
"@angular/core": ">=16.1.0 <16.2.0-next.1"
1307+
}
12381308
}
12391309
}
12401310
}

‎packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { findMatchingProjects } from 'nx/src/utils/find-matching-projects';
1616
export function executeModuleFederationDevServerBuilder(
1717
schema: Schema,
1818
context: import('@angular-devkit/architect').BuilderContext
19-
) {
19+
): ReturnType<typeof executeWebpackDevServerBuilder> {
2020
const { ...options } = schema;
2121
const projectGraph = readCachedProjectGraph();
2222
const { projects: workspaceProjects } =

‎packages/angular/src/migrations/update-16-7-0/update-angular-cli.spec.ts

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import { readJson, Tree, writeJson } from '@nx/devkit';
2+
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
3+
import updateAngularCli, { angularCliVersion } from './update-angular-cli';
4+
5+
describe('update-angular-cli migration', () => {
6+
let tree: Tree;
7+
8+
beforeEach(() => {
9+
tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
10+
});
11+
12+
it('should update @angular/cli version when defined as a dev dependency', async () => {
13+
writeJson(tree, 'package.json', {
14+
devDependencies: { '@angular/cli': '~13.3.0' },
15+
});
16+
17+
await updateAngularCli(tree);
18+
19+
const { devDependencies } = readJson(tree, 'package.json');
20+
expect(devDependencies['@angular/cli']).toBe(angularCliVersion);
21+
});
22+
23+
it('should update @angular/cli version when defined as a dependency', async () => {
24+
writeJson(tree, 'package.json', {
25+
dependencies: { '@angular/cli': '~13.3.0' },
26+
});
27+
28+
await updateAngularCli(tree);
29+
30+
const { dependencies } = readJson(tree, 'package.json');
31+
expect(dependencies['@angular/cli']).toBe(angularCliVersion);
32+
});
33+
34+
it('should not add @angular/cli to package.json when it is not set', async () => {
35+
const initialPackageJson = readJson(tree, 'package.json');
36+
37+
await updateAngularCli(tree);
38+
39+
const packageJson = readJson(tree, 'package.json');
40+
expect(packageJson).toStrictEqual(initialPackageJson);
41+
});
42+
});

‎packages/angular/src/migrations/update-16-7-0/update-angular-cli.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { formatFiles, Tree, updateJson } from '@nx/devkit';
2+
3+
export const angularCliVersion = '~16.2.0-rc.1';
4+
5+
export default async function (tree: Tree) {
6+
let shouldFormat = false;
7+
8+
updateJson(tree, 'package.json', (json) => {
9+
if (json.devDependencies?.['@angular/cli']) {
10+
json.devDependencies['@angular/cli'] = angularCliVersion;
11+
shouldFormat = true;
12+
} else if (json.dependencies?.['@angular/cli']) {
13+
json.dependencies['@angular/cli'] = angularCliVersion;
14+
shouldFormat = true;
15+
}
16+
17+
return json;
18+
});
19+
20+
if (shouldFormat) {
21+
await formatFiles(tree);
22+
}
23+
}

‎packages/angular/src/utils/versions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
export const nxVersion = require('../../package.json').version;
22

3-
export const angularVersion = '~16.1.0';
4-
export const angularDevkitVersion = '~16.1.0';
5-
export const ngPackagrVersion = '~16.1.0';
3+
export const angularVersion = '~16.2.0-rc.0';
4+
export const angularDevkitVersion = '~16.2.0-rc.1';
5+
export const ngPackagrVersion = '~16.2.0-next.1';
66
export const ngrxVersion = '~16.0.0';
77
export const rxjsVersion = '~7.8.0';
88
export const zoneJsVersion = '~0.13.0';
99
export const angularJsVersion = '1.7.9';
1010
export const tsLibVersion = '^2.3.0';
1111

12-
export const ngUniversalVersion = '~16.1.0';
12+
export const ngUniversalVersion = '~16.2.0-rc.0';
1313
export const corsVersion = '~2.8.5';
1414
export const typesCorsVersion = '~2.8.5';
1515
export const expressVersion = '~4.18.2';

‎packages/workspace/src/utils/versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ export const typescriptVersion = '~5.1.3';
44

55
// TODO: remove when preset generation is reworked and
66
// deps are not installed from workspace
7-
export const angularCliVersion = '~16.1.0';
7+
export const angularCliVersion = '~16.2.0-rc.1';

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy