From 560789baea3cdff95d9ecad3797aa1328174678f Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Apr 2020 15:09:10 +0800 Subject: [PATCH 1/3] Update Getting-Started.md(Tiered project require redis) Resolve #2804 --- docs/en/Getting-Started.md | 6 ++++++ docs/zh-Hans/Getting-Started.md | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/docs/en/Getting-Started.md b/docs/en/Getting-Started.md index 72e2f2886c..fa7f47f276 100644 --- a/docs/en/Getting-Started.md +++ b/docs/en/Getting-Started.md @@ -25,6 +25,12 @@ The following tools should be installed on your development machine: * [Node v12+](https://nodejs.org) * [Yarn v1.19+](https://classic.yarnpkg.com/) +{{ if Tiered == "Yes" }} + +* [Redis](https://redis.io/): The applications use Redis as as [distributed cache](../Caching.md). So, you need to have Redis installed & running. + +{{ end }} + > You can use another editor instead of Visual Studio as long as it supports .NET Core and ASP.NET Core. diff --git a/docs/zh-Hans/Getting-Started.md b/docs/zh-Hans/Getting-Started.md index a2b3013fe5..b60fccfaa2 100644 --- a/docs/zh-Hans/Getting-Started.md +++ b/docs/zh-Hans/Getting-Started.md @@ -24,6 +24,11 @@ * [Node v12+](https://nodejs.org) * [Yarn v1.19+](https://classic.yarnpkg.com/) +{{ if Tiered == "Yes" }} + +* [Redis](https://redis.io/): 应用程序将Redis用作[分布式缓存](../Caching.md). 因此你需要安装并运行Redis. + +{{ end }} > 你可以也使用其他支持.NET Core 和 ASP.NET Core的编辑器. From 58b88e2de42157703340bb9c7edcdb144a9d02b0 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Thu, 7 May 2020 05:00:50 +0300 Subject: [PATCH 2/3] fix: language changing error --- npm/ng-packs/packages/core/src/lib/core.module.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts index a8d808b885..c0223d28a6 100644 --- a/npm/ng-packs/packages/core/src/lib/core.module.ts +++ b/npm/ng-packs/packages/core/src/lib/core.module.ts @@ -28,11 +28,13 @@ import { LocalizationPipe, MockLocalizationPipe } from './pipes/localization.pip import { SortPipe } from './pipes/sort.pipe'; import { ConfigPlugin, NGXS_CONFIG_PLUGIN_OPTIONS } from './plugins/config.plugin'; import { LocaleProvider } from './providers/locale.provider'; +import { LocalizationService } from './services/localization.service'; import { ConfigState } from './states/config.state'; import { ProfileState } from './states/profile.state'; import { ReplaceableComponentsState } from './states/replaceable-components.state'; import { SessionState } from './states/session.state'; import { CORE_OPTIONS } from './tokens/options.token'; +import { noop } from './utils/common-utils'; import './utils/date-extensions'; import { getInitialData, localeInitializer } from './utils/initial-utils'; @@ -187,6 +189,12 @@ export class CoreModule { deps: [Injector], useFactory: localeInitializer, }, + { + provide: APP_INITIALIZER, + multi: true, + deps: [LocalizationService], + useFactory: noop, + }, ...OAuthModule.forRoot().providers, { provide: OAuthStorage, useFactory: storageFactory }, ], From dee71ed0bf6a143f4509d8e33ed4b5fb088f970e Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Thu, 7 May 2020 05:01:04 +0300 Subject: [PATCH 3/3] fix: cyclic dependency error --- .../packages/theme-shared/src/lib/theme-shared.module.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index 8134a44be4..5d53ed2124 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -92,6 +92,8 @@ export function appendScript(injector: Injector) { ], }) export class ThemeSharedModule { + constructor(private errorHandler: ErrorHandler) {} + static forRoot(options = {} as RootParams): ModuleWithProviders { return { ngModule: ThemeSharedModule, @@ -102,12 +104,6 @@ export class ThemeSharedModule { deps: [THEME_SHARED_APPEND_CONTENT], useFactory: noop, }, - { - provide: APP_INITIALIZER, - multi: true, - deps: [ErrorHandler], - useFactory: noop, - }, { provide: HTTP_ERROR_CONFIG, useValue: options.httpErrorConfig }, { provide: 'HTTP_ERROR_CONFIG',