Merge branch 'develop'

Signed-off-by: Steve Lombardi <[email protected]> # Conflicts: # .gitignore
PBGUX · Jan 4, 2022 · e44bc4f · e44bc4f
2 parents 3a6b91a + a6bf132
commit e44bc4f
Show file tree

Hide file tree

Showing 24 changed files with 2,064 additions and 5,089 deletions.
diff --git a/.browserlistrc b/.browserlistrc
@@ -0,0 +1,17 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# 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
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,5 @@ npm-debug.log
 Thumbs.db
 node_modules
 dist
+
 /client/.angular
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "angular.enable-strict-mode-prompt": false
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## 2.9.0 – January 3, 2022
+
+- Changed app.component.html to use new "sticky footer" as available in DS 6.8.4+
+- Updated to Angular 13
+- Updated ng-bootstrap to 10.0.0
+
 ## 2.6.0 - March 2, 2021
 
 - Updated to use Design System 6.6.2

diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
-# Starter App
+# PBDS Angular Starter App
 
-This project was generated with [Angular CLI](https://cli.angular.io/) version 10.1.0.
-
-## To use this as a starter for your projects
+## To use this as a starter for your projects:
 
 ### 1. Download the zip file
 

diff --git a/client/angular.json b/client/angular.json
@@ -16,7 +16,10 @@
             "main": "src/main.ts",
             "tsConfig": "src/tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
-
+            "sourceMap": {
+              "scripts": true,
+              "styles": true
+            },
             "assets": ["src/assets"],
             "stylePreprocessorOptions": {
               "includePaths": ["src/sass"]
@@ -41,29 +44,33 @@
                   "maximumWarning": "6kb"
                 }
               ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "extractCss": true,
-              "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.prod.ts"
                 }
-              ]
+              ],
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
+              "outputHashing": "all",
+              "sourceMap": true,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
             }
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "starter:build",
-            "aot": true
+            "browserTarget": "starter:build"
           },
           "configurations": {
             "production": {
@@ -88,13 +95,6 @@
             "styles": ["src/styles.scss"],
             "assets": ["src/assets", "src/favicon.ico"]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       }
     },
@@ -109,13 +109,6 @@
             "protractorConfig": "./protractor.conf.js",
             "devServerTarget": "starter:serve"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["e2e/tsconfig.e2e.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       }
     }