refactoring

npm/ng-packs/apps/dev-app/src/app/app.config.server.ts

@@ -1,10 +1,11 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
-import { provideServerRendering } from '@angular/platform-server';
 import { appConfig } from './app.config';
 import { provideAbpOAuth } from '@abp/ng.oauth';
+import { withRoutes, provideServerRendering } from '@angular/ssr';
+import { appServerRoutes } from './app.routes.server';
 
 const serverConfig: ApplicationConfig = {
-  providers: [provideAbpOAuth({ ssr: true }), provideServerRendering()],
+  providers: [provideAbpOAuth({ ssr: true }), provideServerRendering(withRoutes(appServerRoutes))],
 };
 
 export const config = mergeApplicationConfig(appConfig, serverConfig);

npm/ng-packs/apps/dev-app/src/app/app.routes.server.ts

@@ -0,0 +1,24 @@
+import { RenderMode, ServerRoute } from '@angular/ssr';
+
+export const appServerRoutes: ServerRoute[] = [
+  {
+    path: '',
+    renderMode: RenderMode.Server,
+  },
+  {
+    path: 'account',
+    renderMode: RenderMode.Server,
+  },
+  {
+    path: 'identity',
+    renderMode: RenderMode.Server,
+  },
+  {
+    path: 'tenant-management',
+    renderMode: RenderMode.Server,
+  },
+  {
+    path: 'setting-management',
+    renderMode: RenderMode.Server,
+  },
+];

npm/ng-packs/apps/dev-app/src/server.ts

@@ -1,3 +1,7 @@
+import { environment } from './environments/environment';
+if (environment.production === false) {
+  process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
+}
 import 'zone.js/node';
 
 import { APP_BASE_HREF } from '@angular/common';

templates/app-nolayers/angular/src/app/app.config.server.ts

@@ -1,10 +1,13 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
-import { provideServerRendering } from '@angular/ssr';
+import {provideServerRendering, withRoutes} from '@angular/ssr';
 import { appConfig } from './app.config';
+import {provideAbpOAuth} from "@abp/ng.oauth";
+import {serverRoutes} from "./app.routes.server";
 
 const serverConfig: ApplicationConfig = {
   providers: [
-    provideServerRendering()
+    provideAbpOAuth({ ssr: true }),
+    provideServerRendering(withRoutes(serverRoutes))
   ]
 };
 

templates/app-nolayers/angular/src/app/app.config.ts

@@ -28,7 +28,7 @@ export const appConfig: ApplicationConfig = {
         registerLocaleFn: registerLocale(),
       })
     ),
-    provideAbpOAuth(),
+    provideAbpOAuth({ ssr: false }),
     provideAbpThemeShared(),
     provideSettingManagementConfig(),
     provideAccountConfig(),

templates/app-nolayers/angular/src/app/app.routes.server.ts

@@ -0,0 +1,8 @@
+import {RenderMode, ServerRoute} from "@angular/ssr";
+
+export const serverRoutes: ServerRoute[] = [
+  {
+    path: '',
+    renderMode: RenderMode.Server
+  }
+];

templates/app/angular/src/app/app.config.server.ts

@@ -1,10 +1,13 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
-import { provideServerRendering } from '@angular/platform-server';
+import {provideServerRendering, withRoutes} from '@angular/ssr';
 import { appConfig } from './app.config';
+import {provideAbpOAuth} from "@abp/ng.oauth";
+import {serverRoutes} from "./app.routes.server";
 
 const serverConfig: ApplicationConfig = {
   providers: [
-    provideServerRendering()
+    provideAbpOAuth({ ssr: true }),
+    provideServerRendering(withRoutes(serverRoutes))
   ]
 };
 

templates/app/angular/src/app/app.config.ts

@@ -18,13 +18,9 @@ import {ThemeLeptonXModule} from "@abp/ng.theme.lepton-x";
 import {SideMenuLayoutModule} from "@abp/ng.theme.lepton-x/layouts";
 import {AccountLayoutModule} from "@abp/ng.theme.lepton-x/account";
 import {provideClientHydration, withEventReplay, withHttpTransferCacheOptions} from '@angular/platform-browser';
-import {provideServerRouting} from "@angular/ssr";
-import {provideServerRendering} from "@angular/platform-server";
-import {serverRoutes} from "./app.routes.server";
 import { provideLogo, withEnvironmentOptions } from '@volo/ngx-lepton-x.core';
 
-export function createAppConfig(ssr: boolean): ApplicationConfig {
-  return {
+export const appConfig: ApplicationConfig = {
     providers: [
       provideRouter(appRoutes),
       APP_ROUTE_PROVIDER,
@@ -34,7 +30,7 @@ export function createAppConfig(ssr: boolean): ApplicationConfig {
           registerLocaleFn: registerLocale(),
         })
       ),
-      provideAbpOAuth({ssr}),
+      provideAbpOAuth({ssr: false}),
       provideAbpThemeShared(),
       provideSettingManagementConfig(),
       provideAccountConfig(),
@@ -48,8 +44,6 @@ export function createAppConfig(ssr: boolean): ApplicationConfig {
         ThemeLeptonXModule.forRoot(),
         SideMenuLayoutModule.forRoot(),
         AccountLayoutModule.forRoot(),
-      ]), provideClientHydration(withEventReplay(), withHttpTransferCacheOptions({})),
-      ...(ssr ? [provideServerRendering(), provideServerRouting(serverRoutes)] : []),
+      ]), provideClientHydration(withEventReplay(), withHttpTransferCacheOptions({}))
     ],
-  }
 };