@nestjs-ssr/react 0.3.2 → 0.3.4

package/README.md

@@ -23,9 +23,9 @@ async getProduct(@Param('id') id: string) {
 
 ```tsx
 export default function ProductDetail({
-  data,
+  product,
 }: PageProps<{ product: Product }>) {
-  return <h1>{data.product.name}</h1>;
+  return <h1>{product.name}</h1>;
 }
 ```
 

package/dist/cli/init.js

@@ -39,7 +39,7 @@ var main = citty.defineCommand({
       default: "5173"
     }
   },
-  async run({ args }) {
+  run({ args }) {
     const cwd = process.cwd();
     const viewsDir = args.views;
     const vitePort = parseInt(args.port, 10) || 5173;
@@ -419,17 +419,17 @@ export default defineConfig({
         packageJson.scripts["start:dev"] = 'concurrently --raw -n vite,nest -c cyan,green "pnpm:dev:vite" "pnpm:dev:nest"';
         shouldUpdate = true;
       }
-      const existingBuild = packageJson.scripts.build;
+      const existingBuild = packageJson.scripts["build"];
       const recommendedBuild = "nest build && pnpm build:client && pnpm build:server";
       if (!existingBuild) {
-        packageJson.scripts.build = recommendedBuild;
+        packageJson.scripts["build"] = recommendedBuild;
         shouldUpdate = true;
         consola.consola.success("Created build script");
       } else if (existingBuild !== recommendedBuild) {
         if (!existingBuild.includes("build:client") || !existingBuild.includes("build:server")) {
           consola.consola.warn(`Found existing build script: "${existingBuild}"`);
           consola.consola.info(`Updating to: ${recommendedBuild}`);
-          packageJson.scripts.build = recommendedBuild;
+          packageJson.scripts["build"] = recommendedBuild;
           shouldUpdate = true;
         } else {
           consola.consola.info("Build scripts already configured");
@@ -528,4 +528,4 @@ export default defineConfig({
     consola.consola.log("   Terminal 2: pnpm dev:nest");
   }
 });
-citty.runMain(main);
+void citty.runMain(main);

package/dist/cli/init.mjs

@@ -36,7 +36,7 @@ var main = defineCommand({
       default: "5173"
     }
   },
-  async run({ args }) {
+  run({ args }) {
     const cwd = process.cwd();
     const viewsDir = args.views;
     const vitePort = parseInt(args.port, 10) || 5173;
@@ -416,17 +416,17 @@ export default defineConfig({
         packageJson.scripts["start:dev"] = 'concurrently --raw -n vite,nest -c cyan,green "pnpm:dev:vite" "pnpm:dev:nest"';
         shouldUpdate = true;
       }
-      const existingBuild = packageJson.scripts.build;
+      const existingBuild = packageJson.scripts["build"];
       const recommendedBuild = "nest build && pnpm build:client && pnpm build:server";
       if (!existingBuild) {
-        packageJson.scripts.build = recommendedBuild;
+        packageJson.scripts["build"] = recommendedBuild;
         shouldUpdate = true;
         consola.success("Created build script");
       } else if (existingBuild !== recommendedBuild) {
         if (!existingBuild.includes("build:client") || !existingBuild.includes("build:server")) {
           consola.warn(`Found existing build script: "${existingBuild}"`);
           consola.info(`Updating to: ${recommendedBuild}`);
-          packageJson.scripts.build = recommendedBuild;
+          packageJson.scripts["build"] = recommendedBuild;
           shouldUpdate = true;
         } else {
           consola.info("Build scripts already configured");
@@ -525,4 +525,4 @@ export default defineConfig({
     consola.log("   Terminal 2: pnpm dev:nest");
   }
 });
-runMain(main);
+void runMain(main);

package/dist/index.js

@@ -7,13 +7,13 @@ var path = require('path');
 var devalue = require('devalue');
 var escapeHtml = require('escape-html');
 var server = require('react-dom/server');
-var React = require('react');
+var React2 = require('react');
 var operators = require('rxjs/operators');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var escapeHtml__default = /*#__PURE__*/_interopDefault(escapeHtml);
-var React__default = /*#__PURE__*/_interopDefault(React);
+var React2__default = /*#__PURE__*/_interopDefault(React2);
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -339,16 +339,18 @@ StringRenderer = _ts_decorate2([
     typeof exports.TemplateParserService === "undefined" ? Object : exports.TemplateParserService
   ])
 ], StringRenderer);
+
+// src/render/error-pages/error-page-development.tsx
 function ErrorPageDevelopment({ error, viewPath, phase }) {
   const stackLines = error.stack ? error.stack.split("\n").slice(1) : [];
-  return /* @__PURE__ */ React__default.default.createElement("html", {
+  return /* @__PURE__ */ React.createElement("html", {
     lang: "en"
-  }, /* @__PURE__ */ React__default.default.createElement("head", null, /* @__PURE__ */ React__default.default.createElement("meta", {
+  }, /* @__PURE__ */ React.createElement("head", null, /* @__PURE__ */ React.createElement("meta", {
     charSet: "UTF-8"
-  }), /* @__PURE__ */ React__default.default.createElement("meta", {
+  }), /* @__PURE__ */ React.createElement("meta", {
     name: "viewport",
     content: "width=device-width, initial-scale=1.0"
-  }), /* @__PURE__ */ React__default.default.createElement("title", null, `SSR Error - ${error.name}`), /* @__PURE__ */ React__default.default.createElement("style", {
+  }), /* @__PURE__ */ React.createElement("title", null, `SSR Error - ${error.name}`), /* @__PURE__ */ React.createElement("style", {
     dangerouslySetInnerHTML: {
       __html: `
               body {
@@ -399,28 +401,30 @@ function ErrorPageDevelopment({ error, viewPath, phase }) {
               }
             `
     }
-  })), /* @__PURE__ */ React__default.default.createElement("body", null, /* @__PURE__ */ React__default.default.createElement("div", {
+  })), /* @__PURE__ */ React.createElement("body", null, /* @__PURE__ */ React.createElement("div", {
     className: "error-container"
-  }, /* @__PURE__ */ React__default.default.createElement("h1", null, "Server-Side Rendering Error"), /* @__PURE__ */ React__default.default.createElement("div", {
+  }, /* @__PURE__ */ React.createElement("h1", null, "Server-Side Rendering Error"), /* @__PURE__ */ React.createElement("div", {
     className: "error-type"
-  }, error.name), /* @__PURE__ */ React__default.default.createElement("div", {
+  }, error.name), /* @__PURE__ */ React.createElement("div", {
     className: "error-message"
-  }, error.message), /* @__PURE__ */ React__default.default.createElement("h2", null, "Stack Trace"), /* @__PURE__ */ React__default.default.createElement("div", {
+  }, error.message), /* @__PURE__ */ React.createElement("h2", null, "Stack Trace"), /* @__PURE__ */ React.createElement("div", {
     className: "stack-trace"
-  }, /* @__PURE__ */ React__default.default.createElement("pre", null, stackLines.join("\n"))), /* @__PURE__ */ React__default.default.createElement("div", {
+  }, /* @__PURE__ */ React.createElement("pre", null, stackLines.join("\n"))), /* @__PURE__ */ React.createElement("div", {
     className: "meta"
-  }, /* @__PURE__ */ React__default.default.createElement("p", null, /* @__PURE__ */ React__default.default.createElement("strong", null, "View Path:"), " ", viewPath), /* @__PURE__ */ React__default.default.createElement("p", null, /* @__PURE__ */ React__default.default.createElement("strong", null, "Error Phase:"), " ", phase === "shell" ? "Shell (before streaming started)" : "Streaming (during content delivery)"), /* @__PURE__ */ React__default.default.createElement("p", null, /* @__PURE__ */ React__default.default.createElement("strong", null, "Environment:"), " Development")))));
+  }, /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "View Path:"), " ", viewPath), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "Error Phase:"), " ", phase === "shell" ? "Shell (before streaming started)" : "Streaming (during content delivery)"), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "Environment:"), " Development")))));
 }
 __name(ErrorPageDevelopment, "ErrorPageDevelopment");
+
+// src/render/error-pages/error-page-production.tsx
 function ErrorPageProduction() {
-  return /* @__PURE__ */ React__default.default.createElement("html", {
+  return /* @__PURE__ */ React.createElement("html", {
     lang: "en"
-  }, /* @__PURE__ */ React__default.default.createElement("head", null, /* @__PURE__ */ React__default.default.createElement("meta", {
+  }, /* @__PURE__ */ React.createElement("head", null, /* @__PURE__ */ React.createElement("meta", {
     charSet: "UTF-8"
-  }), /* @__PURE__ */ React__default.default.createElement("meta", {
+  }), /* @__PURE__ */ React.createElement("meta", {
     name: "viewport",
     content: "width=device-width, initial-scale=1.0"
-  }), /* @__PURE__ */ React__default.default.createElement("title", null, "Error"), /* @__PURE__ */ React__default.default.createElement("style", {
+  }), /* @__PURE__ */ React.createElement("title", null, "Error"), /* @__PURE__ */ React.createElement("style", {
     dangerouslySetInnerHTML: {
       __html: `
               body {
@@ -447,9 +451,9 @@ function ErrorPageProduction() {
               }
             `
     }
-  })), /* @__PURE__ */ React__default.default.createElement("body", null, /* @__PURE__ */ React__default.default.createElement("div", {
+  })), /* @__PURE__ */ React.createElement("body", null, /* @__PURE__ */ React.createElement("div", {
     className: "error-container"
-  }, /* @__PURE__ */ React__default.default.createElement("h1", null, "500"), /* @__PURE__ */ React__default.default.createElement("p", null, "Internal Server Error"), /* @__PURE__ */ React__default.default.createElement("p", null, "Something went wrong while rendering this page."))));
+  }, /* @__PURE__ */ React.createElement("h1", null, "500"), /* @__PURE__ */ React.createElement("p", null, "Internal Server Error"), /* @__PURE__ */ React.createElement("p", null, "Something went wrong while rendering this page."))));
 }
 __name(ErrorPageProduction, "ErrorPageProduction");
 
@@ -516,7 +520,7 @@ exports.StreamingErrorHandler = class _StreamingErrorHandler {
   */
   renderDevelopmentErrorPage(error, viewPath, phase) {
     const ErrorComponent = this.errorPageDevelopment || ErrorPageDevelopment;
-    const element = React.createElement(ErrorComponent, {
+    const element = React2.createElement(ErrorComponent, {
       error,
       viewPath,
       phase
@@ -528,7 +532,7 @@ exports.StreamingErrorHandler = class _StreamingErrorHandler {
   */
   renderProductionErrorPage() {
     const ErrorComponent = this.errorPageProduction || ErrorPageProduction;
-    const element = React.createElement(ErrorComponent);
+    const element = React2.createElement(ErrorComponent);
     return "<!DOCTYPE html>\n" + server.renderToStaticMarkup(element);
   }
   /**
@@ -923,23 +927,27 @@ exports.RenderService = class _RenderService {
       "src/views/_layout.tsx"
     ];
     try {
-      for (const path$1 of conventionalPaths) {
-        const absolutePath = path.join(process.cwd(), path$1);
-        if (!fs.existsSync(absolutePath)) {
-          continue;
-        }
-        this.logger.log(`\u2713 Found root layout at ${path$1}`);
-        if (this.vite) {
+      if (this.vite) {
+        for (const path$1 of conventionalPaths) {
+          const absolutePath = path.join(process.cwd(), path$1);
+          if (!fs.existsSync(absolutePath)) {
+            continue;
+          }
+          this.logger.log(`\u2713 Found root layout at ${path$1}`);
           const layoutModule = await this.vite.ssrLoadModule("/" + path$1);
           this.rootLayout = layoutModule.default;
           return this.rootLayout;
-        } else {
-          const prodPath = path$1.replace("src/views", "dist/server/views").replace(".tsx", ".js");
-          const absoluteProdPath = path.join(process.cwd(), prodPath);
-          if (fs.existsSync(absoluteProdPath)) {
-            const layoutModule = await import(absoluteProdPath);
-            this.rootLayout = layoutModule.default;
-            return this.rootLayout;
+        }
+      } else {
+        const entryServerPath = path.join(process.cwd(), "dist/server/entry-server.mjs");
+        if (fs.existsSync(entryServerPath)) {
+          const entryModule = await import(entryServerPath);
+          if (entryModule.getRootLayout) {
+            this.rootLayout = entryModule.getRootLayout();
+            if (this.rootLayout) {
+              this.logger.log(`\u2713 Loaded root layout from entry-server bundle`);
+              return this.rootLayout;
+            }
           }
         }
       }
@@ -1699,7 +1707,7 @@ var CONTEXT_KEY = /* @__PURE__ */ Symbol.for("nestjs-ssr.PageContext");
 var globalStore = globalThis;
 function getOrCreateContext() {
   if (!globalStore[CONTEXT_KEY]) {
-    globalStore[CONTEXT_KEY] = /* @__PURE__ */ React.createContext(null);
+    globalStore[CONTEXT_KEY] = /* @__PURE__ */ React2.createContext(null);
   }
   return globalStore[CONTEXT_KEY];
 }
@@ -1709,12 +1717,12 @@ function registerPageContextState(setter) {
 }
 __name(registerPageContextState, "registerPageContextState");
 function PageContextProvider({ context: initialContext, children, isSegment = false }) {
-  const [context, setContext] = React.useState(initialContext);
-  React.useEffect(() => {
+  const [context, setContext] = React2.useState(initialContext);
+  React2.useEffect(() => {
   }, [
     isSegment
   ]);
-  return /* @__PURE__ */ React__default.default.createElement(PageContext.Provider, {
+  return /* @__PURE__ */ React2__default.default.createElement(PageContext.Provider, {
     value: context
   }, children);
 }
@@ -1726,7 +1734,7 @@ function createSSRHooks() {
     * Contains URL metadata, headers, and any custom properties you've added.
     */
     usePageContext: /* @__PURE__ */ __name(() => {
-      const context = React.useContext(PageContext);
+      const context = React2.useContext(PageContext);
       if (!context) {
         throw new Error("usePageContext must be used within PageContextProvider");
       }
@@ -1743,7 +1751,7 @@ function createSSRHooks() {
     * ```
     */
     useParams: /* @__PURE__ */ __name(() => {
-      const context = React.useContext(PageContext);
+      const context = React2.useContext(PageContext);
       if (!context) {
         throw new Error("useParams must be used within PageContextProvider");
       }
@@ -1761,7 +1769,7 @@ function createSSRHooks() {
     * ```
     */
     useQuery: /* @__PURE__ */ __name(() => {
-      const context = React.useContext(PageContext);
+      const context = React2.useContext(PageContext);
       if (!context) {
         throw new Error("useQuery must be used within PageContextProvider");
       }
@@ -1781,7 +1789,7 @@ function createSSRHooks() {
     * ```
     */
     useRequest: /* @__PURE__ */ __name(() => {
-      const context = React.useContext(PageContext);
+      const context = React2.useContext(PageContext);
       if (!context) {
         throw new Error("useRequest must be used within PageContextProvider");
       }
@@ -1807,7 +1815,7 @@ function createSSRHooks() {
     * ```
     */
     useHeaders: /* @__PURE__ */ __name(() => {
-      const context = React.useContext(PageContext);
+      const context = React2.useContext(PageContext);
       if (!context) {
         throw new Error("useHeaders must be used within PageContextProvider");
       }
@@ -1842,7 +1850,7 @@ function createSSRHooks() {
     * ```
     */
     useHeader: /* @__PURE__ */ __name((name) => {
-      const context = React.useContext(PageContext);
+      const context = React2.useContext(PageContext);
       if (!context) {
         throw new Error("useHeader must be used within PageContextProvider");
       }
@@ -1868,7 +1876,7 @@ function createSSRHooks() {
     * ```
     */
     useCookies: /* @__PURE__ */ __name(() => {
-      const context = React.useContext(PageContext);
+      const context = React2.useContext(PageContext);
       if (!context) {
         throw new Error("useCookies must be used within PageContextProvider");
       }
@@ -1890,7 +1898,7 @@ function createSSRHooks() {
     * ```
     */
     useCookie: /* @__PURE__ */ __name((name) => {
-      const context = React.useContext(PageContext);
+      const context = React2.useContext(PageContext);
       if (!context) {
         throw new Error("useCookie must be used within PageContextProvider");
       }

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { join, relative } from 'path';
 import { uneval } from 'devalue';
 import escapeHtml from 'escape-html';
 import { renderToStaticMarkup } from 'react-dom/server';
-import React, { createElement, createContext, useContext, useState, useEffect } from 'react';
+import React2, { createElement, createContext, useContext, useState, useEffect } from 'react';
 import { switchMap } from 'rxjs/operators';
 
 var __defProp = Object.defineProperty;
@@ -332,6 +332,8 @@ StringRenderer = _ts_decorate2([
     typeof TemplateParserService === "undefined" ? Object : TemplateParserService
   ])
 ], StringRenderer);
+
+// src/render/error-pages/error-page-development.tsx
 function ErrorPageDevelopment({ error, viewPath, phase }) {
   const stackLines = error.stack ? error.stack.split("\n").slice(1) : [];
   return /* @__PURE__ */ React.createElement("html", {
@@ -405,6 +407,8 @@ function ErrorPageDevelopment({ error, viewPath, phase }) {
   }, /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "View Path:"), " ", viewPath), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "Error Phase:"), " ", phase === "shell" ? "Shell (before streaming started)" : "Streaming (during content delivery)"), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "Environment:"), " Development")))));
 }
 __name(ErrorPageDevelopment, "ErrorPageDevelopment");
+
+// src/render/error-pages/error-page-production.tsx
 function ErrorPageProduction() {
   return /* @__PURE__ */ React.createElement("html", {
     lang: "en"
@@ -916,23 +920,27 @@ var RenderService = class _RenderService {
       "src/views/_layout.tsx"
     ];
     try {
-      for (const path of conventionalPaths) {
-        const absolutePath = join(process.cwd(), path);
-        if (!existsSync(absolutePath)) {
-          continue;
-        }
-        this.logger.log(`\u2713 Found root layout at ${path}`);
-        if (this.vite) {
+      if (this.vite) {
+        for (const path of conventionalPaths) {
+          const absolutePath = join(process.cwd(), path);
+          if (!existsSync(absolutePath)) {
+            continue;
+          }
+          this.logger.log(`\u2713 Found root layout at ${path}`);
           const layoutModule = await this.vite.ssrLoadModule("/" + path);
           this.rootLayout = layoutModule.default;
           return this.rootLayout;
-        } else {
-          const prodPath = path.replace("src/views", "dist/server/views").replace(".tsx", ".js");
-          const absoluteProdPath = join(process.cwd(), prodPath);
-          if (existsSync(absoluteProdPath)) {
-            const layoutModule = await import(absoluteProdPath);
-            this.rootLayout = layoutModule.default;
-            return this.rootLayout;
+        }
+      } else {
+        const entryServerPath = join(process.cwd(), "dist/server/entry-server.mjs");
+        if (existsSync(entryServerPath)) {
+          const entryModule = await import(entryServerPath);
+          if (entryModule.getRootLayout) {
+            this.rootLayout = entryModule.getRootLayout();
+            if (this.rootLayout) {
+              this.logger.log(`\u2713 Loaded root layout from entry-server bundle`);
+              return this.rootLayout;
+            }
           }
         }
       }
@@ -1707,7 +1715,7 @@ function PageContextProvider({ context: initialContext, children, isSegment = fa
   }, [
     isSegment
   ]);
-  return /* @__PURE__ */ React.createElement(PageContext.Provider, {
+  return /* @__PURE__ */ React2.createElement(PageContext.Provider, {
     value: context
   }, children);
 }

package/dist/render/index.js

@@ -7,13 +7,12 @@ var path = require('path');
 var devalue = require('devalue');
 var escapeHtml = require('escape-html');
 var server = require('react-dom/server');
-var React = require('react');
+var react = require('react');
 var operators = require('rxjs/operators');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var escapeHtml__default = /*#__PURE__*/_interopDefault(escapeHtml);
-var React__default = /*#__PURE__*/_interopDefault(React);
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -339,16 +338,18 @@ StringRenderer = _ts_decorate2([
     typeof exports.TemplateParserService === "undefined" ? Object : exports.TemplateParserService
   ])
 ], StringRenderer);
+
+// src/render/error-pages/error-page-development.tsx
 function ErrorPageDevelopment({ error, viewPath, phase }) {
   const stackLines = error.stack ? error.stack.split("\n").slice(1) : [];
-  return /* @__PURE__ */ React__default.default.createElement("html", {
+  return /* @__PURE__ */ React.createElement("html", {
     lang: "en"
-  }, /* @__PURE__ */ React__default.default.createElement("head", null, /* @__PURE__ */ React__default.default.createElement("meta", {
+  }, /* @__PURE__ */ React.createElement("head", null, /* @__PURE__ */ React.createElement("meta", {
     charSet: "UTF-8"
-  }), /* @__PURE__ */ React__default.default.createElement("meta", {
+  }), /* @__PURE__ */ React.createElement("meta", {
     name: "viewport",
     content: "width=device-width, initial-scale=1.0"
-  }), /* @__PURE__ */ React__default.default.createElement("title", null, `SSR Error - ${error.name}`), /* @__PURE__ */ React__default.default.createElement("style", {
+  }), /* @__PURE__ */ React.createElement("title", null, `SSR Error - ${error.name}`), /* @__PURE__ */ React.createElement("style", {
     dangerouslySetInnerHTML: {
       __html: `
               body {
@@ -399,28 +400,30 @@ function ErrorPageDevelopment({ error, viewPath, phase }) {
               }
             `
     }
-  })), /* @__PURE__ */ React__default.default.createElement("body", null, /* @__PURE__ */ React__default.default.createElement("div", {
+  })), /* @__PURE__ */ React.createElement("body", null, /* @__PURE__ */ React.createElement("div", {
     className: "error-container"
-  }, /* @__PURE__ */ React__default.default.createElement("h1", null, "Server-Side Rendering Error"), /* @__PURE__ */ React__default.default.createElement("div", {
+  }, /* @__PURE__ */ React.createElement("h1", null, "Server-Side Rendering Error"), /* @__PURE__ */ React.createElement("div", {
     className: "error-type"
-  }, error.name), /* @__PURE__ */ React__default.default.createElement("div", {
+  }, error.name), /* @__PURE__ */ React.createElement("div", {
     className: "error-message"
-  }, error.message), /* @__PURE__ */ React__default.default.createElement("h2", null, "Stack Trace"), /* @__PURE__ */ React__default.default.createElement("div", {
+  }, error.message), /* @__PURE__ */ React.createElement("h2", null, "Stack Trace"), /* @__PURE__ */ React.createElement("div", {
     className: "stack-trace"
-  }, /* @__PURE__ */ React__default.default.createElement("pre", null, stackLines.join("\n"))), /* @__PURE__ */ React__default.default.createElement("div", {
+  }, /* @__PURE__ */ React.createElement("pre", null, stackLines.join("\n"))), /* @__PURE__ */ React.createElement("div", {
     className: "meta"
-  }, /* @__PURE__ */ React__default.default.createElement("p", null, /* @__PURE__ */ React__default.default.createElement("strong", null, "View Path:"), " ", viewPath), /* @__PURE__ */ React__default.default.createElement("p", null, /* @__PURE__ */ React__default.default.createElement("strong", null, "Error Phase:"), " ", phase === "shell" ? "Shell (before streaming started)" : "Streaming (during content delivery)"), /* @__PURE__ */ React__default.default.createElement("p", null, /* @__PURE__ */ React__default.default.createElement("strong", null, "Environment:"), " Development")))));
+  }, /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "View Path:"), " ", viewPath), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "Error Phase:"), " ", phase === "shell" ? "Shell (before streaming started)" : "Streaming (during content delivery)"), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "Environment:"), " Development")))));
 }
 __name(ErrorPageDevelopment, "ErrorPageDevelopment");
+
+// src/render/error-pages/error-page-production.tsx
 function ErrorPageProduction() {
-  return /* @__PURE__ */ React__default.default.createElement("html", {
+  return /* @__PURE__ */ React.createElement("html", {
     lang: "en"
-  }, /* @__PURE__ */ React__default.default.createElement("head", null, /* @__PURE__ */ React__default.default.createElement("meta", {
+  }, /* @__PURE__ */ React.createElement("head", null, /* @__PURE__ */ React.createElement("meta", {
     charSet: "UTF-8"
-  }), /* @__PURE__ */ React__default.default.createElement("meta", {
+  }), /* @__PURE__ */ React.createElement("meta", {
     name: "viewport",
     content: "width=device-width, initial-scale=1.0"
-  }), /* @__PURE__ */ React__default.default.createElement("title", null, "Error"), /* @__PURE__ */ React__default.default.createElement("style", {
+  }), /* @__PURE__ */ React.createElement("title", null, "Error"), /* @__PURE__ */ React.createElement("style", {
     dangerouslySetInnerHTML: {
       __html: `
               body {
@@ -447,9 +450,9 @@ function ErrorPageProduction() {
               }
             `
     }
-  })), /* @__PURE__ */ React__default.default.createElement("body", null, /* @__PURE__ */ React__default.default.createElement("div", {
+  })), /* @__PURE__ */ React.createElement("body", null, /* @__PURE__ */ React.createElement("div", {
     className: "error-container"
-  }, /* @__PURE__ */ React__default.default.createElement("h1", null, "500"), /* @__PURE__ */ React__default.default.createElement("p", null, "Internal Server Error"), /* @__PURE__ */ React__default.default.createElement("p", null, "Something went wrong while rendering this page."))));
+  }, /* @__PURE__ */ React.createElement("h1", null, "500"), /* @__PURE__ */ React.createElement("p", null, "Internal Server Error"), /* @__PURE__ */ React.createElement("p", null, "Something went wrong while rendering this page."))));
 }
 __name(ErrorPageProduction, "ErrorPageProduction");
 
@@ -516,7 +519,7 @@ exports.StreamingErrorHandler = class _StreamingErrorHandler {
   */
   renderDevelopmentErrorPage(error, viewPath, phase) {
     const ErrorComponent = this.errorPageDevelopment || ErrorPageDevelopment;
-    const element = React.createElement(ErrorComponent, {
+    const element = react.createElement(ErrorComponent, {
       error,
       viewPath,
       phase
@@ -528,7 +531,7 @@ exports.StreamingErrorHandler = class _StreamingErrorHandler {
   */
   renderProductionErrorPage() {
     const ErrorComponent = this.errorPageProduction || ErrorPageProduction;
-    const element = React.createElement(ErrorComponent);
+    const element = react.createElement(ErrorComponent);
     return "<!DOCTYPE html>\n" + server.renderToStaticMarkup(element);
   }
   /**
@@ -923,23 +926,27 @@ exports.RenderService = class _RenderService {
       "src/views/_layout.tsx"
     ];
     try {
-      for (const path$1 of conventionalPaths) {
-        const absolutePath = path.join(process.cwd(), path$1);
-        if (!fs.existsSync(absolutePath)) {
-          continue;
-        }
-        this.logger.log(`\u2713 Found root layout at ${path$1}`);
-        if (this.vite) {
+      if (this.vite) {
+        for (const path$1 of conventionalPaths) {
+          const absolutePath = path.join(process.cwd(), path$1);
+          if (!fs.existsSync(absolutePath)) {
+            continue;
+          }
+          this.logger.log(`\u2713 Found root layout at ${path$1}`);
           const layoutModule = await this.vite.ssrLoadModule("/" + path$1);
           this.rootLayout = layoutModule.default;
           return this.rootLayout;
-        } else {
-          const prodPath = path$1.replace("src/views", "dist/server/views").replace(".tsx", ".js");
-          const absoluteProdPath = path.join(process.cwd(), prodPath);
-          if (fs.existsSync(absoluteProdPath)) {
-            const layoutModule = await import(absoluteProdPath);
-            this.rootLayout = layoutModule.default;
-            return this.rootLayout;
+        }
+      } else {
+        const entryServerPath = path.join(process.cwd(), "dist/server/entry-server.mjs");
+        if (fs.existsSync(entryServerPath)) {
+          const entryModule = await import(entryServerPath);
+          if (entryModule.getRootLayout) {
+            this.rootLayout = entryModule.getRootLayout();
+            if (this.rootLayout) {
+              this.logger.log(`\u2713 Loaded root layout from entry-server bundle`);
+              return this.rootLayout;
+            }
           }
         }
       }

package/dist/render/index.mjs

@@ -5,7 +5,7 @@ import { join, relative } from 'path';
 import { uneval } from 'devalue';
 import escapeHtml from 'escape-html';
 import { renderToStaticMarkup } from 'react-dom/server';
-import React, { createElement } from 'react';
+import { createElement } from 'react';
 import { switchMap } from 'rxjs/operators';
 
 var __defProp = Object.defineProperty;
@@ -332,6 +332,8 @@ StringRenderer = _ts_decorate2([
     typeof TemplateParserService === "undefined" ? Object : TemplateParserService
   ])
 ], StringRenderer);
+
+// src/render/error-pages/error-page-development.tsx
 function ErrorPageDevelopment({ error, viewPath, phase }) {
   const stackLines = error.stack ? error.stack.split("\n").slice(1) : [];
   return /* @__PURE__ */ React.createElement("html", {
@@ -405,6 +407,8 @@ function ErrorPageDevelopment({ error, viewPath, phase }) {
   }, /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "View Path:"), " ", viewPath), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "Error Phase:"), " ", phase === "shell" ? "Shell (before streaming started)" : "Streaming (during content delivery)"), /* @__PURE__ */ React.createElement("p", null, /* @__PURE__ */ React.createElement("strong", null, "Environment:"), " Development")))));
 }
 __name(ErrorPageDevelopment, "ErrorPageDevelopment");
+
+// src/render/error-pages/error-page-production.tsx
 function ErrorPageProduction() {
   return /* @__PURE__ */ React.createElement("html", {
     lang: "en"
@@ -916,23 +920,27 @@ var RenderService = class _RenderService {
       "src/views/_layout.tsx"
     ];
     try {
-      for (const path of conventionalPaths) {
-        const absolutePath = join(process.cwd(), path);
-        if (!existsSync(absolutePath)) {
-          continue;
-        }
-        this.logger.log(`\u2713 Found root layout at ${path}`);
-        if (this.vite) {
+      if (this.vite) {
+        for (const path of conventionalPaths) {
+          const absolutePath = join(process.cwd(), path);
+          if (!existsSync(absolutePath)) {
+            continue;
+          }
+          this.logger.log(`\u2713 Found root layout at ${path}`);
           const layoutModule = await this.vite.ssrLoadModule("/" + path);
           this.rootLayout = layoutModule.default;
           return this.rootLayout;
-        } else {
-          const prodPath = path.replace("src/views", "dist/server/views").replace(".tsx", ".js");
-          const absoluteProdPath = join(process.cwd(), prodPath);
-          if (existsSync(absoluteProdPath)) {
-            const layoutModule = await import(absoluteProdPath);
-            this.rootLayout = layoutModule.default;
-            return this.rootLayout;
+        }
+      } else {
+        const entryServerPath = join(process.cwd(), "dist/server/entry-server.mjs");
+        if (existsSync(entryServerPath)) {
+          const entryModule = await import(entryServerPath);
+          if (entryModule.getRootLayout) {
+            this.rootLayout = entryModule.getRootLayout();
+            if (this.rootLayout) {
+              this.logger.log(`\u2713 Loaded root layout from entry-server bundle`);
+              return this.rootLayout;
+            }
           }
         }
       }