Merge branch 'stage' for release 1.3.0

OS2iot · Nov 17, 2022 · 800a551 · 800a551
2 parents c330df4 + fcb7253
commit 800a551
Show file tree

Hide file tree

Showing 148 changed files with 6,412 additions and 9,791 deletions.
diff --git a/browserslist → .browserslistrc b/browserslist → .browserslistrc
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://mherman.org/blog/dockerizing-an-angular-app/
 # base image
-FROM node:12-alpine as DEV
+FROM node:14-alpine as DEV
 
 # removed this for now
 # install chrome for protractor tests
@@ -17,7 +17,7 @@ ENV PATH /app/node_modules/.bin:$PATH
 # install and cache app dependencies
 COPY package.json /app/package.json
 RUN npm install
-RUN npm install -g @angular/cli@7.3.9
+RUN npm install -g @angular/cli@14.2.3
 
 # add app
 COPY . /app

diff --git a/Dockerfile-prod b/Dockerfile-prod
@@ -1,6 +1,6 @@
 # Based on https://mherman.org/blog/dockerizing-an-angular-app/
 # base image
-FROM node:12-alpine as builder
+FROM node:14-alpine as builder
 
 # removed this for now
 # install chrome for protractor tests
@@ -17,7 +17,7 @@ ENV PATH /app/node_modules/.bin:$PATH
 # install and cache app dependencies
 COPY package.json /app/package.json
 RUN npm install
-RUN npm install -g @angular/cli@7.3.9
+RUN npm install -g @angular/cli@14.2.3
 
 # add app
 COPY . /app

diff --git a/angular.json b/angular.json
@@ -22,11 +22,10 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
             "assets": [
-              "src/favicon.ico", 
+              "src/favicon.ico",
               "src/assets",
-              { "glob": "**/*", "input": "node_modules/ngx-monaco-editor/assets/monaco", "output": "./assets/monaco/" }
+              { "glob": "**/*", "input": "node_modules/monaco-editor", "output": "assets/monaco-editor" }
             ],
             "styles": [
               "./node_modules/animate.css/animate.min.css",
@@ -36,14 +35,19 @@
             "scripts": [
               "node_modules/popper.js/dist/umd/popper.min.js",
               "node_modules/bootstrap/dist/js/bootstrap.min.js"
-            ]
+            ],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -61,7 +65,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -92,17 +97,6 @@
             "scripts": []
           }
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": ["**/node_modules/**"]
-          }
-        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -3,7 +3,7 @@
     "compilerOptions": {
         "outDir": "../out-tsc/e2e",
         "module": "commonjs",
-        "target": "es5",
+        "target": "es2018",
         "types": ["jasmine", "jasminewd2", "node"]
     }
 }