Merge pull request #509 from retarsis/develop

feat(release): 4.4.0
tarsisexistence · Jun 5, 2021 · f7a75be · f7a75be
2 parents 37629c0 + 00a770d
commit f7a75be
Show file tree

Hide file tree

Showing 9 changed files with 4,558 additions and 3,675 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 4.4.0 2020-12-06
+
+- Support Angular 12
+- Support RxJS v7
+
 # 4.3.0 2020-12-06
 
 - Support Angular 11

diff --git a/angular.json b/angular.json
@@ -43,7 +43,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "aot": true,
             "outputPath": "dist/example-app",
             "index": "example-app/index.html",
             "main": "example-app/main.ts",
@@ -59,7 +58,13 @@
               }
             ],
             "styles": ["example-app/styles.scss"],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -73,7 +78,6 @@
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -89,7 +93,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",

diff --git a/example-app/main.ts b/example-app/main.ts
@@ -1,4 +1,4 @@
-import 'zone.js/dist/zone';
+import 'zone.js';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 

diff --git a/example-app/polyfills.ts b/example-app/polyfills.ts
@@ -55,7 +55,7 @@
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone';
+import 'zone.js';
 
 /***************************************************************************************************
  * APPLICATION IMPORTS

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "// - NG - //": "------------------------------",
     "start": "ng serve --port 3000",
-    "build": "ng build routeshub --prod",
+    "build": "ng build routeshub --configuration production",
     "test": "ng test routeshub",
     "// - SNYK - //": "------------------------------",
     "snyk:test": "snyk test",
@@ -29,43 +29,44 @@
     "publication": "yarn publication:prepare && yarn publication:publish"
   },
   "dependencies": {
-    "@angular/animations": "11.0.3",
-    "@angular/common": "11.0.3",
-    "@angular/compiler": "11.0.3",
-    "@angular/core": "11.0.5",
-    "@angular/forms": "11.0.3",
-    "@angular/platform-browser": "11.0.3",
-    "@angular/platform-browser-dynamic": "11.0.3",
-    "@angular/router": "11.0.3",
+    "@angular/animations": "12.0.3",
+    "@angular/common": "12.0.3",
+    "@angular/compiler": "12.0.3",
+    "@angular/core": "12.0.3",
+    "@angular/forms": "12.0.3",
+    "@angular/platform-browser": "12.0.3",
+    "@angular/platform-browser-dynamic": "12.0.3",
+    "@angular/router": "12.0.3",
     "hammerjs": "2.0.8",
-    "routeshub": "4.2.2",
-    "rxjs": "6.6.3",
-    "zone.js": "0.11.3"
+    "routeshub": "4.4.0",
+    "rxjs": "7.1.0",
+    "zone.js": "0.11.4"
   },
   "devDependencies": {
-    "@angular-builders/jest": "10.0.1",
-    "@angular-devkit/build-angular": "0.1100.3",
-    "@angular/cli": "11.0.3",
-    "@angular/compiler-cli": "11.0.3",
-    "@angular/language-service": "11.0.3",
-    "@commitlint/cli": "11.0.0",
-    "@commitlint/config-conventional": "11.0.0",
-    "@types/jest": "26.0.16",
-    "@types/node": "14.14.10",
-    "@routerkit/core": "0.8.1",
-    "all-contributors-cli": "6.19.0",
-    "codelyzer": "6.0.1",
-    "husky": "4.3.4",
+    "@angular-builders/jest": "12.0.0",
+    "@angular-devkit/build-angular": "12.0.3",
+    "@angular/cli": "12.0.3",
+    "@angular/compiler-cli": "12.0.3",
+    "@angular/language-service": "12.0.3",
+    "@commitlint/cli": "12.1.4",
+    "@commitlint/config-conventional": "12.1.4",
+    "@types/jest": "26.0.23",
+    "@types/node": "15.12.1",
+    "@routerkit/core": "0.9.0",
+    "all-contributors-cli": "6.20.0",
+    "codelyzer": "6.0.2",
+    "husky": "4.3.8",
     "jest": "26.6.3",
-    "lint-staged": "10.5.3",
-    "ng-packagr": "11.0.3",
-    "prettier": "2.2.1",
+    "lint-staged": "11.0.0",
+    "ng-packagr": "12.0.3",
+    "prettier": "2.3.1",
     "protractor": "7.0.0",
-    "snyk": "1.434.2",
-    "ts-node": "9.1.0",
-    "tsickle": "0.39.1",
-    "tslib": "2.0.3",
-    "typescript": "4.0.5",
+    "snyk": "1.604.0",
+    "ts-node": "10.0.0",
+    "ts-jest": "26.5.6",
+    "tsickle": "0.40.0",
+    "tslib": "2.2.0",
+    "typescript": "4.2.4",
     "yarn": "1.22.10"
   }
 }
diff --git a/package/configs/jest.config.js b/package/configs/jest.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   globals: {
     'ts-jest': {
-      tsConfig: `${__dirname}/../tsconfig.test.json`
+      tsconfig: `${__dirname}/../tsconfig.test.json`
     }
   },
   moduleNameMapper: {

diff --git a/package/configs/jest/setup.ts b/package/configs/jest/setup.ts
@@ -1,4 +1,4 @@
-import 'jest-preset-angular';
+import 'jest-preset-angular/setup-jest';
 import './global-mocks';
 
 import { resetPackage } from '../../src/utils/helpers';

diff --git a/package/package.json b/package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "routeshub",
   "description": "A route management library and pattern for Angular",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "author": "Max Tarsis (https://github.com/retarsis)",
   "repository": {
     "type": "git",
@@ -11,11 +11,11 @@
   "bugs": "https://github.com/retarsis/routeshub/issues",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/common": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/core": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0",
-    "@angular/router": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0",
-    "rxjs": ">=6.0.0 || ^5.6.0-forward-compat.4",
-    "tslib": "~2.0.3"
+    "@angular/common": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/core": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "@angular/router": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
+    "rxjs": "^6.0.0 || ^7.0.0",
+    "tslib": "~2.0.3 || ~2.1.0 || ~2.2.0"
   },
   "keywords": [
     "angular",