@nestjs-ssr/react 0.2.6 → 0.3.1

package/dist/cli/init.js

@@ -33,14 +33,16 @@ var main = citty.defineCommand({
       description: "Skip automatic dependency installation",
       default: false
     },
-    integration: {
+    port: {
       type: "string",
-      description: 'Integration type: "separate" (Vite as separate server) or "integrated" (Vite bundled with NestJS)'
+      description: "Vite dev server port",
+      default: "5173"
     }
   },
   async run({ args }) {
     const cwd = process.cwd();
     const viewsDir = args.views;
+    const vitePort = parseInt(args.port, 10) || 5173;
     const packageJsonPath = path.join(cwd, "package.json");
     const tsconfigPath = path.join(cwd, "tsconfig.json");
     consola.consola.box("@nestjs-ssr/react initialization");
@@ -80,32 +82,6 @@ var main = citty.defineCommand({
       consola.consola.error("Failed to validate package.json:", error);
       process.exit(1);
     }
-    let integrationType = args.integration;
-    if (!integrationType) {
-      const response = await consola.consola.prompt("How do you want to run Vite during development?", {
-        type: "select",
-        options: [
-          {
-            label: "Separate server (Vite runs on its own port, e.g., 5173)",
-            value: "separate"
-          },
-          {
-            label: "Integrated with NestJS (Vite middleware runs within NestJS)",
-            value: "integrated"
-          }
-        ]
-      });
-      integrationType = response;
-    }
-    if (![
-      "separate",
-      "integrated"
-    ].includes(integrationType)) {
-      consola.consola.error(`Invalid integration type: "${integrationType}". Must be "separate" or "integrated"`);
-      process.exit(1);
-    }
-    consola.consola.info(`Using ${integrationType === "separate" ? "separate server" : "integrated"} mode
-`);
     const templateLocations = [
       path.resolve(__dirname$1, "../../src/templates"),
       path.resolve(__dirname$1, "../templates")
@@ -159,28 +135,17 @@ var main = citty.defineCommand({
       consola.consola.warn("vite.config already exists");
       consola.consola.info("Please manually add to your Vite config:");
       consola.consola.log("  import { resolve } from 'path';");
-      if (integrationType === "separate") {
-        consola.consola.log("  server: {");
-        consola.consola.log("    port: 5173,");
-        consola.consola.log("    strictPort: true,");
-        consola.consola.log("    hmr: { port: 5173 },");
-        consola.consola.log("  },");
-      }
+      consola.consola.log("  server: {");
+      consola.consola.log(`    port: ${vitePort},`);
+      consola.consola.log("    strictPort: true,");
+      consola.consola.log(`    hmr: { port: ${vitePort} },`);
+      consola.consola.log("  },");
       consola.consola.log("  build: {");
       consola.consola.log("    rollupOptions: {");
       consola.consola.log(`      input: { client: resolve(process.cwd(), '${viewsDir}/entry-client.tsx') }`);
       consola.consola.log("    }");
       consola.consola.log("  }");
     } else {
-      const serverConfig = integrationType === "separate" ? `  server: {
-    port: 5173,
-    strictPort: true,
-    hmr: { port: 5173 },
-  },
-  ` : `  server: {
-    middlewareMode: true,
-  },
-  `;
       const viteConfig = `import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import { resolve } from 'path';
@@ -192,7 +157,12 @@ export default defineConfig({
       '@': resolve(process.cwd(), 'src'),
     },
   },
-${serverConfig}build: {
+  server: {
+    port: ${vitePort},
+    strictPort: true,
+    hmr: { port: ${vitePort} },
+  },
+  build: {
     outDir: 'dist/client',
     manifest: true,
     rollupOptions: {
@@ -393,7 +363,7 @@ ${serverConfig}build: {
           const importsMatch = appModule.match(importsPattern);
           if (importsMatch) {
             const existingImports = importsMatch[2].trim();
-            const renderModuleConfig = integrationType === "separate" ? "RenderModule.forRoot({ vite: { mode: 'proxy', port: 5173 } })" : "RenderModule.forRoot()";
+            const renderModuleConfig = vitePort === 5173 ? "RenderModule.forRoot()" : `RenderModule.forRoot({ vite: { port: ${vitePort} } })`;
             if (existingImports === "") {
               appModule = appModule.replace(importsPattern, `$1${renderModuleConfig}`);
             } else {
@@ -437,15 +407,15 @@ ${serverConfig}build: {
         packageJson.scripts["build:server"] = `vite build --ssr ${viewsDir}/entry-server.tsx --outDir dist/server`;
         shouldUpdate = true;
       }
-      if (integrationType === "separate") {
-        if (!packageJson.scripts["dev:vite"]) {
-          packageJson.scripts["dev:vite"] = "vite --port 5173";
-          shouldUpdate = true;
-        }
-        if (!packageJson.scripts["dev:nest"]) {
-          packageJson.scripts["dev:nest"] = "nest start --watch --watchAssets --preserveWatchOutput";
-          shouldUpdate = true;
-        }
+      if (!packageJson.scripts["dev:vite"]) {
+        packageJson.scripts["dev:vite"] = `vite --port ${vitePort}`;
+        shouldUpdate = true;
+      }
+      if (!packageJson.scripts["dev:nest"]) {
+        packageJson.scripts["dev:nest"] = "nest start --watch --watchAssets --preserveWatchOutput";
+        shouldUpdate = true;
+      }
+      if (!packageJson.scripts["start:dev"] || !packageJson.scripts["start:dev"].includes("concurrently")) {
         packageJson.scripts["start:dev"] = 'concurrently --raw -n vite,nest -c cyan,green "pnpm:dev:vite" "pnpm:dev:nest"';
         shouldUpdate = true;
       }
@@ -478,16 +448,14 @@ ${serverConfig}build: {
           react: "^19.0.0",
           "react-dom": "^19.0.0",
           vite: "^7.0.0",
-          "@vitejs/plugin-react": "^4.0.0"
+          "@vitejs/plugin-react": "^4.0.0",
+          "http-proxy-middleware": "^3.0.0"
         };
         const requiredDevDeps = {
           "@types/react": "^19.0.0",
-          "@types/react-dom": "^19.0.0"
+          "@types/react-dom": "^19.0.0",
+          concurrently: "^9.0.0"
         };
-        if (integrationType === "separate") {
-          requiredDeps["http-proxy-middleware"] = "^3.0.0";
-          requiredDevDeps["concurrently"] = "^9.0.0";
-        }
         const missingDeps = [];
         const missingDevDeps = [];
         const allDeps = {
@@ -552,17 +520,12 @@ ${serverConfig}build: {
     consola.consola.log("   @Get()");
     consola.consola.log("   @Render(Home)");
     consola.consola.log('   home() { return { message: "Hello" }; }');
-    if (integrationType === "separate") {
-      consola.consola.info("\n3. Start development with HMR:");
-      consola.consola.log("   pnpm start:dev");
-      consola.consola.info("   This runs both Vite (port 5173) and NestJS concurrently");
-      consola.consola.info("\n   Or run them separately:");
-      consola.consola.log("   Terminal 1: pnpm dev:vite");
-      consola.consola.log("   Terminal 2: pnpm dev:nest");
-    } else {
-      consola.consola.info("\n3. Start the dev server: pnpm start:dev");
-      consola.consola.info("   (Vite middleware will be integrated into NestJS)");
-    }
+    consola.consola.info("\n3. Start development with HMR:");
+    consola.consola.log("   pnpm start:dev");
+    consola.consola.info(`   This runs both Vite (port ${vitePort}) and NestJS concurrently`);
+    consola.consola.info("\n   Or run them separately:");
+    consola.consola.log("   Terminal 1: pnpm dev:vite");
+    consola.consola.log("   Terminal 2: pnpm dev:nest");
   }
 });
 citty.runMain(main);

package/dist/cli/init.mjs

@@ -30,14 +30,16 @@ var main = defineCommand({
       description: "Skip automatic dependency installation",
       default: false
     },
-    integration: {
+    port: {
       type: "string",
-      description: 'Integration type: "separate" (Vite as separate server) or "integrated" (Vite bundled with NestJS)'
+      description: "Vite dev server port",
+      default: "5173"
     }
   },
   async run({ args }) {
     const cwd = process.cwd();
     const viewsDir = args.views;
+    const vitePort = parseInt(args.port, 10) || 5173;
     const packageJsonPath = join(cwd, "package.json");
     const tsconfigPath = join(cwd, "tsconfig.json");
     consola.box("@nestjs-ssr/react initialization");
@@ -77,32 +79,6 @@ var main = defineCommand({
       consola.error("Failed to validate package.json:", error);
       process.exit(1);
     }
-    let integrationType = args.integration;
-    if (!integrationType) {
-      const response = await consola.prompt("How do you want to run Vite during development?", {
-        type: "select",
-        options: [
-          {
-            label: "Separate server (Vite runs on its own port, e.g., 5173)",
-            value: "separate"
-          },
-          {
-            label: "Integrated with NestJS (Vite middleware runs within NestJS)",
-            value: "integrated"
-          }
-        ]
-      });
-      integrationType = response;
-    }
-    if (![
-      "separate",
-      "integrated"
-    ].includes(integrationType)) {
-      consola.error(`Invalid integration type: "${integrationType}". Must be "separate" or "integrated"`);
-      process.exit(1);
-    }
-    consola.info(`Using ${integrationType === "separate" ? "separate server" : "integrated"} mode
-`);
     const templateLocations = [
       resolve(__dirname$1, "../../src/templates"),
       resolve(__dirname$1, "../templates")
@@ -156,28 +132,17 @@ var main = defineCommand({
       consola.warn("vite.config already exists");
       consola.info("Please manually add to your Vite config:");
       consola.log("  import { resolve } from 'path';");
-      if (integrationType === "separate") {
-        consola.log("  server: {");
-        consola.log("    port: 5173,");
-        consola.log("    strictPort: true,");
-        consola.log("    hmr: { port: 5173 },");
-        consola.log("  },");
-      }
+      consola.log("  server: {");
+      consola.log(`    port: ${vitePort},`);
+      consola.log("    strictPort: true,");
+      consola.log(`    hmr: { port: ${vitePort} },`);
+      consola.log("  },");
       consola.log("  build: {");
       consola.log("    rollupOptions: {");
       consola.log(`      input: { client: resolve(process.cwd(), '${viewsDir}/entry-client.tsx') }`);
       consola.log("    }");
       consola.log("  }");
     } else {
-      const serverConfig = integrationType === "separate" ? `  server: {
-    port: 5173,
-    strictPort: true,
-    hmr: { port: 5173 },
-  },
-  ` : `  server: {
-    middlewareMode: true,
-  },
-  `;
       const viteConfig = `import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import { resolve } from 'path';
@@ -189,7 +154,12 @@ export default defineConfig({
       '@': resolve(process.cwd(), 'src'),
     },
   },
-${serverConfig}build: {
+  server: {
+    port: ${vitePort},
+    strictPort: true,
+    hmr: { port: ${vitePort} },
+  },
+  build: {
     outDir: 'dist/client',
     manifest: true,
     rollupOptions: {
@@ -390,7 +360,7 @@ ${serverConfig}build: {
           const importsMatch = appModule.match(importsPattern);
           if (importsMatch) {
             const existingImports = importsMatch[2].trim();
-            const renderModuleConfig = integrationType === "separate" ? "RenderModule.forRoot({ vite: { mode: 'proxy', port: 5173 } })" : "RenderModule.forRoot()";
+            const renderModuleConfig = vitePort === 5173 ? "RenderModule.forRoot()" : `RenderModule.forRoot({ vite: { port: ${vitePort} } })`;
             if (existingImports === "") {
               appModule = appModule.replace(importsPattern, `$1${renderModuleConfig}`);
             } else {
@@ -434,15 +404,15 @@ ${serverConfig}build: {
         packageJson.scripts["build:server"] = `vite build --ssr ${viewsDir}/entry-server.tsx --outDir dist/server`;
         shouldUpdate = true;
       }
-      if (integrationType === "separate") {
-        if (!packageJson.scripts["dev:vite"]) {
-          packageJson.scripts["dev:vite"] = "vite --port 5173";
-          shouldUpdate = true;
-        }
-        if (!packageJson.scripts["dev:nest"]) {
-          packageJson.scripts["dev:nest"] = "nest start --watch --watchAssets --preserveWatchOutput";
-          shouldUpdate = true;
-        }
+      if (!packageJson.scripts["dev:vite"]) {
+        packageJson.scripts["dev:vite"] = `vite --port ${vitePort}`;
+        shouldUpdate = true;
+      }
+      if (!packageJson.scripts["dev:nest"]) {
+        packageJson.scripts["dev:nest"] = "nest start --watch --watchAssets --preserveWatchOutput";
+        shouldUpdate = true;
+      }
+      if (!packageJson.scripts["start:dev"] || !packageJson.scripts["start:dev"].includes("concurrently")) {
         packageJson.scripts["start:dev"] = 'concurrently --raw -n vite,nest -c cyan,green "pnpm:dev:vite" "pnpm:dev:nest"';
         shouldUpdate = true;
       }
@@ -475,16 +445,14 @@ ${serverConfig}build: {
           react: "^19.0.0",
           "react-dom": "^19.0.0",
           vite: "^7.0.0",
-          "@vitejs/plugin-react": "^4.0.0"
+          "@vitejs/plugin-react": "^4.0.0",
+          "http-proxy-middleware": "^3.0.0"
         };
         const requiredDevDeps = {
           "@types/react": "^19.0.0",
-          "@types/react-dom": "^19.0.0"
+          "@types/react-dom": "^19.0.0",
+          concurrently: "^9.0.0"
         };
-        if (integrationType === "separate") {
-          requiredDeps["http-proxy-middleware"] = "^3.0.0";
-          requiredDevDeps["concurrently"] = "^9.0.0";
-        }
         const missingDeps = [];
         const missingDevDeps = [];
         const allDeps = {
@@ -549,17 +517,12 @@ ${serverConfig}build: {
     consola.log("   @Get()");
     consola.log("   @Render(Home)");
     consola.log('   home() { return { message: "Hello" }; }');
-    if (integrationType === "separate") {
-      consola.info("\n3. Start development with HMR:");
-      consola.log("   pnpm start:dev");
-      consola.info("   This runs both Vite (port 5173) and NestJS concurrently");
-      consola.info("\n   Or run them separately:");
-      consola.log("   Terminal 1: pnpm dev:vite");
-      consola.log("   Terminal 2: pnpm dev:nest");
-    } else {
-      consola.info("\n3. Start the dev server: pnpm start:dev");
-      consola.info("   (Vite middleware will be integrated into NestJS)");
-    }
+    consola.info("\n3. Start development with HMR:");
+    consola.log("   pnpm start:dev");
+    consola.info(`   This runs both Vite (port ${vitePort}) and NestJS concurrently`);
+    consola.info("\n   Or run them separately:");
+    consola.log("   Terminal 1: pnpm dev:vite");
+    consola.log("   Terminal 2: pnpm dev:nest");
   }
 });
 runMain(main);