Merge remote-tracking branch 'origin/master' into dev

npm/ng-packs/angular.json

@@ -350,6 +350,7 @@
             "tsConfig": "apps/dev-app/tsconfig.dev.json",
             "aot": true,
             "extractCss": true,
+            "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
             "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"],
             "styles": [
               {

npm/ng-packs/apps/dev-app/tsconfig.dev.json

@@ -6,5 +6,5 @@
   },
   "files": ["src/main.ts", "src/polyfills.ts"],
   "include": ["src/**/*.ts"],
-  "exclude": ["src/test.ts", "src/**/*.spec.ts"]
+  "exclude": ["src/test.ts", "src/**/*.spec.ts", "src/environments/*.ts"]
 }

npm/ng-packs/apps/dev-app/tsconfig.prod.json

@@ -12,5 +12,5 @@
   },
   "files": ["src/main.ts", "src/polyfills.ts"],
   "include": ["src/**/*.ts"],
-  "exclude": ["src/test.ts", "src/**/*.spec.ts"]
+  "exclude": ["src/test.ts", "src/**/*.spec.ts", "src/environments/*.ts"]
 }

npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts

@@ -18,8 +18,8 @@ export class PermissionGuard implements CanActivate {
     let { requiredPolicy } = route.data || {};
 
     if (!requiredPolicy) {
-      const route = findRoute(this.routes, getRoutePath(this.router, state.url));
-      requiredPolicy = route?.requiredPolicy;
+      const routeFound = findRoute(this.routes, getRoutePath(this.router, state.url));
+      requiredPolicy = routeFound?.requiredPolicy;
     }
 
     if (!requiredPolicy) return of(true);

npm/ng-packs/packages/core/src/lib/states/replaceable-components.state.ts

@@ -1,10 +1,10 @@
-import { noop } from '@abp/ng.core';
 import { Injectable, NgZone } from '@angular/core';
 import { Router } from '@angular/router';
 import { Action, createSelector, Selector, State, StateContext } from '@ngxs/store';
 import snq from 'snq';
 import { AddReplaceableComponent } from '../actions/replaceable-components.actions';
 import { ReplaceableComponents } from '../models/replaceable-components';
+import { noop } from '../utils/common-utils';
 
 @State<ReplaceableComponents.State>({
   name: 'ReplaceableComponentsState',

templates/app/angular/angular.json

@@ -24,6 +24,7 @@
             "tsConfig": "tsconfig.app.json",
             "aot": true,
             "extractCss": true,
+            "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
             "assets": ["src/favicon.ico", "src/assets"],
             "styles": [
               {