fix(vite-plugin-nitro): produce consistent builds for CSR mode (#1011)

analogjs · Apr 8, 2024 · d97dceb · d97dceb
1 parent 62f0f86
commit d97dceb
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 10 deletions.
diff --git a/packages/vite-plugin-nitro/src/lib/build-server.ts b/packages/vite-plugin-nitro/src/lib/build-server.ts
@@ -23,6 +23,7 @@ export async function buildServer(
   await copyPublicAssets(nitro);
 
   if (
+    options?.ssr &&
     nitroConfig?.prerender?.routes &&
     nitroConfig?.prerender?.routes.find((route) => route === '/')
   ) {

diff --git a/packages/vite-plugin-nitro/src/lib/runtime/renderer-client.mjs b/packages/vite-plugin-nitro/src/lib/runtime/renderer-client.mjs
@@ -0,0 +1,8 @@
+import { eventHandler } from 'h3';
+
+// @ts-ignore
+import template from '#analog/index';
+
+export default eventHandler(async () => {
+  return template;
+});
diff --git a/packages/vite-plugin-nitro/src/lib/runtime/renderer-client.ts b/packages/vite-plugin-nitro/src/lib/runtime/renderer-client.ts
@@ -0,0 +1,8 @@
+import { eventHandler } from 'h3';
+
+// @ts-ignore
+import template from '#analog/index';
+
+export default eventHandler(async () => {
+  return template;
+});
diff --git a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.spec.ts b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.spec.ts
@@ -58,8 +58,11 @@ describe('nitro', () => {
           ...mockNitroConfig,
           alias: expect.anything(),
           prerender: { routes: ['/'] },
+          renderer: expect.anything(),
           rollupConfig: expect.anything(),
           handlers: expect.anything(),
+          publicAssets: expect.anything(),
+          serverAssets: expect.anything(),
         }
       );
     });
@@ -88,7 +91,10 @@ describe('nitro', () => {
           prerender: { routes: ['/'] },
           alias: expect.anything(),
           rollupConfig: expect.anything(),
+          renderer: expect.anything(),
           handlers: expect.anything(),
+          publicAssets: expect.anything(),
+          serverAssets: expect.anything(),
         }
       );
     });
@@ -125,12 +131,15 @@ describe('nitro', () => {
           ...mockNitroConfig,
           alias: expect.anything(),
           rollupConfig: expect.anything(),
+          renderer: expect.anything(),
           handlers: expect.anything(),
           preset: undefined,
           prerender: {
             ...mockNitroConfig.prerender,
             routes: [],
           },
+          publicAssets: expect.anything(),
+          serverAssets: expect.anything(),
         }
       );
       expect(buildSitemapImportSpy).not.toHaveBeenCalled();
@@ -172,7 +181,10 @@ describe('nitro', () => {
           },
           alias: expect.anything(),
           rollupConfig: expect.anything(),
+          renderer: expect.anything(),
           handlers: expect.anything(),
+          publicAssets: expect.anything(),
+          serverAssets: expect.anything(),
         }
       );
 
@@ -237,8 +249,11 @@ describe('nitro', () => {
                 routes: ['/blog', '/about', '/blog/first', '/blog/02-second'],
               },
               alias: expect.anything(),
+              publicAssets: expect.anything(),
               rollupConfig: expect.anything(),
+              renderer: expect.anything(),
               handlers: expect.anything(),
+              serverAssets: expect.anything(),
             }
           );
 

diff --git a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts
@@ -75,7 +75,12 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] {
         const rendererEntry =
           filePrefix +
           normalizePath(
-            join(__dirname, `runtime/renderer${filePrefix ? '.mjs' : ''}`)
+            join(
+              __dirname,
+              `runtime/renderer${!options?.ssr ? '-client' : ''}${
+                filePrefix ? '.mjs' : ''
+              }`
+            )
           );
 
         nitroConfig = {
@@ -144,6 +149,15 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] {
         };
 
         if (isBuild) {
+          nitroConfig.publicAssets = [{ dir: clientOutputPath }];
+          nitroConfig.serverAssets = [
+            {
+              baseName: 'public',
+              dir: clientOutputPath,
+            },
+          ];
+          nitroConfig.renderer = rendererEntry;
+
           if (isEmptyPrerenderRoutes(options)) {
             nitroConfig.prerender = {};
             nitroConfig.prerender.routes = ['/'];
@@ -196,13 +210,6 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] {
           if (ssrBuild) {
             nitroConfig = {
               ...nitroConfig,
-              publicAssets: [{ dir: clientOutputPath }],
-              serverAssets: [
-                {
-                  baseName: 'public',
-                  dir: clientOutputPath,
-                },
-              ],
               externals: {
                 ...nitroOptions?.externals,
                 external: [
@@ -216,7 +223,6 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] {
                 'zone.js/fesm2015/zone-node',
                 ...(nitroOptions?.moduleSideEffects || []),
               ],
-              renderer: rendererEntry,
               handlers: [
                 {
                   handler: apiMiddlewareHandler,

diff --git a/packages/vite-plugin-nitro/tsconfig.lib.json b/packages/vite-plugin-nitro/tsconfig.lib.json
@@ -8,8 +8,9 @@
   },
   "include": ["src/**/*.ts"],
   "exclude": [
-    "jest.config.ts",
+    "vite.config.ts",
     "src/**/*.spec.ts",
+    "src/**/*.spec.data.ts",
     "src/**/*.test.ts",
     "src/lib/runtime/*.ts"
   ]