Skip to content

Commit 4aa1aa3

Browse files
authored
Merge pull request #2804 from adumesny/master
angular upgrade v17 -> v18
2 parents 0db29eb + b8d8dc5 commit 4aa1aa3

File tree

5 files changed

+2066
-2089
lines changed

5 files changed

+2066
-2089
lines changed

angular/angular.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,15 @@
4242
"prefix": "app",
4343
"architect": {
4444
"build": {
45-
"builder": "@angular-devkit/build-angular:browser",
45+
"builder": "@angular-devkit/build-angular:application",
4646
"options": {
47-
"outputPath": "dist/demo",
47+
"outputPath": {
48+
"base": "dist/demo"
49+
},
4850
"index": "projects/demo/src/index.html",
49-
"main": "projects/demo/src/main.ts",
50-
"polyfills": "projects/demo/src/polyfills.ts",
51+
"polyfills": [
52+
"projects/demo/src/polyfills.ts"
53+
],
5154
"tsConfig": "projects/demo/tsconfig.app.json",
5255
"assets": [
5356
"projects/demo/src/favicon.ico",
@@ -58,7 +61,8 @@
5861
"node_modules/gridstack/dist/gridstack-extra.min.css",
5962
"projects/demo/src/styles.css"
6063
],
61-
"scripts": []
64+
"scripts": [],
65+
"browser": "projects/demo/src/main.ts"
6266
},
6367
"configurations": {
6468
"production": {
@@ -80,9 +84,7 @@
8084
"outputHashing": "all"
8185
},
8286
"development": {
83-
"buildOptimizer": false,
8487
"optimization": false,
85-
"vendorChunk": true,
8688
"extractLicenses": false,
8789
"sourceMap": true,
8890
"namedChunks": true

angular/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@angular/animations": "~17.3.12",
14-
"@angular/common": "~17.3.12",
15-
"@angular/compiler": "~17.3.12",
16-
"@angular/core": "~17.3.12",
17-
"@angular/forms": "~17.3.12",
18-
"@angular/platform-browser": "~17.3.12",
19-
"@angular/platform-browser-dynamic": "~17.3.12",
20-
"@angular/router": "~17.3.12",
13+
"@angular/animations": "~18.2.6",
14+
"@angular/common": "~18.2.6",
15+
"@angular/compiler": "~18.2.6",
16+
"@angular/core": "~18.2.6",
17+
"@angular/forms": "~18.2.6",
18+
"@angular/platform-browser": "~18.2.6",
19+
"@angular/platform-browser-dynamic": "~18.2.6",
20+
"@angular/router": "~18.2.6",
2121
"gridstack": "^10.3.1",
2222
"rxjs": "~7.5.0",
2323
"tslib": "^2.3.0",
2424
"zone.js": "~0.14"
2525
},
2626
"devDependencies": {
27-
"@angular-devkit/build-angular": "~17.3.10",
28-
"@angular/cli": "~17.3.10",
29-
"@angular/compiler-cli": "~17.3.12",
27+
"@angular-devkit/build-angular": "~18.2.6",
28+
"@angular/cli": "~18.2.6",
29+
"@angular/compiler-cli": "~18.2.6",
3030
"@types/jasmine": "~4.0.0",
3131
"jasmine-core": "~4.3.0",
32-
"karma": "~6.4.0",
32+
"karma": "~6.4.4",
3333
"karma-chrome-launcher": "~3.1.0",
3434
"karma-coverage": "~2.2.0",
3535
"karma-jasmine": "~5.1.0",
3636
"karma-jasmine-html-reporter": "~2.0.0",
37-
"ng-packagr": "~17",
38-
"typescript": "~5.2"
37+
"ng-packagr": "~18.2.1",
38+
"typescript": "~5.4"
3939
}
40-
}
40+
}

angular/projects/lib/README.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

angular/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"baseUrl": "./",
66
"outDir": "./dist/out-tsc",
77
"forceConsistentCasingInFileNames": true,
8+
"esModuleInterop": true,
89
"strict": true,
910
"noImplicitOverride": true,
1011
"paths": {
@@ -17,7 +18,6 @@
1718
"noFallthroughCasesInSwitch": true,
1819
"sourceMap": true,
1920
"declaration": false,
20-
"downlevelIteration": true,
2121
"experimentalDecorators": true,
2222
"moduleResolution": "node",
2323
"importHelpers": true,

0 commit comments

Comments
 (0)