Merge pull request #464 from retarsis/develop

release: 4.3.0

.lintstagedrc.json

@@ -1,7 +1,6 @@
 {
   "*.{ts,js}": [
     "prettier --write",
-    "tslint",
     "git add"
   ]
 }

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.3.0 2020-12-06
+
+- Support Angular 11
+- Deprecated preserveQueryParams
+- Updated dependencies
+
 # 4.2.2 2020-08-31
 
 - Refactored internal utilities

angular.json

@@ -10,7 +10,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "package/tsconfig.lib.json",
             "project": "package/ng-package.json"
@@ -26,16 +26,6 @@
           "options": {
             "configPath": "./configs/jest.config.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "package/tsconfig.lib.json",
-              "package/tsconfig.spec.json"
-            ],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       }
     },
@@ -82,7 +72,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -122,19 +111,12 @@
         "test": {
           "builder": "@angular-builders/jest:run",
           "options": {}
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["example-app/tsconfig.app.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       }
     }
   },
   "cli": {
-    "packageManager": "npm"
+    "packageManager": "yarn"
   },
   "defaultProject": "routeshub"
 }

example-app/app/core/components/header/header.component.ts

@@ -1,4 +1,3 @@
-// tslint:disable:max-line-length
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import {

example-app/app/hub/app.hub.ts

@@ -1,4 +1,3 @@
-// tslint:disable:max-line-length
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
@@ -64,8 +63,9 @@ export const routing: ModuleWithProviders<AppHub> = RouterModule.forRoot(
     enableTracing: false,
     initialNavigation: 'enabled',
     onSameUrlNavigation: 'reload',
-    scrollPositionRestoration: 'top'
-  }
+    scrollPositionRestoration: 'top',
+    relativeLinkResolution: 'legacy'
+}
 );
 
 /**

example-app/polyfills.ts

@@ -1,4 +1,3 @@
-// tslint:disable:max-line-length
 /**
  * This file includes polyfills needed by Angular and is loaded before the app.
  * You can add your own extra polyfills to this file.

package.json

@@ -10,7 +10,6 @@
     "start": "ng serve --port 3000",
     "build": "ng build routeshub --prod",
     "test": "ng test routeshub",
-    "lint": "ng lint routeshub",
     "// - SNYK - //": "------------------------------",
     "snyk:test": "snyk test",
     "snyk:wizard": "snyk wizard",
@@ -30,46 +29,43 @@
     "publication": "yarn publication:prepare && yarn publication:publish"
   },
   "dependencies": {
-    "@angular/animations": "10.0.14",
-    "@angular/common": "10.0.14",
-    "@angular/compiler": "10.0.14",
-    "@angular/core": "10.0.14",
-    "@angular/forms": "10.0.14",
-    "@angular/platform-browser": "10.0.14",
-    "@angular/platform-browser-dynamic": "10.0.14",
-    "@angular/router": "10.0.8",
+    "@angular/animations": "11.0.3",
+    "@angular/common": "11.0.3",
+    "@angular/compiler": "11.0.3",
+    "@angular/core": "11.0.3",
+    "@angular/forms": "11.0.3",
+    "@angular/platform-browser": "11.0.3",
+    "@angular/platform-browser-dynamic": "11.0.3",
+    "@angular/router": "11.0.3",
     "hammerjs": "2.0.8",
     "routeshub": "4.2.2",
-    "rxjs": "6.6.2",
-    "zone.js": "0.11.1"
+    "rxjs": "6.6.3",
+    "zone.js": "0.11.3"
   },
   "devDependencies": {
-    "@angular-builders/jest": "10.0.0",
-    "@angular-devkit/build-angular": "0.1000.8",
-    "@angular-devkit/build-ng-packagr": "0.1000.8",
-    "@angular/cli": "10.0.8",
-    "@angular/compiler-cli": "10.0.14",
-    "@angular/language-service": "10.0.14",
-    "@commitlint/cli": "9.1.2",
-    "@commitlint/config-conventional": "9.1.2",
-    "@types/jest": "26.0.10",
-    "@types/node": "14.0.27",
-    "all-contributors-cli": "6.17.2",
-    "codelyzer": "5.2.2",
-    "husky": "4.2.5",
-    "jest": "26.2.2",
-    "lint-staged": "10.2.13",
-    "ng-packagr": "10.1.0",
-    "prettier": "2.1.1",
+    "@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",
+    "jest": "26.6.3",
+    "lint-staged": "10.5.3",
+    "ng-packagr": "11.0.3",
+    "prettier": "2.2.1",
     "protractor": "7.0.0",
-    "snyk": "1.369.3",
-    "ts-node": "8.10.1",
+    "snyk": "1.434.2",
+    "ts-node": "9.1.0",
     "tsickle": "0.39.1",
-    "tslib": "2.0.1",
-    "tslint": "6.1.2",
-    "tslint-angular": "3.0.2",
-    "tslint-config-prettier": "1.18.0",
-    "typescript": "3.9.7",
-    "yarn": "1.22.5"
+    "tslib": "2.0.3",
+    "typescript": "4.0.5",
+    "yarn": "1.22.10"
   }
 }

package/configs/jest.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   globals: {
     'ts-jest': {
-      tsConfig: `${__dirname}/../tsconfig.spec.json`
+      tsConfig: `${__dirname}/../tsconfig.test.json`
     }
   },
   moduleNameMapper: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "routeshub",
   "description": "A route management library and pattern for Angular",
-  "version": "4.2.2",
+  "version": "4.3.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",
-    "@angular/core": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0",
-    "@angular/router": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0",
+    "@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.1"
+    "tslib": "~2.0.3"
   },
   "keywords": [
     "angular",

package/src/creators/__tests__/feature.creator.test.ts → package/src/creators/feature.creator.test.ts

@@ -1,9 +1,8 @@
-// tslint:disable:max-line-length
 import { Routes } from '@angular/router';
-import { createRoot } from '../root.creator';
-import { createFeature } from '../feature.creator';
-import { PRIVATE_NOTES_KEY } from '../../constants';
-import { connectFeatures, getRegisteredUnits, getUnit } from '../../functions';
+import { createRoot } from './root.creator';
+import { createFeature } from './feature.creator';
+import { PRIVATE_NOTES_KEY } from '../constants';
+import { connectFeatures, getRegisteredUnits, getUnit } from '../functions';
 
 describe('createFeature', () => {
   it('should create feature with one route', () => {

package/src/creators/__tests__/note.creator.test.ts → package/src/creators/note.creator.test.ts

@@ -1,7 +1,6 @@
 import { Routes } from '@angular/router';
-import { createNote } from '../note.creator';
+import { createNote } from './note.creator';
 
-// tslint:disable:max-line-length
 describe('createNote', () => {
   it('should create note with root and wildcard', () => {
     const routes: Routes = [{ path: '' }, { path: '**' }];

package/src/creators/__tests__/root.creator.test.ts → package/src/creators/root.creator.test.ts

@@ -1,8 +1,7 @@
 import { Routes } from '@angular/router';
-import { createRoot } from '../root.creator';
-import { PRIVATE_NOTES_KEY } from '../../constants';
+import { createRoot } from './root.creator';
+import { PRIVATE_NOTES_KEY } from '../constants';
 
-// tslint:disable:max-line-length
 describe('createRoot', () => {
   it('should create root', () => {
     const routes: Routes = [{ path: '' }];

package/src/creators/__tests__/unit.creator.test.ts → package/src/creators/unit.creator.test.ts

@@ -1,7 +1,7 @@
 import { Routes } from '@angular/router';
-import { createNote } from '../note.creator';
-import { createUnit } from '../unit.creator';
-import { Spot } from '../../interfaces/common.interfaces';
+import { createNote } from './note.creator';
+import { createUnit } from './unit.creator';
+import { Spot } from '../interfaces/common.interfaces';
 
 describe('createUnit', () => {
   it('should create basic without parent', () => {

package/src/decorators/__tests__/secluded.decorator.test.ts → package/src/decorators/secluded.decorator.test.ts

@@ -1,10 +1,8 @@
-// tslint:disable:max-classes-per-file
-// tslint:disable:max-line-length
 import { Routes } from '@angular/router';
-import { Secluded } from '../secluded.decorator';
-import { createFeature, createRoot } from '../../creators';
-import { PRIVATE_NOTES_KEY } from '../../constants';
-import { connectFeatures } from '../../functions/connect-features';
+import { Secluded } from './secluded.decorator';
+import { createFeature, createRoot } from '../creators';
+import { PRIVATE_NOTES_KEY } from '../constants';
+import { connectFeatures } from '../functions/connect-features';
 
 describe('[decorators]: Secluded', () => {
   describe('when create simple unit', () => {

package/src/decorators/secluded.decorator.ts

@@ -8,7 +8,6 @@ import { privateNotesKey } from '../interfaces/common.interfaces';
  * decorator which provides possibility
  * to get units inside component
  */
-// tslint:disable:variable-name
 export function Secluded<T = any>(
   arg: privateNotesKey
 ): (target: any, propertyKey: PropertyKey) => void {

package/src/functions/__tests__/connect-features.test.ts → package/src/functions/connect-features.test.ts

@@ -1,8 +1,8 @@
 import { Routes } from '@angular/router';
-import { connectFeatures } from '../connect-features';
-import { getRegisteredUnits, getUnit } from '../get-unit';
-import { createFeature, createRoot } from '../../creators';
-import { PRIVATE_NOTES_KEY } from '../../constants';
+import { connectFeatures } from './connect-features';
+import { getRegisteredUnits, getUnit } from './get-unit';
+import { createFeature, createRoot } from '../creators';
+import { PRIVATE_NOTES_KEY } from '../constants';
 
 describe('connectFeatures', () => {
   const appRoutes: Routes = [{ path: '' }, { path: 'map' }];

package/src/functions/__tests__/connect-nearby.test.ts → package/src/functions/connect-nearby.test.ts

@@ -1,9 +1,8 @@
-// tslint:disable:max-line-length
 import { Routes } from '@angular/router';
-import { getRegisteredUnits } from '../get-unit';
-import { createFeature, createRoot } from '../../creators';
-import { connectFeatures } from '../connect-features';
-import { PRIVATE_NOTES_KEY } from '../../constants';
+import { getRegisteredUnits } from './get-unit';
+import { createFeature, createRoot } from '../creators';
+import { connectFeatures } from './connect-features';
+import { PRIVATE_NOTES_KEY } from '../constants';
 
 describe('connectNearby', () => {
   it('should contain root and nearby feature', () => {

package/src/functions/__tests__/forward-params.test.ts → package/src/functions/forward-params.test.ts

@@ -1,7 +1,6 @@
-// tslint:disable:max-line-length
 import { Routes } from '@angular/router';
-import { forwardParams } from '../forward-params';
-import { createRoot } from '../../creators/root.creator';
+import { forwardParams } from './forward-params';
+import { createRoot } from '../creators/root.creator';
 
 describe('forwardParams', () => {
   it('should return the same state', () => {

package/src/functions/__tests__/get-unit.test.ts → package/src/functions/get-unit.test.ts

@@ -1,8 +1,8 @@
 import { Routes } from '@angular/router';
-import { PRIVATE_NOTES_KEY } from '../../constants';
-import { connectFeatures } from '../connect-features';
-import { getRegisteredUnits, getUnit } from '../get-unit';
-import { createFeature, createRoot } from '../../creators';
+import { PRIVATE_NOTES_KEY } from '../constants';
+import { connectFeatures } from './connect-features';
+import { getRegisteredUnits, getUnit } from './get-unit';
+import { createFeature, createRoot } from '../creators';
 
 describe('[get-unit] Unit', () => {
   const appRoutes: Routes = [{ path: '' }, { path: '**' }, { path: 'map' }];

package/src/navigation/navigation-link.directive.ts

@@ -30,13 +30,7 @@ export class NavigationLink {
     this.link = getRouteLink(value);
   }
 
-  @Input()
-  set preserveQueryParams(value: boolean) {
-    this.preserve = value;
-  }
-
   public link: string[];
-  private preserve!: boolean;
 
   constructor(
     private router: Router,

package/src/navigation/__tests__/navigation.test.ts → package/src/navigation/navigation.test.ts

@@ -1,4 +1,3 @@
-// tslint:disable:max-line-length
 import { Component } from '@angular/core';
 import { Location } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -10,9 +9,9 @@ import {
   TestBed,
   tick
 } from '@angular/core/testing';
-import { getUnit } from '../../functions';
-import { NavigationModule } from '../navigation.module';
-import { createRoot } from '../../creators/root.creator';
+import { getUnit } from '../functions';
+import { NavigationModule } from './navigation.module';
+import { createRoot } from '../creators/root.creator';
 
 const APP_NOTES_KEY = Symbol();