@tsed/cli 7.5.0-rc.4 → 7.5.0-rc.6

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

@@ -1,10 +1,11 @@
 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 RUN_MODE = "TSED_VITE_RUN_MODE";
+const runnerFile = fileURLToPath(import.meta.url);
+const configFile = path.resolve(process.cwd(), "vite.config.ts");
 function parseWatchValue(args) {
     if (args.includes("--no-watch")) {
         return false;
@@ -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,13 +39,9 @@ async function createViteDevServer() {
     // @ts-ignore
     const { createServer } = await import("vite");
     return createServer({
-        configFile: normalizePath("vite.config.ts"),
-        optimizeDeps: {
-            noDiscovery: true,
-            include: []
-        },
+        configFile,
         server: {
-            middlewareMode: true,
+            middlewareMode: "ssr",
             hmr: false,
             ws: false
         }
@@ -63,7 +59,6 @@ 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;
@@ -75,8 +70,7 @@ async function runViteController(rawArgs) {
             return;
         }
         childStarted = true;
-        const cliEntry = process.argv[1];
-        childProcess = spawn(process.execPath, cliEntry ? [cliEntry, "dev", ...rawArgs] : [runnerFile, ...rawArgs], {
+        childProcess = spawn(process.execPath, [runnerFile, ...rawArgs], {
             env: {
                 ...process.env,
                 [RUN_MODE]: "app"
@@ -107,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;
@@ -126,7 +120,15 @@ async function runViteController(rawArgs) {
             }
         });
     }
-    startChild();
+    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();
@@ -143,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);
+    });
+}

package/lib/esm/commands/init/InitCmd.js

@@ -13,6 +13,7 @@ import { taskOutput } from "../../fn/taskOutput.js";
 import { PlatformsModule } from "../../platforms/PlatformsModule.js";
 import { RuntimesModule } from "../../runtimes/RuntimesModule.js";
 import { BunRuntime } from "../../runtimes/supports/BunRuntime.js";
+import { BunViteRuntime } from "../../runtimes/supports/BunViteRuntime.js";
 import { NodeRuntime } from "../../runtimes/supports/NodeRuntime.js";
 import { ViteRuntime } from "../../runtimes/supports/ViteRuntime.js";
 import { CliProjectService } from "../../services/CliProjectService.js";
@@ -75,7 +76,7 @@ export class InitCmd {
         this.resolveRootDir(ctx);
         ctx = mapToContext(ctx);
         if (this.isLaunchedWithBunx()) {
-            ctx.runtime = "bun";
+            ctx.runtime ??= "bun";
             ctx.packageManager = "bun";
         }
         this.runtimes.init(ctx);
@@ -95,7 +96,7 @@ export class InitCmd {
         return Boolean(globalThis.Bun);
     }
     filterOnlyBun(values) {
-        const filtered = values.filter((value) => value === "bun");
+        const filtered = values.filter((value) => ["bun", "bun-vite"].includes(value));
         return filtered.length ? filtered : values;
     }
     async writeRcFiles(ctx) {
@@ -143,8 +144,9 @@ export class InitCmd {
         ctx = {
             ...ctx,
             node: runtime instanceof NodeRuntime,
-            bun: runtime instanceof BunRuntime,
-            vite: runtime instanceof ViteRuntime,
+            bun: runtime instanceof BunRuntime || runtime instanceof BunViteRuntime,
+            bunVite: runtime instanceof BunViteRuntime,
+            vite: runtime instanceof ViteRuntime || runtime instanceof BunViteRuntime,
             compiled: runtime.isCompiled()
         };
         return [

package/lib/esm/commands/init/config/FeaturesPrompt.js

@@ -333,6 +333,10 @@ export const FeaturesMap = {
         name: "Node.js + Vite",
         checked: false
     },
+    "bun-vite": {
+        name: "Bun + Vite",
+        checked: false
+    },
     node: {
         name: "Node.js + SWC",
         checked: true

package/lib/esm/commands/init/config/InitSchema.js

@@ -278,6 +278,10 @@ export const InitSchema = () => {
                 label: "Node.js + Vite",
                 value: "vite"
             },
+            {
+                label: "Bun.js + Vite",
+                value: "bun-vite"
+            },
             {
                 label: "Node.js + SWC",
                 value: "node"
@@ -291,7 +295,7 @@ export const InitSchema = () => {
                 value: "webpack"
             },
             {
-                label: "Bun",
+                label: "Bun.js",
                 value: "bun"
             }
         ].filter((o) => availableRuntimes.includes(o.value)))
@@ -301,7 +305,7 @@ export const InitSchema = () => {
         packageManager: s
             .enums(availablePackageManagers)
             .prompt("Choose the package manager:")
-            .when((answers) => answers.runtime !== "bun")
+            .when((answers) => !["bun", "bun-vite"].includes(answers.runtime))
             .default(PackageManager.NPM)
             .choices([
             {

package/lib/esm/commands/mcp/schema/ProjectPreferencesSchema.js

@@ -8,8 +8,8 @@ export const ProjectPreferenceSchema = s
     packageManager: s.string().enum(PackageManager).description("Used project manager to install dependencies"),
     runtime: s
         .string()
-        .enum("vite", "node", "babel", "swc", "webpack", "bun")
-        .description("The javascript runtime used to start application (node, node + webpack, node + swc, node + babel, bun, vite)"),
+        .enum("vite", "bun-vite", "node", "babel", "swc", "webpack", "bun")
+        .description("The javascript runtime used to start application (node + vite, bun + vite, node + webpack, node + swc, node + babel, bun)"),
     platform: s.string().enum(PlatformType).description("Node.js framework used to run server (Express, Koa, Fastify)")
 })
     .optional()

package/lib/esm/runtimes/RuntimesModule.js

@@ -3,6 +3,7 @@ import { inject, injectable, injectMany } from "@tsed/di";
 import { BabelRuntime } from "./supports/BabelRuntime.js";
 import { BaseRuntime } from "./supports/BaseRuntime.js";
 import { BunRuntime } from "./supports/BunRuntime.js";
+import { BunViteRuntime } from "./supports/BunViteRuntime.js";
 import { NodeRuntime } from "./supports/NodeRuntime.js";
 import { ViteRuntime } from "./supports/ViteRuntime.js";
 import { WebpackRuntime } from "./supports/WebpackRuntime.js";
@@ -13,7 +14,7 @@ export class RuntimesModule {
     }
     init(ctx) {
         ctx.runtime = ctx.runtime || this.get().name;
-        if (ctx.runtime === "bun") {
+        if (ctx.runtime.startsWith("bun")) {
             ctx.packageManager = "bun";
         }
     }
@@ -42,4 +43,4 @@ export class RuntimesModule {
         };
     }
 }
-injectable(RuntimesModule).imports([ViteRuntime, NodeRuntime, BabelRuntime, WebpackRuntime, BunRuntime]);
+injectable(RuntimesModule).imports([ViteRuntime, BunViteRuntime, NodeRuntime, BabelRuntime, WebpackRuntime, BunRuntime]);

package/lib/esm/runtimes/index.js

@@ -2,6 +2,7 @@ export * from "./RuntimesModule.js";
 export * from "./supports/BabelRuntime.js";
 export * from "./supports/BaseRuntime.js";
 export * from "./supports/BunRuntime.js";
+export * from "./supports/BunViteRuntime.js";
 export * from "./supports/NodeRuntime.js";
 export * from "./supports/ViteRuntime.js";
 export * from "./supports/WebpackRuntime.js";

package/lib/esm/runtimes/supports/BunViteRuntime.js

@@ -0,0 +1,30 @@
+import { injectable } from "@tsed/di";
+import { BaseRuntime } from "./BaseRuntime.js";
+export class BunViteRuntime extends BaseRuntime {
+    constructor() {
+        super(...arguments);
+        this.name = "bun-vite";
+        this.cmd = "bun";
+        this.order = 1;
+    }
+    files() {
+        return ["vite.config.ts"];
+    }
+    compile() {
+        return "tsed build";
+    }
+    startDev() {
+        return "tsed dev";
+    }
+    startProd(args) {
+        return `bun ${args}`;
+    }
+    devDependencies() {
+        return {
+            "@tsed/cli": "{{cliVersion}}",
+            typescript: "latest",
+            vite: "latest"
+        };
+    }
+}
+injectable(BunViteRuntime).type("runtime");