From f53777f2ba5c5a7e75aeed7bed8eeb9ef7e5d5f4 Mon Sep 17 00:00:00 2001 From: Jorge Rocha Gualtieri Date: Thu, 20 Feb 2020 11:42:42 -0300 Subject: [PATCH] fixes to compile with new typescript and ng-packegr --- npm/ng-packs/package.json | 4 ++-- npm/ng-packs/packages/account-config/ng-package.json | 2 +- npm/ng-packs/packages/account/ng-package.json | 2 +- .../change-password/change-password.component.ts | 2 +- npm/ng-packs/packages/core/ng-package.json | 2 +- npm/ng-packs/packages/core/src/lib/directives/index.ts | 2 ++ npm/ng-packs/packages/feature-management/ng-package.json | 2 +- npm/ng-packs/packages/identity-config/ng-package.json | 2 +- npm/ng-packs/packages/identity/ng-package.json | 2 +- .../packages/permission-management/ng-package.json | 2 +- .../packages/setting-management-config/ng-package.json | 2 +- npm/ng-packs/packages/setting-management/ng-package.json | 2 +- .../packages/tenant-management-config/ng-package.json | 2 +- npm/ng-packs/packages/tenant-management/ng-package.json | 2 +- npm/ng-packs/packages/theme-basic/ng-package.json | 2 +- npm/ng-packs/packages/theme-shared/ng-package.json | 2 +- .../packages/theme-shared/src/lib/components/index.ts | 1 + npm/ng-packs/yarn.lock | 7 ------- 18 files changed, 19 insertions(+), 23 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index ddc6a3dd5b..c1f4d234f1 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -38,7 +38,7 @@ "@angular-devkit/build-angular": "~0.900.3", "@angular-devkit/build-ng-packagr": "~0.900.3", "@angular/animations": "~9.0.2", - "@angular/cdk": "^9.0.1", + "@angular/cdk": "^8.2.3", "@angular/cli": "~9.0.3", "@angular/common": "~9.0.2", "@angular/compiler": "~9.0.2", @@ -96,4 +96,4 @@ "path": "cz-conventional-changelog" } } -} \ No newline at end of file +} diff --git a/npm/ng-packs/packages/account-config/ng-package.json b/npm/ng-packs/packages/account-config/ng-package.json index de9885883c..4b4e97b93f 100644 --- a/npm/ng-packs/packages/account-config/ng-package.json +++ b/npm/ng-packs/packages/account-config/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/account-config", + "dest": "../../out-tsc/account-config", "lib": { "entryFile": "src/public-api.ts" } diff --git a/npm/ng-packs/packages/account/ng-package.json b/npm/ng-packs/packages/account/ng-package.json index 0d03a54224..f690848158 100644 --- a/npm/ng-packs/packages/account/ng-package.json +++ b/npm/ng-packs/packages/account/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/account", + "dest": "../../out-tsc/account", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts b/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts index 87169a2c1f..14ed582d95 100644 --- a/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts +++ b/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts @@ -24,7 +24,7 @@ export class ChangePasswordComponent inProgress: boolean; mapErrorsFn: Validation.MapErrorsFn = (errors, groupErrors, control) => { - if (PASSWORD_FIELDS.indexOf(control.name) < 0) return errors; + if (PASSWORD_FIELDS.indexOf(String(control.name)) < 0) return errors; return errors.concat(groupErrors.filter(({ key }) => key === 'passwordMismatch')); }; diff --git a/npm/ng-packs/packages/core/ng-package.json b/npm/ng-packs/packages/core/ng-package.json index 5a23ee2ce7..6e9a011e16 100644 --- a/npm/ng-packs/packages/core/ng-package.json +++ b/npm/ng-packs/packages/core/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/core", + "dest": "../../out-tsc/core", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/core/src/lib/directives/index.ts b/npm/ng-packs/packages/core/src/lib/directives/index.ts index f191cfcef5..73b572f61d 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/index.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/index.ts @@ -6,3 +6,5 @@ export * from './init.directive'; export * from './permission.directive'; export * from './replaceable-template.directive'; export * from './visibility.directive'; +export * from './debounce.directive'; +export * from './stop-propagation.directive'; diff --git a/npm/ng-packs/packages/feature-management/ng-package.json b/npm/ng-packs/packages/feature-management/ng-package.json index 36ae3f8b13..b22252c8c5 100644 --- a/npm/ng-packs/packages/feature-management/ng-package.json +++ b/npm/ng-packs/packages/feature-management/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/feature-management", + "dest": "../../out-tsc/feature-management", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/identity-config/ng-package.json b/npm/ng-packs/packages/identity-config/ng-package.json index d72870cd39..e7bf35c33f 100644 --- a/npm/ng-packs/packages/identity-config/ng-package.json +++ b/npm/ng-packs/packages/identity-config/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/identity-config", + "dest": "../../out-tsc/identity-config", "lib": { "entryFile": "src/public-api.ts" } diff --git a/npm/ng-packs/packages/identity/ng-package.json b/npm/ng-packs/packages/identity/ng-package.json index 5f547dee2b..66997f3e19 100644 --- a/npm/ng-packs/packages/identity/ng-package.json +++ b/npm/ng-packs/packages/identity/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/identity", + "dest": "../../out-tsc/identity", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/permission-management/ng-package.json b/npm/ng-packs/packages/permission-management/ng-package.json index 03f80c37cc..d1646bcd93 100644 --- a/npm/ng-packs/packages/permission-management/ng-package.json +++ b/npm/ng-packs/packages/permission-management/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/permission-management", + "dest": "../../out-tsc/permission-management", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/setting-management-config/ng-package.json b/npm/ng-packs/packages/setting-management-config/ng-package.json index 0d24be4f85..5051f5f734 100644 --- a/npm/ng-packs/packages/setting-management-config/ng-package.json +++ b/npm/ng-packs/packages/setting-management-config/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/setting-management-config", + "dest": "../../out-tsc/setting-management-config", "lib": { "entryFile": "src/public-api.ts" } diff --git a/npm/ng-packs/packages/setting-management/ng-package.json b/npm/ng-packs/packages/setting-management/ng-package.json index 7a08dda36b..f8165824b8 100644 --- a/npm/ng-packs/packages/setting-management/ng-package.json +++ b/npm/ng-packs/packages/setting-management/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/setting-management", + "dest": "../../out-tsc/setting-management", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/tenant-management-config/ng-package.json b/npm/ng-packs/packages/tenant-management-config/ng-package.json index 834556113c..6d8d1b381a 100644 --- a/npm/ng-packs/packages/tenant-management-config/ng-package.json +++ b/npm/ng-packs/packages/tenant-management-config/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/tenant-management-config", + "dest": "../../out-tsc/tenant-management-config", "lib": { "entryFile": "src/public-api.ts" } diff --git a/npm/ng-packs/packages/tenant-management/ng-package.json b/npm/ng-packs/packages/tenant-management/ng-package.json index 959eae44ab..26bb3db4e5 100644 --- a/npm/ng-packs/packages/tenant-management/ng-package.json +++ b/npm/ng-packs/packages/tenant-management/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/tenant-management", + "dest": "../../out-tsc/tenant-management", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/theme-basic/ng-package.json b/npm/ng-packs/packages/theme-basic/ng-package.json index 600c112dee..104bb0b1ab 100644 --- a/npm/ng-packs/packages/theme-basic/ng-package.json +++ b/npm/ng-packs/packages/theme-basic/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/theme-basic", + "dest": "../../out-tsc/theme-basic", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/theme-shared/ng-package.json b/npm/ng-packs/packages/theme-shared/ng-package.json index 73ed96741c..2cc39970ea 100644 --- a/npm/ng-packs/packages/theme-shared/ng-package.json +++ b/npm/ng-packs/packages/theme-shared/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/theme-shared", + "dest": "../../out-tsc/theme-shared", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts index 55b7b187d1..7461bd3841 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts @@ -10,3 +10,4 @@ export * from './sort-order-icon/sort-order-icon.component'; export * from './table-empty-message/table-empty-message.component'; export * from './table/table.component'; export * from './toast/toast.component'; +export * from './toast-container/toast-container.component'; diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index e588ea8da1..b966a3ed0d 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -306,13 +306,6 @@ optionalDependencies: parse5 "^5.0.0" -"@angular/cdk@^9.0.1": - version "9.0.1" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-9.0.1.tgz#3580375ce0b4aa9ddbd6ea790ab241a8db73b156" - integrity sha512-slhYG9lOX7JoxcULdfIvXspkDRjYTBG8PH6B2Slxi8CpV42x0t+yQnBQxp/U3ud1m1BWVrlxwKZywaPFe1tSeA== - optionalDependencies: - parse5 "^5.0.0" - "@angular/cli@~9.0.3": version "9.0.3" resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-9.0.3.tgz#114bf16fd00685d814840f6fece286e0f8f6f1e3"