Skip to content

Commit 3027855

Browse files
authored
Merge pull request #2706 from bcgov/2649-check-for-and-fix-high-severity-issues-before-test-cut
2649: Upgrade portal Angular from 17 to 20
2 parents 6c9a9a4 + 6258fd5 commit 3027855

File tree

392 files changed

+27816
-22470
lines changed

Some content is hidden

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

392 files changed

+27816
-22470
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
platform: [ubuntu-latest]
15-
node: ["18"]
15+
node: ["20"]
1616
name: ALCS Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }}
1717
runs-on: ${{ matrix.platform }}
1818
steps:
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
matrix:
3232
platform: [ubuntu-latest]
33-
node: ["18"]
33+
node: ["20"]
3434
name: Portal Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }}
3535
runs-on: ${{ matrix.platform }}
3636
steps:

.github/workflows/schemaspy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@master
2424
- uses: actions/setup-node@master
2525
with:
26-
node-version: 18
26+
node-version: 20
2727
- run: |
2828
sudo apt-get install --yes --no-install-recommends postgresql-client
2929
- run: |

portal-frontend/angular.json

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular/build:application",
1919
"options": {
20-
"outputPath": "dist/portal-frontend",
20+
"outputPath": {
21+
"base": "dist/portal-frontend"
22+
},
2123
"index": "src/index.html",
22-
"main": "src/main.ts",
23-
"polyfills": "src/polyfills.ts",
24+
"polyfills": [
25+
"src/polyfills.ts"
26+
],
2427
"tsConfig": "tsconfig.app.json",
2528
"inlineStyleLanguage": "scss",
2629
"assets": [
@@ -35,7 +38,8 @@
3538
"node_modules"
3639
]
3740
},
38-
"scripts": []
41+
"scripts": [],
42+
"browser": "src/main.ts"
3943
},
4044
"configurations": {
4145
"production": {
@@ -65,9 +69,7 @@
6569
"outputHashing": "all"
6670
},
6771
"development": {
68-
"buildOptimizer": false,
6972
"optimization": false,
70-
"vendorChunk": true,
7173
"extractLicenses": false,
7274
"sourceMap": true,
7375
"namedChunks": true
@@ -76,7 +78,7 @@
7678
"defaultConfiguration": "production"
7779
},
7880
"serve": {
79-
"builder": "@angular-devkit/build-angular:dev-server",
81+
"builder": "@angular/build:dev-server",
8082
"configurations": {
8183
"production": {
8284
"buildTarget": "portal-frontend:build:production"
@@ -88,7 +90,7 @@
8890
"defaultConfiguration": "development"
8991
},
9092
"extract-i18n": {
91-
"builder": "@angular-devkit/build-angular:extract-i18n",
93+
"builder": "@angular/build:extract-i18n",
9294
"options": {
9395
"buildTarget": "portal-frontend:build"
9496
}
@@ -129,5 +131,31 @@
129131
},
130132
"cli": {
131133
"analytics": false
134+
},
135+
"schematics": {
136+
"@schematics/angular:component": {
137+
"type": "component"
138+
},
139+
"@schematics/angular:directive": {
140+
"type": "directive"
141+
},
142+
"@schematics/angular:service": {
143+
"type": "service"
144+
},
145+
"@schematics/angular:guard": {
146+
"typeSeparator": "."
147+
},
148+
"@schematics/angular:interceptor": {
149+
"typeSeparator": "."
150+
},
151+
"@schematics/angular:module": {
152+
"typeSeparator": "."
153+
},
154+
"@schematics/angular:pipe": {
155+
"typeSeparator": "."
156+
},
157+
"@schematics/angular:resolver": {
158+
"typeSeparator": "."
159+
}
132160
}
133161
}

0 commit comments

Comments
 (0)