void 1.1.0 → 1.1.11

package/dist/{gen-CufHEf42.mjs → gen-Bj6ZkOcI.mjs}

@@ -1,14 +1,13 @@
 import { a as join, n as dirname, s as relative } from "./dist-ipQi0Q8y.mjs";
-import { n as readProjectPaths } from "./project-paths-DMvEeSau.mjs";
-import { d as readConfig, s as getDatabaseDialect } from "./config-Bx_1SpnO.mjs";
-import { n as readJournal, t as collectMigrations } from "./collect-xjffdCdk.mjs";
+import { n as readProjectPaths } from "./project-paths-DGu_QZ_Q.mjs";
+import { d as readConfig, s as getDatabaseDialect } from "./config-D26zcdKy.mjs";
+import { n as readJournal, t as collectMigrations } from "./collect-Dew86qce.mjs";
 import { K as select, L as log, O as cancel, tt as isCancel } from "./dist-BVdsO7Py.mjs";
 import { m as printSuccess } from "./output-Ba6ZbrzY.mjs";
-import { n as ensureProjectTsconfig } from "./project-tsconfig-bveqhlYA.mjs";
-import { r as writeDrizzleConfig, t as PLACEHOLDER_DB_URL } from "./config-BEm9vRvS.mjs";
-import { t as assertJournalCoherence } from "./validate-CheZGRE7.mjs";
+import { r as writeDrizzleConfig, t as PLACEHOLDER_DB_URL } from "./config-DC5llZaI.mjs";
+import { t as assertJournalCoherence } from "./validate-CnZPMq4q.mjs";
 import { n as drizzleKitBin, t as buildDrizzleKitSpawnEnv } from "./yarn-pnp-DLbEFMT0.mjs";
-import { n as snapshotDrizzleOutputs } from "./generate-Dat0UTry.mjs";
+import { n as snapshotDrizzleOutputs } from "./generate-B1m4Cm4n.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 //#region src/cli/gen.ts
@@ -330,7 +329,8 @@ async function runModel(root, name, columns) {
 		const existing = readFileSync(barrelPath, "utf-8");
 		if (!existing.includes(exportLine)) writeFileSync(barrelPath, existing.trimEnd() + "\n" + exportLine + "\n");
 	} else writeFileSync(barrelPath, exportLine + "\n");
-	ensureProjectTsconfig(root, void 0, true, true, { paths });
+	const { prepareProject } = await import("./prepare-EVEbQ9n2.mjs");
+	await prepareProject(root);
 	log.step(`Created ${relative(root, modelPath)}`);
 	log.step(`Updated ${relative(root, barrelPath)}`);
 	writeIfNotExists(join(paths.routesDir, "api", name, "index.ts"), generateIndexRoute(name, columns, validator));
@@ -338,28 +338,34 @@ async function runModel(root, name, columns) {
 	printSuccess("Model scaffolding complete. Run `void db push` to apply.");
 }
 function runMigration(root, name) {
-	const migrationsDir = readProjectPaths(root).migrationsDir;
+	const paths = readProjectPaths(root);
+	const migrationsDir = paths.migrationsDir;
+	const dir = paths.sourceRelative("db/migrations");
 	mkdirSync(migrationsDir, { recursive: true });
 	const currentMigrations = collectMigrations(migrationsDir);
 	try {
-		assertJournalCoherence(migrationsDir, currentMigrations);
+		assertJournalCoherence(migrationsDir, currentMigrations, paths.sourceRelative);
 	} catch (err) {
 		log.error(err instanceof Error ? err.message : String(err));
 		process.exit(1);
 	}
 	const bundlePath = join(migrationsDir, "migrations.js");
 	if (existsSync(bundlePath)) {
-		log.error("Your project uses Drizzle's bundled migration format (db/migrations/migrations.js).\n`void gen migration` cannot add custom hand-written migrations to a bundled project\nbecause the bundle must be regenerated by drizzle-kit.\n\nEither run `drizzle-kit generate` to regenerate the bundle, or migrate away from\nbundled mode by deleting db/migrations/migrations.js and re-running `void db generate`.");
+		log.error(`Your project uses Drizzle's bundled migration format (${dir}/migrations.js).\n\`void gen migration\` cannot add custom hand-written migrations to a bundled project
+because the bundle must be regenerated by drizzle-kit.
+
+Either run \`drizzle-kit generate\` to regenerate the bundle, or migrate away from
+bundled mode by deleting ${dir}/migrations.js and re-running \`void db generate\`.`);
 		process.exit(1);
 	}
-	const existingJournal = readJournal(migrationsDir);
+	const existingJournal = readJournal(migrationsDir, paths.sourceRelative);
 	if (existingJournal !== void 0 && existingJournal.entries.length > 0) {
 		const lastEntry = existingJournal.entries[existingJournal.entries.length - 1];
 		const metaDir = join(migrationsDir, "meta");
 		const lastSnapshotPrefix = lastEntry.tag.split("_")[0];
 		const prevSnapshotPath = join(metaDir, `${lastSnapshotPrefix}_snapshot.json`);
 		if (!existsSync(prevSnapshotPath)) {
-			log.error(`db/migrations/meta/_journal.json's last entry is \`${lastEntry.tag}\` but the matching snapshot \`${lastSnapshotPrefix}_snapshot.json\` is missing under meta/.`);
+			log.error(`${dir}/meta/_journal.json's last entry is \`${lastEntry.tag}\` but the matching snapshot \`${lastSnapshotPrefix}_snapshot.json\` is missing under meta/.`);
 			log.error("Restore the snapshot from version control, or regenerate migrations with `void db generate` before running `void gen migration`.");
 			process.exit(1);
 		}
@@ -370,14 +376,14 @@ function runMigration(root, name) {
 		else if (existingJournal.dialect === "postgresql") journalDialect = "postgresql";
 		else if (existingJournal.dialect === "mysql") journalDialect = "mysql";
 		else {
-			log.error(`db/migrations/meta/_journal.json has an unsupported dialect: \`${existingJournal.dialect}\`.`);
-			log.error("void supports `sqlite`, `postgresql`, and `mysql` only. Restore the journal from version control, or drop db/migrations/ and regenerate from scratch.");
+			log.error(`${dir}/meta/_journal.json has an unsupported dialect: \`${existingJournal.dialect}\`.`);
+			log.error(`void supports \`sqlite\`, \`postgresql\`, and \`mysql\` only. Restore the journal from version control, or drop ${dir}/ and regenerate from scratch.`);
 			process.exit(1);
 		}
 		const configDialect = getDatabaseDialect(readConfig(root));
 		if (configDialect !== journalDialect) {
-			log.error(`db/migrations/meta/_journal.json was generated for ${journalDialect}, but void.config.ts is configured for ${configDialect}.`);
-			log.error(`Generating a new custom migration now would append a snapshot in the wrong dialect. Revert void.config.ts's \`database\` field to ${journalDialect}, or drop db/migrations/ and regenerate from scratch.`);
+			log.error(`${dir}/meta/_journal.json was generated for ${journalDialect}, but void.config.ts is configured for ${configDialect}.`);
+			log.error(`Generating a new custom migration now would append a snapshot in the wrong dialect. Revert void.config.ts's \`database\` field to ${journalDialect}, or drop ${dir}/ and regenerate from scratch.`);
 			process.exit(1);
 		}
 		const authSchemaPath = join(root, ".void", "better-auth-schema.ts");
@@ -404,12 +410,12 @@ function runMigration(root, name) {
 				`Failed to run \`drizzle-kit generate --custom --name ${name}\`.`,
 				...detail ? [detail] : [],
 				"",
-				"This is usually a schema-compilation error. Fix any TypeScript errors in db/schema.ts and try again."
+				`This is usually a schema-compilation error. Fix any TypeScript errors in ${paths.sourceRelative("db/schema.ts")} and try again.`
 			].join("\n"));
 			process.exit(1);
 		}
 		const newSqlFile = readdirSync(migrationsDir).filter((f) => f.endsWith(".sql")).find((f) => !sqlFilesBefore.has(f));
-		if (newSqlFile) log.step(`Created db/migrations/${newSqlFile}`);
+		if (newSqlFile) log.step(`Created ${dir}/${newSqlFile}`);
 		printSuccess("Migration created and journal updated.");
 		return;
 	}

package/dist/gen-DsCukhuw.mjs

@@ -0,0 +1 @@
+export { r as runGenCommand } from "./gen-Bj6ZkOcI.mjs";

package/dist/{generate-Dat0UTry.mjs → generate-B1m4Cm4n.mjs}

@@ -1,5 +1,5 @@
 import { a as join, n as dirname } from "./dist-ipQi0Q8y.mjs";
-import { t as collectMigrations } from "./collect-xjffdCdk.mjs";
+import { t as collectMigrations } from "./collect-Dew86qce.mjs";
 import { n as openMigrationValidationDatabase } from "./sqlite-validation-BzKMWnO4.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 //#region src/drizzle/generate.ts

package/dist/{generate-ClI89brV.mjs → generate-DkEb9rL-.mjs}

@@ -1 +1 @@
-export { t as generateValidatedSqliteMigrations } from "./generate-Dat0UTry.mjs";
+export { t as generateValidatedSqliteMigrations } from "./generate-B1m4Cm4n.mjs";

package/dist/{github-cmd-FU8EjFyU.mjs → github-cmd-DQDryS-5.mjs}

@@ -2,7 +2,7 @@ import { r as readProjectConfig } from "./project-rqDnVsJN.mjs";
 import { c as getToken, n as createCodeChallenge, r as createCodeVerifier, t as awaitBrowserCallback, u as openBrowser } 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 { f as import_picocolors, l as formatUrl, m as printSuccess } from "./output-Ba6ZbrzY.mjs";
-import { c as platformErrorMessage, n as PlatformApiError, r as PlatformClient, s as parsePlatformErrorBody } from "./client-DM9Kcf4e.mjs";
+import { c as platformErrorMessage, n as PlatformApiError, r as PlatformClient, s as parsePlatformErrorBody } from "./client-GuSO3v_x.mjs";
 import { a as resolveProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-WpwkCB_c.mjs";
 import { t as collectGitDeployMetadata } from "./git-metadata-D-gurjzG.mjs";
 import { randomBytes } from "node:crypto";

package/dist/{headers-Di1FsD3e.mjs → headers-Bi4bOAwp.mjs}

@@ -1,5 +1,5 @@
 import { a as join } from "./dist-ipQi0Q8y.mjs";
-import { a as convertRewritesConfig, i as convertRedirectsConfig, l as isProtocolRelative, n as convertFallbacksConfig, o as countSplats, r as convertHeadersConfig, t as VALID_REDIRECT_STATUSES, u as parseHostPrefixedSource } from "./config-Bx_1SpnO.mjs";
+import { a as convertRewritesConfig, i as convertRedirectsConfig, l as isProtocolRelative, n as convertFallbacksConfig, o as countSplats, r as convertHeadersConfig, t as VALID_REDIRECT_STATUSES, u as parseHostPrefixedSource } from "./config-D26zcdKy.mjs";
 import { i as voidWarn } from "./log-vqY3pqwI.mjs";
 import { existsSync, readFileSync } from "node:fs";
 //#region src/cli/headers.ts

package/dist/{help-BT2hovNI.mjs → help-D49SL_lN.mjs}

@@ -178,6 +178,10 @@ const HELP_TREE = {
 				command: "--require-email",
 				description: "Fail instead of deploying without email when the mail domain is not set up (with --platform cloudflare)"
 			},
+			{
+				command: "--provision",
+				description: "Run resource provisioning again, for example to enable D1 read replication (with --platform cloudflare)"
+			},
 			{
 				command: "--atomic",
 				description: "Publish a Durable Object Worker without pre-traffic staging (Cloudflare only)"
@@ -712,7 +716,7 @@ const HELP_TREE = {
 					},
 					{
 						command: "--keep-zone",
-						description: "Explicitly retain an installer-created zone"
+						description: "Deprecated. Has no effect: uninstall always keeps zones"
 					}
 				]
 			}
@@ -768,7 +772,7 @@ const HELP_TREE = {
 			},
 			{
 				command: "purge-cache",
-				description: "Purge all cached pages"
+				description: "Purge all cached pages (Void platform)"
 			}
 		],
 		children: {
@@ -973,7 +977,7 @@ const HELP_TREE = {
 				}]
 			},
 			"purge-cache": {
-				summary: "Purge all cached pages for a project.",
+				summary: "Purge all cached pages for a Void platform project.",
 				usage: ["void project purge-cache [options]"],
 				options: [{
 					command: "--project <name>",
@@ -1155,7 +1159,7 @@ const HELP_TREE = {
 				usage: ["void email status --platform cloudflare"],
 				options: [{
 					command: "--platform cloudflare",
-					description: "Your own Cloudflare account (the only platform with a status today)"
+					description: "Your own Cloudflare account (required; on the Void platform use `void email usage`)"
 				}]
 			},
 			setup: {
@@ -1364,7 +1368,7 @@ const HELP_TREE = {
 		commands: [
 			{
 				command: "push",
-				description: "Push schema to local D1 without migration files"
+				description: "Push schema to the development database without migration files"
 			},
 			{
 				command: "generate",
@@ -1392,7 +1396,7 @@ const HELP_TREE = {
 			},
 			{
 				command: "studio",
-				description: "Open Drizzle Studio (--remote for deployed PG)"
+				description: "Open Drizzle Studio (--remote for deployed PostgreSQL/MySQL)"
 			},
 			{
 				command: "export",
@@ -1412,7 +1416,7 @@ const HELP_TREE = {
 			}
 		],
 		children: {
-			push: basicSubcommand("Push schema to local D1 without migration files.", "void db push"),
+			push: basicSubcommand("Push schema to the development database without migration files.", "void db push"),
 			generate: basicSubcommand("Generate SQL migrations from schema changes.", "void db generate"),
 			status: basicSubcommand("Show migration status for local and remote DBs.", "void db status"),
 			reset: {
@@ -1468,18 +1472,18 @@ const HELP_TREE = {
 				}]
 			},
 			studio: {
-				summary: "Open Drizzle Studio against the database (local by default; use --remote for the deployed PostgreSQL database; D1 remote not yet supported).",
+				summary: "Open Drizzle Studio against the database (local by default; use --remote for the deployed PostgreSQL or MySQL database).",
 				usage: ["void db studio [options]"],
 				options: [{
 					command: "--remote",
-					description: "Open Studio against the deployed PostgreSQL database (D1 remote not yet supported)"
+					description: "Open Studio against the deployed PostgreSQL or MySQL database (not D1)"
 				}],
 				examples: [{
 					command: "void db studio",
 					description: "Open Studio for the local database"
 				}, {
 					command: "void db studio --remote",
-					description: "Open Studio against the deployed PostgreSQL database"
+					description: "Open Studio against the deployed PostgreSQL or MySQL database"
 				}]
 			},
 			export: {
@@ -1565,7 +1569,7 @@ const HELP_TREE = {
 		commands: [
 			{
 				command: "model <name> [cols...]",
-				description: "Generate migration, CRUD routes, and DB types"
+				description: "Scaffold a Drizzle table, API routes, and DB types"
 			},
 			{
 				command: "migration <name>",
@@ -1594,7 +1598,7 @@ const HELP_TREE = {
 		],
 		children: {
 			model: {
-				summary: "Generate a migration, CRUD routes, and database types.",
+				summary: "Scaffold a Drizzle table, list/create/get API routes, and database types.",
 				usage: ["void gen model <name> [columns...]"],
 				examples: [{
 					command: "void gen model post title:string body:text",

package/dist/help-DOFygYi4.mjs

@@ -0,0 +1 @@
+export { r as printHelpPage } from "./help-D49SL_lN.mjs";

package/dist/{inbound-brj2-TM5.d.mts → inbound-Da7XsjH3.d.mts}

@@ -43,18 +43,12 @@ interface SendEmailOptions {
    */
   idempotencyKey?: string;
   /**
-   * Per-call escape hatch for local development. When true, bypasses the
-   * `void dev` in-memory inbox for this one send.
-   *
-   * It does not deliver. `void dev` binds no send transport at all: the
-   * platform's `__VOID_PROXY` service binding is added only on a deployed
-   * worker, and the own-account `SEND_EMAIL` binding is stripped under
-   * `serve`. With the inbox skipped there is nothing to fall through to,
-   * so the call returns `BINDING_MISSING`. To verify real delivery, deploy
-   * and send from the deployed worker.
-   *
-   * Has no effect outside `void dev` (production always sends; the dev
-   * inbox is registered only when `void dev` is running).
+   * @deprecated During `void dev` it skips the local inbox, and the send
+   * returns `BINDING_MISSING`, so it never delivers there. While a
+   * `createEmailTestHarness` sink is active, it skips the sink, and the send
+   * uses the `SEND_EMAIL` binding or the platform proxy of the current
+   * environment. A deployed app ignores it. Remove it, and deploy the app to
+   * test real delivery. Removed in the next major version.
    */
   sendInDev?: boolean;
 }

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 { 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 { 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 { 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-DrdeJgHR.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-CGOo_OL_.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++;
@@ -3262,9 +3285,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 +3302,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 +3336,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 +3368,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 +3666,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 +3740,7 @@ export default {
 		wranglerCompatPlugin,
 		wranglerSyncPlugin,
 		...nuxtVite8WebSocketCompatPlugin ? [nuxtVite8WebSocketCompatPlugin] : [],
-		...astroRequestScopePlugin ? [astroRequestScopePlugin] : [],
+		...astroServerEntryPlugin ? [astroServerEntryPlugin] : [],
 		svelteKitHooksInjectPlugin,
 		...svelteKitWorkerBuildPlugin ? [svelteKitWorkerBuildPlugin] : [],
 		clientStubsPlugin,
@@ -4456,7 +4502,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));

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