build: upgrade to Angular 12.x

NASA-AMMOS · Jun 11, 2021 · dc93247 · dc93247
1 parent c1c82c8
commit dc93247
Show file tree

Hide file tree

Showing 11 changed files with 4,374 additions and 5,215 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -2,11 +2,10 @@
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
 
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-# > 0.5%
-# last 2 versions
-# Firefox ESR
-# not dead
-# not IE 9-11 # For IE 9-11 support, remove 'not'.
+last 1 Firefox version
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -108,7 +108,7 @@ pipeline {
 
               # Install front-end dependencies, build, and cloc
               npm install --silent
-              npm run build:prod
+              npm run build
               npm run cloc
 
               # Build Docker image

diff --git a/angular.json b/angular.json
@@ -11,39 +11,35 @@
       "prefix": "app",
       "architect": {
         "build": {
+          "defaultConfiguration": "production",
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "allowedCommonJsDependencies": ["ajv", "zone.js/dist/zone-error"],
+            "allowedCommonJsDependencies": ["ajv"],
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
             "assets": ["src/favicon.ico", "src/assets"],
             "styles": [
+              "src/assets/fonts/roboto/roboto.css",
+              "src/assets/fonts/material-icons/material-icons.css",
               "src/theme.scss",
               "node_modules/ngx-toastr/toastr.css",
               "src/styles.css"
             ],
             "scripts": []
           },
           "configurations": {
+            "development": {
+              "buildOptimizer": false,
+              "extractLicenses": false,
+              "namedChunks": true,
+              "optimization": false,
+              "sourceMap": true,
+              "vendorChunk": true
+            },
             "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "outputPath": "server/public",
-              "sourceMap": false,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -55,16 +51,24 @@
                   "maximumWarning": "8kb",
                   "maximumError": "10kb"
                 }
-              ]
+              ],
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "outputPath": "server/public"
             }
           }
         },
         "serve": {
+          "defaultConfiguration": "development",
           "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "aerie-ui:build"
-          },
           "configurations": {
+            "development": {
+              "browserTarget": "aerie-ui:build:development"
+            },
             "production": {
               "browserTarget": "aerie-ui:build:production"
             }
@@ -80,7 +84,6 @@
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",
-            "codeCoverageExclude": [],
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",