fix: update to angular v17

FraunhoferIOSB · Jan 10, 2024 · 69ca9a8 · 69ca9a8
1 parent cf06787
commit 69ca9a8
Show file tree

Hide file tree

Showing 43 changed files with 7,841 additions and 9,596 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
   - deploy
 
 tag:
-  image: node:18.10
+  image: node:20.10
   stage: tag
   rules:
     - if: '$CI_COMMIT_MESSAGE !~ /(Release)/'
@@ -15,7 +15,7 @@ tag:
     - npx semantic-release
 
 build:
-  image: node:lts-alpine3.16
+  image: node:lts-alpine3.19
   stage: build
   rules:
     - if: '$CI_COMMIT_MESSAGE =~ /(Release)/'
@@ -24,7 +24,7 @@ build:
     - npm run build -ws
 
 test:
-  image: node:lts-alpine3.16
+  image: node:lts-alpine3.19
   stage: test
   rules:
     - if: '$CI_COMMIT_MESSAGE =~ /(Release)/'

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -22,6 +22,7 @@
         "nicht",
         "NMTOKEN",
         "NMTOKENS",
+        "owncloud",
         "preprocessors",
         "Qualifiable",
         "rechtlich",

diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,13 @@
 # Dockerfile to build server and client parts
-FROM node:lts-alpine3.16 as build
+FROM node:lts-alpine3.19 as build
 WORKDIR /usr/src/app
 COPY . .
 RUN apk add g++ make py3-pip
 RUN npm install
 RUN node create-app-info.js
 RUN npm run build
 
-FROM node:lts-alpine3.16 as aas-server-app
+FROM node:lts-alpine3.19 as aas-server-app
 RUN apk upgrade --update-cache --available && apk add openssl && rm -rf /var/cache/apk/*
 WORKDIR /usr/src/app
 COPY package.json package.json
@@ -16,7 +16,7 @@ COPY --from=build /usr/src/app/projects/aas-server/dist/ /usr/src/app/
 COPY --from=build /usr/src/app/projects/aas-server/app-info.json /usr/src/app/app-info.json
 COPY --from=build /usr/src/app/projects/common/dist/ /usr/src/app/node_modules/common/dist/
 COPY --from=build /usr/src/app/projects/common/package.json /usr/src/app/node_modules/common/package.json
-COPY --from=build /usr/src/app/projects/aas-portal/dist/ /usr/src/app/wwwroot
+COPY --from=build /usr/src/app/projects/aas-portal/dist/browser/ /usr/src/app/wwwroot/
 RUN npm install -w=aas-server --omit=dev
 COPY projects/aas-server/src/assets assets/
 ENV NODE_LOG=./log/debug.log

diff --git a/Dockerfile.aas-portal b/Dockerfile.aas-portal
@@ -1,11 +1,11 @@
 # Dockerfile to build server and client parts
-FROM node:lts-alpine3.16 as build
+FROM node:lts-alpine3.19 as build
 WORKDIR /usr/src/app
 COPY . .
 RUN npm install
 RUN npm run aas-portal:build
 
 FROM nginx:latest as aas-portal
-COPY --from=build /usr/src/app/projects/aas-portal/dist/ /usr/share/nginx/html/
+COPY --from=build /usr/src/app/projects/aas-portal/dist/browser/ /usr/share/nginx/html/
 COPY --from=build /usr/src/app/projects/aas-portal/nginx.conf /etc/nginx/nginx.conf
 EXPOSE 80
diff --git a/Dockerfile.aas-server b/Dockerfile.aas-server
@@ -1,12 +1,12 @@
 # Dockerfile to build server and client parts
-FROM node:lts-alpine3.16 as build
+FROM node:lts-alpine3.19 as build
 WORKDIR /usr/src/app
 COPY . .
 RUN npm install
 RUN node create-app-info.js
 RUN npm run aas-server:build
 
-FROM node:lts-alpine3.16 as aas-server-app
+FROM node:lts-alpine3.19 as aas-server-app
 RUN apk upgrade --update-cache --available && apk add openssl && rm -rf /var/cache/apk/*
 WORKDIR /usr/src/app
 COPY package.json package.json
@@ -24,5 +24,4 @@ ENV ENDPOINTS=["\"file:///samples?name=Samples\""]
 ENV NODE_ENV=production
 
 EXPOSE 1337
-EXPOSE 1338
 CMD ["node", "aas-server.js" ]
diff --git a/angular.json b/angular.json
@@ -16,11 +16,11 @@
             "prefix": "fhg",
             "architect": {
                 "build": {
-                    "builder": "@angular-devkit/build-angular:browser",
+                    "builder": "@angular-devkit/build-angular:application",
                     "options": {
                         "outputPath": "projects/aas-portal/dist",
                         "index": "projects/aas-portal/src/index.html",
-                        "main": "projects/aas-portal/src/main.ts",
+                        "browser": "projects/aas-portal/src/main.ts",
                         "polyfills": [
                             "zone.js"
                         ],
@@ -31,11 +31,11 @@
                             "projects/aas-portal/src/assets"
                         ],
                         "styles": [
+                            "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                            "node_modules/bootstrap-icons/font/bootstrap-icons.min.css",
                             "projects/aas-portal/src/styles.scss"
                         ],
-                        "scripts": [
-                            "node_modules/bootstrap/dist/js/bootstrap.min.js"
-                        ],
+                        "scripts": [],
                         "allowedCommonJsDependencies": [
                             "lodash-es"
                         ]
@@ -59,15 +59,14 @@
                         "development": {
                             "buildOptimizer": false,
                             "optimization": false,
-                            "vendorChunk": true,
                             "extractLicenses": false,
                             "sourceMap": true,
                             "namedChunks": true,
                             "fileReplacements": [
-                              {
-                                "replace": "projects/aas-portal/src/environments/environment.ts",
-                                "with": "projects/aas-portal/src/environments/environment.development.ts"
-                              }
+                                {
+                                    "replace": "projects/aas-portal/src/environments/environment.ts",
+                                    "with": "projects/aas-portal/src/environments/environment.development.ts"
+                                }
                             ]
                         }
                     },
@@ -77,11 +76,11 @@
                     "builder": "@angular-devkit/build-angular:dev-server",
                     "configurations": {
                         "production": {
-                            "browserTarget": "aas-portal:build:production",
+                            "buildTarget": "aas-portal:build:production",
                             "proxyConfig": "projects/aas-portal/proxy.conf.json"
                         },
                         "development": {
-                            "browserTarget": "aas-portal:build:development",
+                            "buildTarget": "aas-portal:build:development",
                             "proxyConfig": "projects/aas-portal/proxy.conf.json"
                         }
                     },
@@ -90,7 +89,7 @@
                 "extract-i18n": {
                     "builder": "@angular-devkit/build-angular:extract-i18n",
                     "options": {
-                        "browserTarget": "aas-portal:build"
+                        "buildTarget": "aas-portal:build"
                     }
                 },
                 "test": {