Skip to content

Commit

Permalink
Story #12961: upgrade to angular 16
Browse files Browse the repository at this point in the history
  • Loading branch information
ebernard committed Jun 19, 2024
1 parent 42590fd commit 38f80c8
Show file tree
Hide file tree
Showing 35 changed files with 6,907 additions and 4,917 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "16.20.2"
node-version: "18.20.3"
cache: "npm"
cache-dependency-path: |
ui/ui-frontend/package-lock.json
- name: Install ui-frontend dependencies
working-directory: ui/ui-frontend
run: npm ci --force
run: npm ci
- name: Build vitamui-library
working-directory: ui/ui-frontend
run: npm run build:vitamui-library
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '14.15.1'
node-version: '18.20.3'
- name: Check missing icon in icomoon
run: ./tools/check_icomoon.sh
# Only install prettier globally (with same version as in package.json)
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@
<snakeyaml.version>1.32</snakeyaml.version>

<!-- Web Pack -->
<node.version>v16.20.2</node.version>
<npm.version>8.19.4</npm.version>
<node.version>v18.20.3</node.version>
<npm.version>10.7.0</npm.version>

<!--Plugins
version -->
Expand Down
35 changes: 35 additions & 0 deletions ui/ui-frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"allowedCommonJsDependencies": [
"moment"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js"
},
Expand Down Expand Up @@ -132,6 +135,9 @@
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"allowedCommonJsDependencies": [
"moment"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js"
},
Expand Down Expand Up @@ -242,6 +248,9 @@
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"allowedCommonJsDependencies": [
"moment"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js"
},
Expand Down Expand Up @@ -346,6 +355,10 @@
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"allowedCommonJsDependencies": [
"moment",
"fast-sha256"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js"
},
Expand Down Expand Up @@ -517,6 +530,9 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"allowedCommonJsDependencies": [
"moment"
],
"outputPath": "dist/design-system",
"index": "projects/design-system/src/index.html",
"main": "projects/design-system/src/main.ts",
Expand Down Expand Up @@ -614,6 +630,9 @@
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"allowedCommonJsDependencies": [
"moment"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js"
},
Expand Down Expand Up @@ -715,6 +734,9 @@
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"allowedCommonJsDependencies": [
"moment"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js"
},
Expand Down Expand Up @@ -816,6 +838,10 @@
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"allowedCommonJsDependencies": [
"moment",
"jszip"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js"
},
Expand Down Expand Up @@ -917,6 +943,15 @@
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"allowedCommonJsDependencies": [
"moment",
"dayjs",
"dayjs/plugin/customParseFormat",
"dayjs/plugin/isBetween",
"dayjs/plugin/isSameOrAfter",
"dayjs/plugin/isSameOrBefore",
"dayjs/plugin/isoWeek"
],
"customWebpackConfig": {
"path": "./extra-webpack.config.js",
"preserveSymlinks": true
Expand Down
Loading

0 comments on commit 38f80c8

Please sign in to comment.