Merge pull request #1513 from rodekruis/build.ng-18

build: upgrade to angular 18
rodekruis · Jul 18, 2024 · 42b8903 · 42b8903
2 parents 6f28ecf + c71dcad
commit 42b8903
Show file tree

Hide file tree

Showing 56 changed files with 11,211 additions and 24,170 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -66,7 +66,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [20.x]
 
     defaults:
       run:

diff --git a/interfaces/IBF-dashboard/.eslintrc.json b/interfaces/IBF-dashboard/.eslintrc.json
@@ -1,14 +1,21 @@
 {
   "root": true,
-  "ignorePatterns": ["dist", "coverage"],
+  "ignorePatterns": [
+    "dist",
+    "coverage"
+  ],
   "parserOptions": {
     "ecmaVersion": 2020
   },
   "overrides": [
     {
-      "files": ["*.ts"],
+      "files": [
+        "*.ts"
+      ],
       "parserOptions": {
-        "project": ["tsconfig.json"],
+        "project": [
+          "tsconfig.json"
+        ],
         "createDefaultProgram": true
       },
       "extends": [
@@ -20,14 +27,21 @@
         "@angular-eslint/component-class-suffix": [
           "error",
           {
-            "suffixes": ["Page", "Component"]
+            "suffixes": [
+              "Page",
+              "Component"
+            ]
           }
         ]
       }
     },
     {
-      "files": ["*.html"],
-      "extends": ["plugin:@angular-eslint/template/recommended"],
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
       "rules": {}
     }
   ]

diff --git a/interfaces/IBF-dashboard/Dockerfile b/interfaces/IBF-dashboard/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:20-alpine
 
 RUN apk update && apk add python3 make g++ git
 
@@ -49,4 +49,4 @@ ENV SUPPORT_EMAIL_ADDRESS=$SUPPORT_EMAIL_ADDRESS
 ARG WHATS_NEW_URL
 ENV WHATS_NEW_URL=$WHATS_NEW_URL
 
-RUN npm run build -- --prod --configuration $NG_CONFIGURATION
+RUN npm run build -- --configuration $NG_CONFIGURATION
diff --git a/interfaces/IBF-dashboard/README.md b/interfaces/IBF-dashboard/README.md
@@ -48,34 +48,10 @@ npm start
 
 See other available tasks/scripts with: `npm run`
 
-## Documentation
+## Frameworks
 
-Documentation of the tools and libraries used.
+- [Ionic Framework](https://ionicframework.com/docs/) This UI-kit or library gives us a foundation to quickly build interfaces cross-platform/cross-device-type.
 
-- [Ionic Framework v5](https://ionicframework.com/docs/)  
-  This UI-kit or library gives us a foundation to quickly build interfaces cross-platform/cross-device-type.  
-  We use the (default) framework of Angular with(in) Ionic.
+- [Angular](https://angular.dev/overview) This front-end framework gives us a structure to create components that can be connected, combined, share data and can be delivered as a web-app.
 
-  - Available components: <https://ionicframework.com/docs/components>
-  - Icons: <https://ionicons.com/>
-
-- [Angular v10](https://v10.angular.io/docs)  
-  This front-end framework gives us a structure to create components that can be connected, combined, share data and can be delivered as a web-app.
-
-  - API Documentation: <https://10.angular.io/api>
-  - Used by Angular, RxJS: <https://rxjs.dev/guide/overview>
-
-- [Leaflet v1.6](https://leafletjs.com/)
-  A library for maps with multiple interactive layers.
-  - API Documentation: <https://leafletjs.com/reference-1.6.0.html>
-  - Angular component(s) used:
-    - `ngx-leaflet`: <https://github.com/Asymmetrik/ngx-leaflet>
-
-## Other resources
-
-- Leaflet Markers  
-  For easily exchangeable marker-images, see: <https://github.com/pointhi/leaflet-color-markers>
-
-## Loading the layer info popup descriptions
-
-See specific readme [here](./src/assets/i18n/README.md)
+- [Leaflet](https://leafletjs.com/) A library for maps with multiple interactive layers. Used with [ngx-leaflet](https://github.com/bluehalo/ngx-leaflet) for Angular.
diff --git a/interfaces/IBF-dashboard/angular.json b/interfaces/IBF-dashboard/angular.json
@@ -1,7 +1,6 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "defaultProject": "app",
   "newProjectRoot": "projects",
   "projects": {
     "app": {
@@ -12,22 +11,20 @@
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "www",
+            "outputPath": {
+              "base": "www"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": ["src/polyfills.ts"],
             "tsConfig": "tsconfig.app.json",
             "assets": [
               {
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "assets",
-                "ignore": [
-                  "icons/stage/*",
-                  "icons/test/*"
-                ]
+                "ignore": ["icons/stage/*", "icons/test/*"]
               },
               {
                 "glob": "**/*.svg",
@@ -59,12 +56,11 @@
               "@turf/meta"
             ],
             "aot": false,
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true
+            "namedChunks": true,
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -80,28 +76,22 @@
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
                   "maximumWarning": "2mb",
                   "maximumError": "5mb"
                 }
               ],
-              "serviceWorker": true,
-              "ngswConfigPath": "ngsw-config.json"
+              "serviceWorker": "ngsw-config.json"
             },
             "stage": {
               "assets": [
                 {
                   "glob": "**/*",
                   "input": "src/assets",
                   "output": "assets",
-                  "ignore": [
-                    "icons/stage/*",
-                    "icons/test/*"
-                  ]
+                  "ignore": ["icons/stage/*", "icons/test/*"]
                 },
                 {
                   "glob": "**/*.svg",
@@ -127,10 +117,7 @@
                   "glob": "**/*",
                   "input": "src/assets",
                   "output": "assets",
-                  "ignore": [
-                    "icons/stage/*",
-                    "icons/test/*"
-                  ]
+                  "ignore": ["icons/stage/*", "icons/test/*"]
                 },
                 {
                   "glob": "**/*.svg",
@@ -162,19 +149,19 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "app:build"
+            "buildTarget": "app:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "app:build:production"
+              "buildTarget": "app:build:production"
             },
             "ci": {}
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "app:build"
+            "buildTarget": "app:build"
           }
         },
         "test": {
@@ -191,10 +178,7 @@
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "/assets",
-                "ignore": [
-                  "icons/stage/*",
-                  "icons/test/*"
-                ]
+                "ignore": ["icons/stage/*", "icons/test/*"]
               },
               "src/manifest.webmanifest"
             ]
@@ -246,10 +230,7 @@
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
         },
         "cypress-run": {
@@ -289,14 +270,23 @@
   },
   "cli": {
     "analytics": false,
-    "defaultCollection": "@angular-eslint/schematics"
+    "schematicCollections": ["@angular-eslint/schematics"],
+    "cache": {
+      "enabled": false
+    }
   },
   "schematics": {
     "@ionic/angular-toolkit:component": {
       "styleext": "scss"
     },
     "@ionic/angular-toolkit:page": {
       "styleext": "scss"
+    },
+    "@angular-eslint/schematics:application": {
+      "setParserOptionsProject": true
+    },
+    "@angular-eslint/schematics:library": {
+      "setParserOptionsProject": true
     }
   }
-}
+}