diff --git a/npm/ng-packs/apps/dev-app/src/app/app.config.server.ts b/npm/ng-packs/apps/dev-app/src/app/app.config.server.ts index c73bbcfa2c..886f4d767a 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.config.server.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.config.server.ts @@ -5,7 +5,7 @@ import { withRoutes, provideServerRendering } from '@angular/ssr'; import { appServerRoutes } from './app.routes.server'; const serverConfig: ApplicationConfig = { - providers: [provideAbpOAuth({ ssr: true }), provideServerRendering(withRoutes(appServerRoutes))], + providers: [provideAbpOAuth(), provideServerRendering(withRoutes(appServerRoutes))], }; export const config = mergeApplicationConfig(appConfig, serverConfig); diff --git a/npm/ng-packs/apps/dev-app/src/app/app.config.ts b/npm/ng-packs/apps/dev-app/src/app/app.config.ts index 4de3fa888e..a51fb92072 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.config.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.config.ts @@ -33,7 +33,7 @@ export const appConfig: ApplicationConfig = { skipGetAppConfiguration: false, }), ), - provideAbpOAuth({ ssr: false }), + provideAbpOAuth(), provideAbpThemeShared(), provideSettingManagementConfig(), provideAccountConfig(), diff --git a/npm/ng-packs/packages/core/src/lib/services/local-storage.service.ts b/npm/ng-packs/packages/core/src/lib/services/local-storage.service.ts index e4fadc2fa9..ebe47955f2 100644 --- a/npm/ng-packs/packages/core/src/lib/services/local-storage.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/local-storage.service.ts @@ -1,44 +1,43 @@ -import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; +import { inject, Injectable, PLATFORM_ID } from '@angular/core'; import { isPlatformBrowser } from '@angular/common'; @Injectable({ providedIn: 'root', }) export class AbpLocalStorageService implements Storage { - private isBrowser: boolean; + private platformId = inject(PLATFORM_ID); - constructor(@Inject(PLATFORM_ID) private platformId: unknown) { - this.isBrowser = isPlatformBrowser(this.platformId); + constructor() { } [name: string]: any; get length(): number { - return this.isBrowser ? localStorage.length : 0; + return isPlatformBrowser(this.platformId) ? localStorage.length : 0; } clear(): void { - if (this.isBrowser) { + if (isPlatformBrowser(this.platformId)) { localStorage.clear(); } } getItem(key: string): string | null { - if (!this.isBrowser) { + if (!isPlatformBrowser(this.platformId)) { return null; } return localStorage.getItem(key); } key(index: number): string | null { - if (!this.isBrowser) { + if (!isPlatformBrowser(this.platformId)) { return null; } return localStorage.key(index); } removeItem(key: string): void { - if (this.isBrowser) { + if (isPlatformBrowser(this.platformId)) { localStorage.removeItem(key); } } setItem(key: string, value: string): void { - if (this.isBrowser) { + if (isPlatformBrowser(this.platformId)) { localStorage.setItem(key, value); } } diff --git a/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts b/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts index 3aba37b8b5..35cfa769f3 100644 --- a/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts +++ b/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts @@ -9,7 +9,7 @@ export class AbpOAuthModule { static forRoot(): ModuleWithProviders { return { ngModule: AbpOAuthModule, - providers: [provideAbpOAuth({ ssr: false })], + providers: [provideAbpOAuth()], }; } } diff --git a/npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts b/npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts index 9030319b3e..39141ec98b 100644 --- a/npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts +++ b/npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts @@ -19,7 +19,7 @@ import { pipeToLogin, checkAccessToken, oAuthStorageFactory } from '../utils'; import { NavigateToManageProfileProvider } from './navigate-to-manage-profile.provider'; import { ServerTokenStorageService } from '../services/server-token-storage.service'; -export function provideAbpOAuth({ ssr = false }: { ssr?: boolean }) { +export function provideAbpOAuth() { const providers = [ { provide: AuthService, diff --git a/templates/app-nolayers/angular/src/app/app.config.server.ts b/templates/app-nolayers/angular/src/app/app.config.server.ts index 7f930215e5..3b6fd1ec1e 100644 --- a/templates/app-nolayers/angular/src/app/app.config.server.ts +++ b/templates/app-nolayers/angular/src/app/app.config.server.ts @@ -6,7 +6,7 @@ import {serverRoutes} from "./app.routes.server"; const serverConfig: ApplicationConfig = { providers: [ - provideAbpOAuth({ ssr: true }), + provideAbpOAuth(), provideServerRendering(withRoutes(serverRoutes)) ] }; diff --git a/templates/app-nolayers/angular/src/app/app.config.ts b/templates/app-nolayers/angular/src/app/app.config.ts index 6213e69012..041567383e 100644 --- a/templates/app-nolayers/angular/src/app/app.config.ts +++ b/templates/app-nolayers/angular/src/app/app.config.ts @@ -28,7 +28,7 @@ export const appConfig: ApplicationConfig = { registerLocaleFn: registerLocale(), }) ), - provideAbpOAuth({ ssr: false }), + provideAbpOAuth(), provideAbpThemeShared(), provideSettingManagementConfig(), provideAccountConfig(), diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 5d6e8cf17a..347d390d68 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -8,11 +8,7 @@ "build:prod": "ng build --configuration production", "watch": "ng build --watch --configuration development", "test": "ng test", - "lint": "ng lint", - "dev:ssr": "ng run MyProjectName:serve-ssr", - "serve:ssr": "node dist/MyProjectName/server/main.js", - "build:ssr": "ng build && ng run MyProjectName:server", - "prerender": "ng run MyProjectName:prerender" + "lint": "ng lint" }, "private": true, "dependencies": { diff --git a/templates/app/angular/src/app/app.config.server.ts b/templates/app/angular/src/app/app.config.server.ts index 7f930215e5..3b6fd1ec1e 100644 --- a/templates/app/angular/src/app/app.config.server.ts +++ b/templates/app/angular/src/app/app.config.server.ts @@ -6,7 +6,7 @@ import {serverRoutes} from "./app.routes.server"; const serverConfig: ApplicationConfig = { providers: [ - provideAbpOAuth({ ssr: true }), + provideAbpOAuth(), provideServerRendering(withRoutes(serverRoutes)) ] }; diff --git a/templates/app/angular/src/app/app.config.ts b/templates/app/angular/src/app/app.config.ts index ebd7e0b150..183908bb8a 100644 --- a/templates/app/angular/src/app/app.config.ts +++ b/templates/app/angular/src/app/app.config.ts @@ -30,7 +30,7 @@ export const appConfig: ApplicationConfig = { registerLocaleFn: registerLocale(), }) ), - provideAbpOAuth({ssr: false}), + provideAbpOAuth(), provideAbpThemeShared(), provideSettingManagementConfig(), provideAccountConfig(), diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index eeb0e33782..0322d97e4d 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -6,7 +6,6 @@ "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, - "downlevelIteration": true, "experimentalDecorators": true, "moduleResolution": "bundler", "importHelpers": true,