Skip to content

Commit bc735c9

Browse files
alan-agius4alan-agius4
committed
build: update framework packages to 18.1.0-next.0
1 parent 721d50b commit bc735c9

File tree

11 files changed

+104
-84
lines changed

11 files changed

+104
-84
lines changed

‎package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,23 @@
5151
},
5252
"devDependencies": {
5353
"@ampproject/remapping": "2.3.0",
54-
"@angular/animations": "18.0.0",
54+
"@angular/animations": "18.1.0-next.0",
5555
"@angular/bazel": "https://github.com/angular/bazel-builds.git#71bd2e043e076365effdb6076f33b2d8d6bd6d02",
5656
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#8b5a56554a0f7024fc2d0f4abf7260bf37e28150",
5757
"@angular/cdk": "18.0.0",
58-
"@angular/common": "18.0.0",
59-
"@angular/compiler": "18.0.0",
60-
"@angular/compiler-cli": "18.0.0",
61-
"@angular/core": "18.0.0",
62-
"@angular/forms": "18.0.0",
63-
"@angular/localize": "18.0.0",
58+
"@angular/common": "18.1.0-next.0",
59+
"@angular/compiler": "18.1.0-next.0",
60+
"@angular/compiler-cli": "18.1.0-next.0",
61+
"@angular/core": "18.1.0-next.0",
62+
"@angular/forms": "18.1.0-next.0",
63+
"@angular/localize": "18.1.0-next.0",
6464
"@angular/material": "18.0.0",
6565
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#c44d21e50aad681b895171cb3b3d773c73b3af4b",
66-
"@angular/platform-browser": "18.0.0",
67-
"@angular/platform-browser-dynamic": "18.0.0",
68-
"@angular/platform-server": "18.0.0",
69-
"@angular/router": "18.0.0",
70-
"@angular/service-worker": "18.0.0",
66+
"@angular/platform-browser": "18.1.0-next.0",
67+
"@angular/platform-browser-dynamic": "18.1.0-next.0",
68+
"@angular/platform-server": "18.1.0-next.0",
69+
"@angular/router": "18.1.0-next.0",
70+
"@angular/service-worker": "18.1.0-next.0",
7171
"@babel/core": "7.24.6",
7272
"@babel/generator": "7.24.6",
7373
"@babel/helper-annotate-as-pure": "7.24.6",

‎packages/angular/build/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
"watchpack": "2.4.1"
4646
},
4747
"peerDependencies": {
48-
"@angular/compiler-cli": "^18.0.0 || ^18.0.0-next.0",
49-
"@angular/localize": "^18.0.0 || ^18.0.0-next.0",
50-
"@angular/platform-server": "^18.0.0 || ^18.0.0-next.0",
51-
"@angular/service-worker": "^18.0.0 || ^18.0.0-next.0",
48+
"@angular/compiler-cli": "^18.0.0 || ^18.1.0-next.0",
49+
"@angular/localize": "^18.0.0 || ^18.1.0-next.0",
50+
"@angular/platform-server": "^18.0.0 || ^18.1.0-next.0",
51+
"@angular/service-worker": "^18.0.0 || ^18.1.0-next.0",
5252
"less": "^4.2.0",
5353
"postcss": "^8.4.0",
5454
"tailwindcss": "^2.0.0 || ^3.0.0",

‎packages/angular/pwa/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"parse5-html-rewriting-stream": "7.0.0"
1818
},
1919
"peerDependencies": {
20-
"@angular/cli": "^18.0.0-next.0"
20+
"@angular/cli": "^18.0.0 || ^18.1.0-next.0"
2121
},
2222
"peerDependenciesMeta": {
2323
"@angular/cli": {

‎packages/angular/ssr/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"tslib": "^2.3.0"
1818
},
1919
"peerDependencies": {
20-
"@angular/common": "^18.0.0-next.0",
21-
"@angular/core": "^18.0.0-next.0"
20+
"@angular/common": "^18.0.0 || ^18.1.0-next.0",
21+
"@angular/core": "^18.0.0 || ^18.1.0-next.0"
2222
},
2323
"schematics": "./schematics/collection.json",
2424
"repository": {

‎packages/angular_devkit/build_angular/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,16 @@
7575
"esbuild": "0.21.4"
7676
},
7777
"peerDependencies": {
78-
"@angular/compiler-cli": "^18.0.0-next.0",
79-
"@angular/localize": "^18.0.0-next.0",
80-
"@angular/platform-server": "^18.0.0-next.0",
81-
"@angular/service-worker": "^18.0.0-next.0",
78+
"@angular/compiler-cli": "^18.0.0 || ^18.1.0-next.0",
79+
"@angular/localize": "^18.0.0 || ^18.1.0-next.0",
80+
"@angular/platform-server": "^18.0.0 || ^18.1.0-next.0",
81+
"@angular/service-worker": "^18.0.0 || ^18.1.0-next.0",
8282
"@web/test-runner": "^0.18.0",
8383
"browser-sync": "^3.0.2",
8484
"jest": "^29.5.0",
8585
"jest-environment-jsdom": "^29.5.0",
8686
"karma": "^6.3.0",
87-
"ng-packagr": "^18.0.0-next.0",
87+
"ng-packagr": "^18.0.0 || ^18.1.0-next.0",
8888
"protractor": "^7.0.0",
8989
"tailwindcss": "^2.0.0 || ^3.0.0",
9090
"typescript": ">=5.4 <5.5"

‎packages/ngtools/webpack/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
"homepage": "https://github.com/angular/angular-cli/tree/main/packages/ngtools/webpack",
2323
"dependencies": {},
2424
"peerDependencies": {
25-
"@angular/compiler-cli": "^18.0.0-next.0",
25+
"@angular/compiler-cli": "^18.0.0 || ^18.1.0-next.0",
2626
"typescript": ">=5.4 <5.5",
2727
"webpack": "^5.54.0"
2828
},
2929
"devDependencies": {
3030
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
31-
"@angular/compiler": "18.0.0",
32-
"@angular/compiler-cli": "18.0.0",
31+
"@angular/compiler": "18.1.0-next.0",
32+
"@angular/compiler-cli": "18.1.0-next.0",
3333
"typescript": "5.4.5",
3434
"webpack": "5.91.0"
3535
}

‎packages/schematics/angular/utility/latest-versions/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"comment": "This file is needed so that dependencies are synced by Renovate.",
44
"private": true,
55
"dependencies": {
6-
"@angular/core": "^18.0.0-next.0",
6+
"@angular/core": "^18.1.0-next.0",
77
"@types/express": "^4.17.17",
88
"@types/jasmine": "~5.1.0",
99
"@types/node": "^18.18.0",
@@ -17,7 +17,7 @@
1717
"karma-jasmine": "~5.1.0",
1818
"karma": "~6.4.0",
1919
"less": "^4.2.0",
20-
"ng-packagr": "^18.0.0-next.0",
20+
"ng-packagr": "^18.0.0",
2121
"postcss": "^8.4.38",
2222
"protractor": "~7.0.0",
2323
"rxjs": "~7.8.0",

‎tests/legacy-cli/e2e/tests/build/material.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
1+
import { appendFile } from 'node:fs/promises';
12
import { getGlobalVariable } from '../../utils/env';
23
import { readFile, replaceInFile } from '../../utils/fs';
3-
import { installPackage, installWorkspacePackages } from '../../utils/packages';
4+
import {
5+
getActivePackageManager,
6+
installPackage,
7+
installWorkspacePackages,
8+
} from '../../utils/packages';
49
import { ng } from '../../utils/process';
510
import { isPrereleaseCli, updateJsonFile } from '../../utils/project';
611

712
const snapshots = require('../../ng-snapshot/package.json');
813

914
export default async function () {
10-
let tag = (await isPrereleaseCli()) ? '@next' : '';
15+
const isPrerelease = await isPrereleaseCli();
16+
let tag = isPrerelease ? '@next' : '';
17+
if (getActivePackageManager() === 'npm') {
18+
await appendFile('.npmrc', '\nlegacy-peer-deps=true');
19+
}
20+
1121
await ng('add', `@angular/material${tag}`, '--skip-confirmation');
1222

1323
const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];

‎tests/legacy-cli/e2e/tests/commands/add/add-material.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
import { assertIsError } from '../../../utils/utils';
22
import { expectFileToMatch, rimraf } from '../../../utils/fs';
3-
import { uninstallPackage } from '../../../utils/packages';
3+
import { getActivePackageManager, uninstallPackage } from '../../../utils/packages';
44
import { ng } from '../../../utils/process';
55
import { isPrereleaseCli } from '../../../utils/project';
6+
import { appendFile } from 'node:fs/promises';
67

78
export default async function () {
89
// forcibly remove in case another test doesn't clean itself up
910
await rimraf('node_modules/@angular/material');
1011

11-
const tag = (await isPrereleaseCli()) ? '@next' : '';
12+
const isPrerelease = await isPrereleaseCli();
13+
const tag = isPrerelease ? '@next' : '';
14+
if (getActivePackageManager() === 'npm') {
15+
await appendFile('.npmrc', '\nlegacy-peer-deps=true');
16+
}
1217

1318
try {
1419
await ng('add', `@angular/material${tag}`, '--unknown', '--skip-confirmation');

‎tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { expectFileToMatch } from '../../utils/fs';
22
import { execWithEnv, extractNpmEnv, ng, silentNpm } from '../../utils/process';
3-
import { installPackage, uninstallPackage } from '../../utils/packages';
3+
import { getActivePackageManager, installPackage, uninstallPackage } from '../../utils/packages';
44
import { isPrereleaseCli } from '../../utils/project';
5+
import { appendFile } from 'node:fs/promises';
56

67
export default async function () {
78
// Must publish old version to local registry to allow install. This is especially important
@@ -13,7 +14,12 @@ export default async function () {
1314
// Install outdated and incompatible version
1415
await installPackage('@schematics/angular@7');
1516

16-
const tag = (await isPrereleaseCli()) ? '@next' : '';
17+
const isPrerelease = await isPrereleaseCli();
18+
const tag = isPrerelease ? '@next' : '';
19+
if (getActivePackageManager() === 'npm') {
20+
await appendFile('.npmrc', '\nlegacy-peer-deps=true');
21+
}
22+
1723
await ng('add', `@angular/material${tag}`, '--skip-confirmation');
1824
await expectFileToMatch('package.json', /@angular\/material/);
1925

0 commit comments

Comments
 (0)