Skip to content

Commit 0a1764c

Browse files
authored
Merge pull request #2934 from 4Science/DURACOM-248-ANGULAR-17
Upgrade to angular 17
2 parents a16139c + bd9e580 commit 0a1764c

File tree

42 files changed

+2428
-2567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2428
-2567
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/.angular/cache
2+
/.nx
23
/__build__
34
/__server_build__
45
/node_modules

angular.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,22 +109,22 @@
109109
"serve": {
110110
"builder": "@angular-builders/custom-webpack:dev-server",
111111
"options": {
112-
"browserTarget": "dspace-angular:build",
112+
"buildTarget": "dspace-angular:build",
113113
"port": 4000
114114
},
115115
"configurations": {
116116
"development": {
117-
"browserTarget": "dspace-angular:build:development"
117+
"buildTarget": "dspace-angular:build:development"
118118
},
119119
"production": {
120-
"browserTarget": "dspace-angular:build:production"
120+
"buildTarget": "dspace-angular:build:production"
121121
}
122122
}
123123
},
124124
"extract-i18n": {
125125
"builder": "@angular-devkit/build-angular:extract-i18n",
126126
"options": {
127-
"browserTarget": "dspace-angular:build"
127+
"buildTarget": "dspace-angular:build"
128128
}
129129
},
130130
"test": {
@@ -217,23 +217,23 @@
217217
}
218218
},
219219
"serve-ssr": {
220-
"builder": "@nguniversal/builders:ssr-dev-server",
220+
"builder": "@angular-devkit/build-angular:ssr-dev-server",
221221
"options": {
222-
"browserTarget": "dspace-angular:build",
222+
"buildTarget": "dspace-angular:build",
223223
"serverTarget": "dspace-angular:server",
224224
"port": 4000
225225
},
226226
"configurations": {
227227
"production": {
228-
"browserTarget": "dspace-angular:build:production",
228+
"buildTarget": "dspace-angular:build:production",
229229
"serverTarget": "dspace-angular:server:production"
230230
}
231231
}
232232
},
233233
"prerender": {
234-
"builder": "@nguniversal/builders:prerender",
234+
"builder": "@angular-devkit/build-angular:prerender",
235235
"options": {
236-
"browserTarget": "dspace-angular:build:production",
236+
"buildTarget": "dspace-angular:build:production",
237237
"serverTarget": "dspace-angular:server:production",
238238
"routes": [
239239
"/"

cypress/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
"**/*.ts"
55
],
66
"compilerOptions": {
7+
"sourceMap": false,
78
"types": [
89
"cypress",
910
"cypress-axe",
1011
"node"
1112
]
1213
}
13-
}
14+
}

package.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,28 @@
5555
"ts-node": "10.2.1"
5656
},
5757
"dependencies": {
58-
"@angular/animations": "^16.2.12",
59-
"@angular/cdk": "^16.2.12",
60-
"@angular/common": "^16.2.12",
61-
"@angular/compiler": "^16.2.12",
62-
"@angular/core": "^16.2.12",
63-
"@angular/forms": "^16.2.12",
64-
"@angular/localize": "16.2.12",
65-
"@angular/platform-browser": "^16.2.12",
66-
"@angular/platform-browser-dynamic": "^16.2.12",
67-
"@angular/platform-server": "^16.2.12",
68-
"@angular/router": "^16.2.12",
58+
"@angular/animations": "^17.3.4",
59+
"@angular/cdk": "^17.3.4",
60+
"@angular/common": "^17.3.4",
61+
"@angular/compiler": "^17.3.4",
62+
"@angular/core": "^17.3.4",
63+
"@angular/forms": "^17.3.4",
64+
"@angular/localize": "17.3.4",
65+
"@angular/platform-browser": "^17.3.4",
66+
"@angular/platform-browser-dynamic": "^17.3.4",
67+
"@angular/platform-server": "^17.3.4",
68+
"@angular/router": "^17.3.4",
69+
"@angular/ssr": "^17.3.0",
6970
"@babel/runtime": "7.21.0",
7071
"@kolkov/ngx-gallery": "^2.0.1",
7172
"@material-ui/core": "^4.11.0",
7273
"@material-ui/icons": "^4.11.3",
7374
"@ng-bootstrap/ng-bootstrap": "^11.0.0",
7475
"@ng-dynamic-forms/core": "^16.0.0",
7576
"@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
76-
"@ngrx/effects": "^16.3.0",
77-
"@ngrx/router-store": "^16.3.0",
78-
"@ngrx/store": "^16.3.0",
79-
"@nguniversal/express-engine": "^16.2.0",
77+
"@ngrx/effects": "^17.1.1",
78+
"@ngrx/router-store": "^17.1.1",
79+
"@ngrx/store": "^17.1.1",
8080
"@ngx-translate/core": "^14.0.0",
8181
"@nicky-lenaers/ngx-scroll-to": "^14.0.0",
8282
"@types/grecaptcha": "^3.0.4",
@@ -130,24 +130,23 @@
130130
"sortablejs": "1.15.0",
131131
"uuid": "^8.3.2",
132132
"webfontloader": "1.6.28",
133-
"zone.js": "~0.13.3"
133+
"zone.js": "~0.14.4"
134134
},
135135
"devDependencies": {
136-
"@angular-builders/custom-webpack": "~16.0.0",
137-
"@angular-devkit/build-angular": "^16.2.12",
138-
"@angular-eslint/builder": "16.3.1",
139-
"@angular-eslint/eslint-plugin": "16.3.1",
140-
"@angular-eslint/eslint-plugin-template": "16.3.1",
141-
"@angular-eslint/schematics": "16.3.1",
142-
"@angular-eslint/template-parser": "16.3.1",
143-
"@angular/cli": "^16.2.12",
144-
"@angular/compiler-cli": "^16.2.12",
145-
"@angular/language-service": "^16.2.12",
136+
"@angular-builders/custom-webpack": "~17.0.1",
137+
"@angular-devkit/build-angular": "^17.3.0",
138+
"@angular-eslint/builder": "17.2.1",
139+
"@angular-eslint/eslint-plugin": "17.2.1",
140+
"@angular-eslint/eslint-plugin-template": "17.2.1",
141+
"@angular-eslint/schematics": "17.2.1",
142+
"@angular-eslint/template-parser": "17.2.1",
143+
"@angular/cli": "^17.3.0",
144+
"@angular/compiler-cli": "^17.3.4",
145+
"@angular/language-service": "^17.3.4",
146146
"@cypress/schematic": "^1.5.0",
147147
"@fortawesome/fontawesome-free": "^6.4.0",
148-
"@ngrx/store-devtools": "^16.3.0",
148+
"@ngrx/store-devtools": "^17.1.1",
149149
"@ngtools/webpack": "^16.2.12",
150-
"@nguniversal/builders": "^16.2.0",
151150
"@types/deep-freeze": "0.1.2",
152151
"@types/ejs": "^3.1.2",
153152
"@types/express": "^4.17.17",
@@ -159,6 +158,7 @@
159158
"@typescript-eslint/eslint-plugin": "^5.59.1",
160159
"@typescript-eslint/parser": "^5.59.1",
161160
"axe-core": "^4.7.2",
161+
"browser-sync": "^3.0.0",
162162
"compression-webpack-plugin": "^9.2.0",
163163
"copy-webpack-plugin": "^6.4.1",
164164
"cross-env": "^7.0.3",
@@ -200,10 +200,10 @@
200200
"sass-loader": "^12.6.0",
201201
"sass-resources-loader": "^2.2.5",
202202
"ts-node": "^8.10.2",
203-
"typescript": "~4.9.3",
203+
"typescript": "~5.3.3",
204204
"webpack": "5.76.1",
205205
"webpack-bundle-analyzer": "^4.8.0",
206206
"webpack-cli": "^4.2.0",
207207
"webpack-dev-server": "^4.13.3"
208208
}
209-
}
209+
}

0 commit comments

Comments
 (0)