|
24 | 24 | "deploy:web:single": "ng build phoenix-app --configuration singleEvent --output-path ./docs --base-href \"./\" && cp ./docs/index.html ./docs/404.html" |
25 | 25 | }, |
26 | 26 | "dependencies": { |
| 27 | +<<<<<<< HEAD |
27 | 28 | "@angular/animations": "^19.2.17", |
28 | 29 | "@angular/cdk": "^19.2.19", |
29 | 30 | "@angular/common": "^19.2.17", |
|
34 | 35 | "@angular/platform-browser": "^19.2.17", |
35 | 36 | "@angular/platform-browser-dynamic": "^19.2.17", |
36 | 37 | "@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) |
37 | 50 | "css-element-queries": "^1.2.3", |
38 | 51 | "jszip": "^3.10.1", |
39 | 52 | "phoenix-event-display": "^3.0.5", |
|
46 | 59 | "zone.js": "^0.16.0" |
47 | 60 | }, |
48 | 61 | "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 | + |
53 | 68 | "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", |
54 | 69 | "@types/qrcode": "^1.5.6", |
55 | 70 | "concurrently": "^9.2.1", |
56 | 71 | "cypress": "^15.7.1", |
57 | 72 | "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 | + |
60 | 77 | "ts-jest": "^29.3.4" |
61 | 78 | }, |
62 | 79 | "peerDependencies": { |
|
0 commit comments