devflare 1.0.0-next.11 → 1.0.0-next.12

package/dist/{deploy-jdpy21t6.js → deploy-k0fcgt3d.js}

@@ -1,3 +1,6 @@
+import {
+  bundleWorkerEntry
+} from "./index-1xqeptt2.js";
 import {
   detectViteProject
 } from "./index-y1d8za14.js";
@@ -5,21 +8,26 @@ import {
   getDependencies
 } from "./index-1xpj0m4r.js";
 import {
-  prepareComposedWorkerEntrypoint
-} from "./index-ws68xvq2.js";
+  prepareComposedWorkerEntrypoint,
+  resolveEffectiveViteProject,
+  writeGeneratedViteConfig
+} from "./index-zbvmtcn2.js";
 import"./index-1p814k7s.js";
 import"./index-rbht7m9r.js";
+import"./index-9wt9x09k.js";
 import {
   compileConfig,
   stringifyConfig,
   writeWranglerConfig
-} from "./index-51s1hkw4.js";
+} from "./index-rfhx0yd5.js";
 import {
   loadConfig
 } from "./index-wyf3s77s.js";
+import"./index-v8vvsn9x.js";
 import"./index-37x76zdn.js";
 
 // src/cli/commands/deploy.ts
+import { relative, resolve } from "pathe";
 async function runDeployCommand(parsed, logger, options) {
   const cwd = options.cwd || process.cwd();
   const configPath = parsed.options.config;
@@ -31,9 +39,26 @@ async function runDeployCommand(parsed, logger, options) {
     logger.info(`Deploying: ${config.name}`);
     const composedMainEntry = await prepareComposedWorkerEntrypoint(cwd, config, environment);
     const wranglerConfig = compileConfig(config, environment);
-    if (composedMainEntry) {
-      wranglerConfig.main = composedMainEntry;
-      logger.info(`Generated composed worker entry: ${composedMainEntry}`);
+    const deps = await getDependencies();
+    const viteProject = resolveEffectiveViteProject(await detectViteProject(cwd, deps.fs), config, environment);
+    if (viteProject.shouldStartVite) {
+      if (composedMainEntry) {
+        wranglerConfig.main = composedMainEntry;
+        logger.info(`Generated composed worker entry: ${composedMainEntry}`);
+      }
+    } else if (composedMainEntry) {
+      const bundledMainEntryPath = await bundleWorkerEntry({
+        cwd,
+        inputFile: resolve(cwd, composedMainEntry),
+        outFile: resolve(cwd, ".devflare", "worker-entrypoints", "main.js"),
+        rolldownOptions: config.rolldown?.options,
+        sourcemap: config.rolldown?.sourcemap,
+        minify: config.rolldown?.minify,
+        target: config.rolldown?.target,
+        logger
+      });
+      wranglerConfig.main = relative(cwd, bundledMainEntryPath).replace(/\\/g, "/");
+      logger.info(`Generated bundled worker entry: ${wranglerConfig.main}`);
     }
     if (dryRun) {
       logger.info("Dry run - skipping actual deployment");
@@ -43,11 +68,15 @@ async function runDeployCommand(parsed, logger, options) {
     }
     await writeWranglerConfig(cwd, wranglerConfig);
     logger.debug("Generated wrangler.jsonc");
-    const deps = await getDependencies();
-    const viteProject = await detectViteProject(cwd, deps.fs);
     if (viteProject.shouldStartVite) {
+      const generatedViteConfigPath = await writeGeneratedViteConfig({
+        cwd,
+        configPath,
+        environment,
+        localConfigPath: viteProject.viteConfigPath
+      });
       logger.info("Building...");
-      const buildProc = await deps.exec.exec("bunx", ["vite", "build"], {
+      const buildProc = await deps.exec.exec("bunx", ["vite", "build", "--config", generatedViteConfigPath], {
         cwd,
         stdio: "inherit"
       });
@@ -56,7 +85,7 @@ async function runDeployCommand(parsed, logger, options) {
         return { exitCode: 1 };
       }
     } else {
-      logger.info("Skipping Vite build (no local vite.config.* found for this package)");
+      logger.info("Skipping Vite build (no effective Vite config found for this package)");
     }
     logger.info("Deploying with wrangler...");
     const wranglerArgs = ["wrangler", "deploy"];