Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
328e450
Temporarily uninstall @angular-builders/jest
trslater Dec 4, 2025
e9ac013
Make sure all versions are compatible with 17
trslater Dec 4, 2025
2b9328a
Pin Angular versions to avoid conflicts
trslater Dec 4, 2025
adb4f6e
Upgrade Angular eslint schematics
trslater Dec 4, 2025
ef96ef0
Upgrade ALCS Angular core/CLI 17 -> 18
trslater Dec 4, 2025
c78b454
Temporarily remove problematic packages
trslater Dec 4, 2025
78c791b
Upgrade Angular material/CDK 17 -> 18
trslater Dec 4, 2025
4fc7bd7
Uninstall blocking ng-select addon
trslater Dec 4, 2025
71dc23b
Upgrade Angular core/CLI 18 -> 19
trslater Dec 4, 2025
b717251
Upgrade Angular material/CDK 18 -> 19
trslater Dec 4, 2025
2f6f1fe
Upgrade Angular core/CLI 19 -> 20
trslater Dec 4, 2025
cf07a3c
Upgrade Angular material/CDK 19 -> 20
trslater Dec 4, 2025
a46b7d1
Refresh package lock for v20
trslater Dec 9, 2025
31b3ee5
Re-add problematic packages
trslater Dec 10, 2025
b366346
Remove missing `isArray` function
trslater Dec 10, 2025
e6a2980
Account for null `$users` for `ng-select`
trslater Dec 10, 2025
dd91d7b
Fix date picker super
trslater Dec 10, 2025
ed3866c
Fix HTTP client import
trslater Dec 10, 2025
5398f0f
Lock packages
trslater Dec 10, 2025
a3087ff
Fix all Angular compiler errors
trslater Dec 15, 2025
42b71f5
Fix Angular compiler warngins
trslater Dec 15, 2025
af2ae59
Add back `@anuglar-builders/jest`
trslater Dec 15, 2025
425d8a9
Create missing mocks
trslater Dec 15, 2025
140952e
Create missing mocks
trslater Dec 16, 2025
1785cb5
Fix HTTP mock in incoming files service
trslater Dec 23, 2025
1405370
This was causing an error
trslater Dec 23, 2025
d3252cf
Merge branch 'develop' into 2649-upgrade-alcs
PaulGreywal Dec 24, 2025
8b3c616
fix: addressed angular updates with rebased develop branch
PaulGreywal Dec 24, 2025
2d734a7
chore: updated node ci
PaulGreywal Dec 24, 2025
6e6d898
Merge branch 'develop' into 2649-upgrade-alcs
trslater Jan 6, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest]
node: ["18"]
node: ["20"]
name: ALCS Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }}
runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -30,7 +30,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest]
node: ["18"]
node: ["20"]
name: Portal Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }}
runs-on: ${{ matrix.platform }}
steps:
Expand Down
46 changes: 37 additions & 9 deletions alcs-frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular/build:application",
"options": {
"outputPath": "dist/alcs-frontend",
"outputPath": {
"base": "dist/alcs-frontend"
},
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts"
],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
Expand All @@ -37,7 +40,8 @@
"node_modules"
]
},
"scripts": []
"scripts": [],
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand Down Expand Up @@ -68,9 +72,7 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
Expand All @@ -79,7 +81,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular/build:dev-server",
"configurations": {
"production": {
"buildTarget": "alcs-frontend:build:production"
Expand All @@ -91,7 +93,7 @@
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"builder": "@angular/build:extract-i18n",
"options": {
"buildTarget": "alcs-frontend:build"
}
Expand Down Expand Up @@ -136,5 +138,31 @@
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"schematics": {
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
}
}
Loading
Loading