@nestjs-ssr/react 0.3.1 → 0.3.3

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/index.js

@@ -923,23 +923,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/index.mjs

@@ -916,23 +916,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;
+            }
           }
         }
       }

package/dist/render/index.js

@@ -923,23 +923,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

@@ -916,23 +916,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;
+            }
           }
         }
       }

package/dist/templates/entry-server.tsx

@@ -2,6 +2,24 @@ import React from 'react';
 import { renderToString, renderToPipeableStream } from 'react-dom/server';
 import { PageContextProvider } from '@nestjs-ssr/react/client';
 
+// Auto-discover root layout using Vite's glob import
+// This eagerly loads layout if it exists, null otherwise
+// @ts-ignore - Vite-specific API
+const layoutModules = import.meta.glob('@/views/layout.tsx', {
+  eager: true,
+}) as Record<string, { default: React.ComponentType<any> }>;
+
+const layoutPath = Object.keys(layoutModules)[0];
+const RootLayout = layoutPath ? layoutModules[layoutPath].default : null;
+
+/**
+ * Get the root layout component.
+ * Used by RenderService in production when dynamic import isn't available.
+ */
+export function getRootLayout(): React.ComponentType<any> | null {
+  return RootLayout;
+}
+
 /**
  * Compose a component with its layouts from the interceptor.
  * Layouts are passed from the RenderInterceptor based on decorators.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs-ssr/react",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "React SSR for NestJS that respects Clean Architecture. Proper DI, SOLID principles, clear separation of concerns.",
   "keywords": [
     "nestjs",

package/src/templates/entry-server.tsx

@@ -2,6 +2,24 @@ import React from 'react';
 import { renderToString, renderToPipeableStream } from 'react-dom/server';
 import { PageContextProvider } from '@nestjs-ssr/react/client';
 
+// Auto-discover root layout using Vite's glob import
+// This eagerly loads layout if it exists, null otherwise
+// @ts-ignore - Vite-specific API
+const layoutModules = import.meta.glob('@/views/layout.tsx', {
+  eager: true,
+}) as Record<string, { default: React.ComponentType<any> }>;
+
+const layoutPath = Object.keys(layoutModules)[0];
+const RootLayout = layoutPath ? layoutModules[layoutPath].default : null;
+
+/**
+ * Get the root layout component.
+ * Used by RenderService in production when dynamic import isn't available.
+ */
+export function getRootLayout(): React.ComponentType<any> | null {
+  return RootLayout;
+}
+
 /**
  * Compose a component with its layouts from the interceptor.
  * Layouts are passed from the RenderInterceptor based on decorators.