Updated from generator v9.2.0

.editorconfig

@@ -10,6 +10,9 @@ trim_trailing_whitespace = true
 end_of_line = lf
 max_line_length = 120
 
+[*.ts]
+quote_type = single
+
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false

.gitignore

@@ -16,7 +16,8 @@
 /platforms
 
 # Electron
-/dist.electron
+/dist-electron
+/dist-packages
 /electron.main.js
 
 # IDEs and editors

.stylelintrc

@@ -41,7 +41,7 @@
         "ignorePseudoElements": ["ng-deep"]
       }
     ],
-    "unit-whitelist": ["px", "%", "em", "rem", "vw", "vh", "deg", "s"],
+    "unit-allowed-list": ["px", "%", "em", "rem", "vw", "vh", "deg", "s"],
     "max-empty-lines": 2,
     "max-line-length": 120
   }

angular.json

@@ -40,7 +40,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -73,14 +72,11 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "ng-x-rocket:build",
-            "hmr": true,
-            "hmrWarning": false
+            "browserTarget": "ng-x-rocket:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "ng-x-rocket:build:production",
-              "hmr": false
+              "browserTarget": "ng-x-rocket:build:production"
             },
             "ci": {
               "progress": false

e2e/tsconfig.json

@@ -1,6 +1,6 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
@@ -11,4 +11,4 @@
       "node"
     ]
   }
-}
+}

jest.config.js

@@ -15,7 +15,7 @@ module.exports = {
   globals: {
     'ts-jest': {
       allowSyntheticDefaultImports: true,
-      tsConfig: '<rootDir>/tsconfig.spec.json'
+      tsconfig: '<rootDir>/tsconfig.spec.json'
     },
   },
   // Do not ignore librairies such as ionic, ionic-native or bootstrap to transform them during unit testing.

package.json

@@ -4,74 +4,74 @@
   "private": true,
     "scripts": {
     "ng": "ng",
-    "build": "npm run env -s && ng build --prod",
-    "start": "npm run env -s && ng serve --proxy-config proxy.conf.js",
+    "build": "npm run write:env -s && ng build --prod",
+    "start": "npm run write:env -s && ng serve --proxy-config proxy.conf.js",
     "serve:sw": "npm run build -s && npx http-server ./dist -p 4200",
     "lint": "ng lint && stylelint \"src/**/*.scss\" --syntax scss && htmlhint \"src\" --config .htmlhintrc",
-    "test": "npm run env -s && ng test",
-    "test:ci": "npm run env -s && npm run lint -s && ng test --configuration=ci",
-    "e2e": "npm run env -s && ng e2e",
+    "test": "npm run write:env -s && ng test",
+    "test:ci": "npm run write:env -s && npm run lint -s && ng test --configuration=ci",
+    "e2e": "npm run write:env -s && ng e2e",
     "translations:extract": "ngx-translate-extract --input ./src --output ./src/translations/template.json --format=json --clean --sort",
     "docs": "hads ./docs -o",
-    "env": "ngx-scripts env npm_package_version",
+    "write:env": "ngx-scripts env npm_package_version",
     "prettier": "prettier --write \"./{src,e2e}/**/*.{ts,js,html,scss}\"",
     "prettier:check": "prettier --list-different \"./{src,e2e}/**/*.{ts,js,html,scss}\"",
     "postinstall": "npm run prettier -s",
     "generate": "ng generate"
   },
   "dependencies": {
-    "@angular/animations": "^10.1.4",
-    "@angular/common": "^10.1.4",
-    "@angular/compiler": "^10.1.4",
-    "@angular/core": "^10.1.4",
-    "@angular/forms": "^10.1.4",
-    "@angular/localize": "^10.1.4",
-    "@angular/platform-browser": "^10.1.4",
-    "@angular/platform-browser-dynamic": "^10.1.4",
-    "@angular/router": "^10.1.4",
+    "@angular/animations": "^11.0.8",
+    "@angular/common": "^11.0.8",
+    "@angular/compiler": "^11.0.8",
+    "@angular/core": "^11.0.8",
+    "@angular/forms": "^11.0.8",
+    "@angular/localize": "^11.0.8",
+    "@angular/platform-browser": "^11.0.8",
+    "@angular/platform-browser-dynamic": "^11.0.8",
+    "@angular/router": "^11.0.8",
     "@ngx-translate/core": "^13.0.0",
-    "@angular/service-worker": "^10.1.4",
-    "@ng-bootstrap/ng-bootstrap": "^7.0.0",
-    "bootstrap": "^4.5.2",
-    "@fortawesome/fontawesome-free": "^5.14.0",
+    "@angular/service-worker": "^11.0.8",
+    "@ng-bootstrap/ng-bootstrap": "^8.0.0",
+    "bootstrap": "^4.5.3",
+    "@fortawesome/fontawesome-free": "^5.15.1",
     "rxjs": "^6.6.3",
     "tslib": "^2.0.1",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-builders/jest": "^10.0.0",
-    "@angular/cli": "~10.1.4",
-    "@angular/compiler-cli": "^10.1.4",
-    "@angular/language-service": "^10.1.4",
-    "@angular-devkit/build-angular": "^0.1001.4",
-    "@angularclass/hmr": "^3.0.0",
+    "@angular-builders/jest": "^11.0.0",
+    "@angular/cli": "~11.0.6",
+    "@angular/compiler-cli": "^11.0.8",
+    "@angular/language-service": "^11.0.8",
+    "@angular-devkit/build-angular": "^0.1100.6",
     "@biesbjerg/ngx-translate-extract": "^7.0.3",
     "@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
-    "@ngx-rocket/scripts": "^4.0.0",
-    "@types/jasmine": "^3.5.14",
+    "@ngx-rocket/scripts": "^5.0.0",
+    "@ngneat/until-destroy": "^8.0.3",
+    "@types/jasmine": "^3.6.2",
     "@types/jasminewd2": "^2.0.8",
-    "@types/jest": "^26.0.12",
-    "@types/node": "^12.12.62",
+    "@types/jest": "^26.0.19",
+    "@types/node": "^12.19.12",
     "codelyzer": "^6.0.1",
-    "hads": "^2.1.0",
-    "htmlhint": "^0.14.1",
+    "hads": "^3.0.0",
+    "htmlhint": "^0.14.2",
     "https-proxy-agent": "^5.0.0",
     "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.1",
-    "jest": "^26.4.2",
-    "prettier": "^2.1.1",
+    "jasmine-spec-reporter": "~6.0.0",
+    "jest": "^26.6.3",
+    "prettier": "^2.2.1",
     "tslint-config-prettier": "^1.18.0",
     "stylelint-config-prettier": "^8.0.2",
-    "pretty-quick": "^3.0.0",
-    "husky": "^4.2.5",
+    "pretty-quick": "^3.1.0",
+    "husky": "^4.3.6",
     "protractor": "~7.0.0",
-    "stylelint": "~13.7.2",
+    "stylelint": "~13.8.0",
     "stylelint-config-recommended-scss": "~4.2.0",
     "stylelint-config-standard": "~20.0.0",
     "stylelint-scss": "~3.18.0",
-    "ts-node": "^9.0.0",
+    "ts-node": "^9.1.1",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.3"
+    "typescript": "~4.0.5"
   },
   "prettier": {
     "singleQuote": true,

src/app/@core/index.ts

@@ -3,4 +3,4 @@ export * from './http/api-prefix.interceptor';
 export * from './http/error-handler.interceptor';
 export * from './route-reusable-strategy';
 export * from './logger.service';
-export * from './until-destroyed';
+export * from '@ngneat/until-destroy';;

src/app/@core/route-reusable-strategy.ts

@@ -24,7 +24,11 @@ export class RouteReusableStrategy extends RouteReuseStrategy {
   }
 
   public shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {
-    return (future.routeConfig === curr.routeConfig) || future.data.reuse;
+    // Reuse the route if the RouteConfig is the same, or if both routes use the
+    // same component, because the latter can have different RouteConfigs.
+    return future.routeConfig === curr.routeConfig ||
+      Boolean(future.routeConfig?.component &&
+      future.routeConfig?.component === curr.routeConfig?.component);
   }
 
 }