devflare 1.0.0-next.16 → 1.0.0-next.18

package/dist/index-g0rqh52c.js

@@ -0,0 +1,385 @@
+import {
+  ensureGeneratedDirectory,
+  getGeneratedArtifactPaths
+} from "./index-aabgympv.js";
+import {
+  getDependencies
+} from "./index-z9gy8w6b.js";
+import {
+  bundleWorkerEntry
+} from "./index-7m0x8m9r.js";
+import {
+  detectViteProject
+} from "./index-gn5wy09x.js";
+import {
+  logLine
+} from "./index-stgn34cr.js";
+import {
+  resolvePackageSpecifier
+} from "./index-t4fhcx1n.js";
+import {
+  prepareComposedWorkerEntrypoint,
+  resolveEffectiveViteProject,
+  writeGeneratedViteConfig
+} from "./index-j7cf22x7.js";
+import {
+  compileBuildConfig,
+  isolateViteBuildOutputPaths,
+  rebaseWranglerConfigPaths,
+  writeWranglerConfig
+} from "./index-xvk5n96q.js";
+import {
+  loadConfig,
+  resolveConfigForEnvironment
+} from "./index-1wn8mjep.js";
+import {
+  __require
+} from "./index-37x76zdn.js";
+
+// src/cli/deploy-strategy.ts
+function normalizeBranchScope(value) {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : undefined;
+}
+function shouldIncludePreviewCrons(config) {
+  return config.previews?.includeCrons === true;
+}
+function omitQueueConsumers(config) {
+  if (!config.bindings?.queues?.consumers?.length) {
+    return config;
+  }
+  const nextBindings = {
+    ...config.bindings
+  };
+  const nextQueues = {
+    ...nextBindings.queues
+  };
+  delete nextQueues.consumers;
+  if (!nextQueues.producers || Object.keys(nextQueues.producers).length === 0) {
+    delete nextBindings.queues;
+  } else {
+    nextBindings.queues = nextQueues;
+  }
+  return {
+    ...config,
+    bindings: nextBindings
+  };
+}
+function omitCronTriggers(config) {
+  if (!config.triggers?.crons?.length) {
+    return config;
+  }
+  const nextTriggers = {
+    ...config.triggers
+  };
+  delete nextTriggers.crons;
+  if (Object.keys(nextTriggers).length === 0) {
+    const { triggers: _triggers, ...rest } = config;
+    return rest;
+  }
+  return {
+    ...config,
+    triggers: nextTriggers
+  };
+}
+function applyDeploymentStrategy(config, options = {}) {
+  const branchScope = normalizeBranchScope(options.previewBranch) ?? normalizeBranchScope(options.branchName);
+  const isBranchScopedPreviewDeploy = !options.preview && options.environment === "preview" && Boolean(branchScope);
+  if (!isBranchScopedPreviewDeploy) {
+    return {
+      config,
+      strategy: "default",
+      omittedResources: []
+    };
+  }
+  const omittedResources = [];
+  let nextConfig = config;
+  if (nextConfig.bindings?.queues?.consumers?.length) {
+    nextConfig = omitQueueConsumers(nextConfig);
+    omittedResources.push("queue-consumers");
+  }
+  if (!shouldIncludePreviewCrons(nextConfig) && nextConfig.triggers?.crons?.length) {
+    nextConfig = omitCronTriggers(nextConfig);
+    omittedResources.push("cron-triggers");
+  }
+  return {
+    config: nextConfig,
+    strategy: "preview-scope",
+    branchScope,
+    omittedResources
+  };
+}
+function describeDeploymentStrategy(result) {
+  if (result.strategy !== "preview-scope" || result.omittedResources.length === 0) {
+    return;
+  }
+  const labels = result.omittedResources.map((resource) => {
+    return resource === "queue-consumers" ? "queue consumers" : "cron triggers";
+  });
+  const formattedLabels = labels.length === 2 ? `${labels[0]} and ${labels[1]}` : labels[0];
+  const scopeSuffix = result.branchScope ? ` (${result.branchScope})` : "";
+  return `Named preview-scope deploy detected${scopeSuffix}; omitting shared ${formattedLabels} from the deployed Wrangler config to avoid singleton Cloudflare resource conflicts.`;
+}
+
+// src/cli/commands/build-artifacts.ts
+import { dirname, relative, resolve } from "pathe";
+function getBuildArtifactPaths(cwd) {
+  return getGeneratedArtifactPaths(cwd);
+}
+function isNestedPath(parentPath, candidatePath) {
+  const normalizedParentPath = parentPath.replace(/\\/g, "/");
+  const normalizedCandidatePath = candidatePath.replace(/\\/g, "/");
+  return normalizedCandidatePath.startsWith(`${normalizedParentPath}/`);
+}
+function isolateViteBuildOutputPaths2(cwd, wranglerConfig) {
+  return isolateViteBuildOutputPaths(cwd, wranglerConfig);
+}
+function getViteBuildCleanupTargets(cwd, wranglerConfig) {
+  const targets = [];
+  const assetsDirectory = wranglerConfig.assets?.directory;
+  const mainEntry = wranglerConfig.main;
+  if (assetsDirectory) {
+    targets.push(resolve(cwd, assetsDirectory));
+  }
+  if (mainEntry) {
+    const mainEntryPath = resolve(cwd, mainEntry);
+    const isCoveredByAssetsDirectory = targets.some((targetPath) => {
+      return mainEntryPath === targetPath || isNestedPath(targetPath, mainEntryPath);
+    });
+    if (!isCoveredByAssetsDirectory) {
+      targets.push(mainEntryPath);
+    }
+  }
+  return targets;
+}
+function shouldRetryCleanup(error) {
+  if (!error || typeof error !== "object") {
+    return false;
+  }
+  const errorCode = error.code;
+  return errorCode === "EBUSY" || errorCode === "EPERM" || errorCode === "ENOTEMPTY";
+}
+async function getCleanupFileSystem() {
+  return await import("node:fs/promises");
+}
+async function pathExists(cleanupFs, targetPath) {
+  try {
+    await cleanupFs.access(targetPath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function createDeferredCleanupPath(targetPath, uniqueSuffix) {
+  const suffix = uniqueSuffix ?? `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+  return `${targetPath}.devflare-stale-${suffix}`;
+}
+async function tryMoveLockedPathAside(targetPath, logger, cleanupFs) {
+  if (!await pathExists(cleanupFs, targetPath)) {
+    return true;
+  }
+  const deferredCleanupPath = createDeferredCleanupPath(targetPath);
+  try {
+    await cleanupFs.rename(targetPath, deferredCleanupPath);
+  } catch {
+    return false;
+  }
+  logger.warn(`Moved locked build output aside to ${deferredCleanupPath} after repeated cleanup failures; continuing build`);
+  try {
+    await cleanupFs.rm(deferredCleanupPath, {
+      recursive: true,
+      force: true
+    });
+  } catch (error) {
+    const cleanupErrorCode = error instanceof Error && "code" in error && typeof error.code === "string" ? error.code : "an unknown error";
+    logger.warn(`Deferred cleanup for ${deferredCleanupPath} is still blocked by ${cleanupErrorCode}; you can remove it manually later`);
+  }
+  return true;
+}
+async function removePathWithRetries(targetPath, logger, attempts = 5, cleanupFs) {
+  const fs = cleanupFs ?? await getCleanupFileSystem();
+  let lastError;
+  for (let attempt = 1;attempt <= attempts; attempt++) {
+    try {
+      await fs.rm(targetPath, {
+        recursive: true,
+        force: true
+      });
+      return;
+    } catch (error) {
+      lastError = error;
+      if (!shouldRetryCleanup(error) || attempt === attempts) {
+        break;
+      }
+      logger.warn(`Retrying cleanup for ${targetPath} after ${error.code} (${attempt}/${attempts})`);
+      await new Promise((resolveRetry) => setTimeout(resolveRetry, attempt * 100));
+    }
+  }
+  if (shouldRetryCleanup(lastError) && await tryMoveLockedPathAside(targetPath, logger, fs)) {
+    return;
+  }
+  if (shouldRetryCleanup(lastError)) {
+    const cleanupErrorCode = lastError instanceof Error && "code" in lastError && typeof lastError.code === "string" ? lastError.code : "an unknown error";
+    logger.warn(`Continuing build without pre-clean for ${targetPath} because cleanup is still blocked by ${cleanupErrorCode}`);
+    return;
+  }
+  throw lastError;
+}
+async function cleanupViteBuildOutputs(cwd, wranglerConfig, logger) {
+  const cleanupTargets = getViteBuildCleanupTargets(cwd, wranglerConfig);
+  for (const cleanupTarget of cleanupTargets) {
+    await removePathWithRetries(cleanupTarget, logger);
+  }
+}
+async function writeDeployRedirect(cwd, generatedConfigPath) {
+  const fs = await import("node:fs/promises");
+  const paths = getBuildArtifactPaths(cwd);
+  await ensureGeneratedDirectory(paths.deployDir);
+  const configPath = relative(paths.deployDir, generatedConfigPath).replace(/\\/g, "/");
+  await fs.writeFile(paths.deployRedirectPath, `${JSON.stringify({ configPath }, null, "\t")}
+`, "utf-8");
+}
+async function readDeployRedirect(cwd) {
+  const fs = await import("node:fs/promises");
+  const paths = getBuildArtifactPaths(cwd);
+  try {
+    const rawConfig = await fs.readFile(paths.deployRedirectPath, "utf-8");
+    const parsed = JSON.parse(rawConfig);
+    if (typeof parsed.configPath !== "string" || parsed.configPath.length === 0) {
+      return null;
+    }
+    return resolve(dirname(paths.deployRedirectPath), parsed.configPath);
+  } catch {
+    return null;
+  }
+}
+async function writeGeneratedDeployWranglerConfig(cwd, wranglerConfig, options = {}) {
+  const paths = getBuildArtifactPaths(cwd);
+  await ensureGeneratedDirectory(paths.buildDir, true);
+  const buildConfig = rebaseWranglerConfigPaths(cwd, paths.buildDir, wranglerConfig);
+  if (options.main) {
+    buildConfig.main = options.main;
+  }
+  await writeWranglerConfig(paths.buildDir, buildConfig, "wrangler.jsonc");
+  return paths.buildWranglerConfigPath;
+}
+async function writeGeneratedDevWranglerConfig(cwd, wranglerConfig) {
+  const paths = getGeneratedArtifactPaths(cwd);
+  await ensureGeneratedDirectory(paths.devflareDir, true);
+  const devConfig = rebaseWranglerConfigPaths(cwd, paths.devflareDir, wranglerConfig);
+  await writeWranglerConfig(paths.devflareDir, devConfig, "wrangler.jsonc");
+  return paths.devWranglerConfigPath;
+}
+async function buildWorkerOnlyDeployArtifact(cwd, wranglerConfig, config, logger) {
+  if (!wranglerConfig.main) {
+    return await writeGeneratedDeployWranglerConfig(cwd, wranglerConfig);
+  }
+  const paths = getBuildArtifactPaths(cwd);
+  const bundledMainEntryPath = await bundleWorkerEntry({
+    cwd,
+    inputFile: resolve(cwd, wranglerConfig.main),
+    outFile: paths.buildWorkerPath,
+    rolldownOptions: config.rolldown?.options,
+    sourcemap: config.rolldown?.sourcemap,
+    minify: config.rolldown?.minify,
+    logger
+  });
+  logLine(logger, `Generated deploy artifact: ${relative(cwd, bundledMainEntryPath).replace(/\\/g, "/")}`);
+  return await writeGeneratedDeployWranglerConfig(cwd, wranglerConfig, {
+    main: "./worker.js"
+  });
+}
+async function resolveLocalViteExecutable(cwd, fs) {
+  const viteExecutablePath = resolvePackageSpecifier("vite/bin/vite.js", cwd);
+  try {
+    await fs.access(viteExecutablePath);
+  } catch {
+    throw new Error(`Could not resolve a local Vite CLI entrypoint from ${cwd}. Install vite in this package before running a Vite-backed Devflare build.`);
+  }
+  return viteExecutablePath;
+}
+async function prepareBuildArtifacts(parsed, logger, options) {
+  const cwd = options.cwd || process.cwd();
+  const configPath = parsed.options.config;
+  const environment = parsed.options.env;
+  const rawConfig = await loadConfig({ cwd, configFile: configPath });
+  const config = resolveConfigForEnvironment(rawConfig, environment);
+  logLine(logger, `Building: ${config.name}`);
+  const composedMainEntry = await prepareComposedWorkerEntrypoint(cwd, config, environment);
+  const deps = await getDependencies();
+  const viteProject = resolveEffectiveViteProject(await detectViteProject(cwd, deps.fs), config, environment);
+  const deploymentStrategy = applyDeploymentStrategy(config, {
+    environment,
+    preview: parsed.options.preview === true,
+    branchName: parsed.options["branch-name"],
+    previewBranch: process.env.DEVFLARE_PREVIEW_BRANCH
+  });
+  const deploymentStrategyMessage = describeDeploymentStrategy(deploymentStrategy);
+  if (deploymentStrategyMessage) {
+    logLine(logger, deploymentStrategyMessage);
+  }
+  const devWranglerConfig = viteProject.shouldStartVite ? isolateViteBuildOutputPaths2(cwd, compileBuildConfig(config)) : compileBuildConfig(config);
+  const deployWranglerConfig = viteProject.shouldStartVite ? isolateViteBuildOutputPaths2(cwd, compileBuildConfig(deploymentStrategy.config)) : compileBuildConfig(deploymentStrategy.config);
+  if (viteProject.shouldStartVite) {
+    if (composedMainEntry) {
+      deployWranglerConfig.main = composedMainEntry;
+      logLine(logger, `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,
+      logger
+    });
+    const bundledMainPath = relative(cwd, bundledMainEntryPath).replace(/\\/g, "/");
+    devWranglerConfig.main = bundledMainPath;
+    deployWranglerConfig.main = bundledMainPath;
+    logLine(logger, `Generated bundled worker entry: ${bundledMainPath}`);
+  }
+  let deployConfigPath;
+  if (viteProject.shouldStartVite) {
+    const generatedViteConfigPath = await writeGeneratedViteConfig({
+      cwd,
+      configPath,
+      environment,
+      localConfigPath: viteProject.viteConfigPath
+    });
+    const viteExecutablePath = await resolveLocalViteExecutable(cwd, deps.fs);
+    await cleanupViteBuildOutputs(cwd, devWranglerConfig, logger);
+    logLine(logger, "Running vite build...");
+    const buildProc = await deps.exec.exec(viteExecutablePath, ["build", "--config", generatedViteConfigPath], {
+      cwd,
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        DEVFLARE_BUILD: "true"
+      }
+    });
+    if (buildProc.exitCode !== 0) {
+      throw new Error("Build failed");
+    }
+    const existingDeployConfigPath = await readDeployRedirect(cwd);
+    const generatedDeployConfigPath = deployWranglerConfig.main && deployWranglerConfig.main !== devWranglerConfig.main ? await buildWorkerOnlyDeployArtifact(cwd, deployWranglerConfig, config, logger) : await writeGeneratedDeployWranglerConfig(cwd, deployWranglerConfig);
+    deployConfigPath = existingDeployConfigPath && existingDeployConfigPath !== generatedDeployConfigPath ? existingDeployConfigPath : generatedDeployConfigPath;
+  } else {
+    logLine(logger, "Skipping Vite build (no effective Vite config found for this package)");
+    deployConfigPath = await buildWorkerOnlyDeployArtifact(cwd, deployWranglerConfig, config, logger);
+  }
+  const generatedDevConfigPath = await writeGeneratedDevWranglerConfig(cwd, devWranglerConfig);
+  logger.debug(`Generated dev Wrangler config: ${relative(cwd, generatedDevConfigPath).replace(/\\/g, "/")}`);
+  await writeDeployRedirect(cwd, deployConfigPath);
+  logLine(logger, `Generated deploy Wrangler config: ${relative(cwd, deployConfigPath).replace(/\\/g, "/")}`);
+  logLine(logger, `Generated deploy redirect: ${relative(cwd, getBuildArtifactPaths(cwd).deployRedirectPath).replace(/\\/g, "/")}`);
+  return {
+    config,
+    wranglerConfig: deployWranglerConfig,
+    deployConfigPath,
+    viteProject
+  };
+}
+
+export { applyDeploymentStrategy, describeDeploymentStrategy, prepareBuildArtifacts };

package/dist/{index-0eqksag4.js → index-g170d619.js}

@@ -2,18 +2,15 @@ import {
   ensureGeneratedDirectory,
   getGeneratedArtifactPaths
 } from "./index-aabgympv.js";
-import {
-  preparePreviewScopedResourcesForDeploy
-} from "./index-gs4y9gdf.js";
 import {
   getDependencies
-} from "./index-1xpj0m4r.js";
+} from "./index-z9gy8w6b.js";
 import {
   bundleWorkerEntry
-} from "./index-9fbtk7gv.js";
+} from "./index-5gmf048z.js";
 import {
   detectViteProject
-} from "./index-y1d8za14.js";
+} from "./index-gn5wy09x.js";
 import {
   logLine
 } from "./index-stgn34cr.js";
@@ -24,18 +21,17 @@ import {
   prepareComposedWorkerEntrypoint,
   resolveEffectiveViteProject,
   writeGeneratedViteConfig
-} from "./index-yqbxjysa.js";
+} from "./index-vxhxk8mf.js";
 import {
-  compileConfig,
+  compileBuildConfig,
   isolateViteBuildOutputPaths,
   rebaseWranglerConfigPaths,
   writeWranglerConfig
-} from "./index-11m5a8wd.js";
+} from "./index-j47hhb3r.js";
 import {
   loadConfig,
-  resolveConfigResources,
-  resolveMaterializedConfigResources
-} from "./index-yzddwp02.js";
+  resolveConfigForEnvironment
+} from "./index-ngbzr9gz.js";
 import {
   __require
 } from "./index-37x76zdn.js";
@@ -127,19 +123,6 @@ function describeDeploymentStrategy(result) {
 
 // src/cli/commands/build-artifacts.ts
 import { dirname, relative, resolve } from "pathe";
-function summarizePreviewScopedResourceNames(resources) {
-  const segments = [
-    resources.kv.length > 0 ? `KV ${resources.kv.length}` : null,
-    resources.d1.length > 0 ? `D1 ${resources.d1.length}` : null,
-    resources.r2.length > 0 ? `R2 ${resources.r2.length}` : null,
-    resources.queues.length > 0 ? `Queues ${resources.queues.length}` : null,
-    resources.vectorize.length > 0 ? `Vectorize ${resources.vectorize.length}` : null,
-    resources.hyperdrive.length > 0 ? `Hyperdrive ${resources.hyperdrive.length}` : null,
-    resources.analyticsEngine.length > 0 ? `Analytics ${resources.analyticsEngine.length}` : null,
-    resources.browser.length > 0 ? `Browser ${resources.browser.length}` : null
-  ].filter((segment) => segment !== null);
-  return segments.length > 0 ? segments.join(" · ") : null;
-}
 function getBuildArtifactPaths(cwd) {
   return getGeneratedArtifactPaths(cwd);
 }
@@ -320,23 +303,7 @@ async function prepareBuildArtifacts(parsed, logger, options) {
   const configPath = parsed.options.config;
   const environment = parsed.options.env;
   const rawConfig = await loadConfig({ cwd, configFile: configPath });
-  const shouldPreparePreviewScopedResources = parsed.command === "deploy" && environment === "preview";
-  const previewScopedResources = shouldPreparePreviewScopedResources ? await preparePreviewScopedResourcesForDeploy(rawConfig, { environment }) : null;
-  const config = previewScopedResources ? await resolveMaterializedConfigResources(previewScopedResources.config, {
-    accountId: previewScopedResources.accountId,
-    cloudflare: previewScopedResources.resourceResolutionCloudflare
-  }) : await resolveConfigResources(rawConfig, { environment });
-  const createdPreviewResourcesSummary = previewScopedResources ? summarizePreviewScopedResourceNames(previewScopedResources.created) : null;
-  if (createdPreviewResourcesSummary) {
-    logLine(logger, `Provisioned preview-scoped resources: ${createdPreviewResourcesSummary}`);
-  }
-  const existingPreviewResourcesSummary = previewScopedResources ? summarizePreviewScopedResourceNames(previewScopedResources.existing) : null;
-  if (existingPreviewResourcesSummary) {
-    logLine(logger, `Reused preview-scoped resources: ${existingPreviewResourcesSummary}`);
-  }
-  for (const warning of previewScopedResources?.warnings ?? []) {
-    logger.warn(warning);
-  }
+  const config = resolveConfigForEnvironment(rawConfig, environment);
   logLine(logger, `Building: ${config.name}`);
   const composedMainEntry = await prepareComposedWorkerEntrypoint(cwd, config, environment);
   const deps = await getDependencies();
@@ -351,8 +318,8 @@ async function prepareBuildArtifacts(parsed, logger, options) {
   if (deploymentStrategyMessage) {
     logLine(logger, deploymentStrategyMessage);
   }
-  const devWranglerConfig = viteProject.shouldStartVite ? isolateViteBuildOutputPaths2(cwd, compileConfig(config)) : compileConfig(config);
-  const deployWranglerConfig = viteProject.shouldStartVite ? isolateViteBuildOutputPaths2(cwd, compileConfig(deploymentStrategy.config)) : compileConfig(deploymentStrategy.config);
+  const devWranglerConfig = viteProject.shouldStartVite ? isolateViteBuildOutputPaths2(cwd, compileBuildConfig(config)) : compileBuildConfig(config);
+  const deployWranglerConfig = viteProject.shouldStartVite ? isolateViteBuildOutputPaths2(cwd, compileBuildConfig(deploymentStrategy.config)) : compileBuildConfig(deploymentStrategy.config);
   if (viteProject.shouldStartVite) {
     if (composedMainEntry) {
       deployWranglerConfig.main = composedMainEntry;
@@ -373,8 +340,6 @@ async function prepareBuildArtifacts(parsed, logger, options) {
     deployWranglerConfig.main = bundledMainPath;
     logLine(logger, `Generated bundled worker entry: ${bundledMainPath}`);
   }
-  const generatedDevConfigPath = await writeGeneratedDevWranglerConfig(cwd, devWranglerConfig);
-  logger.debug(`Generated dev Wrangler config: ${relative(cwd, generatedDevConfigPath).replace(/\\/g, "/")}`);
   let deployConfigPath;
   if (viteProject.shouldStartVite) {
     const generatedViteConfigPath = await writeGeneratedViteConfig({
@@ -404,6 +369,8 @@ async function prepareBuildArtifacts(parsed, logger, options) {
     logLine(logger, "Skipping Vite build (no effective Vite config found for this package)");
     deployConfigPath = await buildWorkerOnlyDeployArtifact(cwd, deployWranglerConfig, config, logger);
   }
+  const generatedDevConfigPath = await writeGeneratedDevWranglerConfig(cwd, devWranglerConfig);
+  logger.debug(`Generated dev Wrangler config: ${relative(cwd, generatedDevConfigPath).replace(/\\/g, "/")}`);
   await writeDeployRedirect(cwd, deployConfigPath);
   logLine(logger, `Generated deploy Wrangler config: ${relative(cwd, deployConfigPath).replace(/\\/g, "/")}`);
   logLine(logger, `Generated deploy redirect: ${relative(cwd, getBuildArtifactPaths(cwd).deployRedirectPath).replace(/\\/g, "/")}`);