void 1.1.0 → 1.1.12

package/dist/index.mjs

@@ -1,43 +1,43 @@
 import { n as __toESM } from "./rolldown-runtime-DXIUcv95.mjs";
-import { a as join, c as resolve, n as dirname, o as normalize, s as relative } from "./dist-ipQi0Q8y.mjs";
+import { a as join, c as resolve, i as isAbsolute, n as dirname, o as normalize, s as relative } from "./dist-ipQi0Q8y.mjs";
 import { t as require_picocolors } from "./picocolors-BTps1_gs.mjs";
-import { d as walk, l as inferBindingsFromSource, m as applyBindingOverrides, n as FRAMEWORK_SCAN_DIRS, t as DEFAULT_SCAN_DIRS, u as staticModuleReferences } from "./plugin-inference-DsARdQKE.mjs";
-import { n as readProjectPaths, t as assertNoRootSourceConventionConflicts } from "./project-paths-DMvEeSau.mjs";
-import { n as loadVoidAuthConfig } from "./config-D0GY5ItR.mjs";
-import { c as isNodeTarget, d as readConfig, s as getDatabaseDialect } from "./config-Bx_1SpnO.mjs";
+import { d as walk, l as inferBindingsFromSource, m as applyBindingOverrides, n as FRAMEWORK_SCAN_DIRS, t as DEFAULT_SCAN_DIRS, u as staticModuleReferences } from "./plugin-inference-Bekzjuqw.mjs";
+import { n as readProjectPaths, t as assertNoRootSourceConventionConflicts } from "./project-paths-DGu_QZ_Q.mjs";
+import { n as loadVoidAuthConfig } from "./config-CyUJzi3q.mjs";
+import { c as isNodeTarget, d as readConfig, s as getDatabaseDialect } from "./config-D26zcdKy.mjs";
 import { i as isMemberExpression, n as isIdentifier, r as isLiteral } from "./ast-CPGPjb0V.mjs";
 import { t as isRouteEnabledForEnvironment } from "./parse-filename-CUbj-1MP.mjs";
-import { a as hasSandboxSqliteMigration, c as sandboxContainerConfig, i as assertSandboxNamespaceConfig, n as DEFAULT_SANDBOX_CLASS_NAME, p as scanJobsSync, r as SANDBOX_MIGRATION_TAG, s as resolveSandboxConfig, t as analyzeApplicationSync, u as scanQueuesSync } from "./application-analysis-AB_YYWgH.mjs";
-import { a as validateSsrEntries, n as SSR_SERVER_ENTRY_RELATIVE_PATHS, o as validateSsrEntry, t as SSR_CLIENT_ENTRY_RELATIVE_PATHS } from "./entry-ehmBvs5w.mjs";
+import { a as hasSandboxSqliteMigration, c as sandboxContainerConfig, i as assertSandboxNamespaceConfig, n as DEFAULT_SANDBOX_CLASS_NAME, p as scanJobsSync, r as SANDBOX_MIGRATION_TAG, s as resolveSandboxConfig, t as analyzeApplicationSync, u as scanQueuesSync } from "./application-analysis-D7nNmNJb.mjs";
+import { a as validateSsrEntries, n as SSR_SERVER_ENTRY_RELATIVE_PATHS, o as validateSsrEntry, t as SSR_CLIENT_ENTRY_RELATIVE_PATHS } from "./entry-B_0IhV64.mjs";
 import { r as hasEmailHandlers } from "./email-BcjSyAL0.mjs";
+import { i as voidWarn, n as voidError, r as voidLog, t as setShowTimestamp } from "./log-vqY3pqwI.mjs";
 import { t as MagicString } from "./dist-Cegxq8gs.mjs";
-import { i as resolveLayoutIds } from "./scan-C0BMdmEd.mjs";
+import { i as resolveLayoutIds } from "./scan-D2-FcLHs.mjs";
 import { a as resolveDistDir, c as hasDocumentRoutes, n as collectRevalidate, o as resolveWorkerDirName, r as hasRevalidate, s as hasApiRoutes, t as collectPages, u as resolveAssetRoutingPolicy } from "./isr-config-fZaJJ8t7.mjs";
-import { i as voidWarn, n as voidError, r as voidLog, t as setShowTimestamp } from "./log-vqY3pqwI.mjs";
-import { n as mergeRoutingRules, t as lintRoutingPhases } from "./headers-Di1FsD3e.mjs";
+import { n as mergeRoutingRules, t as lintRoutingPhases } from "./headers-Bi4bOAwp.mjs";
 import { n as readDeploymentPlatform, r as readProjectConfig } from "./project-rqDnVsJN.mjs";
-import { a as restoreCloudflarePreviewPointer, r as materializeCloudflareConfig, s as stashCloudflareDeployPointer } from "./cloudflare-config-DV60XFFK.mjs";
-import { D as syncWranglerBindings, E as resolveLiveBindingConfig, O as syncWranglerDurableObjects, T as readWranglerWebSocketTombstones, a as LIVE_MIGRATION_TAG, d as ensureWranglerCompatibilityDate, f as ensureWranglerNodejsAlsFlag, g as normalizeWranglerCompatibilityFlags, h as nextDurableObjectMigrationTag, k as syncWranglerWebSockets, m as hasDurableObjectSqliteMigration, p as findBindingNameOwner, u as ensureWranglerCompat, v as readExistingLiveBindingConfig, x as readWranglerCompat } from "./wrangler-BYs07Rxy.mjs";
-import { n as writeLocalD1PersistState, t as resolveLocalD1Target } from "./local-d1-BxvQYEFi.mjs";
+import { a as restoreCloudflarePreviewPointer, r as materializeCloudflareConfig, s as stashCloudflareDeployPointer } from "./cloudflare-config-rdFOys4X.mjs";
+import { D as syncWranglerBindings, E as resolveLiveBindingConfig, O as syncWranglerDurableObjects, T as readWranglerWebSocketTombstones, a as LIVE_MIGRATION_TAG, b as readRootWranglerConfig, d as ensureWranglerCompatibilityDate, f as ensureWranglerNodejsAlsFlag, g as normalizeWranglerCompatibilityFlags, h as nextDurableObjectMigrationTag, k as syncWranglerWebSockets, m as hasDurableObjectSqliteMigration, p as findBindingNameOwner, u as ensureWranglerCompat, v as readExistingLiveBindingConfig, x as readWranglerCompat } from "./wrangler-C9XSzrju.mjs";
+import { n as writeLocalD1PersistState, t as resolveLocalD1Target } from "./local-d1-CpaPbd_L.mjs";
 import { n as scopedAccessCredentials } from "./cf-access-BM9G0lhO.mjs";
 import { n as ensurePlatformProxyAccess } from "./cf-access-CWP4avfP.mjs";
 import { a as getApiUrl, c as getToken, o as getProxyUrl } from "./auth-B6iOCjKI.mjs";
-import { m as printSuccess } from "./output-Ba6ZbrzY.mjs";
-import { r as writeFileIfChanged } from "./project-tsconfig-bveqhlYA.mjs";
-import { n as drizzlePlugin, t as generateQueueResolverSource } from "./dispatch-DrTTk8Xg.mjs";
+import { m as printSuccess } from "./output-CKguMgr7.mjs";
+import { r as writeFileIfChanged } from "./project-tsconfig-Itv1f4WC.mjs";
+import { n as drizzlePlugin, t as generateQueueResolverSource } from "./dispatch-BAbbn3jg.mjs";
 import { _ as parseCapturedMessage, a as DEV_INBOX_ENV_VAR, c as DEV_INBOX_TOKEN_ENV_VAR, f as clearDevBuffer, g as listDevMessages, l as DEV_INBOX_TOKEN_HEADER, m as findDevMessage, n as DEV_INBOX_ACK_VALUE, o as DEV_INBOX_MAX_CAPTURE_BYTES, s as DEV_INBOX_PREFIX, t as DEV_INBOX_ACK_HEADER, u as DEV_INBOX_TOKEN_QUERY, v as pushToDevBuffer } from "./dev-inbox-Rd6j_8vM.mjs";
 import { n as scanWranglerDotenvKeys } from "./dotenv-CNazY3-w.mjs";
 import { a as isClientEnvKey, c as resolveRemoteMode, i as findReservedEnvKeys, n as LOCAL_ENV_FILE, o as loadLocalEnv, r as findLegacyEnvFiles, s as reservedEnvKeysMessage } from "./env-BJjULvL0.mjs";
-import { n as findEnvFileForPaths, r as generateEnvTypes, t as findEnvFile } from "./env-types-DS2_y4X8.mjs";
+import { n as findEnvFileForPaths, r as generateEnvTypes, t as findEnvFile } from "./env-types-GRchm5dw.mjs";
 import { t as loadUserEnvFile } from "./load-user-env-DD5qveNU.mjs";
 import { n as INTERNAL_BINDING_PREFIXES, t as INTERNAL_BINDING_EXACT_NAMES } from "./env-raw-D74P4ebM.mjs";
 import { t as ASSET_EXTENSIONS } from "./routing-assets-VkrKIbxE.mjs";
-import { r as selectNativeVersionMetadataBinding, t as CLOUDFLARE_PRESERVE_BINDINGS_BUILD_ENV } from "./version-metadata-DIrqEHQo.mjs";
-import { f as prerenderPages, n as SEND_EMAIL_BINDING, p as prerenderPagesNode } from "./email-cloudflare-DfG6UEMm.mjs";
+import { r as selectNativeVersionMetadataBinding, t as CLOUDFLARE_PRESERVE_BINDINGS_BUILD_ENV } from "./version-metadata-B1Bm2wSq.mjs";
+import { f as prerenderPages, n as SEND_EMAIL_BINDING, p as prerenderPagesNode } from "./email-cloudflare-etpKiITL.mjs";
 import { r as defer } from "./validation-error-Dg9Recn1.mjs";
-import { i as safeJsonStringify } from "./protocol-RNP0u7UY.mjs";
-import { n as completeApplicationAnalysis } from "./application-routing-L7V-TFhZ.mjs";
-import { n as generateVoidAuthDrizzleSchema, t as generateVoidAuthDatabaseModule } from "./drizzle-CF84FOVM.mjs";
+import { i as safeJsonStringify } from "./protocol-bAUUkx70.mjs";
+import { n as completeApplicationAnalysis } from "./application-routing-CZH66gXn.mjs";
+import { n as generateVoidAuthDrizzleSchema, t as generateVoidAuthDatabaseModule } from "./drizzle-BQfyvQKX.mjs";
 import { n as generateQueueTypes, t as generateRouteTypes } from "./route-types-BZi26DVS.mjs";
 import { a as defineMiddleware, c as defineScheduled, i as defineHead, n as basicAuth, o as defineQueue, r as defineHandler, s as defineRender, t as VoidAssetRewriteError } from "./handler-BZ1t7-Rv.mjs";
 import module, { builtinModules, createRequire } from "node:module";
@@ -490,7 +490,7 @@ function readVoidDevCredentials(root) {
 */
 async function runAiSetupPrompt(root, token, apiUrl, server) {
 	const { select, text, isCancel, log } = await import("./dist-CfgIkieS.mjs");
-	const { PlatformClient } = await import("./client-B60PwCC4.mjs");
+	const { PlatformClient } = await import("./client-DAnfyMe9.mjs");
 	const { attachSelectedPlatform, writeProjectConfig } = await import("./project-zdB3fs9G.mjs");
 	const { inferDefaultSlug } = await import("./resolve-project-PnhzMtY6.mjs");
 	const client = new PlatformClient(token, { apiUrl });
@@ -519,7 +519,7 @@ async function runAiSetupPrompt(root, token, apiUrl, server) {
 	let slug;
 	if (result === "__create__") {
 		const { validateProjectSlug } = await import("./project-slug-6cyz8E7k.mjs");
-		const { createProjectWithSlugRetry } = await import("./create-project-B-ewF_Af.mjs");
+		const { createProjectWithSlugRetry } = await import("./create-project-CvuYDD-l.mjs");
 		let created;
 		try {
 			created = await createProjectWithSlugRetry(client, inferDefaultSlug(root), async (defaultSlug) => {
@@ -1645,9 +1645,9 @@ function writeFrameworkTriggersDispatch(root, devTriggerToken) {
 /**
 * Writes a real file at `<root>/.void/dev-triggers.ts` exporting
 * `handleDevTrigger(request, env, ctx)`. We use a real file (not a Vite
-* virtual module) because Nitro and Astro have their own server bundlers
-* that don't go through Vite's plugin pipeline. The framework injection
-* code imports this path at runtime to dispatch cron and queue handlers
+* virtual module) because Nitro has its own server bundler that doesn't go
+* through Vite's plugin pipeline. The framework injection code imports
+* this path at runtime to dispatch cron and queue handlers
 * with the framework adapter's real bindings.
 */
 function frameworkTriggersPlugin(root, options) {
@@ -2041,13 +2041,34 @@ function astroMiddlewareClaims() {
 	return store[ASTRO_MIDDLEWARE_CLAIMS] ??= /* @__PURE__ */ new Map();
 }
 /**
+* Whether the Astro app has middleware that Void did not write. Void cannot add its dev trigger
+* middleware then, so the wrapper around Astro's Cloudflare server entry answers the triggers.
+*/
+function hasOwnAstroMiddleware(root) {
+	const middlewarePath = join(root, ASTRO_MIDDLEWARE_RELATIVE);
+	if (existsSync(middlewarePath)) return !astroMiddlewareClaims().has(middlewarePath);
+	return existsSync(join(root, "src", "middleware", "index.ts"));
+}
+/** The Worker entry from the app's Cloudflare config, unless it is Astro's server entry. */
+function customAstroWorkerEntry(root) {
+	let main;
+	try {
+		main = readRootWranglerConfig(root)?.config.main;
+	} catch {
+		return;
+	}
+	return typeof main === "string" && !/^@astrojs\/cloudflare\/entrypoints\/server(?:\.js)?$/.test(main) ? main : void 0;
+}
+/**
 * Writes a tiny Astro middleware to the user's project so
 * `/__void/scheduled` and `/__void/queue` are intercepted inside Astro's
-* request pipeline, with bindings from `cloudflare:workers`.
+* request pipeline, with bindings from `cloudflare:workers`. Astro runs
+* middleware for a custom Worker entry too.
 *
 * Astro middleware lives at a single discoverable entry, so if the user
-* already has `src/middleware.ts` we don't overwrite it — instead we log a
-* one-shot snippet they can paste into their existing middleware.
+* already has `src/middleware.ts` we don't overwrite it. The wrapper around
+* Astro's Cloudflare server entry answers the triggers then. A custom Worker
+* entry can skip that server entry, so we warn when the app sets one.
 *
 * If we wrote the file we remove it when the last dev server using it closes,
 * so the user's source tree stays clean. `src/middleware.ts` belongs to the
@@ -2056,19 +2077,21 @@ function astroMiddlewareClaims() {
 */
 function astroDevTriggerInjectPlugin(root) {
 	const middlewarePath = join(root, ASTRO_MIDDLEWARE_RELATIVE);
-	const middlewareDirIndexPath = join(root, "src", "middleware", "index.ts");
 	const claims = astroMiddlewareClaims();
 	/** Whether the dev server being set up now holds the middleware Void wrote. */
 	const ensureFile = () => {
+		if (hasOwnAstroMiddleware(root)) {
+			const entry = customAstroWorkerEntry(root);
+			if (entry) voidWarn(`Your Astro app has its own middleware and its own Worker entry (${entry}).\n         In dev, /__void/scheduled and /__void/queue do not work if this entry calls
+         handle() from @astrojs/cloudflare/handler. To use them, call fetch() on the
+         default export of @astrojs/cloudflare/entrypoints/server instead.`);
+			return false;
+		}
 		const claim = claims.get(middlewarePath);
 		if (claim && existsSync(middlewarePath)) {
 			claim.servers++;
 			return true;
 		}
-		if (existsSync(middlewarePath) || existsSync(middlewareDirIndexPath)) {
-			voidWarn("Astro middleware already exists. To enable /__void/scheduled and /__void/queue,\n         add the Void dev-trigger middleware to your existing onRequest sequence.\n         See https://void.cloud/guide/jobs#local-development.");
-			return false;
-		}
 		mkdirSync(dirname(middlewarePath), { recursive: true });
 		writeFileSync(middlewarePath, astroMiddlewareSource(frameworkTriggersDispatchPath(root)));
 		if (claim) claim.servers++;
@@ -2104,7 +2127,7 @@ function astroDevTriggerInjectPlugin(root) {
 }
 //#endregion
 //#region src/router/compile.ts
-const ROUTE_URL_PATH = fileURLToPath(import.meta.resolve("#self/runtime/route-url"));
+const FETCH_SERVER_PATH = fileURLToPath(import.meta.resolve("#self/runtime/fetch-server"));
 const ROUTING_RUNTIME_PATH = fileURLToPath(import.meta.resolve("#self/runtime/routing"));
 function pushDefaultErrorPageHelpers(lines, options) {
 	lines.push(`const __errorRenderer = __createErrorRenderer(${JSON.stringify({
@@ -2873,68 +2896,17 @@ function compileHeaderMiddleware(lines, rules) {
 /** Generate the server-side fetch client, which calls `app.fetch()` with the current request's credentials. */
 function compileWorkerClient(authClientPath, nodeTarget = false) {
 	const envImport = nodeTarget ? "" : "import { env } from \"cloudflare:workers\";\n";
-	const dispatch = nodeTarget ? "const response = await app.fetch(request);" : "const executionCtx = store?.executionCtx ?? { waitUntil() {}, passThroughOnException() {} };\n  const response = await app.fetch(request, env, executionCtx);";
+	const dispatch = nodeTarget ? "app.fetch(request)" : "app.fetch(request, env, store?.executionCtx ?? { waitUntil() {}, passThroughOnException() {} })";
 	return `import app, { requestContext } from "virtual:void-routes";
-import { interpolateRouteParams } from ${JSON.stringify(ROUTE_URL_PATH)};
+import { createServerFetch } from ${JSON.stringify(FETCH_SERVER_PATH)};
+export { FetchError } from ${JSON.stringify(FETCH_SERVER_PATH)};
 ${envImport}export { auth, createAuthClient } from ${JSON.stringify(authClientPath)};
 
-export class FetchError extends Error {
-  constructor(status, statusText, data) {
-    super(\`fetch: Request failed with status \${status}.\`);
-    this.name = "FetchError";
-    this.status = status;
-    this.statusText = statusText;
-    this.data = data;
-  }
-}
-
-export async function fetch(path, options) {
-  let url = interpolateRouteParams(path, options?.params);
-
-  if (options?.query) {
-    const qs = new URLSearchParams(options.query).toString();
-    if (qs) url += "?" + qs;
-  }
-
-  const method = options?.method ?? "GET";
-  const headers = new Headers(options?.headers);
-
-  const store = requestContext.getStore();
-  if (store?.request) {
-    const outerReq = store.request;
-    if (!headers.has("cookie")) {
-      const cookie = outerReq.headers.get("cookie");
-      if (cookie) headers.set("cookie", cookie);
-    }
-    if (!headers.has("authorization")) {
-      const auth = outerReq.headers.get("authorization");
-      if (auth) headers.set("authorization", auth);
-    }
-  }
-
-  if (options?.body != null && !headers.has("content-type")) {
-    headers.set("content-type", "application/json");
-  }
-
-  const request = new Request("${nodeTarget ? "http://localhost" : "http://worker.local"}" + url, {
-    method,
-    headers,
-    body: options?.body != null ? JSON.stringify(options.body) : undefined,
-  });
-
-  ${dispatch}
-
-  if (response.status === 204) return undefined;
-
-  const contentType = response.headers.get("content-type") ?? "";
-  const data = contentType.includes("application/json") ? await response.json() : await response.text();
-
-  if (!response.ok) {
-    throw new FetchError(response.status, response.statusText, data);
-  }
-
-  return data;
-}
+export const fetch = createServerFetch(
+  (request, store) => ${dispatch},
+  () => requestContext.getStore(),
+  "${nodeTarget ? "http://localhost" : "http://worker.local"}",
+);
 `;
 }
 //#endregion
@@ -2947,15 +2919,32 @@ export async function fetch(path, options) {
 * (see `generateClassATriggerWrapper`). Production deploys go through
 * `cli/wrapper.ts` instead.
 */
-function getFrameworkEntry(framework, root, devTriggerToken, dialect, notFound) {
+function getFrameworkEntry(framework, root, devTriggerToken, dialect, notFound, configuredMain) {
 	const isBuild = isViteBuildOrPreview();
 	if (!isBuild) writeFrameworkTriggersDispatch(root, devTriggerToken);
-	return generateClassATriggerWrapper(root, framework, getOriginalFrameworkEntry(framework, root), isBuild, dialect, void 0, notFound);
+	return generateClassATriggerWrapper(root, framework, getOriginalFrameworkEntry(framework, root, configuredMain), isBuild, dialect, void 0, notFound);
+}
+const TANSTACK_SERVER_ENTRY = "@tanstack/react-start/server-entry";
+/**
+* Whether `main` names a file in the app rather than a package. A migrated TanStack config keeps
+* `main: "@tanstack/react-start/server-entry"`, and a package subpath may end in `.js`, so a
+* bare name counts as a file only when it exists in the app.
+*/
+function isFileEntry(root, main) {
+	if (main.startsWith(".") || isAbsolute(main)) return true;
+	return statSync(resolve(root, main), { throwIfNoEntry: false })?.isFile() === true;
 }
 /** The framework's own server entry, before our trigger wrapper. */
-function getOriginalFrameworkEntry(framework, root) {
+function getOriginalFrameworkEntry(framework, root, configuredMain) {
 	switch (framework) {
-		case "tanstack-start": return "@tanstack/react-start/server-entry";
+		case "tanstack-start": {
+			if (configuredMain === void 0 || configuredMain === TANSTACK_SERVER_ENTRY || configuredMain === `${TANSTACK_SERVER_ENTRY}.js`) return TANSTACK_SERVER_ENTRY;
+			if (typeof configuredMain !== "string" || configuredMain.trim() === "") throw new Error("config: cloudflare.main must be a non-empty Worker entry path.");
+			if (!isFileEntry(root, configuredMain)) return configuredMain;
+			const original = resolve(root, configuredMain);
+			if (original === resolve(root, ".void", "tanstack-start-trigger-wrapper.ts")) throw new Error("config: cloudflare.main cannot point to Void's generated framework wrapper.");
+			return original;
+		}
 		case "react-router": return generateReactRouterEntry(root);
 		case "vinext-app": return "vinext/server/app-router-entry";
 		case "vinext-pages": return generateVinextPagesEntry(root);
@@ -3007,6 +2996,7 @@ ${fetchBody}
   },`;
 	const body = `// @ts-nocheck — Auto-generated by Void ${isBuild ? "for vite build" : "in dev"}. Do NOT edit.
 import original from ${JSON.stringify(original)};
+export * from ${JSON.stringify(original)};
 ${scoped ? "import { withRuntimeEnv } from \"void/_env\";\n" : ""}
 export default {
   ...original,
@@ -3262,9 +3252,12 @@ function findDependencyClosure(name, fromDir) {
 function readDatabaseUrl(root) {
 	return loadLocalEnv(root).DATABASE_URL;
 }
-/** DATABASE_URL as Better Auth's local migrations read it: the shell before `.env`. */
+/**
+* DATABASE_URL as Better Auth's local migrations read it: the shell before `.env`. An empty
+* shell value counts as unset.
+*/
 function readAuthDatabaseUrl(root) {
-	return (process.env.DATABASE_URL ?? readDatabaseUrl(root)) || void 0;
+	return process.env.DATABASE_URL || readDatabaseUrl(root) || void 0;
 }
 /**
 * Vite plugin that runs local migrations on dev server startup.
@@ -3276,25 +3269,32 @@ function migrationPlugin(root, dialect, databaseId = "local", persistRoot = join
 		name: "void:migrations",
 		apply: "serve",
 		async configureServer(server) {
-			const migrationsDir = readProjectPaths(root).migrationsDir;
+			const paths = readProjectPaths(root);
+			const migrationsDir = paths.migrationsDir;
 			const hasSqlMigrations = existsSync(migrationsDir);
 			if (!hasSqlMigrations && !auth?.enabled) return;
 			const migrateAuth = async (databaseUrl) => {
-				const { runLocalVoidAuthMigrations } = await import("./node-cPadMgUO.mjs");
+				const { runLocalVoidAuthMigrations } = await import("./node-uN8_zxJr.mjs");
 				await runLocalVoidAuthMigrations(root, dialect, persistRoot, databaseId, auth?.configPath, databaseUrl);
 			};
 			const mysqlAuth = dialect === "mysql" && auth?.enabled === true;
 			const logApplied = (applied) => {
 				if (applied.length > 0) voidLog(`Applied ${applied.length} migration(s): ${applied.join(", ")}`);
 			};
+			const refuse = (err) => {
+				afterServerReady(server, () => {
+					console.log();
+					voidError(`${err instanceof Error ? err.message : String(err)}\nNo migrations were applied. Fix the files, then restart the dev server.`);
+				});
+			};
 			try {
 				if (dialect !== "sqlite") {
-					const { collectMigrations } = await import("./collect-Cae8A7Zr.mjs");
+					const { collectMigrations } = await import("./collect-BWhkgtAn.mjs");
 					const allMigrations = collectMigrations(migrationsDir);
 					const runFiles = dialect === "mysql" ? allMigrations.length > 0 : hasSqlMigrations;
 					const url = runFiles ? readDatabaseUrl(root) : void 0;
 					const authUrl = mysqlAuth ? readAuthDatabaseUrl(root) : void 0;
-					if (runFiles && !url || mysqlAuth && !authUrl) {
+					if (runFiles && !url || auth?.enabled && !readAuthDatabaseUrl(root)) {
 						afterServerReady(server, () => {
 							console.log();
 							voidError(`DATABASE_URL not found in .env — skipping ${dialect === "mysql" ? "MySQL" : "PostgreSQL"} migrations.`);
@@ -3303,29 +3303,30 @@ function migrationPlugin(root, dialect, databaseId = "local", persistRoot = join
 					}
 					const authWithFiles = authUrl !== void 0 && authUrl === url;
 					if (url) {
-						const { validateMigrations } = await import("./validate-BQFdf0Pi.mjs");
-						const appliedNames = dialect === "mysql" ? await import("./runner-mysql-DWwE8jKi.mjs").then((runner) => runner.getMySqlAppliedMigrations(url)) : await import("./runner-pg-_Xncr3H5.mjs").then((runner) => runner.getPgAppliedMigrations(url));
+						const { validateMigrations } = await import("./validate-D7Wn8PUX.mjs");
+						const appliedNames = dialect === "mysql" ? await import("./runner-mysql-BcHnLUuM.mjs").then((runner) => runner.getMySqlAppliedMigrations(url)) : await import("./runner-pg-Cgp-cr_p.mjs").then((runner) => runner.getPgAppliedMigrations(url));
 						const appliedSet = new Set(appliedNames);
 						const pending = allMigrations.filter((migration) => !appliedSet.has(migration.name));
 						if (pending.length > 0) try {
 							validateMigrations(pending);
 						} catch (err) {
-							voidWarn(err instanceof Error ? err.message : String(err));
+							refuse(err);
+							return;
 						}
-						const applied = dialect === "mysql" ? await import("./runner-mysql-DWwE8jKi.mjs").then((runner) => runner.runMySqlMigrations(migrationsDir, url, authWithFiles ? async (names) => {
+						const applied = dialect === "mysql" ? await import("./runner-mysql-BcHnLUuM.mjs").then((runner) => runner.runMySqlMigrations(migrationsDir, url, authWithFiles ? async (names) => {
 							logApplied(names);
 							await migrateAuth(url);
-						} : void 0)) : await import("./runner-pg-_Xncr3H5.mjs").then((runner) => runner.runPgMigrations(migrationsDir, url));
+						} : void 0)) : await import("./runner-pg-Cgp-cr_p.mjs").then((runner) => runner.runPgMigrations(migrationsDir, url));
 						if (!authWithFiles) logApplied(applied);
 					}
 					if (authUrl && !authWithFiles) {
-						const { withMySqlMigrationLockAt } = await import("./runner-mysql-DWwE8jKi.mjs");
+						const { withMySqlMigrationLockAt } = await import("./runner-mysql-BcHnLUuM.mjs");
 						await withMySqlMigrationLockAt(authUrl, () => migrateAuth(authUrl));
 					}
 				} else if (hasSqlMigrations) {
-					const { runMigrations, getMiniflareDatabasePath, getAppliedMigrations } = await import("./runner-So9mYfcm.mjs");
-					const { collectMigrations } = await import("./collect-Cae8A7Zr.mjs");
-					const { validateMigrations } = await import("./validate-BQFdf0Pi.mjs");
+					const { runMigrations, getMiniflareDatabasePath, getAppliedMigrations } = await import("./runner-WCdfeI0q.mjs");
+					const { collectMigrations } = await import("./collect-BWhkgtAn.mjs");
+					const { validateMigrations } = await import("./validate-D7Wn8PUX.mjs");
 					const dbPath = getMiniflareDatabasePath(persistRoot, databaseId);
 					const allMigrations = collectMigrations(migrationsDir);
 					const appliedRows = await getAppliedMigrations(dbPath);
@@ -3334,9 +3335,10 @@ function migrationPlugin(root, dialect, databaseId = "local", persistRoot = join
 					if (pending.length > 0) try {
 						validateMigrations(pending);
 					} catch (err) {
-						voidWarn(err instanceof Error ? err.message : String(err));
+						refuse(err);
+						return;
 					}
-					const applied = await runMigrations(migrationsDir, dbPath);
+					const applied = await runMigrations(migrationsDir, dbPath, paths.sourceRelative);
 					if (applied.length > 0) voidLog(`Applied ${applied.length} migration(s): ${applied.join(", ")}`);
 				}
 				if (auth?.enabled) {
@@ -3631,27 +3633,38 @@ function createFrameworkPlugins(input) {
 			return injectSvelteKitHooks(code, id, frameworkTriggersDispatchPath(root));
 		}
 	};
-	const astroRequestScopePlugin = detected.name === "astro" && dialect !== "sqlite" ? {
-		name: "void:astro-request-scope",
+	const scopeAstroRequests = dialect !== "sqlite";
+	let astroDevTriggers = false;
+	const astroServerEntryPlugin = detected.name === "astro" ? {
+		name: "void:astro-server-entry",
 		enforce: "pre",
+		configResolved(resolvedConfig) {
+			astroDevTriggers = resolvedConfig.command === "serve" && hasOwnAstroMiddleware(root);
+		},
 		resolveId: {
 			filter: { id: /^@astrojs\/cloudflare\/entrypoints\/server(?:\.js)?$/ },
 			handler(_id, importer) {
-				if (importer === ASTRO_SCOPED_SERVER_ENTRY || this.environment?.name === "client") return;
+				if (!scopeAstroRequests && !astroDevTriggers || importer === ASTRO_SCOPED_SERVER_ENTRY || this.environment?.name === "client") return;
 				return ASTRO_SCOPED_SERVER_ENTRY;
 			}
 		},
 		load: {
 			filter: { id: /^\0void:astro-server-entry$/ },
 			handler() {
-				return `import original from ${JSON.stringify(ASTRO_SERVER_ENTRY)};
-import { withRuntimeEnv } from ${JSON.stringify(envModuleFile)};
+				const imports = [
+					`import original from ${JSON.stringify(ASTRO_SERVER_ENTRY)};`,
+					...scopeAstroRequests ? [`import { withRuntimeEnv } from ${JSON.stringify(envModuleFile)};`] : [],
+					...astroDevTriggers ? [`import { handleDevTrigger } from ${JSON.stringify(frameworkTriggersDispatchPath(root))};`] : []
+				];
+				const handle = astroDevTriggers ? "async () => (await handleDevTrigger(request, env, ctx)) ?? original.fetch(request, env, ctx)" : "() => original.fetch(request, env, ctx)";
+				return `${imports.join("\n")}
 export * from ${JSON.stringify(ASTRO_SERVER_ENTRY)};
 
 export default {
   ...original,
   fetch(request, env, ctx) {
-    return withRuntimeEnv(env, () => original.fetch(request, env, ctx));
+    const handle = ${handle};
+    return ${scopeAstroRequests ? "withRuntimeEnv(env, handle)" : "handle()"};
   },
 };
 `;
@@ -3694,7 +3707,7 @@ export default {
 		wranglerCompatPlugin,
 		wranglerSyncPlugin,
 		...nuxtVite8WebSocketCompatPlugin ? [nuxtVite8WebSocketCompatPlugin] : [],
-		...astroRequestScopePlugin ? [astroRequestScopePlugin] : [],
+		...astroServerEntryPlugin ? [astroServerEntryPlugin] : [],
 		svelteKitHooksInjectPlugin,
 		...svelteKitWorkerBuildPlugin ? [svelteKitWorkerBuildPlugin] : [],
 		clientStubsPlugin,
@@ -4456,7 +4469,7 @@ function routingPlugin(root, options) {
 			if (!options.target) {
 				const migrationsDir = paths.migrationsDir;
 				if (existsSync(migrationsDir) || compileOptions.auth) {
-					const { collectMigrations } = await import("./collect-Cae8A7Zr.mjs");
+					const { collectMigrations } = await import("./collect-BWhkgtAn.mjs");
 					const { buildMigrationPlanBundle } = await import("./plan-CKX_jWnD.mjs");
 					const migrations = existsSync(migrationsDir) ? collectMigrations(migrationsDir) : [];
 					const dialect = getDatabaseDialect(readConfig(root));
@@ -5163,7 +5176,7 @@ function voidPlugin(options) {
 		}
 	};
 	if (framework) {
-		workerConfig.main = getFrameworkEntry(framework, root, devTriggerToken, dialect, config.routing?.notFound);
+		workerConfig.main = getFrameworkEntry(framework, root, devTriggerToken, dialect, config.routing?.notFound, config.cloudflare?.main);
 		let notFoundIgnoredWarned = false;
 		const frameworkBuildWrapperPlugin = {
 			name: "void:framework-build-wrapper",
@@ -5173,7 +5186,7 @@ function voidPlugin(options) {
 					notFoundIgnoredWarned = true;
 					voidWarn(`Void generates no asset routing policy for a ${framework} build, so "routing.notFound" in void.config.ts is not written to the built worker config. During a self-hosted build and direct Cloudflare deployment, it takes effect only if your own Cloudflare config declares a complete \`assets\` policy (\`binding\`, \`directory\`, \`not_found_handling\`, \`run_worker_first\`); otherwise Cloudflare's default applies. Managed \`void deploy\` supplies the policy for you.`);
 				}
-				generateClassATriggerWrapper(root, framework, getOriginalFrameworkEntry(framework, root), true, dialect, resolved.build.assetsDir, config.routing?.notFound);
+				generateClassATriggerWrapper(root, framework, getOriginalFrameworkEntry(framework, root, config.cloudflare?.main), true, dialect, resolved.build.assetsDir, config.routing?.notFound);
 			}
 		};
 		const existingFlags = workerConfig.compatibility_flags ?? [];

package/dist/{info-l249eUdH.mjs → info-Bxunp14X.mjs}

@@ -1,8 +1,8 @@
 import { a as join, s as relative } from "./dist-ipQi0Q8y.mjs";
-import { a as deriveWebSocketClassNameFromName, o as inferWebSocketResourceName } from "./plugin-inference-DsARdQKE.mjs";
-import { d as readConfig } from "./config-Bx_1SpnO.mjs";
-import { d as deriveDurableResourceIdentity, f as inferDurableResourceName, t as analyzeApplicationSync } from "./application-analysis-AB_YYWgH.mjs";
-import { n as VOID_LOCK_FILE } from "./cloudflare-config-DV60XFFK.mjs";
+import { a as deriveWebSocketClassNameFromName, o as inferWebSocketResourceName } from "./plugin-inference-Bekzjuqw.mjs";
+import { d as readConfig } from "./config-D26zcdKy.mjs";
+import { d as deriveDurableResourceIdentity, f as inferDurableResourceName, t as analyzeApplicationSync } from "./application-analysis-D7nNmNJb.mjs";
+import { n as VOID_LOCK_FILE } from "./cloudflare-config-rdFOys4X.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { isRecord } from "@void/deploy-core";
 //#region src/cli/info.ts

package/dist/{init-D0A6M64Q.mjs → init-DGFQMnbk.mjs}

@@ -1,28 +1,28 @@
 import { a as join, c as resolve, i as isAbsolute, n as dirname, s as relative, t as basename } from "./dist-ipQi0Q8y.mjs";
-import { r as detectFramework } from "./plugin-inference-DsARdQKE.mjs";
-import { n as readProjectPaths, o as TYPED_CONFIG_FILE } from "./project-paths-DMvEeSau.mjs";
-import { d as readConfig, s as getDatabaseDialect } from "./config-Bx_1SpnO.mjs";
+import { r as detectFramework } from "./plugin-inference-Bekzjuqw.mjs";
+import { n as readProjectPaths, o as TYPED_CONFIG_FILE } from "./project-paths-DGu_QZ_Q.mjs";
+import { d as readConfig, s as getDatabaseDialect } from "./config-D26zcdKy.mjs";
 import { t as MagicString } from "./dist-Cegxq8gs.mjs";
 import { c as writeDeploymentPlatform, n as readDeploymentPlatform, r as readProjectConfig, t as attachSelectedPlatform, u as writeProjectConfig } from "./project-rqDnVsJN.mjs";
-import { r as materializeCloudflareConfig } from "./cloudflare-config-DV60XFFK.mjs";
-import { i as LATEST_KNOWN_COMPAT_DATE, j as writeProvisionedWranglerConfig } from "./wrangler-BYs07Rxy.mjs";
+import { r as materializeCloudflareConfig } from "./cloudflare-config-rdFOys4X.mjs";
+import { i as LATEST_KNOWN_COMPAT_DATE, j as writeProvisionedWranglerConfig } from "./wrangler-C9XSzrju.mjs";
 import { i as readPackageJson, n as hasPackageDependency } from "./package-json-BjYqR-So.mjs";
 import { c as getToken } from "./auth-B6iOCjKI.mjs";
 import { A as confirm, K as select, L as log, O as cancel, X as text, tt as isCancel } from "./dist-BVdsO7Py.mjs";
-import { l as formatUrl, m as printSuccess, p as note } from "./output-Ba6ZbrzY.mjs";
-import { n as ensureProjectTsconfig, t as createProjectTsconfig } from "./project-tsconfig-bveqhlYA.mjs";
+import { l as formatUrl, m as printSuccess, p as note } from "./output-CKguMgr7.mjs";
+import { n as ensureProjectTsconfig, t as createProjectTsconfig } from "./project-tsconfig-Itv1f4WC.mjs";
 import { t as parseDotenvFile } from "./dotenv-CNazY3-w.mjs";
-import { r as writeDrizzleConfig, t as PLACEHOLDER_DB_URL } from "./config-BEm9vRvS.mjs";
+import { r as writeDrizzleConfig, t as PLACEHOLDER_DB_URL } from "./config-DC5llZaI.mjs";
 import { n as getOwnVersion, r as getPackageDir, t as detectAgents } from "./agents-CuNtT0D_.mjs";
-import { r as PlatformClient } from "./client-DM9Kcf4e.mjs";
-import { a as promptProjectSelection, r as promptAndCreateProject } from "./create-project-yInGo72M.mjs";
-import { s as formatProjectCommand } from "./cloudflare-process-CeDWJRhj.mjs";
+import { r as PlatformClient } from "./client-BdzxubTS.mjs";
+import { a as promptProjectSelection, r as promptAndCreateProject } from "./create-project-D8jQTwVQ.mjs";
+import { s as formatProjectCommand } from "./cloudflare-process-CZJ4viYl.mjs";
 import { i as hasLocalLockfile, n as drizzleKitBin, r as findInstalledYarnPnpRuntime, t as buildDrizzleKitSpawnEnv } from "./yarn-pnp-DLbEFMT0.mjs";
-import { t as promptForLoginToken } from "./login-C2T1oVG-.mjs";
-import { i as saveDiscoveredPlatform, t as discoverPlatform } from "./platform-cmd-DaAOiWTl.mjs";
-import { t as connectCloudflare } from "./cloudflare-connect-WjwnVOJA.mjs";
-import { n as snapshotDrizzleOutputs } from "./generate-Dat0UTry.mjs";
-import { i as writeVoidProjectConfig, o as migrateFrameworkAdapterPaths, r as canRewriteVoidProjectConfig, t as migrateLegacyVoidConfig } from "./migrate-BDIprOYd.mjs";
+import { t as promptForLoginToken } from "./login-f2eu2TQh.mjs";
+import { i as saveDiscoveredPlatform, t as discoverPlatform } from "./platform-cmd-CX7phm7V.mjs";
+import { t as connectCloudflare } from "./cloudflare-connect-BN-k2kD-.mjs";
+import { n as snapshotDrizzleOutputs } from "./generate-B1m4Cm4n.mjs";
+import { i as writeVoidProjectConfig, o as migrateFrameworkAdapterPaths, r as canRewriteVoidProjectConfig, t as migrateLegacyVoidConfig } from "./migrate-DYfdWBXt.mjs";
 import { createRequire } from "node:module";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { parseSync } from "vite";
@@ -2318,15 +2318,27 @@ function setupExistingProject(root, framework) {
 	ensureExistingProjectViteConfig(root, framework);
 	return dependencyAdded;
 }
-/**
-* Scaffolds the "SQL → types → handler → fetch" demo into an existing project.
-* `setupExistingProject` has already declared `void` in `package.json`.
-*/
-function scaffoldDemo(root) {
-	const devCommand = getDevCommand(root);
-	const paths = readProjectPaths(root);
-	mkdirSync(paths.dbDir, { recursive: true });
-	writeFileSync(paths.schemaFile, `import { sql } from "void/db";
+/** The demo `posts` table for the database dialect that init configured. */
+function demoSchemaSource(dialect) {
+	if (dialect === "postgresql") return `import { pgTable, serial, text, timestamp } from "void/schema-pg";
+
+export const posts = pgTable("posts", {
+  id: serial("id").primaryKey(),
+  title: text("title").notNull(),
+  body: text("body").notNull(),
+  createdAt: timestamp("created_at").notNull().defaultNow(),
+});
+`;
+	if (dialect === "mysql") return `import { int, mysqlTable, text, timestamp } from "void/schema-mysql";
+
+export const posts = mysqlTable("posts", {
+  id: int("id").autoincrement().primaryKey(),
+  title: text("title").notNull(),
+  body: text("body").notNull(),
+  createdAt: timestamp("created_at").notNull().defaultNow(),
+});
+`;
+	return `import { sql } from "void/db";
 import { integer, sqliteTable, text } from "void/schema-d1";
 
 export const posts = sqliteTable("posts", {
@@ -2335,7 +2347,17 @@ export const posts = sqliteTable("posts", {
   body: text("body").notNull(),
   createdAt: text("created_at").notNull().default(sql\`(datetime('now'))\`),
 });
-`);
+`;
+}
+/**
+* Scaffolds the "SQL → types → handler → fetch" demo into an existing project.
+* `setupExistingProject` has already declared `void` in `package.json`.
+*/
+function scaffoldDemo(root, dialect) {
+	const devCommand = getDevCommand(root);
+	const paths = readProjectPaths(root);
+	mkdirSync(paths.dbDir, { recursive: true });
+	writeFileSync(paths.schemaFile, demoSchemaSource(dialect));
 	log.step("Created db/schema.ts");
 	mkdirSync(join(paths.routesDir, "api"), { recursive: true });
 	writeFileSync(join(paths.routesDir, "api", "posts.ts"), `import { defineHandler } from "void";
@@ -2495,14 +2517,15 @@ async function runInitCommand(root, initArgs) {
 				process.exit(0);
 			}
 			if (scaffold) {
-				scaffoldDemo(root);
+				const demoDialect = getDatabaseDialect(readConfig(root));
+				scaffoldDemo(root, demoDialect);
 				const voidResolvable = isVoidResolvableFrom(root);
 				const deferral = resolveWorkspaceDeferral(root, readPackageJson(root));
 				if (deferral && !voidResolvable) {
 					const relRoot = relative(deferral.workspaceRoot, root) || ".";
 					note(`Scaffolded the starter demo in ./${relRoot}.\n\nRun your workspace install from ${deferral.workspaceRoot} to pick up the new \`void\` dep,\nthen run \`void db generate\` from ./${relRoot} to create the initial migration.`, "Workspace subpackage");
 				}
-				scaffoldedStarterMode = "sqlite";
+				scaffoldedStarterMode = demoDialect;
 			}
 		}
 	}

package/dist/{link-WMoJFf4i.mjs → link-CwrfpjIM.mjs}

@@ -1,9 +1,9 @@
 import { r as readProjectConfig, t as attachSelectedPlatform, u as writeProjectConfig } from "./project-rqDnVsJN.mjs";
 import { c as getToken, s as getSiteDomain } from "./auth-B6iOCjKI.mjs";
 import { H as outro, L as log, O as cancel } from "./dist-BVdsO7Py.mjs";
-import { f as import_picocolors, m as printSuccess } from "./output-Ba6ZbrzY.mjs";
-import { r as PlatformClient } from "./client-DM9Kcf4e.mjs";
-import { a as promptProjectSelection, r as promptAndCreateProject } from "./create-project-yInGo72M.mjs";
+import { f as import_picocolors, m as printSuccess } from "./output-CKguMgr7.mjs";
+import { r as PlatformClient } from "./client-BdzxubTS.mjs";
+import { a as promptProjectSelection, r as promptAndCreateProject } from "./create-project-D8jQTwVQ.mjs";
 import { a as resolveProjectBySlug } from "./resolve-project-WpwkCB_c.mjs";
 //#region src/cli/link.ts
 function projectLabel(slug, root, url) {