@tsed/cli 7.5.0-rc.3 → 7.5.0-rc.5

package/lib/esm/bin/tsed-dev.js

@@ -1,9 +1,10 @@
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
+import path from "node:path";
 import process from "node:process";
-import { fileURLToPath } from "node:url";
-import { normalizePath } from "@tsed/cli-core";
-import { logger } from "@tsed/di";
+import { fileURLToPath, pathToFileURL } from "node:url";
+const runnerFile = fileURLToPath(import.meta.url);
+const configFile = path.resolve(path.dirname(runnerFile), "../../vite.config.ts");
 const RUN_MODE = "TSED_VITE_RUN_MODE";
 function parseWatchValue(args) {
     if (args.includes("--no-watch")) {
@@ -30,7 +31,6 @@ function parseWatchValue(args) {
     return true;
 }
 function assertViteProject() {
-    const configFile = normalizePath("vite.config.ts");
     if (!existsSync(configFile)) {
         throw new Error("tsed dev is only available for ViteRuntime projects. Missing vite.config.ts in the current directory.");
     }
@@ -39,9 +39,9 @@ async function createViteDevServer() {
     // @ts-ignore
     const { createServer } = await import("vite");
     return createServer({
-        configFile: normalizePath("vite.config.ts"),
+        configFile,
         server: {
-            middlewareMode: true,
+            middlewareMode: "ssr",
             hmr: false,
             ws: false
         }
@@ -59,30 +59,40 @@ async function runViteApp() {
     await new Promise(() => { });
 }
 async function runViteController(rawArgs) {
-    const runnerFile = fileURLToPath(import.meta.url);
     const watch = parseWatchValue(rawArgs);
     const vite = await createViteDevServer();
     let childProcess;
+    let childStarted = false;
     let restarting = false;
     let queued = false;
     const startChild = () => {
-        const cliEntry = process.argv[1];
-        childProcess = spawn(process.execPath, cliEntry ? [cliEntry, "dev", ...rawArgs] : [runnerFile, ...rawArgs], {
+        if (childStarted) {
+            return;
+        }
+        childStarted = true;
+        childProcess = spawn(process.execPath, [runnerFile, ...rawArgs], {
             env: {
                 ...process.env,
                 [RUN_MODE]: "app"
             },
             stdio: "inherit"
         });
+        childProcess.once("exit", () => {
+            childStarted = false;
+            childProcess = undefined;
+        });
     };
     const stopChild = async () => {
-        if (!childProcess || childProcess.killed) {
+        if (!childProcess || childProcess.killed || childProcess.exitCode !== null || childProcess.signalCode !== null) {
+            childStarted = false;
+            childProcess = undefined;
             return;
         }
         await new Promise((resolve) => {
             childProcess.once("exit", resolve);
             childProcess.kill("SIGTERM");
         });
+        childStarted = false;
     };
     const restartChild = async (reason, file = "") => {
         if (restarting) {
@@ -91,7 +101,7 @@ async function runViteController(rawArgs) {
         }
         restarting = true;
         const suffix = file ? `: ${file}` : "";
-        logger().info(`[tsed-dev] restart (${reason})${suffix}`);
+        vite.config.logger.info(`[tsed-dev] restart (${reason})${suffix}`);
         await stopChild();
         startChild();
         restarting = false;
@@ -113,6 +123,12 @@ async function runViteController(rawArgs) {
     vite.watcher.once("ready", () => {
         startChild();
     });
+    // Fallback: some environments can miss/lag watcher "ready" when Vite re-optimizes deps.
+    setTimeout(() => {
+        if (!childStarted) {
+            startChild();
+        }
+    }, 2500);
     const shutdown = async () => {
         await stopChild();
         await vite.close();
@@ -129,3 +145,9 @@ export async function dev(rawArgs = process.argv.slice(2)) {
     }
     await runViteController(rawArgs);
 }
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+    dev().catch((error) => {
+        console.error(error);
+        process.exit(1);
+    });
+}