Skip to content

Commit 4aa6504

Browse files
committed
chore(angular): bump Angular packages to v20
1 parent 70f1bd2 commit 4aa6504

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

packages/phoenix-ng/package.json

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"deploy:web:single": "ng build phoenix-app --configuration singleEvent --output-path ./docs --base-href \"./\" && cp ./docs/index.html ./docs/404.html"
2525
},
2626
"dependencies": {
27+
<<<<<<< HEAD
2728
"@angular/animations": "^19.2.17",
2829
"@angular/cdk": "^19.2.19",
2930
"@angular/common": "^19.2.17",
@@ -34,6 +35,18 @@
3435
"@angular/platform-browser": "^19.2.17",
3536
"@angular/platform-browser-dynamic": "^19.2.17",
3637
"@angular/router": "^19.2.17",
38+
=======
39+
"@angular/animations": "^20.0.0",
40+
"@angular/cdk": "^20.0.0",
41+
"@angular/common": "^20.0.0",
42+
"@angular/compiler": "^20.0.0",
43+
"@angular/core": "^20.0.0",
44+
"@angular/forms": "^20.0.0",
45+
"@angular/material": "^20.0.0",
46+
"@angular/platform-browser": "^20.0.0",
47+
"@angular/platform-browser-dynamic": "^20.0.0",
48+
"@angular/router": "^20.0.0",
49+
>>>>>>> 84dcbc69 (chore(angular): bump Angular packages to v20)
3750
"css-element-queries": "^1.2.3",
3851
"jszip": "^3.10.1",
3952
"phoenix-event-display": "^3.0.5",
@@ -46,17 +59,21 @@
4659
"zone.js": "^0.16.0"
4760
},
4861
"devDependencies": {
49-
"@angular-devkit/build-angular": "^19.2.19",
50-
"@angular/cli": "~19.2.19",
51-
"@angular/compiler-cli": "~19.2.17",
52-
"@angular/language-service": "^19.2.17",
62+
63+
"@angular-devkit/build-angular": "^20.0.0",
64+
"@angular/cli": "^20.0.0",
65+
"@angular/compiler-cli": "^20.0.0",
66+
"@angular/language-service": "^20.0.0",
67+
5368
"@frsource/cypress-plugin-visual-regression-diff": "^3.3.10",
5469
"@types/qrcode": "^1.5.6",
5570
"concurrently": "^9.2.1",
5671
"cypress": "^15.7.1",
5772
"jest": "^29.7.0",
58-
"jest-preset-angular": "^14.6.2",
59-
"ng-packagr": "^19.2.2",
73+
74+
"jest-preset-angular": "^14.3.2",
75+
"ng-packagr": "^20.0.0",
76+
6077
"ts-jest": "^29.3.4"
6178
},
6279
"peerDependencies": {

0 commit comments

Comments
 (0)