From c10c3ecf302771a3451b2662cb9ba2ed8ab03110 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 3 Apr 2020 08:22:41 +0300 Subject: [PATCH 1/2] refactor: refactor development project --- npm/ng-packs/angular.json | 4 +-- npm/ng-packs/apps/dev-app/tsconfig.dev.json | 10 +++++++ .../{tsconfig.app.json => tsconfig.prod.json} | 2 +- npm/ng-packs/package.json | 1 + .../packages/account-config/tsconfig.lib.json | 12 ++------ .../account-config/tsconfig.spec.json | 2 +- .../packages/account/tsconfig.lib.json | 2 +- .../packages/account/tsconfig.spec.json | 2 +- npm/ng-packs/packages/core/tsconfig.lib.json | 2 +- npm/ng-packs/packages/core/tsconfig.spec.json | 2 +- .../feature-management/tsconfig.lib.json | 12 ++------ .../feature-management/tsconfig.spec.json | 2 +- .../identity-config/tsconfig.lib.json | 12 ++------ .../identity-config/tsconfig.spec.json | 2 +- .../packages/identity/tsconfig.lib.json | 2 +- .../packages/identity/tsconfig.spec.json | 2 +- .../permission-management/tsconfig.lib.json | 2 +- .../permission-management/tsconfig.spec.json | 2 +- .../tsconfig.lib.json | 12 ++------ .../tsconfig.spec.json | 2 +- .../setting-management/tsconfig.lib.json | 12 ++------ .../setting-management/tsconfig.spec.json | 2 +- .../tsconfig.lib.json | 12 ++------ .../tsconfig.spec.json | 2 +- .../tenant-management/tsconfig.lib.json | 12 ++------ .../tenant-management/tsconfig.spec.json | 2 +- .../packages/theme-basic/tsconfig.lib.json | 2 +- .../packages/theme-basic/tsconfig.spec.json | 2 +- .../packages/theme-shared/tsconfig.lib.json | 2 +- .../packages/theme-shared/tsconfig.spec.json | 2 +- npm/ng-packs/tsconfig.json | 30 ++++++++++++++++++- npm/ng-packs/tsconfig.prod.json | 22 ++++++++++++++ 32 files changed, 105 insertions(+), 86 deletions(-) create mode 100644 npm/ng-packs/apps/dev-app/tsconfig.dev.json rename npm/ng-packs/apps/dev-app/{tsconfig.app.json => tsconfig.prod.json} (98%) create mode 100644 npm/ng-packs/tsconfig.prod.json diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index af185688b2..1f13192da0 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -32,7 +32,6 @@ } } }, - "theme-shared": { "projectType": "library", "root": "packages/theme-shared", @@ -436,7 +435,7 @@ "index": "apps/dev-app/src/index.html", "main": "apps/dev-app/src/main.ts", "polyfills": "apps/dev-app/src/polyfills.ts", - "tsConfig": "apps/dev-app/tsconfig.app.json", + "tsConfig": "apps/dev-app/tsconfig.prod.json", "aot": false, "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"], "extractCss": true, @@ -487,6 +486,7 @@ ] }, "internal": { + "tsConfig": "apps/dev-app/tsconfig.dev.json", "fileReplacements": [ { "replace": "apps/dev-app/src/environments/environment.ts", diff --git a/npm/ng-packs/apps/dev-app/tsconfig.dev.json b/npm/ng-packs/apps/dev-app/tsconfig.dev.json new file mode 100644 index 0000000000..cfbd94952d --- /dev/null +++ b/npm/ng-packs/apps/dev-app/tsconfig.dev.json @@ -0,0 +1,10 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "../../out-tsc/app", + "types": [] + }, + "files": ["src/main.ts", "src/polyfills.ts"], + "include": ["src/**/*.ts"], + "exclude": ["src/test.ts", "src/**/*.spec.ts"] +} diff --git a/npm/ng-packs/apps/dev-app/tsconfig.app.json b/npm/ng-packs/apps/dev-app/tsconfig.prod.json similarity index 98% rename from npm/ng-packs/apps/dev-app/tsconfig.app.json rename to npm/ng-packs/apps/dev-app/tsconfig.prod.json index 464faaec10..91d6f20c5a 100644 --- a/npm/ng-packs/apps/dev-app/tsconfig.app.json +++ b/npm/ng-packs/apps/dev-app/tsconfig.prod.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/app", "types": [], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 80adfa3d3e..c55324f98f 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -9,6 +9,7 @@ "symlink": "symlink", "start": "ng serve dev-app", "start:internal": "ng serve dev-app --configuration=internal", + "build": "ng build", "test": "ng test --watchAll --runInBand", "commit": "git-cz", "lint": "ng lint", diff --git a/npm/ng-packs/packages/account-config/tsconfig.lib.json b/npm/ng-packs/packages/account-config/tsconfig.lib.json index bd23948e59..7f52d4a590 100644 --- a/npm/ng-packs/packages/account-config/tsconfig.lib.json +++ b/npm/ng-packs/packages/account-config/tsconfig.lib.json @@ -1,15 +1,12 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", "declaration": true, "inlineSources": true, "types": [], - "lib": [ - "dom", - "es2018" - ] + "lib": ["dom", "es2018"] }, "angularCompilerOptions": { "annotateForClosureCompiler": true, @@ -19,8 +16,5 @@ "strictInjectionParameters": true, "enableResourceInlining": true }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] + "exclude": ["src/test.ts", "**/*.spec.ts"] } diff --git a/npm/ng-packs/packages/account-config/tsconfig.spec.json b/npm/ng-packs/packages/account-config/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/account-config/tsconfig.spec.json +++ b/npm/ng-packs/packages/account-config/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/account/tsconfig.lib.json b/npm/ng-packs/packages/account/tsconfig.lib.json index 2972099ba1..7f52d4a590 100644 --- a/npm/ng-packs/packages/account/tsconfig.lib.json +++ b/npm/ng-packs/packages/account/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", diff --git a/npm/ng-packs/packages/account/tsconfig.spec.json b/npm/ng-packs/packages/account/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/account/tsconfig.spec.json +++ b/npm/ng-packs/packages/account/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/core/tsconfig.lib.json b/npm/ng-packs/packages/core/tsconfig.lib.json index 2972099ba1..7f52d4a590 100644 --- a/npm/ng-packs/packages/core/tsconfig.lib.json +++ b/npm/ng-packs/packages/core/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", diff --git a/npm/ng-packs/packages/core/tsconfig.spec.json b/npm/ng-packs/packages/core/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/core/tsconfig.spec.json +++ b/npm/ng-packs/packages/core/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/feature-management/tsconfig.lib.json b/npm/ng-packs/packages/feature-management/tsconfig.lib.json index bd23948e59..7f52d4a590 100644 --- a/npm/ng-packs/packages/feature-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/feature-management/tsconfig.lib.json @@ -1,15 +1,12 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", "declaration": true, "inlineSources": true, "types": [], - "lib": [ - "dom", - "es2018" - ] + "lib": ["dom", "es2018"] }, "angularCompilerOptions": { "annotateForClosureCompiler": true, @@ -19,8 +16,5 @@ "strictInjectionParameters": true, "enableResourceInlining": true }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] + "exclude": ["src/test.ts", "**/*.spec.ts"] } diff --git a/npm/ng-packs/packages/feature-management/tsconfig.spec.json b/npm/ng-packs/packages/feature-management/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/feature-management/tsconfig.spec.json +++ b/npm/ng-packs/packages/feature-management/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/identity-config/tsconfig.lib.json b/npm/ng-packs/packages/identity-config/tsconfig.lib.json index bd23948e59..7f52d4a590 100644 --- a/npm/ng-packs/packages/identity-config/tsconfig.lib.json +++ b/npm/ng-packs/packages/identity-config/tsconfig.lib.json @@ -1,15 +1,12 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", "declaration": true, "inlineSources": true, "types": [], - "lib": [ - "dom", - "es2018" - ] + "lib": ["dom", "es2018"] }, "angularCompilerOptions": { "annotateForClosureCompiler": true, @@ -19,8 +16,5 @@ "strictInjectionParameters": true, "enableResourceInlining": true }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] + "exclude": ["src/test.ts", "**/*.spec.ts"] } diff --git a/npm/ng-packs/packages/identity-config/tsconfig.spec.json b/npm/ng-packs/packages/identity-config/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/identity-config/tsconfig.spec.json +++ b/npm/ng-packs/packages/identity-config/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/identity/tsconfig.lib.json b/npm/ng-packs/packages/identity/tsconfig.lib.json index 2972099ba1..7f52d4a590 100644 --- a/npm/ng-packs/packages/identity/tsconfig.lib.json +++ b/npm/ng-packs/packages/identity/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", diff --git a/npm/ng-packs/packages/identity/tsconfig.spec.json b/npm/ng-packs/packages/identity/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/identity/tsconfig.spec.json +++ b/npm/ng-packs/packages/identity/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/permission-management/tsconfig.lib.json b/npm/ng-packs/packages/permission-management/tsconfig.lib.json index 2972099ba1..7f52d4a590 100644 --- a/npm/ng-packs/packages/permission-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/permission-management/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", diff --git a/npm/ng-packs/packages/permission-management/tsconfig.spec.json b/npm/ng-packs/packages/permission-management/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/permission-management/tsconfig.spec.json +++ b/npm/ng-packs/packages/permission-management/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/setting-management-config/tsconfig.lib.json b/npm/ng-packs/packages/setting-management-config/tsconfig.lib.json index bd23948e59..7f52d4a590 100644 --- a/npm/ng-packs/packages/setting-management-config/tsconfig.lib.json +++ b/npm/ng-packs/packages/setting-management-config/tsconfig.lib.json @@ -1,15 +1,12 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", "declaration": true, "inlineSources": true, "types": [], - "lib": [ - "dom", - "es2018" - ] + "lib": ["dom", "es2018"] }, "angularCompilerOptions": { "annotateForClosureCompiler": true, @@ -19,8 +16,5 @@ "strictInjectionParameters": true, "enableResourceInlining": true }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] + "exclude": ["src/test.ts", "**/*.spec.ts"] } diff --git a/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json b/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json +++ b/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/setting-management/tsconfig.lib.json b/npm/ng-packs/packages/setting-management/tsconfig.lib.json index bd23948e59..7f52d4a590 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.lib.json @@ -1,15 +1,12 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", "declaration": true, "inlineSources": true, "types": [], - "lib": [ - "dom", - "es2018" - ] + "lib": ["dom", "es2018"] }, "angularCompilerOptions": { "annotateForClosureCompiler": true, @@ -19,8 +16,5 @@ "strictInjectionParameters": true, "enableResourceInlining": true }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] + "exclude": ["src/test.ts", "**/*.spec.ts"] } diff --git a/npm/ng-packs/packages/setting-management/tsconfig.spec.json b/npm/ng-packs/packages/setting-management/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.spec.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json b/npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json index bd23948e59..7f52d4a590 100644 --- a/npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json +++ b/npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json @@ -1,15 +1,12 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", "declaration": true, "inlineSources": true, "types": [], - "lib": [ - "dom", - "es2018" - ] + "lib": ["dom", "es2018"] }, "angularCompilerOptions": { "annotateForClosureCompiler": true, @@ -19,8 +16,5 @@ "strictInjectionParameters": true, "enableResourceInlining": true }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] + "exclude": ["src/test.ts", "**/*.spec.ts"] } diff --git a/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json b/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json +++ b/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json index 11fb84af38..fa838f3a89 100644 --- a/npm/ng-packs/packages/tenant-management/tsconfig.lib.json +++ b/npm/ng-packs/packages/tenant-management/tsconfig.lib.json @@ -1,15 +1,12 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", "declaration": true, "inlineSources": true, "types": [], - "lib": [ - "dom", - "es2018" - ], + "lib": ["dom", "es2018"], "paths": {} }, "angularCompilerOptions": { @@ -20,8 +17,5 @@ "strictInjectionParameters": true, "enableResourceInlining": true }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] + "exclude": ["src/test.ts", "**/*.spec.ts"] } diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.spec.json b/npm/ng-packs/packages/tenant-management/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/tenant-management/tsconfig.spec.json +++ b/npm/ng-packs/packages/tenant-management/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json index 2972099ba1..7f52d4a590 100644 --- a/npm/ng-packs/packages/theme-basic/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-basic/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.spec.json b/npm/ng-packs/packages/theme-basic/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/theme-basic/tsconfig.spec.json +++ b/npm/ng-packs/packages/theme-basic/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json index 2972099ba1..7f52d4a590 100644 --- a/npm/ng-packs/packages/theme-shared/tsconfig.lib.json +++ b/npm/ng-packs/packages/theme-shared/tsconfig.lib.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "outDir": "../../out-tsc/lib", "target": "es2015", diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.spec.json b/npm/ng-packs/packages/theme-shared/tsconfig.spec.json index 54e55c4f05..02f312c262 100644 --- a/npm/ng-packs/packages/theme-shared/tsconfig.spec.json +++ b/npm/ng-packs/packages/theme-shared/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.prod.json", "compilerOptions": { "emitDecoratorMetadata": true, "esModuleInterop": true, diff --git a/npm/ng-packs/tsconfig.json b/npm/ng-packs/tsconfig.json index ac9e9e8eea..e52b99135e 100644 --- a/npm/ng-packs/tsconfig.json +++ b/npm/ng-packs/tsconfig.json @@ -13,7 +13,35 @@ "target": "es2015", "typeRoots": ["node_modules/@types"], "lib": ["es2018", "dom"], - "types": ["jest"] + "types": ["jest"], + "paths": { + "@abp/ng.core": ["packages/core/src/public-api.ts"], + "@abp/ng.core/*": ["packages/core/src/lib/*"], + "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"], + "@abp/ng.theme.shared/*": ["packages/theme-shared/src/lib/*"], + "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"], + "@abp/ng.theme.basic/*": ["packages/theme-basic/src/lib/*"], + "@abp/ng.account": ["packages/account/src/public-api.ts"], + "@abp/ng.account/*": ["packages/account/src/lib/*"], + "@abp/ng.account.config": ["packages/account-config/src/public-api.ts"], + "@abp/ng.account.config/*": ["packages/account-config/src/lib/*"], + "@abp/ng.identity": ["packages/identity/src/public-api.ts"], + "@abp/ng.identity/*": ["packages/identity/src/lib/*"], + "@abp/ng.identity.config": ["packages/identity-config/src/public-api.ts"], + "@abp/ng.identity.config/*": ["packages/identity-config/src/lib/*"], + "@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"], + "@abp/ng.tenant-management/*": ["packages/tenant-management/src/lib/*"], + "@abp/ng.tenant-management.config": ["packages/tenant-management-config/src/public-api.ts"], + "@abp/ng.tenant-management.config/*": ["packages/tenant-management-config/src/lib/*"], + "@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"], + "@abp/ng.setting-management/*": ["packages/setting-management/src/lib/*"], + "@abp/ng.setting-management.config": ["packages/setting-management-config/src/public-api.ts"], + "@abp/ng.setting-management.config/*": ["packages/setting-management-config/src/lib/*"], + "@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"], + "@abp/ng.permission-management/*": ["packages/permission-management/src/lib/*"], + "@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"], + "@abp/ng.feature-management/*": ["packages/feature-management/src/lib/*"] + } }, "angularCompilerOptions": { "fullTemplateTypeCheck": true, diff --git a/npm/ng-packs/tsconfig.prod.json b/npm/ng-packs/tsconfig.prod.json new file mode 100644 index 0000000000..ac9e9e8eea --- /dev/null +++ b/npm/ng-packs/tsconfig.prod.json @@ -0,0 +1,22 @@ +{ + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./", + "outDir": "./dist/out-tsc", + "sourceMap": true, + "declaration": false, + "downlevelIteration": true, + "experimentalDecorators": true, + "module": "esnext", + "moduleResolution": "node", + "importHelpers": true, + "target": "es2015", + "typeRoots": ["node_modules/@types"], + "lib": ["es2018", "dom"], + "types": ["jest"] + }, + "angularCompilerOptions": { + "fullTemplateTypeCheck": true, + "strictInjectionParameters": true + } +} From fcf9ebe0c95af4223a98fa09690120594904993c Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 3 Apr 2020 08:39:02 +0300 Subject: [PATCH 2/2] fix: fix lint error --- npm/ng-packs/angular.json | 6 +++++- .../identity/src/lib/components/roles/roles.component.ts | 6 +++--- .../src/lib/components/tenants/tenants.component.ts | 6 +++--- .../src/lib/components/modal/modal.component.ts | 6 +++--- .../packages/theme-shared/src/lib/handlers/error.handler.ts | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index 1f13192da0..39a10f827b 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -519,7 +519,11 @@ "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { - "tsConfig": ["apps/dev-app/tsconfig.app.json", "apps/dev-app/tsconfig.spec.json"], + "tsConfig": [ + "apps/dev-app/tsconfig.dev.json", + "apps/dev-app/tsconfig.prod.json", + "apps/dev-app/tsconfig.spec.json" + ], "exclude": ["**/node_modules/**"] } } diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts index 546ff48483..20b1114669 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts @@ -1,5 +1,5 @@ import { ABP } from '@abp/ng.core'; -import { ConfirmationService, Toaster } from '@abp/ng.theme.shared'; +import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared'; import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { Select, Store } from '@ngxs/store'; @@ -116,8 +116,8 @@ export class RolesComponent implements OnInit { .warn('AbpIdentity::RoleDeletionConfirmationMessage', 'AbpIdentity::AreYouSure', { messageLocalizationParams: [name], }) - .subscribe((status: Toaster.Status) => { - if (status === Toaster.Status.confirm) { + .subscribe((status: Confirmation.Status) => { + if (status === Confirmation.Status.confirm) { this.store.dispatch(new DeleteRole(id)).subscribe(() => this.get()); } }); diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts index 788953096f..de7a6ad644 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts @@ -1,5 +1,5 @@ import { ABP } from '@abp/ng.core'; -import { ConfirmationService, Toaster } from '@abp/ng.theme.shared'; +import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared'; import { Component, OnInit, TemplateRef, ViewChild, ChangeDetectorRef } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Select, Store } from '@ngxs/store'; @@ -252,8 +252,8 @@ export class TenantsComponent implements OnInit { messageLocalizationParams: [name], }, ) - .subscribe((status: Toaster.Status) => { - if (status === Toaster.Status.confirm) { + .subscribe((status: Confirmation.Status) => { + if (status === Confirmation.Status.confirm) { this.store.dispatch(new DeleteTenant(id)).subscribe(() => this.get()); } }); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts index 8aaaa58076..e00cda5b55 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts @@ -14,7 +14,7 @@ import { import { fromEvent, Subject } from 'rxjs'; import { debounceTime, filter, takeUntil } from 'rxjs/operators'; import { fadeAnimation } from '../../animations/modal.animations'; -import { Toaster } from '../../models/toaster'; +import { Confirmation } from '../../models/confirmation'; import { ConfirmationService } from '../../services/confirmation.service'; import { ButtonComponent } from '../button/button.component'; @@ -133,9 +133,9 @@ export class ModalComponent implements OnDestroy { 'AbpAccount::AreYouSureYouWantToCancelEditingWarningMessage', 'AbpAccount::AreYouSure', ) - .subscribe((status: Toaster.Status) => { + .subscribe((status: Confirmation.Status) => { this.isConfirmationOpen = false; - if (status === Toaster.Status.confirm) { + if (status === Confirmation.Status.confirm) { this.visible = false; } }); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts index 1f221a42e9..c84bf30470 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts @@ -17,7 +17,7 @@ import { Observable, Subject } from 'rxjs'; import snq from 'snq'; import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component'; import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common'; -import { Toaster } from '../models/toaster'; +import { Confirmation } from '../models/confirmation'; import { ConfirmationService } from '../services/confirmation.service'; export const DEFAULT_ERROR_MESSAGES = { @@ -185,7 +185,7 @@ export class ErrorHandler { message?: Config.LocalizationParam, title?: Config.LocalizationParam, body?: any, - ): Observable { + ): Observable { if (body) { if (body.details) { message = body.details;