Merge branch 'release/2.0.0'

ju4n97 · May 24, 2021 · 2f6abd5 · 2f6abd5
2 parents 36ed6d3 + 29a5ed9
commit 2f6abd5
Show file tree

Hide file tree

Showing 22 changed files with 1,594 additions and 2,146 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -2,11 +2,16 @@
 # 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
+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 dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
+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/README.md b/README.md
@@ -287,14 +287,15 @@ yarn remove tailwindcss autoprefixer postcss
 
 ## 🧙‍♂️ Commands
 
-| Command       | Description                                       | NPM                   | Yarn               | Background command                                          |
-| ------------- | ------------------------------------------------- | --------------------- | ------------------ | ----------------------------------------------------------- |
-| ng            | See available commands                            | npm run ng            | yarn ng            | ng                                                          |
-| start         | Run your app in development mode                  | npm start             | yarn start         | ng serve                                                    |
-| build         | Build your app                                    | npm run build         | yarn build         | ng build                                                    |
-| build:prod    | Build your app ready for production               | npm run build:prod    | yarn build:prod    | ng build --prod --build-optimizer --aot --stats-json        |
-| test:unit     | Run your unit tests                               | npm run test          | yarn test          | ng test                                                     |
-| test:e2e      | Run your e2e tests                                | npm run e2e           | yarn e2e           | ng e2e                                                      |
-| test:coverage | Run your unit tests & generates a coverage report | npm run test:coverage | yarn test:coverage | ng test --coverage                                          |
-| lint          | Use ESLint to lint your app                       | npm run lint          | yarn lint          | ng lint                                                     |
-| analyze       | Open webpack-bundle-analyzer                      | npm run analyze       | yarn analyze       | webpack-bundle-analyzer dist/angular-boilerplate/stats.json |
+| Command       | Description                                                    | NPM                   | Yarn               | Background command                                          |
+| ------------- | -------------------------------------------------------------- | --------------------- | ------------------ | ----------------------------------------------------------- |
+| ng            | See available commands                                         | npm run ng            | yarn ng            | ng                                                          |
+| start         | Run your app in development mode                               | npm start             | yarn start         | ng serve                                                    |
+| build         | Build your app for production                                  | npm run build         | yarn build         | ng build                                                    |
+| build:stats   | Build your app for production and generate a "stats.json" file | npm run build:stats   | yarn build:stats   | ng build --stats-json                                       |
+| watch         | Run build when files change.                                   | npm run watch         | yarn watch         | ng build --watch --configuration development                |
+| test:unit     | Run your unit tests                                            | npm run test          | yarn test          | ng test                                                     |
+| test:e2e      | Run your e2e tests                                             | npm run e2e           | yarn e2e           | ng e2e                                                      |
+| test:coverage | Run your unit tests & generates a coverage report              | npm run test:coverage | yarn test:coverage | ng test --coverage                                          |
+| lint          | Use ESLint to lint your app                                    | npm run lint          | yarn lint          | ng lint                                                     |
+| analyze       | Open webpack-bundle-analyzer                                   | npm run analyze       | yarn analyze       | webpack-bundle-analyzer dist/angular-boilerplate/stats.json |
diff --git a/angular.json b/angular.json
@@ -28,30 +28,13 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
-            "assets": [
-              "src/favicon.ico",
-              "src/assets",
-              "src/manifest.webmanifest"
-            ],
+            "inlineStyleLanguage": "scss",
+            "assets": ["src/favicon.ico", "src/assets"],
             "styles": ["src/theme/styles.scss"],
             "scripts": []
           },
           "configurations": {
             "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -64,33 +47,44 @@
                   "maximumError": "4kb"
                 }
               ],
-              "serviceWorker": true,
-              "ngswConfigPath": "ngsw-config.json"
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
             }
-          }
+          },
+          "defaultConfiguration": "production"
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "angular-boilerplate:build"
-          },
           "configurations": {
             "production": {
-              "browserTarget": "angular-boilerplate:build:production"
+              "browserTarget": "test:build:production"
+            },
+            "development": {
+              "browserTarget": "angular-boilerplate:build:development"
             }
-          }
+          },
+          "defaultConfiguration": "development"
         },
         "test": {
           "builder": "@angular-builders/jest:run",
           "options": {
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets",
-              "src/manifest.webmanifest"
-            ],
-            "styles": ["src/theme/styles.scss"],
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": [],
             "scripts": []
           }
         },

diff --git a/ngsw-config.json b/ngsw-config.json
diff --git a/package.json b/package.json
@@ -1,54 +1,52 @@
 {
   "name": "angular-boilerplate",
   "version": "0.0.0",
-  "sideEffects": false,
   "private": true,
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
-    "build:prod": "cross-env NODE_ENV=production ng build --prod --build-optimizer --aot --stats-json",
+    "build:stats": "ng build --stats-json",
+    "watch": "ng build --watch --configuration development",
     "test:unit": "ng test",
     "test:e2e": "ng e2e",
     "test:coverage": "ng test --coverage",
     "lint": "ng lint",
     "analyze": "webpack-bundle-analyzer dist/angular-boilerplate/stats.json"
   },
   "dependencies": {
-    "@angular/animations": "11.2.13",
-    "@angular/common": "11.2.13",
-    "@angular/compiler": "11.2.13",
-    "@angular/core": "11.2.13",
-    "@angular/forms": "11.2.13",
-    "@angular/platform-browser": "11.2.13",
-    "@angular/platform-browser-dynamic": "11.2.13",
-    "@angular/router": "11.2.13",
-    "@angular/service-worker": "11.2.13",
-    "rxjs": "6.6.7",
+    "@angular/animations": "~12.0.1",
+    "@angular/common": "~12.0.1",
+    "@angular/compiler": "~12.0.1",
+    "@angular/core": "~12.0.1",
+    "@angular/forms": "~12.0.1",
+    "@angular/platform-browser": "~12.0.1",
+    "@angular/platform-browser-dynamic": "~12.0.1",
+    "@angular/router": "~12.0.1",
+    "rxjs": "^7.1.0",
     "tslib": "2.2.0",
-    "zone.js": "0.11.4"
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
     "@angular-builders/jest": "12.0.0",
-    "@angular-devkit/build-angular": "0.1102.13",
+    "@angular-devkit/build-angular": "~12.0.1",
     "@angular-eslint/builder": "12.0.0",
     "@angular-eslint/eslint-plugin": "12.0.0",
     "@angular-eslint/eslint-plugin-template": "12.0.0",
     "@angular-eslint/schematics": "12.0.0",
     "@angular-eslint/template-parser": "12.0.0",
-    "@angular/cli": "11.2.13",
-    "@angular/compiler-cli": "11.2.13",
+    "@angular/cli": "~12.0.1",
+    "@angular/compiler-cli": "~12.0.1",
     "@briebug/cypress-schematic": "5.0.0",
     "@commitlint/cli": "12.1.4",
     "@commitlint/config-conventional": "12.1.4",
     "@cypress/webpack-preprocessor": "5.8.0",
     "@types/jasmine": "3.7.4",
     "@types/jest": "26.0.23",
-    "@types/node": "15.3.1",
+    "@types/node": "^15.6.0",
     "@typescript-eslint/eslint-plugin": "4.24.0",
     "@typescript-eslint/parser": "4.24.0",
     "autoprefixer": "10.2.5",
-    "cross-env": "7.0.3",
     "cypress": "7.3.0",
     "eslint": "7.27.0",
     "eslint-config-prettier": "8.3.0",
@@ -67,7 +65,7 @@
     "tailwindcss": "2.1.2",
     "ts-loader": "9.2.2",
     "ts-node": "10.0.0",
-    "typescript": "4.1.5",
+    "typescript": "4.2.4",
     "webpack-bundle-analyzer": "4.4.2"
   }
 }
diff --git a/src/app/@core/core.module.ts b/src/app/@core/core.module.ts
@@ -1,19 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { ServiceWorkerModule } from '@angular/service-worker';
-import { environment } from '@environments/environment';
 import { JwtInterceptor, ServerErrorInterceptor } from './interceptors';
 
 @NgModule({
   declarations: [],
-  imports: [
-    CommonModule,
-    HttpClientModule,
-    ServiceWorkerModule.register('ngsw-worker.js', {
-      enabled: environment.production,
-    }),
-  ],
+  imports: [CommonModule, HttpClientModule],
   providers: [
     {
       provide: HTTP_INTERCEPTORS,

diff --git a/src/assets/icons/icon-128x128.png b/src/assets/icons/icon-128x128.png
diff --git a/src/assets/icons/icon-144x144.png b/src/assets/icons/icon-144x144.png
diff --git a/src/assets/icons/icon-152x152.png b/src/assets/icons/icon-152x152.png
diff --git a/src/assets/icons/icon-192x192.png b/src/assets/icons/icon-192x192.png
diff --git a/src/assets/icons/icon-384x384.png b/src/assets/icons/icon-384x384.png
diff --git a/src/assets/icons/icon-512x512.png b/src/assets/icons/icon-512x512.png
diff --git a/src/assets/icons/icon-72x72.png b/src/assets/icons/icon-72x72.png
diff --git a/src/assets/icons/icon-96x96.png b/src/assets/icons/icon-96x96.png
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -14,4 +14,4 @@ export const environment = {
  * This import should be commented out in production mode because it will have a negative impact
  * on performance if an error is thrown.
  */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.
diff --git a/src/index.html b/src/index.html
@@ -6,14 +6,13 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="./favicon.ico" />
-    <link rel="apple-touch-icon" href="./assets/icons/icon-512x512.png" />
-    <link rel="manifest" href="manifest.webmanifest" />
-    <meta name="theme-color" content="#1976d2" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Oswald:wght@700&family=Poppins:wght@100;300;600&display=swap"
+      rel="stylesheet"
+    />
   </head>
   <body class="app">
     <app-root></app-root>
-    <noscript>
-      Please enable JavaScript to continue using this application.
-    </noscript>
   </body>
 </html>
diff --git a/src/manifest.webmanifest b/src/manifest.webmanifest
diff --git a/src/polyfills.ts b/src/polyfills.ts
@@ -1 +1 @@
-import 'zone.js/dist/zone';
+import 'zone.js';
diff --git a/src/theme/01-base/font.scss b/src/theme/01-base/font.scss
@@ -1,7 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Oswald:wght@700&family=Poppins:ital,wght@0,300;0,600;1,100&display=swap');
-// Poppins - 100, 300, 600
-// Oswald - 700
-
 html {
   @apply font-body;
   @apply font-light;

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,9 +1,8 @@
 module.exports = {
   prefix: '',
-  // mode: 'jit', Still not working correctly with Angular
   purge: {
-    enabled: process.env.NODE_ENV === 'production',
-    content: ['./src/**/*.{html,scss,ts}'],
+    enabled: process.env.TAILWIND_MODE === 'build',
+    content: ['./src/**/*.{html,ts}', './projects/**/*.{html,ts}'],
   },
   darkMode: 'class',
   theme: {