From 96be03d15bd3c6b1419b4c97c9fcbeeee885a7d9 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 18 Aug 2021 13:42:26 +0300 Subject: [PATCH] change package tsconfig structure --- npm/ng-packs/angular.json | 455 +++++++++--------- .../packages/account-core/tsconfig.json | 2 +- .../account-core/tsconfig.lib.prod.json | 2 +- .../manage-profile.component.html | 2 +- npm/ng-packs/packages/account/tsconfig.json | 2 +- .../packages/account/tsconfig.lib.prod.json | 2 +- .../packages/components/tsconfig.json | 2 +- .../components/tsconfig.lib.prod.json | 2 +- npm/ng-packs/packages/core/tsconfig.json | 2 +- .../packages/core/tsconfig.lib.prod.json | 2 +- .../feature-management/src/public-api.ts | 3 +- .../packages/feature-management/tsconfig.json | 2 +- .../feature-management/tsconfig.lib.prod.json | 2 +- npm/ng-packs/packages/identity/tsconfig.json | 2 +- .../packages/identity/tsconfig.lib.prod.json | 2 +- .../permission-management/tsconfig.json | 2 +- .../tsconfig.lib.prod.json | 2 +- .../packages/setting-management/tsconfig.json | 2 +- .../setting-management/tsconfig.lib.prod.json | 2 +- .../packages/tenant-management/tsconfig.json | 2 +- .../tenant-management/tsconfig.lib.prod.json | 2 +- .../packages/theme-basic/tsconfig.json | 2 +- .../theme-basic/tsconfig.lib.prod.json | 2 +- .../toast-container.component.html | 6 +- .../toast-container.component.ts | 4 +- .../lib/components/toast/toast.component.ts | 10 +- .../src/lib/services/toaster.service.ts | 5 +- .../packages/theme-shared/tsconfig.json | 2 +- .../theme-shared/tsconfig.lib.prod.json | 2 +- npm/ng-packs/scripts/build.ts | 2 +- .../tsconfig.lib.json | 2 +- .../tsconfig.lib.prod.json | 2 +- npm/ng-packs/tools/tsconfig.tools.json | 2 +- npm/ng-packs/tsconfig.base.json | 5 +- npm/ng-packs/tsconfig.lib.base.json | 48 -- npm/ng-packs/yarn.lock | 12 +- 36 files changed, 279 insertions(+), 323 deletions(-) delete mode 100644 npm/ng-packs/tsconfig.lib.base.json diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index 977cf101ee..f275679ff7 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -1,71 +1,71 @@ { "version": 1, "projects": { - "core": { + "account": { "projectType": "library", - "root": "packages/core", - "sourceRoot": "packages/core/src", + "root": "packages/account", + "sourceRoot": "packages/account/src", "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/account"], "options": { - "tsConfig": "packages/core/tsconfig.lib.json", - "project": "packages/core/ng-package.json" + "project": "packages/account/ng-package.json" }, "configurations": { "production": { - "tsConfig": "packages/core/tsconfig.lib.prod.json" + "tsConfig": "packages/account/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "packages/core/tsconfig.lib.json" + "tsConfig": "packages/account/tsconfig.lib.json" } }, "defaultConfiguration": "production" }, "test": { "builder": "@nrwl/jest:jest", - "outputs": ["coverage/packages/core"], + "outputs": ["coverage/packages/account"], "options": { - "jestConfig": "packages/core/jest.config.js", + "jestConfig": "packages/account/jest.config.js", "passWithNoTests": true } }, "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": ["packages/core/src/**/*.ts", "packages/core/src/**/*.html"] + "lintFilePatterns": ["packages/account/src/**/*.ts", "packages/account/src/**/*.html"] } } } }, - "theme-shared": { + "account-core": { "projectType": "library", - "root": "packages/theme-shared", - "sourceRoot": "packages/theme-shared/src", + "root": "packages/account-core", + "sourceRoot": "packages/account-core/src", "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/account-core"], "options": { - "tsConfig": "packages/theme-shared/tsconfig.lib.json", - "project": "packages/theme-shared/ng-package.json" + "project": "packages/account-core/ng-package.json" }, "configurations": { "production": { - "tsConfig": "packages/theme-shared/tsconfig.lib.prod.json" + "tsConfig": "packages/account-core/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "packages/theme-shared/tsconfig.lib.json" + "tsConfig": "packages/account-core/tsconfig.lib.json" } }, "defaultConfiguration": "production" }, "test": { "builder": "@nrwl/jest:jest", - "outputs": ["coverage/packages/theme-shared"], + "outputs": ["coverage/packages/account-core"], "options": { - "jestConfig": "packages/theme-shared/jest.config.js", + "jestConfig": "packages/account-core/jest.config.js", "passWithNoTests": true } }, @@ -73,8 +73,8 @@ "builder": "@nrwl/linter:eslint", "options": { "lintFilePatterns": [ - "packages/theme-shared/src/**/*.ts", - "packages/theme-shared/src/**/*.html" + "packages/account-core/src/**/*.ts", + "packages/account-core/src/**/*.html" ] } } @@ -87,9 +87,9 @@ "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/components"], "options": { - "tsConfig": "packages/components/tsconfig.lib.json", "project": "packages/components/ng-package.json" }, "configurations": { @@ -121,125 +121,192 @@ } } }, - "account-core": { + "core": { "projectType": "library", - "root": "packages/account-core", - "sourceRoot": "packages/account-core/src", + "root": "packages/core", + "sourceRoot": "packages/core/src", "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/core"], "options": { - "tsConfig": "packages/account-core/tsconfig.lib.json", - "project": "packages/account-core/ng-package.json" + "project": "packages/core/ng-package.json" }, "configurations": { "production": { - "tsConfig": "packages/account-core/tsconfig.lib.prod.json" + "tsConfig": "packages/core/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "packages/account-core/tsconfig.lib.json" + "tsConfig": "packages/core/tsconfig.lib.json" } }, "defaultConfiguration": "production" }, "test": { "builder": "@nrwl/jest:jest", - "outputs": ["coverage/packages/account-core"], + "outputs": ["coverage/packages/core"], "options": { - "jestConfig": "packages/account-core/jest.config.js", + "jestConfig": "packages/core/jest.config.js", "passWithNoTests": true } }, "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": [ - "packages/account-core/src/**/*.ts", - "packages/account-core/src/**/*.html" - ] + "lintFilePatterns": ["packages/core/src/**/*.ts", "packages/core/src/**/*.html"] } } } }, - "theme-basic": { - "projectType": "library", - "root": "packages/theme-basic", - "sourceRoot": "packages/theme-basic/src", - "prefix": "abp", + "dev-app": { + "projectType": "application", + "root": "apps/dev-app", + "sourceRoot": "apps/dev-app/src", + "prefix": "app", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@angular-devkit/build-angular:browser", + "outputs": ["{options.outputPath}"], "options": { - "tsConfig": "packages/theme-basic/tsconfig.lib.json", - "project": "packages/theme-basic/ng-package.json" + "outputPath": "dist/apps/dev-app", + "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", + "inlineStyleLanguage": "scss", + "allowedCommonJsDependencies": ["chart.js", "js-sha256"], + "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"], + "styles": [ + { + "input": "node_modules/@abp/ng.theme.shared/styles/bootstrap-rtl.min.css", + "inject": false, + "bundleName": "bootstrap-rtl.min" + }, + { + "input": "node_modules/bootstrap/dist/css/bootstrap.min.css", + "inject": true, + "bundleName": "bootstrap-ltr.min" + }, + { + "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", + "inject": true, + "bundleName": "fontawesome-all.min" + }, + { + "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css", + "inject": true, + "bundleName": "fontawesome-v4-shims.min" + }, + { + "input": "node_modules/@swimlane/ngx-datatable/index.css", + "inject": true, + "bundleName": "ngx-datatable-index" + }, + { + "input": "node_modules/@swimlane/ngx-datatable/assets/icons.css", + "inject": true, + "bundleName": "ngx-datatable-icons" + }, + { + "input": "node_modules/@swimlane/ngx-datatable/themes/material.css", + "inject": true, + "bundleName": "ngx-datatable-material" + }, + "apps/dev-app/src/styles.scss" + ], + "scripts": [] }, "configurations": { "production": { - "tsConfig": "packages/theme-basic/tsconfig.lib.prod.json" + "tsConfig": "apps/dev-app/tsconfig.prod.json", + "budgets": [ + { + "type": "initial", + "maximumWarning": "1mb", + "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb", + "maximumError": "10kb" + } + ], + "fileReplacements": [ + { + "replace": "apps/dev-app/src/environments/environment.ts", + "with": "apps/dev-app/src/environments/environment.prod.ts" + } + ], + "outputHashing": "all" }, "development": { - "tsConfig": "packages/theme-basic/tsconfig.lib.json" + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true } }, "defaultConfiguration": "production" }, - "test": { - "builder": "@nrwl/jest:jest", - "outputs": ["coverage/packages/theme-basic"], + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "browserTarget": "dev-app:build:production" + }, + "development": { + "browserTarget": "dev-app:build:development" + } + }, + "defaultConfiguration": "development" + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "jestConfig": "packages/theme-basic/jest.config.js", - "passWithNoTests": true + "browserTarget": "dev-app:build" } }, "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": [ - "packages/theme-basic/src/**/*.ts", - "packages/theme-basic/src/**/*.html" - ] + "lintFilePatterns": ["apps/dev-app/src/**/*.ts", "apps/dev-app/src/**/*.html"] + } + }, + "test": { + "builder": "@nrwl/jest:jest", + "outputs": ["coverage/apps/dev-app"], + "options": { + "jestConfig": "apps/dev-app/jest.config.js", + "passWithNoTests": true } } } }, - "permission-management": { - "projectType": "library", - "root": "packages/permission-management", - "sourceRoot": "packages/permission-management/src", - "prefix": "abp", + "dev-app-e2e": { + "root": "apps/dev-app-e2e", + "sourceRoot": "apps/dev-app-e2e/src", + "projectType": "application", "architect": { - "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "e2e": { + "builder": "@nrwl/cypress:cypress", "options": { - "tsConfig": "packages/permission-management/tsconfig.lib.json", - "project": "packages/permission-management/ng-package.json" + "cypressConfig": "apps/dev-app-e2e/cypress.json", + "tsConfig": "apps/dev-app-e2e/tsconfig.e2e.json", + "devServerTarget": "dev-app:serve:development" }, "configurations": { "production": { - "tsConfig": "packages/permission-management/tsconfig.lib.prod.json" - }, - "development": { - "tsConfig": "packages/permission-management/tsconfig.lib.json" + "devServerTarget": "dev-app:serve:production" } - }, - "defaultConfiguration": "production" - }, - "test": { - "builder": "@nrwl/jest:jest", - "outputs": ["coverage/packages/permission-management"], - "options": { - "jestConfig": "packages/permission-management/jest.config.js", - "passWithNoTests": true } }, "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": [ - "packages/permission-management/src/**/*.ts", - "packages/permission-management/src/**/*.html" - ] + "lintFilePatterns": ["apps/dev-app-e2e/**/*.{js,ts}"] } } } @@ -251,9 +318,9 @@ "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/feature-management"], "options": { - "tsConfig": "packages/feature-management/tsconfig.lib.json", "project": "packages/feature-management/ng-package.json" }, "configurations": { @@ -285,79 +352,81 @@ } } }, - "account": { + "identity": { "projectType": "library", - "root": "packages/account", - "sourceRoot": "packages/account/src", + "root": "packages/identity", + "sourceRoot": "packages/identity/src", "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/identity"], "options": { - "tsConfig": "packages/account/tsconfig.lib.json", - "project": "packages/account/ng-package.json" + "project": "packages/identity/ng-package.json" }, "configurations": { "production": { - "tsConfig": "packages/account/tsconfig.lib.prod.json" + "tsConfig": "packages/identity/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "packages/account/tsconfig.lib.json" + "tsConfig": "packages/identity/tsconfig.lib.json" } }, "defaultConfiguration": "production" }, "test": { "builder": "@nrwl/jest:jest", - "outputs": ["coverage/packages/account"], + "outputs": ["coverage/packages/identity"], "options": { - "jestConfig": "packages/account/jest.config.js", + "jestConfig": "packages/identity/jest.config.js", "passWithNoTests": true } }, "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": ["packages/account/src/**/*.ts", "packages/account/src/**/*.html"] + "lintFilePatterns": ["packages/identity/src/**/*.ts", "packages/identity/src/**/*.html"] } } } }, - - "identity": { + "permission-management": { "projectType": "library", - "root": "packages/identity", - "sourceRoot": "packages/identity/src", + "root": "packages/permission-management", + "sourceRoot": "packages/permission-management/src", "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/permission-management"], "options": { - "tsConfig": "packages/identity/tsconfig.lib.json", - "project": "packages/identity/ng-package.json" + "project": "packages/permission-management/ng-package.json" }, "configurations": { "production": { - "tsConfig": "packages/identity/tsconfig.lib.prod.json" + "tsConfig": "packages/permission-management/tsconfig.lib.prod.json" }, "development": { - "tsConfig": "packages/identity/tsconfig.lib.json" + "tsConfig": "packages/permission-management/tsconfig.lib.json" } }, "defaultConfiguration": "production" }, "test": { "builder": "@nrwl/jest:jest", - "outputs": ["coverage/packages/identity"], + "outputs": ["coverage/packages/permission-management"], "options": { - "jestConfig": "packages/identity/jest.config.js", + "jestConfig": "packages/permission-management/jest.config.js", "passWithNoTests": true } }, "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": ["packages/identity/src/**/*.ts", "packages/identity/src/**/*.html"] + "lintFilePatterns": [ + "packages/permission-management/src/**/*.ts", + "packages/permission-management/src/**/*.html" + ] } } } @@ -394,9 +463,9 @@ "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/setting-management"], "options": { - "tsConfig": "packages/setting-management/tsconfig.lib.json", "project": "packages/setting-management/ng-package.json" }, "configurations": { @@ -435,9 +504,9 @@ "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/tenant-management"], "options": { - "tsConfig": "packages/tenant-management/tsconfig.lib.json", "project": "packages/tenant-management/ng-package.json" }, "configurations": { @@ -469,154 +538,84 @@ } } }, - "dev-app": { - "projectType": "application", - "root": "apps/dev-app", - "sourceRoot": "apps/dev-app/src", - "prefix": "app", + "theme-basic": { + "projectType": "library", + "root": "packages/theme-basic", + "sourceRoot": "packages/theme-basic/src", + "prefix": "abp", "architect": { "build": { - "builder": "@angular-devkit/build-angular:browser", - "outputs": ["{options.outputPath}"], + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/theme-basic"], "options": { - "outputPath": "dist/apps/dev-app", - "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", - "inlineStyleLanguage": "scss", - "allowedCommonJsDependencies": ["chart.js", "js-sha256"], - "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"], - "styles": [ - { - "input": "node_modules/@abp/ng.theme.shared/styles/bootstrap-rtl.min.css", - "inject": false, - "bundleName": "bootstrap-rtl.min" - }, - { - "input": "node_modules/bootstrap/dist/css/bootstrap.min.css", - "inject": true, - "bundleName": "bootstrap-ltr.min" - }, - { - "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", - "inject": true, - "bundleName": "fontawesome-all.min" - }, - { - "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css", - "inject": true, - "bundleName": "fontawesome-v4-shims.min" - }, - { - "input": "node_modules/@swimlane/ngx-datatable/index.css", - "inject": true, - "bundleName": "ngx-datatable-index" - }, - { - "input": "node_modules/@swimlane/ngx-datatable/assets/icons.css", - "inject": true, - "bundleName": "ngx-datatable-icons" - }, - { - "input": "node_modules/@swimlane/ngx-datatable/themes/material.css", - "inject": true, - "bundleName": "ngx-datatable-material" - }, - "apps/dev-app/src/styles.scss" - ], - "scripts": [] + "project": "packages/theme-basic/ng-package.json" }, "configurations": { "production": { - "tsConfig": "apps/dev-app/tsconfig.prod.json", - "budgets": [ - { - "type": "initial", - "maximumWarning": "1mb", - "maximumError": "5mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "6kb", - "maximumError": "10kb" - } - ], - "fileReplacements": [ - { - "replace": "apps/dev-app/src/environments/environment.ts", - "with": "apps/dev-app/src/environments/environment.prod.ts" - } - ], - "outputHashing": "all" + "tsConfig": "packages/theme-basic/tsconfig.lib.prod.json" }, "development": { - "buildOptimizer": false, - "optimization": false, - "vendorChunk": true, - "extractLicenses": false, - "sourceMap": true, - "namedChunks": true + "tsConfig": "packages/theme-basic/tsconfig.lib.json" } }, "defaultConfiguration": "production" }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "configurations": { - "production": { - "browserTarget": "dev-app:build:production" - }, - "development": { - "browserTarget": "dev-app:build:development" - } - }, - "defaultConfiguration": "development" - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", + "test": { + "builder": "@nrwl/jest:jest", + "outputs": ["coverage/packages/theme-basic"], "options": { - "browserTarget": "dev-app:build" + "jestConfig": "packages/theme-basic/jest.config.js", + "passWithNoTests": true } }, "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": ["apps/dev-app/src/**/*.ts", "apps/dev-app/src/**/*.html"] - } - }, - "test": { - "builder": "@nrwl/jest:jest", - "outputs": ["coverage/apps/dev-app"], - "options": { - "jestConfig": "apps/dev-app/jest.config.js", - "passWithNoTests": true + "lintFilePatterns": [ + "packages/theme-basic/src/**/*.ts", + "packages/theme-basic/src/**/*.html" + ] } } } }, - "dev-app-e2e": { - "root": "apps/dev-app-e2e", - "sourceRoot": "apps/dev-app-e2e/src", - "projectType": "application", + "theme-shared": { + "projectType": "library", + "root": "packages/theme-shared", + "sourceRoot": "packages/theme-shared/src", + "prefix": "abp", "architect": { - "e2e": { - "builder": "@nrwl/cypress:cypress", + "build": { + "builder": "@nrwl/angular:package", + "outputs": ["dist/packages/theme-shared"], "options": { - "cypressConfig": "apps/dev-app-e2e/cypress.json", - "tsConfig": "apps/dev-app-e2e/tsconfig.e2e.json", - "devServerTarget": "dev-app:serve:development" + "project": "packages/theme-shared/ng-package.json" }, "configurations": { "production": { - "devServerTarget": "dev-app:serve:production" + "tsConfig": "packages/theme-shared/tsconfig.lib.prod.json" + }, + "development": { + "tsConfig": "packages/theme-shared/tsconfig.lib.json" } + }, + "defaultConfiguration": "production" + }, + "test": { + "builder": "@nrwl/jest:jest", + "outputs": ["coverage/packages/theme-shared"], + "options": { + "jestConfig": "packages/theme-shared/jest.config.js", + "passWithNoTests": true } }, "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": ["apps/dev-app-e2e/**/*.{js,ts}"] + "lintFilePatterns": [ + "packages/theme-shared/src/**/*.ts", + "packages/theme-shared/src/**/*.html" + ] } } } diff --git a/npm/ng-packs/packages/account-core/tsconfig.json b/npm/ng-packs/packages/account-core/tsconfig.json index 89d2f8f919..62ebbd9464 100644 --- a/npm/ng-packs/packages/account-core/tsconfig.json +++ b/npm/ng-packs/packages/account-core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/account-core/tsconfig.lib.prod.json b/npm/ng-packs/packages/account-core/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/account-core/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/account-core/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html b/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html index 76c4d102ad..47319cb381 100644 --- a/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html +++ b/npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html @@ -1,6 +1,6 @@
-
+
diff --git a/npm/ng-packs/packages/account/tsconfig.json b/npm/ng-packs/packages/account/tsconfig.json index 89d2f8f919..62ebbd9464 100644 --- a/npm/ng-packs/packages/account/tsconfig.json +++ b/npm/ng-packs/packages/account/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/account/tsconfig.lib.prod.json b/npm/ng-packs/packages/account/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/account/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/account/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/components/tsconfig.json b/npm/ng-packs/packages/components/tsconfig.json index 89d2f8f919..62ebbd9464 100644 --- a/npm/ng-packs/packages/components/tsconfig.json +++ b/npm/ng-packs/packages/components/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/components/tsconfig.lib.prod.json b/npm/ng-packs/packages/components/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/components/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/components/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/core/tsconfig.json b/npm/ng-packs/packages/core/tsconfig.json index 6ead5a6a59..692cc17b32 100644 --- a/npm/ng-packs/packages/core/tsconfig.json +++ b/npm/ng-packs/packages/core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/core/tsconfig.lib.prod.json b/npm/ng-packs/packages/core/tsconfig.lib.prod.json index 7f09086ce4..573fb7bef3 100644 --- a/npm/ng-packs/packages/core/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/core/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/feature-management/src/public-api.ts b/npm/ng-packs/packages/feature-management/src/public-api.ts index 1d9ef938b8..10c71be72a 100644 --- a/npm/ng-packs/packages/feature-management/src/public-api.ts +++ b/npm/ng-packs/packages/feature-management/src/public-api.ts @@ -1,5 +1,6 @@ -export * from './lib/feature-management.module'; export * from './lib/components'; +export * from './lib/directives'; export * from './lib/enums/components'; +export * from './lib/feature-management.module'; export * from './lib/proxy/feature-management'; export * from './lib/proxy/validation/string-values'; diff --git a/npm/ng-packs/packages/feature-management/tsconfig.json b/npm/ng-packs/packages/feature-management/tsconfig.json index 89d2f8f919..62ebbd9464 100644 --- a/npm/ng-packs/packages/feature-management/tsconfig.json +++ b/npm/ng-packs/packages/feature-management/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/feature-management/tsconfig.lib.prod.json b/npm/ng-packs/packages/feature-management/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/feature-management/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/feature-management/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/identity/tsconfig.json b/npm/ng-packs/packages/identity/tsconfig.json index 89d2f8f919..62ebbd9464 100644 --- a/npm/ng-packs/packages/identity/tsconfig.json +++ b/npm/ng-packs/packages/identity/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/identity/tsconfig.lib.prod.json b/npm/ng-packs/packages/identity/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/identity/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/identity/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/permission-management/tsconfig.json b/npm/ng-packs/packages/permission-management/tsconfig.json index 89d2f8f919..62ebbd9464 100644 --- a/npm/ng-packs/packages/permission-management/tsconfig.json +++ b/npm/ng-packs/packages/permission-management/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/permission-management/tsconfig.lib.prod.json b/npm/ng-packs/packages/permission-management/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/permission-management/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/permission-management/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/setting-management/tsconfig.json b/npm/ng-packs/packages/setting-management/tsconfig.json index 89d2f8f919..62ebbd9464 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/setting-management/tsconfig.lib.prod.json b/npm/ng-packs/packages/setting-management/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.json b/npm/ng-packs/packages/tenant-management/tsconfig.json index 89d2f8f919..62ebbd9464 100644 --- a/npm/ng-packs/packages/tenant-management/tsconfig.json +++ b/npm/ng-packs/packages/tenant-management/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/tenant-management/tsconfig.lib.prod.json b/npm/ng-packs/packages/tenant-management/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/tenant-management/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/tenant-management/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.json b/npm/ng-packs/packages/theme-basic/tsconfig.json index 6ead5a6a59..692cc17b32 100644 --- a/npm/ng-packs/packages/theme-basic/tsconfig.json +++ b/npm/ng-packs/packages/theme-basic/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/theme-basic/tsconfig.lib.prod.json b/npm/ng-packs/packages/theme-basic/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/theme-basic/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/theme-basic/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html index 3dc2427f92..a58fecc9e6 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html @@ -7,5 +7,9 @@ [style.display]="toasts.length ? 'flex' : 'none'" [@toastInOut]="toasts.length" > - +
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts index 28d66123a9..f6fcecf570 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; +import { ReplaySubject } from 'rxjs'; import { toastInOut } from '../../animations/toast.animations'; import { Toaster } from '../../models/toaster'; -import { ReplaySubject } from 'rxjs'; @Component({ selector: 'abp-toast-container', @@ -12,6 +12,8 @@ import { ReplaySubject } from 'rxjs'; export class ToastContainerComponent implements OnInit { toasts$: ReplaySubject; + remove: (toastId: number) => void; + toasts = [] as Toaster.Toast[]; @Input() diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts index 89d86dd265..2bd4a17b70 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts @@ -1,7 +1,5 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Toaster } from '../../models/toaster'; -import { ToasterService } from '../../services/toaster.service'; - @Component({ selector: 'abp-toast', templateUrl: './toast.component.html', @@ -11,6 +9,8 @@ export class ToastComponent implements OnInit { @Input() toast: Toaster.Toast; + @Output() remove = new EventEmitter(); + get severityClass(): string { if (!this.toast || !this.toast.severity) return ''; return `abp-toast-${this.toast.severity}`; @@ -31,8 +31,6 @@ export class ToastComponent implements OnInit { } } - constructor(private toasterService: ToasterService) {} - ngOnInit() { const { sticky, life } = this.toast.options || {}; @@ -44,7 +42,7 @@ export class ToastComponent implements OnInit { } close() { - this.toasterService.remove(this.toast.options.id); + this.remove.emit(this.toast.options.id); } tap() { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts index ed4430aa92..10ff9467f9 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/services/toaster.service.ts @@ -27,6 +27,7 @@ export class ToasterService implements ToasterContract { this.containerComponentRef = this.contentProjectionService.projectContent( PROJECTION_STRATEGY.AppendComponentToBody(ToastContainerComponent, { toasts$: this.toasts$, + remove: this.remove, }), ); @@ -120,10 +121,10 @@ export class ToasterService implements ToasterContract { * Removes the toast with given id. * @param id ID of the toast to be removed. */ - remove(id: number): void { + remove = (id: number) => { this.toasts = this.toasts.filter(toast => toast.options?.id !== id); this.toasts$.next(this.toasts); - } + }; /** * Removes all open toasts at once. diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.json b/npm/ng-packs/packages/theme-shared/tsconfig.json index 6ead5a6a59..692cc17b32 100644 --- a/npm/ng-packs/packages/theme-shared/tsconfig.json +++ b/npm/ng-packs/packages/theme-shared/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.lib.base.json", + "extends": "../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/npm/ng-packs/packages/theme-shared/tsconfig.lib.prod.json b/npm/ng-packs/packages/theme-shared/tsconfig.lib.prod.json index 331d0ecb05..85cd584a48 100644 --- a/npm/ng-packs/packages/theme-shared/tsconfig.lib.prod.json +++ b/npm/ng-packs/packages/theme-shared/tsconfig.lib.prod.json @@ -6,6 +6,6 @@ }, "angularCompilerOptions": { "compilationMode": "partial", - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/scripts/build.ts b/npm/ng-packs/scripts/build.ts index d6bc4aee41..f27dc01782 100644 --- a/npm/ng-packs/scripts/build.ts +++ b/npm/ng-packs/scripts/build.ts @@ -51,7 +51,7 @@ import execa from 'execa'; '--prod', '--all', '--exclude', - 'schematics,core,theme-shared,components,feature-management,permission-management,account-core', + 'dev-app,schematics,core,theme-shared,components,feature-management,permission-management,account-core', '--parallel', ], { stdout: 'inherit', cwd: '../' }, diff --git a/npm/ng-packs/source-code-requirements/tsconfig.lib.json b/npm/ng-packs/source-code-requirements/tsconfig.lib.json index 8f976470f9..4186710f21 100644 --- a/npm/ng-packs/source-code-requirements/tsconfig.lib.json +++ b/npm/ng-packs/source-code-requirements/tsconfig.lib.json @@ -9,7 +9,7 @@ "lib": ["dom", "es2018"] }, "angularCompilerOptions": { - "enableIvy": false, + "enableIvy": true, "skipTemplateCodegen": true, "strictMetadataEmit": true, "enableResourceInlining": true diff --git a/npm/ng-packs/source-code-requirements/tsconfig.lib.prod.json b/npm/ng-packs/source-code-requirements/tsconfig.lib.prod.json index cbae794224..f8edd63243 100644 --- a/npm/ng-packs/source-code-requirements/tsconfig.lib.prod.json +++ b/npm/ng-packs/source-code-requirements/tsconfig.lib.prod.json @@ -1,6 +1,6 @@ { "extends": "./tsconfig.lib.json", "angularCompilerOptions": { - "enableIvy": false + "enableIvy": true } } diff --git a/npm/ng-packs/tools/tsconfig.tools.json b/npm/ng-packs/tools/tsconfig.tools.json index 99428e1473..2725573ee7 100644 --- a/npm/ng-packs/tools/tsconfig.tools.json +++ b/npm/ng-packs/tools/tsconfig.tools.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.base.json", + "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../dist/out-tsc/tools", "rootDir": ".", diff --git a/npm/ng-packs/tsconfig.base.json b/npm/ng-packs/tsconfig.base.json index 78bbbb6184..415fcd2ce5 100644 --- a/npm/ng-packs/tsconfig.base.json +++ b/npm/ng-packs/tsconfig.base.json @@ -1,7 +1,6 @@ { "compileOnSave": false, "compilerOptions": { - "rootDir": ".", "sourceMap": true, "declaration": false, "moduleResolution": "node", @@ -11,7 +10,7 @@ "target": "es2015", "module": "esnext", "lib": ["es2017", "dom"], - "baseUrl": ".", + "baseUrl": "./", "allowSyntheticDefaultImports": true, "paths": { "@abp/ng.account": ["packages/account/src/public-api.ts"], @@ -34,7 +33,7 @@ "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"], "@abp/ng.theme.basic/testing": ["packages/theme-basic/testing/src/public-api.ts"], "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"], - "@abp/ng.theme.shared/extensions": ["packages/theme-shared/extensions"], + "@abp/ng.theme.shared/extensions": ["packages/theme-shared/extensions/src/public-api.ts"], "@abp/ng.theme.shared/testing": ["packages/theme-shared/testing/src/public-api.ts"] } }, diff --git a/npm/ng-packs/tsconfig.lib.base.json b/npm/ng-packs/tsconfig.lib.base.json deleted file mode 100644 index 452f037f59..0000000000 --- a/npm/ng-packs/tsconfig.lib.base.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "compileOnSave": false, - "compilerOptions": { - "rootDir": ".", - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "importHelpers": true, - "target": "es2015", - "module": "esnext", - "lib": ["es2017", "dom"], - "allowSyntheticDefaultImports": true, - "baseUrl": ".", - "paths": { - "@abp/ng.account": ["dist/packages/account"], - "@abp/ng.account.core": ["dist/packages/account-core"], - "@abp/ng.account/config": ["dist/packages/account/config"], - "@abp/ng.components": ["dist/packages/components"], - "@abp/ng.components/page": ["dist/packages/components/page"], - "@abp/ng.components/tree": ["dist/packages/components/tree"], - "@abp/ng.core": ["dist/packages/core"], - "@abp/ng.core/locale": ["dist/packages/core/locale"], - "@abp/ng.core/testing": ["dist/packages/core/testing"], - "@abp/ng.feature-management": ["dist/packages/feature-management"], - "@abp/ng.identity": ["dist/packages/identity/"], - "@abp/ng.identity/config": ["dist/packages/identity/config"], - "@abp/ng.permission-management": ["dist/packages/permission-management"], - "@abp/ng.setting-management": ["dist/packages/setting-management"], - "@abp/ng.setting-management/config": [ - "dist/packages/setting-management/config" - ], - "@abp/ng.tenant-management": ["dist/packages/tenant-management"], - "@abp/ng.tenant-management/config": [ - "dist/packages/tenant-management/config" - ], - "@abp/ng.theme.basic": ["dist/packages/theme-basic"], - "@abp/ng.theme.basic/testing": ["dist/packages/theme-basic/testing"], - "@abp/ng.theme.shared": ["dist/packages/theme-shared"], - "@abp/ng.theme.shared/extensions": [ - "dist/packages/theme-shared/extensions" - ], - "@abp/ng.theme.shared/testing": ["dist/packages/theme-shared/testing"] - } - }, - "exclude": ["node_modules", "tmp"] -} diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index e6dde4bfb8..2b2922effe 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -6482,9 +6482,9 @@ ejs@^3.1.5: jake "^10.6.1" electron-to-chromium@^1.3.793: - version "1.3.807" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.807.tgz#c2eb803f4f094869b1a24151184ffbbdbf688b1f" - integrity sha512-p8uxxg2a23zRsvQ2uwA/OOI+O4BQxzaR7YKMIGGGQCpYmkFX2CVF5f0/hxLMV7yCr7nnJViCwHLhPfs52rIYCA== + version "1.3.810" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.810.tgz#23e340507e13e48debdb7445d2f8fbfab681c4df" + integrity sha512-NteznMlGtkIZCJNM2X6AVm3oMqWAdq7TjqagZhmVLPwd9mtrIq+rRxGHerjFAOFIqQJYQUMT72ncd/lVcH1cOw== elliptic@^6.5.3: version "6.5.4" @@ -8459,9 +8459,9 @@ is-color-stop@^1.1.0: rgba-regex "^1.0.0" is-core-module@^2.2.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" - integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== + version "2.6.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" + integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== dependencies: has "^1.0.3"