Browse Source

Merge pull request #4748 from abpframework/fix/4747

Removed Compile Warnings
pull/4749/head
Mehmet Erim 6 years ago
committed by GitHub
parent
commit
f76cbc44cd
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      npm/ng-packs/angular.json
  2. 2
      npm/ng-packs/apps/dev-app/tsconfig.dev.json
  3. 2
      npm/ng-packs/apps/dev-app/tsconfig.prod.json
  4. 4
      npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
  5. 1
      templates/app/angular/angular.json

1
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": [
{

2
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"]
}

2
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"]
}

4
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);

1
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": [
{

Loading…
Cancel
Save