Merge branch 'frontend-rewrite' of github.com:lieberlois/observabilit…

…y-workshop into frontend-rewrite
feature-creeps · Oct 5, 2023 · c4d138f · c4d138f
2 parents 62e9073 + dbba18d
commit c4d138f
Show file tree

Hide file tree

Showing 79 changed files with 24,804 additions and 10,401 deletions.
diff --git a/stack/application/frontend/.gitignore b/stack/application/frontend/.gitignore
@@ -32,6 +32,7 @@ speed-measure-plugin.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/stack/application/frontend/Dockerfile b/stack/application/frontend/Dockerfile
@@ -1,9 +1,4 @@
-FROM node:10.24.1-buster AS builder
-
-# install chrome for protractor tests
-RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-RUN apt-get update && apt-get install -yq google-chrome-stable
+FROM node:18 AS builder
 
 # set working directory
 RUN mkdir /usr/src/app
@@ -15,14 +10,14 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 # install and cache app dependencies
 COPY package.json /usr/src/app/package.json
 RUN npm install
-RUN npm install -g @angular/cli@9.0.3
+RUN npm install -g @angular/cli@15
 
 # add app
 COPY src /usr/src/app/src
 COPY angular.json /usr/src/app/
 COPY tsconfig.json /usr/src/app/
 
-RUN ng build --prod
+RUN ng build --configuration production
 
 
 FROM opentracing/nginx-opentracing

diff --git a/stack/application/frontend/angular.json b/stack/application/frontend/angular.json
@@ -26,7 +26,13 @@
               "src/styles.css"
             ],
             "scripts": [],
-            "es5BrowserSupport": true
+            "aot": false,
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -39,7 +45,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -53,7 +58,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -88,18 +94,6 @@
               "src/assets"
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -119,18 +113,11 @@
               "devServerTarget": "frontend:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
   },
-  "defaultProject": "frontend"
+  "cli": {
+    "analytics": false
+  }
 }