@nestjs-ssr/react 0.1.1 → 0.1.3

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { Injectable, Logger, Optional, Inject, Global, Module, SetMetadata } fro
 import { HttpAdapterHost, APP_INTERCEPTOR, Reflector } from '@nestjs/core';
 import * as fs from 'fs';
 import { existsSync, readFileSync, realpathSync as realpathSync$1, readlinkSync, readdirSync, readdir as readdir$1, lstatSync } from 'fs';
-import path2, { join, win32, posix } from 'path';
+import path2, { join, relative, win32, posix } from 'path';
 import serialize from 'serialize-javascript';
 import escapeHtml from 'escape-html';
 import { renderToStaticMarkup } from 'react-dom/server';
@@ -426,12 +426,20 @@ var RenderService = class _RenderService {
   serverManifest = null;
   isDevelopment;
   ssrMode;
+  entryServerPath;
   constructor(templateParser, streamingErrorHandler, ssrMode, defaultHead) {
     this.templateParser = templateParser;
     this.streamingErrorHandler = streamingErrorHandler;
     this.defaultHead = defaultHead;
     this.isDevelopment = process.env.NODE_ENV !== "production";
     this.ssrMode = ssrMode || process.env.SSR_MODE || "string";
+    const absoluteTemplatePath = join(__dirname, "../templates/entry-server.tsx");
+    const relativeToApp = relative(process.cwd(), absoluteTemplatePath);
+    if (relativeToApp.startsWith("..")) {
+      this.entryServerPath = absoluteTemplatePath;
+    } else {
+      this.entryServerPath = "/" + relativeToApp.replace(/\\/g, "/");
+    }
     let templatePath;
     if (this.isDevelopment) {
       const packageTemplatePaths = [
@@ -527,7 +535,7 @@ var RenderService = class _RenderService {
       }
       let renderModule;
       if (this.vite) {
-        renderModule = await this.vite.ssrLoadModule("/src/entry-server.tsx");
+        renderModule = await this.vite.ssrLoadModule(this.entryServerPath);
       } else {
         if (this.serverManifest) {
           const manifestEntry = Object.entries(this.serverManifest).find(([key, value]) => value.isEntry && key.includes("entry-server"));
@@ -611,7 +619,7 @@ var RenderService = class _RenderService {
       const templateParts = this.templateParser.parseTemplate(template);
       let renderModule;
       if (this.vite) {
-        renderModule = await this.vite.ssrLoadModule("/src/entry-server.tsx");
+        renderModule = await this.vite.ssrLoadModule(this.entryServerPath);
       } else {
         if (this.serverManifest) {
           const manifestEntry = Object.entries(this.serverManifest).find(([key, value]) => value.isEntry && key.includes("entry-server"));
@@ -7092,10 +7100,10 @@ var Ignore = class {
   ignored(p) {
     const fullpath = p.fullpath();
     const fullpaths = `${fullpath}/`;
-    const relative = p.relative() || ".";
-    const relatives = `${relative}/`;
+    const relative2 = p.relative() || ".";
+    const relatives = `${relative2}/`;
     for (const m of this.relative) {
-      if (m.match(relative) || m.match(relatives)) return true;
+      if (m.match(relative2) || m.match(relatives)) return true;
     }
     for (const m of this.absolute) {
       if (m.match(fullpath) || m.match(fullpaths)) return true;
@@ -7104,9 +7112,9 @@ var Ignore = class {
   }
   childrenIgnored(p) {
     const fullpath = p.fullpath() + "/";
-    const relative = (p.relative() || ".") + "/";
+    const relative2 = (p.relative() || ".") + "/";
     for (const m of this.relativeChildren) {
-      if (m.match(relative)) return true;
+      if (m.match(relative2)) return true;
     }
     for (const m of this.absoluteChildren) {
       if (m.match(fullpath)) return true;