void 0.7.13 → 0.8.1

package/dist/{deploy-CPAEgVQm.mjs → deploy-DbmbcKID.mjs}

@@ -1,26 +1,28 @@
 import { n as __exportAll } from "./chunk-DJd-R1mw.mjs";
-import { a as join, i as isAbsolute, n as dirname, o as relative, r as extname, s as resolve } from "./pathe.M-eThtNZ-D-kmWkCS.mjs";
-import { n as cliTitle, r as createSpinner, s as import_picocolors } from "./output-D3g5otMC.mjs";
-import { t as findVoidAuthConfig } from "./config-CvHtTM0q.mjs";
-import { a as isExpiredTokenError, c as getToken, i as isCliOutdatedError, l as getTokenSource, n as PlatformClient, o as parsePlatformErrorBody, t as PlatformApiError, u as isStagingMode } from "./client-C_DYiXeu.mjs";
-import { c as R, g as ge, u as Se, v as ue, x as q, y as ye } from "./dist-D2L3_KTK.mjs";
-import { a as writeProjectConfig, r as readProjectConfig } from "./project-DhB4A8_g.mjs";
-import { c as getDatabaseDialect, f as readConfig, l as isNodeTarget, p as resolveBindingNames } from "./config-CeRQg3Lz.mjs";
-import { i as scanJobsSync, n as scanWebSocketRoutesSync, r as scanQueuesSync, t as scanRoutes } from "./scan-CkK1Hzpa.mjs";
-import { i as inferProjectBindings, l as validateSsrEntry, n as FRAMEWORK_SCAN_DIRS, r as detectFramework } from "./plugin-inference-BexV6LL3.mjs";
-import { i as voidWarn, r as voidLog } from "./log-7ChR5Fbc.mjs";
-import { t as discoverSchema } from "./discover-CKGQpis8.mjs";
-import { t as findEnvFile } from "./env-types-BSQghXbx.mjs";
-import { i as validateProdEnv, n as formatEnvReport, r as getDeployEnvDefaults, t as fetchRemoteSecretNames } from "./env-validation-Buy5pe3u.mjs";
-import { n as writeDrizzleConfig } from "./config-DyUSwbeX.mjs";
-import { t as collectMigrations } from "./collect-HqAuilH6.mjs";
-import { r as validateMigrations, t as assertJournalCoherence } from "./validate-DW3ViKTA.mjs";
-import { t as scanPages } from "./scan-CKpylFj9.mjs";
-import { n as promptProjectSelection, r as promptProjectSetupAction, t as promptAndCreateProject } from "./create-project-hvFe6rbI.mjs";
-import { r as resolveProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-DdjLQ2tB.mjs";
-import { n as lintDuplicateSources, r as mergeRoutingRules, t as lintDestinationSplats } from "./headers-CuVHn6Kl.mjs";
-import { t as promptForLoginToken } from "./login-C_MfDjhu.mjs";
-import { i as resolveProjectCommand, n as detectPreset, r as formatProjectCommand, t as FRAMEWORK_PRESETS } from "./preset-CYQh93UF.mjs";
+import { a as join, c as resolve, i as isAbsolute, n as dirname, r as extname, s as relative } from "./pathe.M-eThtNZ-BrPhGF_K.mjs";
+import { n as cliTitle, r as createSpinner, s as import_picocolors } from "./output-DeiS4oEX.mjs";
+import { i as resolveProjectPaths, n as readProjectPaths } from "./project-paths-CCMrHYQm.mjs";
+import { t as findVoidAuthConfig } from "./config-hhMYPVRT.mjs";
+import { a as isExpiredTokenError, c as getToken, i as isCliOutdatedError, l as getTokenSource, n as PlatformClient, o as parsePlatformErrorBody, t as PlatformApiError, u as isStagingMode } from "./client-C-nH6yz3.mjs";
+import { c as R, g as ge, u as Se, v as ue, x as q, y as ye } from "./dist-abzUneor.mjs";
+import { a as writeProjectConfig, r as readProjectConfig } from "./project-CH9pdo16.mjs";
+import { c as getDatabaseDialect, f as readConfig, l as isNodeTarget, p as resolveBindingNames } from "./config-BVEC0lti.mjs";
+import { a as scanQueuesSync, i as scanWebSocketRoutesSync, o as scanJobsSync, r as scanRoutes } from "./scan-DzzHqtiT.mjs";
+import { i as inferProjectBindings, l as validateSsrEntry, n as FRAMEWORK_SCAN_DIRS, r as detectFramework } from "./plugin-inference-Ba1uGdIy.mjs";
+import { i as voidWarn, r as voidLog } from "./log-CWWZV4V1.mjs";
+import { t as discoverSchema } from "./discover-C8N1I4tK.mjs";
+import { t as findEnvFile } from "./env-types-D6qI1ThV.mjs";
+import { i as validateProdEnv, n as formatEnvReport, r as getDeployEnvDefaults, t as fetchRemoteSecretNames } from "./env-validation-DBJsxZLz.mjs";
+import { n as writeDrizzleConfig } from "./config--wXmVOoe.mjs";
+import { t as collectMigrations } from "./collect-9rO3JFNM.mjs";
+import { n as buildMigrationPlanBundle } from "./plan-aD3wRDqF.mjs";
+import { r as validateMigrations, t as assertJournalCoherence } from "./validate-CNWm-PsL.mjs";
+import { t as scanPages } from "./scan-2YmJkYAf.mjs";
+import { i as promptProjectSetupAction, n as promptAndCreateProject, r as promptProjectSelection } from "./create-project-BGnQMy5N.mjs";
+import { r as resolveProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-CNpUbUHd.mjs";
+import { n as lintDuplicateSources, r as mergeRoutingRules, t as lintDestinationSplats } from "./headers-wAPJigtE.mjs";
+import { t as promptForLoginToken } from "./login-CkLr-AaI.mjs";
+import { i as resolveProjectCommand, n as detectPreset, r as formatProjectCommand, t as FRAMEWORK_PRESETS } from "./preset-BRsCi8ZB.mjs";
 import { createRequire } from "node:module";
 import { copyFileSync, cpSync, createWriteStream, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -31,6 +33,34 @@ import { execFile, execFileSync, execSync, spawnSync } from "node:child_process"
 import { parse } from "jsonc-parser";
 import { hash } from "blake3-jit";
 import ignore from "ignore";
+//#region src/asset-routing.ts
+function isApiRoutePattern(pattern) {
+	return pattern === "/api" || pattern.startsWith("/api/");
+}
+function hasDocumentRoutes(routes) {
+	return routes.some((route) => !isApiRoutePattern(route.pattern));
+}
+/**
+* Returns true when browser document navigations must reach the worker before
+* a static asset fallback can serve HTML.
+*/
+function workerOwnsHtmlRouting(inputs) {
+	return inputs.isSsr || inputs.hasPages || inputs.hasDocumentRoutes || inputs.hasMiddleware || inputs.hasWebSockets === true || inputs.authEnabled === true || inputs.liveEnabled === true;
+}
+function resolveAssetConfig(inputs) {
+	return resolveAssetRoutingPolicy(inputs).assetConfig;
+}
+function resolveAssetRoutingPolicy(inputs) {
+	const workerFirst = workerOwnsHtmlRouting(inputs);
+	return {
+		assetConfig: workerFirst ? {
+			not_found_handling: "none",
+			run_worker_first: ["/**"]
+		} : { not_found_handling: "single-page-application" },
+		workerFirst,
+		workerSpaFallback: workerFirst && !inputs.isSsr && !inputs.hasPages
+	};
+}
 const SANDBOX_MIGRATION_TAG = "void-sandbox-v1";
 const require = createRequire(import.meta.url);
 function isSandboxEnabled(config) {
@@ -1706,10 +1736,19 @@ function buildVoidManifest(opts) {
 		});
 	}
 	if (bindings.needsLive) manifest.live = toLiveManifest(options?.live);
-	if (migrations && migrations.length > 0) manifest.migrations = {
-		dialect: dialect ?? "sqlite",
-		pending: migrations.length
-	};
+	if (migrations && migrations.length > 0) {
+		const planBundle = dialect === "postgresql" ? void 0 : buildMigrationPlanBundle(migrations);
+		manifest.migrations = {
+			dialect: dialect ?? "sqlite",
+			...planBundle ? {
+				classifierVersion: planBundle.classifierVersion,
+				migrationListHash: planBundle.migrationListHash,
+				protocolVersion: planBundle.protocolVersion,
+				stability: planBundle.plans.some((plan) => plan.stability === "legacy") ? "legacy" : "stable"
+			} : {},
+			pending: migrations.length
+		};
+	}
 	if (schedules && schedules.length > 0) manifest.schedules = schedules;
 	if (queues && queues.length > 0) manifest.queues = queues;
 	if (ssr) manifest.ssr = true;
@@ -1800,10 +1839,19 @@ function buildFrameworkManifest(opts) {
 	if (opts.bindings.needsR2) manifest.bindings.r2 = [po?.bindingNames?.r2 ?? "STORAGE"];
 	if (opts.bindings.needsAI) manifest.bindings.ai = true;
 	if (opts.bindings.needsLive) throw new Error(FRAMEWORK_LIVE_UNSUPPORTED_MESSAGE);
-	if (opts.migrations && opts.migrations.length > 0) manifest.migrations = {
-		dialect: opts.dialect ?? "sqlite",
-		pending: opts.migrations.length
-	};
+	if (opts.migrations && opts.migrations.length > 0) {
+		const planBundle = opts.dialect === "postgresql" ? void 0 : buildMigrationPlanBundle(opts.migrations);
+		manifest.migrations = {
+			dialect: opts.dialect ?? "sqlite",
+			...planBundle ? {
+				classifierVersion: planBundle.classifierVersion,
+				migrationListHash: planBundle.migrationListHash,
+				protocolVersion: planBundle.protocolVersion,
+				stability: planBundle.plans.some((plan) => plan.stability === "legacy") ? "legacy" : "stable"
+			} : {},
+			pending: opts.migrations.length
+		};
+	}
 	if (opts.schedules && opts.schedules.length > 0) manifest.schedules = opts.schedules;
 	if (opts.queues && opts.queues.length > 0) manifest.queues = opts.queues;
 	if (opts.revalidate != null && opts.revalidate !== 0) manifest.revalidate = opts.revalidate;
@@ -1920,9 +1968,13 @@ async function generateWrapper(workerDir, workerMain, root, features) {
 		copyFileSync(join(outDir, handlerFilename), join(workerDir, handlerFilename));
 	}
 	let migrations;
+	let migrationPlanBundle;
 	if (features.hasMigrations) {
-		const { collectMigrations } = await import("./collect-HqAuilH6.mjs").then((n) => n.n);
-		migrations = collectMigrations(join(root, "db", "migrations"));
+		const { collectMigrations } = await import("./collect-9rO3JFNM.mjs").then((n) => n.n);
+		const { buildMigrationPlanBundle } = await import("./plan-aD3wRDqF.mjs").then((n) => n.i);
+		const migrationsDir = readProjectPaths(root).migrationsDir;
+		migrations = collectMigrations(migrationsDir);
+		migrationPlanBundle = features.migrationDialect === "sqlite" ? buildMigrationPlanBundle(migrations) : void 0;
 		const handlerFilename_ = features.migrationDialect === "postgresql" ? "migration-handler-pg.mjs" : "migration-handler.mjs";
 		let handlerPath = join(import.meta.dirname, "runtime", handlerFilename_);
 		if (!existsSync(handlerPath)) handlerPath = join(import.meta.dirname, "..", "runtime", handlerFilename_);
@@ -1930,7 +1982,7 @@ async function generateWrapper(workerDir, workerMain, root, features) {
 		if (!existsSync(handlerPath)) throw new Error(`Migration handler not found: ${handlerFilename_}. Run "pnpm -C packages/void build" first.`);
 		copyFileSync(handlerPath, join(workerDir, "__void_migration_handler.mjs"));
 	}
-	const wrapperSource = generateWrapperSource(renamedName, handlerFilename, features, migrations);
+	const wrapperSource = generateWrapperSource(renamedName, handlerFilename, features, migrations, migrationPlanBundle);
 	writeFileSync(join(workerDir, workerMain), wrapperSource);
 }
 /**
@@ -1996,7 +2048,7 @@ function cleanupWrapper(root) {
 		writeFileSync(tokenPath, preservedToken);
 	}
 }
-function generateWrapperSource(renamedEntry, handlersModule, features, migrations) {
+function generateWrapperSource(renamedEntry, handlersModule, features, migrations, migrationPlanBundle) {
 	const lines = [];
 	lines.push(`import original from "./${renamedEntry}";`);
 	if (features.crons.length > 0) lines.push(`import { handleScheduled } from "./${handlersModule}";`);
@@ -2004,6 +2056,7 @@ function generateWrapperSource(renamedEntry, handlersModule, features, migration
 	if (migrations && migrations.length > 0) {
 		lines.push(`import { createMigrationHandler } from "./__void_migration_handler.mjs";`);
 		lines.push(`const __migrations = ${JSON.stringify(migrations)};`);
+		lines.push(`const __migrationPlanBundle = ${JSON.stringify(migrationPlanBundle)};`);
 		lines.push(`const __migrationDialect = ${JSON.stringify(features.migrationDialect ?? "sqlite")};`);
 	}
 	lines.push("");
@@ -2019,6 +2072,18 @@ function generateWrapperSource(renamedEntry, handlersModule, features, migration
 			lines.push("    const handler = createMigrationHandler(env, __migrations, __migrationDialect);");
 			lines.push("    return handler(request);");
 			lines.push("  }");
+			lines.push("  if (request.method === \"GET\" && url.pathname === \"/__void/migrate/capabilities\") {");
+			lines.push("    const handler = createMigrationHandler(env, __migrations, __migrationDialect, undefined, __migrationPlanBundle);");
+			lines.push("    return handler(request);");
+			lines.push("  }");
+			lines.push("  if (request.method === \"POST\" && url.pathname === \"/__void/migrate/app\") {");
+			lines.push("    const handler = createMigrationHandler(env, __migrations, __migrationDialect, undefined, __migrationPlanBundle);");
+			lines.push("    return handler(request);");
+			lines.push("  }");
+			lines.push("  if (request.method === \"GET\" && url.pathname.startsWith(\"/__void/migrate/app/attempt/\")) {");
+			lines.push("    const handler = createMigrationHandler(env, __migrations, __migrationDialect, undefined, __migrationPlanBundle);");
+			lines.push("    return handler(request);");
+			lines.push("  }");
 		}
 		if (features.crons.length > 0) {
 			lines.push("  if (request.method === \"POST\" && url.pathname === \"/__void/scheduled\") {");
@@ -2059,9 +2124,10 @@ function generateWrapperSource(renamedEntry, handlersModule, features, migration
 }
 function generateHandlersSource(root, features) {
 	const lines = [];
+	const paths = readProjectPaths(root);
 	if (features.crons.length > 0) {
 		for (let i = 0; i < features.crons.length; i++) {
-			const absPath = join(root, "crons", features.crons[i].filePath);
+			const absPath = join(paths.cronsDir, features.crons[i].filePath);
 			lines.push(`import cronHandler${i} from "${absPath}";`);
 		}
 		lines.push("");
@@ -2082,7 +2148,7 @@ function generateHandlersSource(root, features) {
 	if (features.queues.length > 0) {
 		lines.push("");
 		for (let i = 0; i < features.queues.length; i++) {
-			const absPath = join(root, "queues", features.queues[i].filePath);
+			const absPath = join(paths.queuesDir, features.queues[i].filePath);
 			lines.push(`import queueHandler${i} from "${absPath}";`);
 		}
 		lines.push("");
@@ -2118,11 +2184,11 @@ var deploy_exports = /* @__PURE__ */ __exportAll({
 	ensurePreviouslyDeployedLiveBindingConfig: () => ensurePreviouslyDeployedLiveBindingConfig,
 	hasDeploySchemaDrift: () => hasDeploySchemaDrift,
 	promptDeployProjectConfig: () => promptDeployProjectConfig,
-	resolveAssetConfig: () => resolveAssetConfig,
 	resolveDeployLiveBindingConfig: () => resolveDeployLiveBindingConfig,
 	resolveDeployWranglerCompat: () => resolveDeployWranglerCompat,
 	resolveDistDir: () => resolveDistDir,
 	resolveStaticBuildCommand: () => resolveStaticBuildCommand,
+	resolveStaticDeployPreset: () => resolveStaticDeployPreset,
 	resolveWorkerDirName: () => resolveWorkerDirName,
 	runDeploy: () => runDeploy,
 	runStaticDeploy: () => runStaticDeploy,
@@ -2180,24 +2246,6 @@ async function resolveDeployLiveBindingConfig(root, client, projectId, opts) {
 		reservedClasses: [...opts.webSockets.map((route) => route.className), opts.sandboxClassName]
 	});
 }
-/**
-* Resolve the Cloudflare Workers Static Assets `not_found_handling` config.
-*
-* Any worker capable of producing HTML (SSR, pages, file-based routes, or
-* middleware) must use `'none'` so the asset binding returns 404 for
-* unmatched paths and the worker — gated by `run_worker_first` — owns the
-* response. With `'single-page-application'`, CF short-circuits any
-* `Sec-Fetch-Mode: navigate` request straight to the SPA shell *before*
-* `run_worker_first` is consulted, silently bypassing auth middleware and
-* breaking OAuth callbacks (which arrive as navigations from the provider's
-* 302 redirect).
-*
-* Pure-frontend SPAs without any backend code keep the SPA-fallback config
-* because the worker has no responsibility for HTML routing.
-*/
-function resolveAssetConfig(opts) {
-	return opts.isSsr || opts.hasPages || opts.hasRoutes || opts.hasMiddleware || opts.hasWebSockets === true || opts.authEnabled === true ? { not_found_handling: "none" } : { not_found_handling: "single-page-application" };
-}
 function getExitCode(error) {
 	if (typeof error === "object" && error !== null && "status" in error && typeof error.status === "number") return error.status;
 	return 1;
@@ -2285,8 +2333,12 @@ async function runDeployInner(root, options, cliLog) {
 			appType: voidConfig.inference?.appType,
 			output: voidConfig.output
 		});
+		let preset = resolveStaticDeployPreset(root, voidConfig, {
+			dir: options?.dir,
+			spa: options?.spa
+		});
 		const detected = detectFramework(root);
-		if (detected) {
+		if (!preset && detected) {
 			cliLog.info("framework_detected", {
 				name: detected.name,
 				class: detected.class
@@ -2302,27 +2354,7 @@ async function runDeployInner(root, options, cliLog) {
 			} else await runFullDeploy(root, config, client, fwPreset, options?.skipBuild, gitMetadata, detected, cliLog);
 			return;
 		}
-		let preset = null;
-		const appType = voidConfig.inference?.appType;
-		if (appType && appType !== "void" && appType !== "framework") {
-			const outputDir = voidConfig.inference?.outputDir;
-			preset = {
-				buildCommand: null,
-				outputDir: outputDir ? resolve(root, outputDir) : join(root, "dist"),
-				appType
-			};
-			const detectedPreset = detectPreset(root, {
-				dir: options?.dir,
-				spa: options?.spa
-			});
-			if (detectedPreset) {
-				preset.buildCommand = detectedPreset.buildCommand;
-				if (!outputDir) preset.outputDir = detectedPreset.outputDir;
-			}
-		} else if (!appType) preset = detectPreset(root, {
-			dir: options?.dir,
-			spa: options?.spa
-		});
+		if (!preset && !voidConfig.inference?.appType) preset = detectPreset(root, { spa: options?.spa });
 		const gitMetadata = collectGitDeployMetadata(root, options?.skipBuild ? null : getGitCommit(root));
 		if (preset) {
 			preset = {
@@ -2366,6 +2398,28 @@ function resolveStaticBuildCommand(preset, buildOverride, hasExplicitDir = false
 	if (hasExplicitDir) return null;
 	return buildOverride ?? preset.buildCommand;
 }
+function resolveStaticDeployPreset(root, voidConfig, options) {
+	if (options?.dir) return detectPreset(root, {
+		dir: options.dir,
+		spa: options.spa
+	});
+	const appType = voidConfig.inference?.appType;
+	if (appType === "static" || appType === "spa") {
+		const outputDir = voidConfig.inference?.outputDir;
+		const preset = {
+			buildCommand: null,
+			outputDir: outputDir ? resolve(root, outputDir) : join(root, "dist"),
+			appType
+		};
+		const detectedPreset = detectPreset(root, { spa: options?.spa });
+		if (detectedPreset) {
+			preset.buildCommand = detectedPreset.buildCommand;
+			if (!outputDir) preset.outputDir = detectedPreset.outputDir;
+		}
+		return preset;
+	}
+	return null;
+}
 /**
 * Apply the visible side effects of a streamed deploy event (spinner
 * message or log warning). Returns a discriminated result so the caller
@@ -2695,8 +2749,14 @@ async function runFrameworkDeploy(root, config, client, detected, fwPreset, void
 		R.error(`deploy: Worker output '${fwPreset.workerDir}' not found. Run '${buildCmd}' first.`);
 		process.exit(1);
 	}
-	const bindings = inferProjectBindings(root, voidConfig.inference?.bindings ? { bindings: voidConfig.inference.bindings } : void 0, voidConfig.inference?.scanDirs ?? FRAMEWORK_SCAN_DIRS);
-	if (bindings.needsAuth || findVoidAuthConfig(root) !== null || voidConfig.auth !== void 0) {
+	const inferenceOptions = voidConfig.inference?.bindings ? { bindings: voidConfig.inference.bindings } : void 0;
+	const paths = resolveProjectPaths(root, voidConfig);
+	const scanDirs = voidConfig.inference?.scanDirs ?? FRAMEWORK_SCAN_DIRS;
+	const bindings = inferProjectBindings(root, {
+		...inferenceOptions,
+		paths
+	}, scanDirs);
+	if (bindings.needsAuth || findVoidAuthConfig(root, paths) !== null || voidConfig.auth !== void 0) {
 		R.error("deploy: Void-managed Better Auth is only supported in Void apps. Use Better Auth's official integration for this framework instead.");
 		process.exit(1);
 	}
@@ -2704,7 +2764,7 @@ async function runFrameworkDeploy(root, config, client, detected, fwPreset, void
 		R.error("deploy: void/live is currently supported in Void apps only.");
 		process.exit(1);
 	}
-	const migrationsDir = join(root, "db", "migrations");
+	const migrationsDir = paths.migrationsDir;
 	assertDeploySchemaDriftFree(root, dialect);
 	const rawMigrations = collectMigrations(migrationsDir);
 	let validatedMigrations;
@@ -2721,26 +2781,32 @@ async function runFrameworkDeploy(root, config, client, detected, fwPreset, void
 		R.error(getErrorMessage(err));
 		process.exit(1);
 	}
-	if (dialect === "postgresql" && (bindings.needsD1 || rawMigrations.length > 0)) try {
-		if (!(await client.getResources(config.projectId)).some((resource) => resource.type === "hyperdrive")) {
-			const { text: promptText, isCancel: isCancelPrompt } = await import("./dist-D2L3_KTK.mjs").then((n) => n.p);
-			const connectionString = await promptText({
-				message: "Your project uses PostgreSQL. Enter your connection string:",
-				placeholder: "postgresql://user:pass@host:5432/dbname",
-				validate(value) {
-					if (!value?.startsWith("postgres://") && !value?.startsWith("postgresql://")) return "Must start with \"postgres://\" or \"postgresql://\"";
+	if (dialect === "postgresql" && (bindings.needsD1 || rawMigrations.length > 0)) {
+		let resources = null;
+		try {
+			resources = await client.getResources(config.projectId);
+		} catch {}
+		if (resources) {
+			if (!resources.some((resource) => resource.type === "hyperdrive")) {
+				const { text: promptText, isCancel: isCancelPrompt } = await import("./dist-abzUneor.mjs").then((n) => n.p);
+				const connectionString = await promptText({
+					message: "Your project uses PostgreSQL. Enter your connection string:",
+					placeholder: "postgresql://user:pass@host:5432/dbname",
+					validate(value) {
+						if (!value?.startsWith("postgres://") && !value?.startsWith("postgresql://")) return "Must start with \"postgres://\" or \"postgresql://\"";
+					}
+				});
+				if (isCancelPrompt(connectionString)) {
+					R.info("Deploy cancelled.");
+					process.exit(0);
 				}
-			});
-			if (isCancelPrompt(connectionString)) {
-				R.info("Deploy cancelled.");
-				process.exit(0);
+				await client.provisionDatabase(config.projectId, connectionString);
+				R.success("Hyperdrive provisioned.");
 			}
-			await client.provisionDatabase(config.projectId, connectionString);
-			R.success("Hyperdrive provisioned.");
 		}
-	} catch {}
-	const rawJobs = scanJobsSync(root);
-	const rawQueues = scanQueuesSync(root);
+	}
+	const rawJobs = scanJobsSync(root, paths.cronsDir);
+	const rawQueues = scanQueuesSync(root, paths.queuesDir);
 	const originalEntry = join(workerDir, fwPreset.workerMain);
 	const wrapperFeatures = {
 		auth: null,
@@ -2881,10 +2947,12 @@ async function runFullDeploy(root, config, client, fwPreset, skipBuild, gitMetad
 	}
 	const isFrameworkMode = detected != null;
 	const deployConfig = readConfig(root);
+	const paths = resolveProjectPaths(root, deployConfig);
 	const dialect = getDatabaseDialect(deployConfig);
-	const bindings = inferProjectBindings(root, void 0, deployConfig.inference?.scanDirs ?? (isFrameworkMode ? FRAMEWORK_SCAN_DIRS : void 0));
+	const deployScanDirs = deployConfig.inference?.scanDirs ?? (isFrameworkMode ? FRAMEWORK_SCAN_DIRS : void 0);
+	const bindings = inferProjectBindings(root, { paths }, deployScanDirs);
 	if (isSandboxEnabled(deployConfig)) bindings.needsSandbox = true;
-	const authEnabled = bindings.needsAuth || findVoidAuthConfig(root) !== null || deployConfig.auth !== void 0;
+	const authEnabled = bindings.needsAuth || findVoidAuthConfig(root, paths) !== null || deployConfig.auth !== void 0;
 	const effectiveBindings = authEnabled ? {
 		...bindings,
 		needsAuth: true,
@@ -2917,7 +2985,7 @@ async function runFullDeploy(root, config, client, fwPreset, skipBuild, gitMetad
 	lintDuplicateSources(fallbackRules, "fallbacks (post-asset)");
 	lintDestinationSplats(redirectRules, "redirects/rewrites (pre-asset)");
 	lintDestinationSplats(fallbackRules, "fallbacks (post-asset)");
-	const migrationsDir = join(root, "db", "migrations");
+	const migrationsDir = paths.migrationsDir;
 	assertDeploySchemaDriftFree(root, dialect);
 	const rawMigrations = collectMigrations(migrationsDir);
 	let validatedMigrations;
@@ -2934,31 +3002,40 @@ async function runFullDeploy(root, config, client, fwPreset, skipBuild, gitMetad
 		R.error(getErrorMessage(err));
 		process.exit(1);
 	}
-	if (dialect === "postgresql" && (effectiveBindings.needsD1 || rawMigrations.length > 0)) try {
-		if (!(await client.getResources(config.projectId)).some((resource) => resource.type === "hyperdrive")) {
-			const { text: promptText, isCancel: isCancelPrompt } = await import("./dist-D2L3_KTK.mjs").then((n) => n.p);
-			const connectionString = await promptText({
-				message: "Your project uses PostgreSQL. Enter your connection string:",
-				placeholder: "postgresql://user:pass@host:5432/dbname",
-				validate(value) {
-					if (!value?.startsWith("postgres://") && !value?.startsWith("postgresql://")) return "Must start with \"postgres://\" or \"postgresql://\"";
+	if (dialect === "postgresql" && (effectiveBindings.needsD1 || rawMigrations.length > 0)) {
+		let resources = null;
+		try {
+			resources = await client.getResources(config.projectId);
+		} catch {}
+		if (resources) {
+			if (!resources.some((resource) => resource.type === "hyperdrive")) {
+				const { text: promptText, isCancel: isCancelPrompt } = await import("./dist-abzUneor.mjs").then((n) => n.p);
+				const connectionString = await promptText({
+					message: "Your project uses PostgreSQL. Enter your connection string:",
+					placeholder: "postgresql://user:pass@host:5432/dbname",
+					validate(value) {
+						if (!value?.startsWith("postgres://") && !value?.startsWith("postgresql://")) return "Must start with \"postgres://\" or \"postgresql://\"";
+					}
+				});
+				if (isCancelPrompt(connectionString)) {
+					R.info("Deploy cancelled.");
+					process.exit(0);
 				}
-			});
-			if (isCancelPrompt(connectionString)) {
-				R.info("Deploy cancelled.");
-				process.exit(0);
+				await client.provisionDatabase(config.projectId, connectionString);
+				R.success("Hyperdrive provisioned.");
 			}
-			await client.provisionDatabase(config.projectId, connectionString);
-			R.success("Hyperdrive provisioned.");
 		}
-	} catch {}
+	}
 	const workerDirName = resolveWorkerDirName(distDir, fwPreset, frameworkBuildCmd);
-	const schedules = scanJobsSync(root).flatMap((job) => job.crons.map((cron) => ({
+	const schedules = scanJobsSync(root, paths.cronsDir).flatMap((job) => job.crons.map((cron) => ({
 		name: job.name,
 		cron
 	})));
-	const routeScan = await scanRoutes(root, { output: deployConfig.output });
-	const webSockets = routeScan.websockets ?? scanWebSocketRoutesSync(root);
+	const routeScan = await scanRoutes(root, {
+		output: deployConfig.output,
+		paths
+	});
+	const webSockets = routeScan.websockets ?? scanWebSocketRoutesSync(root, paths);
 	const liveConfig = await resolveDeployLiveBindingConfig(root, client, config.projectId, {
 		isFrameworkMode,
 		needsLive: effectiveBindings.needsLive,
@@ -2966,21 +3043,25 @@ async function runFullDeploy(root, config, client, fwPreset, skipBuild, gitMetad
 		sandboxClassName: sandboxConfig?.className,
 		cliLog
 	});
-	const queues = scanQueuesSync(root).map((q) => ({
+	const queues = scanQueuesSync(root, paths.queuesDir).map((q) => ({
 		name: q.name,
 		bindingName: q.bindingName,
 		...q.maxBatchSize != null && { maxBatchSize: q.maxBatchSize },
 		...q.maxBatchTimeout != null && { maxBatchTimeout: q.maxBatchTimeout }
 	}));
-	const hasPages = existsSync(join(root, "pages"));
+	const hasPages = existsSync(paths.pagesDir);
 	const hasRoutes = routeScan.routes.length > 0;
+	const hasDocumentRoutes$1 = hasDocumentRoutes(routeScan.routes);
 	const hasMiddleware = routeScan.middleware.length > 0;
 	const hasWebSockets = webSockets.length > 0;
-	const isSsr = isFrameworkMode ? true : Boolean(validateSsrEntry(root)) || hasPages && deployConfig.output !== "static";
+	const isSsr = isFrameworkMode ? true : Boolean(validateSsrEntry(root, paths)) || hasPages && deployConfig.output !== "static";
 	const vcRevalidate = readConfig(root).routing?.revalidate;
 	let revalidate;
 	if (vcRevalidate != null) revalidate = vcRevalidate;
-	const pageScan = existsSync(join(root, "pages")) ? routeScan.pages.pages.length > 0 ? routeScan.pages : await scanPages(root, { output: deployConfig.output }) : null;
+	const pageScan = existsSync(paths.pagesDir) ? routeScan.pages.pages.length > 0 ? routeScan.pages : await scanPages(root, {
+		output: deployConfig.output,
+		paths
+	}) : null;
 	if (pageScan) {
 		const perPageRules = {};
 		for (const page of pageScan.pages) if (page.revalidate != null) perPageRules[page.pattern] = page.revalidate;
@@ -3024,10 +3105,11 @@ async function runFullDeploy(root, config, client, fwPreset, skipBuild, gitMetad
 	const assetConfig = resolveAssetConfig({
 		isSsr,
 		hasPages,
-		hasRoutes,
+		hasDocumentRoutes: hasDocumentRoutes$1,
 		hasMiddleware,
 		hasWebSockets,
-		authEnabled
+		authEnabled,
+		liveEnabled: liveConfig !== void 0
 	});
 	s.start("Checking for changes...");
 	cliLog?.info("preflight_start", { dir: clientDir });
@@ -3151,12 +3233,12 @@ function assertDeploySchemaDriftFree(root, dialect) {
 	process.exit(1);
 }
 function hasDeploySchemaDrift(root, dialect) {
-	if (!discoverSchema(root)) return false;
+	if (!discoverSchema(root, readProjectPaths(root))) return false;
 	const driftRoot = mkDeployDriftCheckRoot(root);
 	const driftProjectRoot = join(driftRoot, "project");
 	createDeployDriftProject(root, driftProjectRoot);
 	try {
-		const migrationsDir = join(driftProjectRoot, "db", "migrations");
+		const migrationsDir = readProjectPaths(driftProjectRoot).migrationsDir;
 		const before = snapshotDir(migrationsDir);
 		const output = runDrizzleKitGenerate(driftProjectRoot, writeDrizzleConfig(driftProjectRoot, dialect === "postgresql" ? "postgresql://dummy" : ":memory:", dialect));
 		const snapshotsEqual = migrationSnapshotsEqual(before, snapshotDir(migrationsDir));
@@ -3360,4 +3442,4 @@ function resolveWorkerDirName(distDir, fwPreset, buildCommand) {
 	throw new Error("deploy: Worker output not found. Expected dist/ssr/ or dist/rsc/.");
 }
 //#endregion
-export { isSandboxEnabled as C, SANDBOX_MIGRATION_TAG as S, normalizeWranglerCompatibilityFlags as _, prerenderPagesNode as a, resolveLiveBindingConfig as b, filterLoadedEnv as c, LIVE_MIGRATION_TAG as d, ensureWranglerCompat as f, nextDurableObjectMigrationTag as g, hasDurableObjectSqliteMigration as h, prerenderPages as i, resolveRemoteMode as l, ensureWranglerNodejsAlsFlag as m, resolveDistDir as n, DEFAULT_PROXY_URL as o, ensureWranglerCompatibilityDate as p, resolveWorkerDirName as r, STAGING_PROXY_URL as s, deploy_exports as t, stripInternalEnvKeys as u, readExistingLiveBindingConfig as v, resolveSandboxConfig as w, syncWranglerBindings as x, readWranglerCompat as y };
+export { isSandboxEnabled as C, resolveAssetRoutingPolicy as E, SANDBOX_MIGRATION_TAG as S, hasDocumentRoutes as T, normalizeWranglerCompatibilityFlags as _, prerenderPagesNode as a, resolveLiveBindingConfig as b, filterLoadedEnv as c, LIVE_MIGRATION_TAG as d, ensureWranglerCompat as f, nextDurableObjectMigrationTag as g, hasDurableObjectSqliteMigration as h, prerenderPages as i, resolveRemoteMode as l, ensureWranglerNodejsAlsFlag as m, resolveDistDir as n, DEFAULT_PROXY_URL as o, ensureWranglerCompatibilityDate as p, resolveWorkerDirName as r, STAGING_PROXY_URL as s, deploy_exports as t, stripInternalEnvKeys as u, readExistingLiveBindingConfig as v, resolveSandboxConfig as w, syncWranglerBindings as x, readWranglerCompat as y };

package/dist/{discover-CKGQpis8.mjs → discover-C8N1I4tK.mjs}

@@ -1,5 +1,6 @@
 import { n as __exportAll } from "./chunk-DJd-R1mw.mjs";
-import { a as join } from "./pathe.M-eThtNZ-D-kmWkCS.mjs";
+import { s as relative } from "./pathe.M-eThtNZ-BrPhGF_K.mjs";
+import { n as readProjectPaths } from "./project-paths-CCMrHYQm.mjs";
 import { existsSync, statSync } from "node:fs";
 //#region src/drizzle/discover.ts
 var discover_exports = /* @__PURE__ */ __exportAll({
@@ -15,13 +16,13 @@ var discover_exports = /* @__PURE__ */ __exportAll({
 *
 * Returns null if no schema is found.
 */
-function discoverSchema(root) {
-	const filePath = join(root, "db", "schema.ts");
+function discoverSchema(root, paths = readProjectPaths(root)) {
+	const filePath = paths.schemaFile;
 	if (existsSync(filePath) && statSync(filePath).isFile()) return {
 		type: "file",
 		path: filePath
 	};
-	const dirPath = join(root, "db", "schema");
+	const dirPath = paths.schemaDir;
 	if (existsSync(dirPath) && statSync(dirPath).isDirectory()) return {
 		type: "directory",
 		path: dirPath
@@ -33,8 +34,10 @@ function discoverSchema(root) {
 * - File: `"./db/schema.ts"`
 * - Directory: `"./db/schema/*.ts"`
 */
-function schemaSpecifier(location) {
-	return location.type === "file" ? "./db/schema.ts" : "./db/schema/*.ts";
+function schemaSpecifier(location, root) {
+	if (!root) return location.type === "file" ? "./db/schema.ts" : "./db/schema/*.ts";
+	const rel = relative(root, location.path).replace(/\\/g, "/");
+	return location.type === "file" ? `./${rel}` : `./${rel}/*.ts`;
 }
 //#endregion
 export { discover_exports as n, schemaSpecifier as r, discoverSchema as t };