feat: always inject runtimeConfig to html (#575)

shuvijs · Dec 28, 2023 · c1fabbb · c1fabbb
1 parent b4ef652
commit c1fabbb
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/packages/platform-shared/src/shared/helper/getAppData.ts b/packages/platform-shared/src/shared/helper/getAppData.ts
@@ -40,7 +40,8 @@ export function getAppData(): IAppData {
       ssr: false,
       pageData: {},
       filesByRoutId: {},
-      publicPath: '/'
+      publicPath: '/',
+      runtimeConfig: {}
     };
   }
 

diff --git a/packages/platform-web/src/node/features/html-render/lib/renderer/spa.ts b/packages/platform-web/src/node/features/html-render/lib/renderer/spa.ts
@@ -1,3 +1,4 @@
+import { getPublicRuntimeConfig } from '@shuvi/platform-shared/shared/shuvi-singleton-runtimeConfig';
 import { BaseRenderer, AppData } from './base';
 import { IRenderViewOptions, IHtmlDocument } from './types';
 
@@ -10,8 +11,10 @@ export class SpaRenderer extends BaseRenderer {
     const appData: AppData = {
       ssr: false,
       pageData: {},
-      basename
+      basename,
+      runtimeConfig: getPublicRuntimeConfig() || {}
     };
+
     const document: IHtmlDocument = {
       htmlAttrs: {},
       headTags: [...assets.styles],

diff --git a/packages/platform-web/src/node/features/html-render/lib/renderer/ssr.ts b/packages/platform-web/src/node/features/html-render/lib/renderer/ssr.ts
@@ -35,9 +35,9 @@ export class SsrRenderer extends BaseRenderer {
       ssr: true,
       appState: store.getState(),
       pageData,
-      basename: router.basename
+      basename: router.basename,
+      runtimeConfig: getPublicRuntimeConfig() || {}
     };
-    appData.runtimeConfig = getPublicRuntimeConfig() || {};
 
     const document: IHtmlDocument = {
       htmlAttrs: { ...result.htmlAttrs },

diff --git a/test/e2e/runtime-config.test.ts b/test/e2e/runtime-config.test.ts
@@ -1,13 +1,26 @@
-import { AppCtx, Page, devFixture, check } from '../utils';
+import {
+  AppCtx,
+  Page,
+  devFixture,
+  check,
+  buildFixture,
+  serveFixture,
+  ShuviConfig
+} from '../utils';
 
 let ctx: AppCtx;
 let page: Page;
 
 jest.setTimeout(5 * 60 * 1000);
 
-describe('SSR: Runtime Config', () => {
+describe.each([false, true])('SSR: Runtime Config', isProd => {
   beforeAll(async () => {
-    ctx = await devFixture('runtime-config');
+    if (isProd) {
+      buildFixture('runtime-config');
+      ctx = await serveFixture('runtime-config');
+    } else {
+      ctx = await devFixture('runtime-config');
+    }
   });
 
   beforeEach(() => {
@@ -54,14 +67,20 @@ describe('SSR: Runtime Config', () => {
   });
 });
 
-describe('CSR: Runtime Config', () => {
+describe.each([false, true])('CSR: Runtime Config', isProd => {
   beforeAll(async () => {
-    ctx = await devFixture('runtime-config', {
+    const config = {
       ssr: false,
       router: {
         history: 'browser'
       }
-    });
+    } as ShuviConfig;
+    if (isProd) {
+      buildFixture('runtime-config', config);
+      ctx = await serveFixture('runtime-config');
+    } else {
+      ctx = await devFixture('runtime-config', config);
+    }
   });
   afterAll(async () => {
     await ctx.close();