From 66435236fafa7f9e993dcbb7061957bf6f3dc14e Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 27 Apr 2021 18:27:35 +0300 Subject: [PATCH 1/3] update yarn.lock --- npm/ng-packs/yarn.lock | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index 0ad33cc385..fcd4dce941 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -2,14 +2,20 @@ # yarn lockfile v1 +"@abp/ng.account@~4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-4.3.0.tgz#d13e237f933a45d108a8bedce96d3ee41c3207eb" + integrity sha512-WRUbExtryzHKQfP+QkjUG2n8PmJVV7oVEYrDHfP8QLdxwg0uxG4lQ4de5eXYO8ROd5RdE2QDeHgLqxASRx0ARw== + dependencies: + "@abp/ng.theme.shared" "~4.3.0" + tslib "^2.0.0" + "@abp/ng.components@~4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-4.3.0.tgz#0dd6b982945a3b1c3cac1da95f09ffaa9fd3dfd4" integrity sha512-rZ/NgxW6LfqKLFhXSoadVlv6n7bdsWOiwK0rDj+8wUp5bKyCPUFNkRuBsxkY6RVk6xHC/QX1JNd0Py3YK9OihA== dependencies: ng-zorro-antd "^11.0.0" - - tslib "^2.0.0" "@abp/ng.core@~4.3.0": @@ -19,8 +25,6 @@ dependencies: "@abp/utils" "^4.3.0-rc.2" "@angular/localize" "~10.0.10" - "@ngxs/router-plugin" "^3.7.0" - "@ngxs/storage-plugin" "^3.7.0" "@ngxs/store" "^3.7.0" angular-oauth2-oidc "^10.0.0" just-clone "^3.1.0" @@ -100,7 +104,7 @@ "@abp/ng.core" "~4.3.0" "@fortawesome/fontawesome-free" "^5.14.0" "@ng-bootstrap/ng-bootstrap" "^7.0.0" - "@ngx-validate/core" "^0.0.12" + "@ngx-validate/core" "^0.0.13" "@swimlane/ngx-datatable" "^17.1.0" bootstrap "~4.6.0" chart.js "^2.9.3" From e80ce1d923aa6b88901a8fd9bf3b5efdd82c66b8 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 27 Apr 2021 18:27:52 +0300 Subject: [PATCH 2/3] singularize webpack lazy imports for locales --- .../packages/core/locale/src/utils/register-locale.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/core/locale/src/utils/register-locale.ts b/npm/ng-packs/packages/core/locale/src/utils/register-locale.ts index 27d65d0d5f..5d730702a6 100644 --- a/npm/ng-packs/packages/core/locale/src/utils/register-locale.ts +++ b/npm/ng-packs/packages/core/locale/src/utils/register-locale.ts @@ -1,5 +1,4 @@ import { differentLocales } from '@abp/ng.core'; -import { registerLocaleData } from '@angular/common'; import { isDevMode } from '@angular/core'; export interface LocaleErrorHandlerData { @@ -27,7 +26,8 @@ export function registerLocale( return new Promise((resolve, reject) => { return import( - /* webpackChunkName: "_locale-[request]"*/ + /* webpackMode: "lazy-once" */ + /* webpackChunkName: "locales"*/ /* webpackInclude: /[/\\](ar|cs|en|en-GB|es|de|fr|pt|tr|ru|hu|sl|zh-Hans|zh-Hant).js/ */ /* webpackExclude: /[/\\]global|extra/ */ `@angular/common/locales/${localeMap[locale] || locale}.js` From 32f5e0498a8f5e00bb1437eefe3be48fdc12f105 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 28 Apr 2021 04:43:58 +0300 Subject: [PATCH 3/3] add fi locale to webpackInclude magic comment --- npm/ng-packs/packages/core/locale/src/utils/register-locale.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/locale/src/utils/register-locale.ts b/npm/ng-packs/packages/core/locale/src/utils/register-locale.ts index 5d730702a6..f568c13c53 100644 --- a/npm/ng-packs/packages/core/locale/src/utils/register-locale.ts +++ b/npm/ng-packs/packages/core/locale/src/utils/register-locale.ts @@ -28,7 +28,7 @@ export function registerLocale( return import( /* webpackMode: "lazy-once" */ /* webpackChunkName: "locales"*/ - /* webpackInclude: /[/\\](ar|cs|en|en-GB|es|de|fr|pt|tr|ru|hu|sl|zh-Hans|zh-Hant).js/ */ + /* webpackInclude: /[/\\](ar|cs|en|en-GB|es|de|fi|fr|pt|tr|ru|hu|sl|zh-Hans|zh-Hant).js/ */ /* webpackExclude: /[/\\]global|extra/ */ `@angular/common/locales/${localeMap[locale] || locale}.js` )