Merge pull request #282 from SamuelBradley/samhub/AUS-3948

AUS-3948 Fixed
AuScope · Jun 19, 2023 · 00ac7e3 · 00ac7e3
2 parents 1427961 + 788816e
commit 00ac7e3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,7 @@
 
 # IDE - VSCode
 .vscode/*
-!.vscode/settings.json
+.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json

diff --git a/angular.json b/angular.json
@@ -2,9 +2,7 @@
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "cli": {
     "analytics": false,
-    "schematicCollections": [
-      "@angular-eslint/schematics"
-    ]
+    "schematicCollections": ["@angular-eslint/schematics"]
   },
   "version": 1,
   "newProjectRoot": "projects",
@@ -23,6 +21,20 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "tsConfig": "src/tsconfig.app.json",
+            "outputHashing": "all",
+            "sourceMap": false,
+            "namedChunks": false,
+            "extractLicenses": true,
+            "vendorChunk": false,
+            "optimization": {
+              "scripts": false,
+              "styles": {
+                "minify": true,
+                "inlineCritical": true
+              },
+              "fonts": true
+            },
+            "buildOptimizer": false,
             "polyfills": "src/polyfills.ts",
             "assets": [
               "src/contexts",
@@ -84,14 +96,6 @@
                   "maximumWarning": "20kb"
                 }
               ],
-              "optimization": false,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -103,17 +107,9 @@
               "budgets": [
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "20kb"
+                  "maximumWarning": "50kb"
                 }
               ],
-              "optimization": false,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -196,10 +192,7 @@
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
         }
       }

diff --git a/package.json b/package.json
@@ -6,9 +6,9 @@
     "ng": "ng",
     "start": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng serve",
     "build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build",
-    "build-prod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration production --configuration=production",
-    "build-test": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration production --configuration=au2",
-    "build-dev": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration production --configuration=audev",
+    "build-prod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration=production",
+    "build-test": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration=au2",
+    "build-dev": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --configuration=audev",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",