From 3fea7046f2d71cd96bad2cf5934160294ff43471 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 14 Jul 2020 10:08:13 +0300 Subject: [PATCH 1/5] fix: avoid circular dependency --- .../core/src/lib/states/replaceable-components.state.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/src/lib/states/replaceable-components.state.ts b/npm/ng-packs/packages/core/src/lib/states/replaceable-components.state.ts index fe9cecaa79..82096c5472 100644 --- a/npm/ng-packs/packages/core/src/lib/states/replaceable-components.state.ts +++ b/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({ name: 'ReplaceableComponentsState', From 183ab028ad623ba1f747894b60ca0a31ce89ad5a Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 14 Jul 2020 10:17:37 +0300 Subject: [PATCH 2/5] build: add chart.js and js-sha256 to allowedCommonJsDependencies --- npm/ng-packs/angular.json | 1 + 1 file changed, 1 insertion(+) diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index 17f886f13a..2849475999 100644 --- a/npm/ng-packs/angular.json +++ b/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": [ { From 4cc9f4e458e50a313364ce4ffbb268c5a6ebe6b7 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 14 Jul 2020 10:20:58 +0300 Subject: [PATCH 3/5] fix: avoid lint error in permission guard --- npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts index 5de83fef7a..5c94873ee2 100644 --- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts +++ b/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); From 38d34e9cb45b5429bb400c80beb453a0a2bbcd5f Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 14 Jul 2020 10:34:28 +0300 Subject: [PATCH 4/5] build: exclude environment files --- npm/ng-packs/apps/dev-app/tsconfig.dev.json | 2 +- npm/ng-packs/apps/dev-app/tsconfig.prod.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/apps/dev-app/tsconfig.dev.json b/npm/ng-packs/apps/dev-app/tsconfig.dev.json index ac0a5c3d24..957c5b7c73 100644 --- a/npm/ng-packs/apps/dev-app/tsconfig.dev.json +++ b/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"] } diff --git a/npm/ng-packs/apps/dev-app/tsconfig.prod.json b/npm/ng-packs/apps/dev-app/tsconfig.prod.json index ba7ca79842..fc2fc5abf6 100644 --- a/npm/ng-packs/apps/dev-app/tsconfig.prod.json +++ b/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"] } From eadcf3ec47883b4dc6021119531c7c1c39d22092 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 14 Jul 2020 10:38:28 +0300 Subject: [PATCH 5/5] build: add chart.js and js-sha256 to allowedCommonJsDependencies of template --- templates/app/angular/angular.json | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index e3c0dbb2c3..7cd1efa44d 100644 --- a/templates/app/angular/angular.json +++ b/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": [ {