void 0.7.12 → 0.8.0

package/dist/{init-iIiQWzyB.mjs → init-DL6syXuF.mjs}

@@ -1,19 +1,20 @@
-import { a as join, i as isAbsolute, n as dirname, o as relative, s as resolve, t as basename } from "./pathe.M-eThtNZ-D-kmWkCS.mjs";
-import { n as cliTitle } from "./output-D3g5otMC.mjs";
-import { c as getToken, n as PlatformClient, u as isStagingMode } from "./client-C_DYiXeu.mjs";
-import { _ as me, c as R, g as ge, i as Ee, 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 } from "./config-CeRQg3Lz.mjs";
-import { r as detectFramework } from "./plugin-inference-BexV6LL3.mjs";
-import { r as parseDotenvFile, t as expandDotenv } from "./dotenv-HQNhRalS.mjs";
-import { n as ensureProjectTsconfig, t as createProjectTsconfig } from "./project-tsconfig-Bfy55qvs.mjs";
-import { t as MagicString } from "./magic-string.es-DS_lmuBe.mjs";
-import { n as writeDrizzleConfig } from "./config-DyUSwbeX.mjs";
-import { n as getAgentById, r as getPackageDir, t as detectAgents } from "./agents-DqkFfc2c.mjs";
-import { n as promptProjectSelection, t as promptAndCreateProject } from "./create-project-hvFe6rbI.mjs";
-import { t as promptForLoginToken } from "./login-C_MfDjhu.mjs";
-import { r as formatProjectCommand } from "./preset-CYQh93UF.mjs";
-import { n as findInstalledYarnPnpRuntime, r as hasLocalLockfile, t as buildDrizzleKitSpawnEnv } from "./yarn-pnp-6LD6_3Ej.mjs";
+import { a as join, c as resolve, i as isAbsolute, n as dirname, s as relative, t as basename } from "./pathe.M-eThtNZ-BrPhGF_K.mjs";
+import { n as cliTitle } from "./output-DeiS4oEX.mjs";
+import { n as readProjectPaths } from "./project-paths-CCMrHYQm.mjs";
+import { c as getToken, n as PlatformClient, u as isStagingMode } from "./client-C-nH6yz3.mjs";
+import { _ as me, c as R, g as ge, i as Ee, l as Re, 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 } from "./config-BVEC0lti.mjs";
+import { r as detectFramework } from "./plugin-inference-Ba1uGdIy.mjs";
+import { r as parseDotenvFile, t as expandDotenv } from "./dotenv-Bkoqyq9r.mjs";
+import { n as ensureProjectTsconfig, t as createProjectTsconfig } from "./project-tsconfig-HAGjfY6w.mjs";
+import { t as MagicString } from "./magic-string.es-C1Fb0uxq.mjs";
+import { n as writeDrizzleConfig } from "./config--wXmVOoe.mjs";
+import { n as getAgentById, r as getPackageDir, t as detectAgents } from "./agents-Dkgafwfr.mjs";
+import { n as promptAndCreateProject, r as promptProjectSelection } from "./create-project-BGnQMy5N.mjs";
+import { t as promptForLoginToken } from "./login-CkLr-AaI.mjs";
+import { r as formatProjectCommand } from "./preset-BRsCi8ZB.mjs";
+import { n as findInstalledYarnPnpRuntime, r as hasLocalLockfile, t as buildDrizzleKitSpawnEnv } from "./yarn-pnp-QgEYVC3V.mjs";
 import { createRequire } from "node:module";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -208,6 +209,16 @@ const SCAFFOLD_BASE_DEV_DEPENDENCIES = {
 	vite: "^8.0.10",
 	typescript: "^5.9.3"
 };
+const SCAFFOLD_VITE_PLUS_DEV_DEPENDENCIES = { "vite-plus": "^0.1.21" };
+const SCAFFOLD_TOOLCHAIN_OPTIONS = [{
+	value: "vite-plus",
+	label: "Vite+",
+	hint: "Uses the Vite+ toolchain and vp commands."
+}, {
+	value: "vite",
+	label: "Vite",
+	hint: "Uses plain Vite commands without Vite+."
+}];
 const REACT_SCAFFOLD_COMPILER_DEV_DEPENDENCIES = {
 	"@rolldown/plugin-babel": "^0.2.3",
 	"@vitejs/plugin-react": "^6.0.1",
@@ -294,7 +305,7 @@ function getScaffoldTsconfigCompilerOptions(framework) {
 	return framework ? { ...SCAFFOLD_FRAMEWORKS[framework].tsconfigCompilerOptions } : {};
 }
 function createPagesStarterTemplate(options) {
-	const { framework, starterMode, voidPackageSpec, adapterPackageSpec } = options;
+	const { framework, starterMode, toolchain = "vite", voidPackageSpec, adapterPackageSpec } = options;
 	const config = SCAFFOLD_FRAMEWORKS[framework];
 	const files = {
 		"vite.config.ts": getViteConfig(framework, config),
@@ -308,9 +319,9 @@ function createPagesStarterTemplate(options) {
 	}
 	return {
 		scripts: {
-			dev: "vite",
-			build: "vite build",
-			preview: "vite preview"
+			dev: toolchain === "vite-plus" ? "vp dev" : "vite",
+			build: toolchain === "vite-plus" ? "vp build" : "vite build",
+			preview: toolchain === "vite-plus" ? "vp preview" : "vite preview"
 		},
 		dependencies: {
 			...SCAFFOLD_BASE_DEPENDENCIES,
@@ -319,6 +330,7 @@ function createPagesStarterTemplate(options) {
 		devDependencies: {
 			void: voidPackageSpec,
 			...SCAFFOLD_BASE_DEV_DEPENDENCIES,
+			...toolchain === "vite-plus" ? SCAFFOLD_VITE_PLUS_DEV_DEPENDENCIES : {},
 			[config.adapterPackage]: adapterPackageSpec,
 			...config.devDependencies
 		},
@@ -654,6 +666,7 @@ const EMPTY_PROJECT_ALLOWED_ENTRIES = new Set([
 const PNPM_ALLOWED_BUILDS = [
 	"better-sqlite3",
 	"esbuild",
+	"sharp",
 	"workerd"
 ];
 const drizzleKitBin = join(fileURLToPath(import.meta.resolve("drizzle-kit")), "..", "bin.cjs");
@@ -673,6 +686,7 @@ const VITE_CONFIG_FILES = [
 	"vite.config.cjs"
 ];
 const VOID_CONFIG_FILE = "void.json";
+const VOID_SCHEMA_PATH = "./node_modules/void/schema.json";
 function asRecord(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
 	return value;
@@ -823,6 +837,53 @@ function isScaffoldableEmptyProject(root) {
 	if (Object.keys(scripts).some((name) => name !== "test")) return false;
 	return true;
 }
+function shouldPromptForInitLocation(root) {
+	if (isScaffoldableEmptyProject(root)) return false;
+	if (existsSync(join(root, "package.json"))) return false;
+	if (existsSync(join(root, VOID_CONFIG_FILE))) return false;
+	return findViteConfig(root) === void 0;
+}
+function validateSubfolderName(root, value) {
+	const name = value?.trim() ?? "";
+	if (!name) return "Enter a folder name.";
+	if (name === "." || name === ".." || name.includes("/") || name.includes("\\")) return "Enter a single folder name, not a path.";
+	if (existsSync(join(root, name))) return "That folder already exists.";
+}
+async function resolveInitRoot(root) {
+	if (!shouldPromptForInitLocation(root)) return root;
+	const choice = await Ee({
+		message: "This folder is not empty. Where should Void initialize?",
+		initialValue: "subfolder",
+		options: [{
+			value: "subfolder",
+			label: "Create a new subfolder",
+			hint: "Scaffold a new app inside this directory."
+		}, {
+			value: "current",
+			label: "Continue here",
+			hint: "Add package.json, vite.config.ts, and Void files to this directory."
+		}]
+	});
+	if (q(choice)) {
+		me("Setup cancelled.");
+		process.exit(0);
+	}
+	if (choice === "current") return root;
+	const folder = await Re({
+		message: "New project folder name:",
+		placeholder: "my-void-app",
+		initialValue: "my-void-app",
+		validate: (value) => validateSubfolderName(root, value)
+	});
+	if (q(folder)) {
+		me("Setup cancelled.");
+		process.exit(0);
+	}
+	const nextRoot = join(root, folder.trim());
+	mkdirSync(nextRoot, { recursive: true });
+	R.info(`Scaffolding in ${nextRoot}`);
+	return nextRoot;
+}
 function parsePackageManagerField(pkg) {
 	if (!pkg || typeof pkg !== "object") return;
 	const raw = pkg.packageManager;
@@ -1251,9 +1312,9 @@ function detectProjectState(root) {
 		hasTypescript,
 		hasTsconfig: existsSync(join(root, "tsconfig.json")),
 		hasGithubWorkflows: existsSync(join(root, ".github", "workflows")),
-		hasRoutes: existsSync(join(root, "routes")),
-		hasMigrations: existsSync(join(root, "db", "migrations")) || existsSync(join(root, "migrations")),
-		hasPages: existsSync(join(root, "pages")),
+		hasRoutes: existsSync(readProjectPaths(root).routesDir),
+		hasMigrations: existsSync(readProjectPaths(root).migrationsDir) || existsSync(join(root, "migrations")),
+		hasPages: existsSync(readProjectPaths(root).pagesDir),
 		packageManager,
 		typescriptWanted: hasTypescript
 	};
@@ -1262,7 +1323,8 @@ function findViteConfig(root) {
 	return VITE_CONFIG_FILES.find((file) => existsSync(join(root, file)));
 }
 function hasDrizzleSchema(root) {
-	return existsSync(join(root, "db", "schema.ts")) || existsSync(join(root, "db", "schema"));
+	const paths = readProjectPaths(root);
+	return existsSync(paths.schemaFile) || existsSync(paths.schemaDir);
 }
 function detectPagesFramework(root) {
 	try {
@@ -1475,8 +1537,15 @@ function setupWranglerConfig(root, framework) {
 		else R.success("Updated wrangler.jsonc with compatibility_date and nodejs_als");
 	} else R.success("wrangler.jsonc looks good");
 }
+function withDefaultVoidSchema(config) {
+	if (typeof config.$schema === "string" && config.$schema.length > 0) return config;
+	return {
+		$schema: VOID_SCHEMA_PATH,
+		...config
+	};
+}
 function writeVoidConfig(root, config) {
-	writeFileSync(join(root, VOID_CONFIG_FILE), JSON.stringify(config, null, 2) + "\n");
+	writeFileSync(join(root, VOID_CONFIG_FILE), JSON.stringify(withDefaultVoidSchema(config), null, 2) + "\n");
 }
 function ensureVoidWorkerCompatibilityDate(root) {
 	const config = readConfig(root);
@@ -1526,7 +1595,7 @@ function applyDatabaseDialect(root, dialect) {
 }
 function detectDatabaseSetup(root) {
 	if (getDatabaseDialect(readConfig(root)) === "postgresql") return "postgresql";
-	if (hasDrizzleSchema(root) || existsSync(join(root, "db", "migrations")) || existsSync(join(root, "migrations"))) return "sqlite";
+	if (hasDrizzleSchema(root) || existsSync(readProjectPaths(root).migrationsDir) || existsSync(join(root, "migrations"))) return "sqlite";
 	return "none";
 }
 function applyDatabaseSetup(root, choice) {
@@ -1566,6 +1635,18 @@ async function promptStarterMode() {
 	}
 	return choice;
 }
+async function promptScaffoldToolchain() {
+	const choice = await Ee({
+		message: "Choose a Pages scaffold toolchain:",
+		initialValue: "vite-plus",
+		options: [...SCAFFOLD_TOOLCHAIN_OPTIONS]
+	});
+	if (q(choice)) {
+		me("Setup cancelled.");
+		process.exit(0);
+	}
+	return choice;
+}
 async function promptScaffoldFramework() {
 	const choice = await Ee({
 		message: "Choose a Pages framework to scaffold:",
@@ -1794,7 +1875,7 @@ function installProjectDependencies(root, packageManager) {
 function generateStarterMigration(root, starterMode) {
 	const dialect = starterMode === "postgresql" ? "postgresql" : "sqlite";
 	const configPath = writeDrizzleConfig(root, dialect === "postgresql" ? "postgresql://dummy" : ":memory:", dialect);
-	const migrationsDir = join(root, "db", "migrations");
+	const migrationsDir = readProjectPaths(root).migrationsDir;
 	const metaDir = join(migrationsDir, "meta");
 	const journalPath = join(metaDir, "_journal.json");
 	const migrationsDirExistedBefore = existsSync(migrationsDir);
@@ -1850,11 +1931,12 @@ function generateStarterMigration(root, starterMode) {
 	}
 	R.success("Generated initial Drizzle migration");
 }
-function scaffoldPagesApp(root, packageManager, framework, starterMode) {
+function scaffoldPagesApp(root, packageManager, framework, starterMode, toolchain) {
 	const packageJsonPath = join(root, "package.json");
 	const template = createPagesStarterTemplate({
 		framework,
 		starterMode,
+		toolchain,
 		voidPackageSpec: resolveScaffoldDependencySpec(root, "void", getOwnVersion()),
 		adapterPackageSpec: resolveScaffoldDependencySpec(root, SCAFFOLD_FRAMEWORKS[framework].adapterPackage, getOwnVersion())
 	});
@@ -1893,7 +1975,7 @@ function scaffoldPagesApp(root, packageManager, framework, starterMode) {
 	for (const [name, version] of Object.entries(template.dependencies)) ensureDependency("dependencies", name, version);
 	for (const [name, version] of Object.entries(template.devDependencies)) ensureDependency("devDependencies", name, version);
 	if (isPnpmProject(root, pkg)) ensurePnpmAllowBuilds(root, pkg);
-	if (packageManager === "pnpm" && (!pkg.packageManager || typeof pkg.packageManager !== "string")) pkg.packageManager = "pnpm@11.0.9";
+	if (packageManager === "pnpm" && resolveWorkspaceDeferral(root, pkg) === void 0 && (!pkg.packageManager || typeof pkg.packageManager !== "string")) pkg.packageManager = "pnpm@11.0.9";
 	writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + "\n");
 	R.success("Updated package.json with starter scripts and dependencies");
 	for (const [filePath, content] of Object.entries(template.files)) writeFileIfMissing(root, filePath, content);
@@ -2304,9 +2386,10 @@ function setupExistingProject(root, framework) {
 */
 function scaffoldDemo(root) {
 	const devCommand = getDevCommand(root);
+	const paths = readProjectPaths(root);
 	const packageJsonMutated = ensureVoidDependency(root);
-	mkdirSync(join(root, "db"), { recursive: true });
-	writeFileSync(join(root, "db", "schema.ts"), `import { sql } from "void/db";
+	mkdirSync(paths.dbDir, { recursive: true });
+	writeFileSync(paths.schemaFile, `import { sql } from "void/db";
 import { integer, sqliteTable, text } from "void/schema-d1";
 
 export const posts = sqliteTable("posts", {
@@ -2317,8 +2400,8 @@ export const posts = sqliteTable("posts", {
 });
 `);
 	R.success("Created db/schema.ts");
-	mkdirSync(join(root, "routes", "api"), { recursive: true });
-	writeFileSync(join(root, "routes", "api", "posts.ts"), `import { defineHandler } from "void";
+	mkdirSync(join(paths.routesDir, "api"), { recursive: true });
+	writeFileSync(join(paths.routesDir, "api", "posts.ts"), `import { defineHandler } from "void";
 import { db } from "void/db";
 import { posts } from "@schema";
 
@@ -2328,9 +2411,9 @@ export const GET = defineHandler(async () => {
 });
 `);
 	R.success("Created routes/api/posts.ts");
-	ensureProjectTsconfig(root, void 0, true, true);
-	mkdirSync(join(root, "src"), { recursive: true });
-	writeFileSync(join(root, "src", "demo.ts"), `import { fetch } from "void/client";
+	ensureProjectTsconfig(root, void 0, true, true, { paths });
+	mkdirSync(paths.ssrDir, { recursive: true });
+	writeFileSync(join(paths.ssrDir, "demo.ts"), `import { fetch } from "void/client";
 
 // Fully typed: response type is inferred from the GET handler's return type,
 // which is derived from the migration schema. No manual types needed.
@@ -2547,6 +2630,7 @@ async function runInitCommand(root, initArgs) {
 	console.log();
 	ge(cliTitle("init"));
 	const targeted = Boolean(initArgs && (initArgs.tsconfig || initArgs.github || initArgs.agents));
+	if (!targeted) root = await resolveInitRoot(root);
 	const framework = detectFramework(root);
 	const preScaffoldState = detectProjectState(root);
 	const detectedPagesFramework = detectPagesFramework(root);
@@ -2558,12 +2642,14 @@ async function runInitCommand(root, initArgs) {
 	if (framework) R.info(`Detected ${framework.name} framework`);
 	if (!targeted && !framework && isScaffoldableEmptyProject(root)) {
 		R.info("Empty project detected. Scaffolding a Pages starter...");
+		const scaffoldToolchain = await promptScaffoldToolchain();
 		if (detectedPagesFramework) {
 			scaffoldedPagesFramework = detectedPagesFramework;
 			R.info(`Detected ${SCAFFOLD_FRAMEWORKS[detectedPagesFramework].label} adapter in package.json`);
 		} else scaffoldedPagesFramework = await promptScaffoldFramework();
 		const starterMode = await promptStarterMode();
-		const scaffoldWroteDeps = scaffoldPagesApp(root, preScaffoldState.packageManager, scaffoldedPagesFramework, starterMode);
+		const scaffoldPackageManager = scaffoldToolchain === "vite-plus" ? "pnpm" : preScaffoldState.packageManager;
+		const scaffoldWroteDeps = scaffoldPagesApp(root, scaffoldPackageManager, scaffoldedPagesFramework, starterMode, scaffoldToolchain);
 		const deferral = resolveWorkspaceDeferral(root, readPackageJson(root));
 		const voidResolvable = isVoidResolvableFrom(root);
 		if (deferral && (!voidResolvable || scaffoldWroteDeps)) {
@@ -2605,7 +2691,7 @@ async function runInitCommand(root, initArgs) {
 		const agentSetup = await resolveAgentSetup(root);
 		injectAgentBlock(root, agentSetup.instructionFilePath);
 		if (agentSetup.agents.length > 0) {
-			const { linkSkillsForSpecificAgents } = await import("./skills-SAG0WyVn.mjs");
+			const { linkSkillsForSpecificAgents } = await import("./skills-B_ynF4lA.mjs");
 			linkSkillsForSpecificAgents(root, agentSetup.agents);
 		} else R.info("Skills linking skipped for generic agent setup");
 		setupMcpConfig(root, agentSetup.agents);

package/dist/{link-DdXqlUiJ.mjs → link-C5x1E-XZ.mjs}

@@ -1,8 +1,8 @@
-import { n as cliTitle, s as import_picocolors } from "./output-D3g5otMC.mjs";
-import { c as getToken, n as PlatformClient, s as getSiteDomain } from "./client-C_DYiXeu.mjs";
-import { _ as me, c as R, g as ge, y as ye } from "./dist-D2L3_KTK.mjs";
-import { a as writeProjectConfig, r as readProjectConfig } from "./project-DhB4A8_g.mjs";
-import { n as promptProjectSelection, t as promptAndCreateProject } from "./create-project-hvFe6rbI.mjs";
+import { n as cliTitle, s as import_picocolors } from "./output-DeiS4oEX.mjs";
+import { c as getToken, n as PlatformClient, s as getSiteDomain } from "./client-C-nH6yz3.mjs";
+import { _ as me, c as R, g as ge, y as ye } from "./dist-abzUneor.mjs";
+import { a as writeProjectConfig, r as readProjectConfig } from "./project-CH9pdo16.mjs";
+import { n as promptAndCreateProject, r as promptProjectSelection } from "./create-project-BGnQMy5N.mjs";
 //#region src/cli/link.ts
 async function runLink(root, slug) {
 	console.log();

package/dist/{list-9Bxa5Odn.mjs → list-ezL7hqDV.mjs}

@@ -1,8 +1,8 @@
-import { a as ensureUtc, i as dim, l as tablePrefix, n as cliTitle, s as import_picocolors } from "./output-D3g5otMC.mjs";
-import { c as getToken, n as PlatformClient } from "./client-C_DYiXeu.mjs";
-import { c as R, g as ge, y as ye } from "./dist-D2L3_KTK.mjs";
-import { r as readProjectConfig } from "./project-DhB4A8_g.mjs";
-import { r as resolveProjectBySlug } from "./resolve-project-DdjLQ2tB.mjs";
+import { a as ensureUtc, i as dim, l as tablePrefix, n as cliTitle, s as import_picocolors } from "./output-DeiS4oEX.mjs";
+import { c as getToken, n as PlatformClient } from "./client-C-nH6yz3.mjs";
+import { c as R, g as ge, y as ye } from "./dist-abzUneor.mjs";
+import { r as readProjectConfig } from "./project-CH9pdo16.mjs";
+import { r as resolveProjectBySlug } from "./resolve-project-CNpUbUHd.mjs";
 //#region src/cli/list.ts
 async function runListCommand(root, slug) {
 	console.log();

package/dist/{login-C_MfDjhu.mjs → login-CkLr-AaI.mjs}

@@ -1,6 +1,6 @@
-import { n as cliTitle, r as createSpinner, s as import_picocolors } from "./output-D3g5otMC.mjs";
-import { a as isExpiredTokenError, c as getToken, d as removeToken, f as runLogin, l as getTokenSource, n as PlatformClient, p as saveToken, u as isStagingMode } from "./client-C_DYiXeu.mjs";
-import { _ as me, c as R, g as ge, i as Ee, x as q, y as ye } from "./dist-D2L3_KTK.mjs";
+import { n as cliTitle, r as createSpinner, s as import_picocolors } from "./output-DeiS4oEX.mjs";
+import { a as isExpiredTokenError, c as getToken, d as removeToken, f as runLogin, l as getTokenSource, n as PlatformClient, p as saveToken, u as isStagingMode } from "./client-C-nH6yz3.mjs";
+import { _ as me, c as R, g as ge, i as Ee, x as q, y as ye } from "./dist-abzUneor.mjs";
 //#region src/cli/login.ts
 async function promptForLoginToken(root = process.cwd()) {
 	const provider = await Ee({

package/dist/{logs-DjqCpEER.mjs → logs-MnGILmLz.mjs}

@@ -1,7 +1,7 @@
-import { i as dim, n as cliTitle, s as import_picocolors } from "./output-D3g5otMC.mjs";
-import { c as getToken, n as PlatformClient } from "./client-C_DYiXeu.mjs";
-import { c as R, g as ge, y as ye } from "./dist-D2L3_KTK.mjs";
-import { r as readProjectConfig } from "./project-DhB4A8_g.mjs";
+import { i as dim, n as cliTitle, s as import_picocolors } from "./output-DeiS4oEX.mjs";
+import { c as getToken, n as PlatformClient } from "./client-C-nH6yz3.mjs";
+import { c as R, g as ge, y as ye } from "./dist-abzUneor.mjs";
+import { r as readProjectConfig } from "./project-CH9pdo16.mjs";
 //#region src/cli/logs.ts
 async function runLogsCommand(root, filter, range, deployment, level) {
 	console.log();

package/dist/{mcp-vA0880_K.mjs → mcp-B84MmVAW.mjs}

@@ -1,6 +1,6 @@
-import { a as join, n as dirname } from "./pathe.M-eThtNZ-D-kmWkCS.mjs";
-import { c as getToken, n as PlatformClient } from "./client-C_DYiXeu.mjs";
-import { a as writeProjectConfig } from "./project-DhB4A8_g.mjs";
+import { a as join, n as dirname } from "./pathe.M-eThtNZ-BrPhGF_K.mjs";
+import { c as getToken, n as PlatformClient } from "./client-C-nH6yz3.mjs";
+import { a as writeProjectConfig } from "./project-CH9pdo16.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { createInterface } from "node:readline";

package/dist/{node-gxRQXIRT.mjs → node-fpywdcbN.mjs}

@@ -1,9 +1,9 @@
-import { a as join } from "./pathe.M-eThtNZ-D-kmWkCS.mjs";
-import { n as loadVoidAuthConfig, t as findVoidAuthConfig } from "./config-CvHtTM0q.mjs";
-import { f as readConfig } from "./config-CeRQg3Lz.mjs";
-import { r as resolveVoidAuthMigrationSchema } from "./drizzle-Cx7cVwrE.mjs";
-import { n as applySqliteAuthMigrations, t as applyPgAuthMigrations } from "./auth-migrations-BwLPwRgH.mjs";
-import { getMiniflareDatabasePath } from "./runner-C0d3lJo1.mjs";
+import { a as join } from "./pathe.M-eThtNZ-BrPhGF_K.mjs";
+import { n as loadVoidAuthConfig, t as findVoidAuthConfig } from "./config-hhMYPVRT.mjs";
+import { f as readConfig } from "./config-BVEC0lti.mjs";
+import { r as resolveVoidAuthMigrationSchema } from "./drizzle-DmaANP4-.mjs";
+import { n as applySqliteAuthMigrations, t as applyPgAuthMigrations } from "./auth-migrations-BqJoGqGQ.mjs";
+import { getMiniflareDatabasePath } from "./runner-BkGBfr4e.mjs";
 import { loadEnv } from "vite";
 //#region src/auth/node.ts
 async function runLocalVoidAuthMigrations(root, dialect, persistRoot = join(root, ".void"), databaseId = "local", configPath = findVoidAuthConfig(root)) {

package/dist/{output-D3g5otMC.mjs → output-DeiS4oEX.mjs}

@@ -1,5 +1,5 @@
 import { r as __toESM, t as __commonJSMin } from "./chunk-DJd-R1mw.mjs";
-import { c as R, f as at, h as ft } from "./dist-D2L3_KTK.mjs";
+import { c as R, f as at, h as ft } from "./dist-abzUneor.mjs";
 //#region ../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
 var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	let p = process || {}, argv = p.argv || [], env = p.env || {};

package/dist/pages/client.d.mts

@@ -1,4 +1,4 @@
-import { t as PageObject } from "../protocol-D7r_deVZ.mjs";
+import { t as PageObject } from "../protocol-mcSsdMij.mjs";
 import { CacheForInput, CacheForResult } from "./prefetch.mjs";
 
 //#region src/pages/action-result.d.ts

package/dist/pages/head-client.d.mts

@@ -1,4 +1,4 @@
-import { n as HeadDescriptor } from "../head-C7QW7UY1.mjs";
+import { n as HeadDescriptor } from "../head-CZs8dMxG.mjs";
 
 //#region src/pages/head-client.d.ts
 /**

package/dist/pages/head.d.mts

@@ -1,2 +1,2 @@
-import { a as renderHtmlAttrs, i as renderHeadToString, n as HeadDescriptor, o as resolveHead, r as renderBodyAttrs, t as HeadConfig } from "../head-C7QW7UY1.mjs";
+import { a as renderHtmlAttrs, i as renderHeadToString, n as HeadDescriptor, o as resolveHead, r as renderBodyAttrs, t as HeadConfig } from "../head-CZs8dMxG.mjs";
 export { HeadConfig, HeadDescriptor, renderBodyAttrs, renderHeadToString, renderHtmlAttrs, resolveHead };

package/dist/pages/index.d.mts

@@ -1,7 +1,30 @@
-import { a as renderHtmlAttrs, i as renderHeadToString, n as HeadDescriptor, o as resolveHead, r as renderBodyAttrs, t as HeadConfig } from "../head-C7QW7UY1.mjs";
-import { a as PageScanResult, i as PageDefinition, n as LayoutDefinition, r as NamedLayoutDefinition } from "../types-DG_Ynnyd.mjs";
+import { a as renderHtmlAttrs, i as renderHeadToString, n as HeadDescriptor, o as resolveHead, r as renderBodyAttrs, t as HeadConfig } from "../head-CZs8dMxG.mjs";
+import { a as PageScanResult, i as PageDefinition, n as LayoutDefinition, r as NamedLayoutDefinition } from "../types-C8wsi1hv.mjs";
 import { serializePageData } from "./serialize.mjs";
+import { RewriteDestination } from "void/routes";
 
+//#region src/project-paths.d.ts
+type ProjectPaths = {
+  root: string;
+  sourceDir: string;
+  sourceRoot: string;
+  routesDir: string;
+  middlewareDir: string;
+  cronsDir: string;
+  queuesDir: string;
+  pagesDir: string;
+  dbDir: string;
+  migrationsDir: string;
+  schemaFile: string;
+  schemaDir: string;
+  srcDir: string;
+  ssrDir: string;
+  sourceRelative: (path: string) => string;
+  authConfigCandidates: ReadonlyArray<string>;
+  envFileCandidates: ReadonlyArray<string>;
+};
+declare function resolvePagesDir(root?: string): string;
+//#endregion
 //#region src/pages/layout-resolution.d.ts
 /** Resolve the layout chain for a component (innermost last) */
 declare function resolveLayoutChain(componentId: string, layouts: Array<LayoutDefinition>): Array<LayoutDefinition>;
@@ -16,6 +39,8 @@ declare function resolveEffectiveLayoutChain(page: {
 //#region src/pages/scan.d.ts
 declare function scanPages(root: string, options?: {
   output?: "server" | "static";
+  paths?: ProjectPaths;
+  pagesDir?: string;
 }): Promise<PageScanResult>;
 //#endregion
 //#region src/pages/manifest.d.ts
@@ -35,4 +60,4 @@ type ResolveStaticPageDataBuildOptionsInput = {
 };
 declare function resolveStaticPageDataBuildOptions(root: string, options?: ResolveStaticPageDataBuildOptionsInput): StaticPageDataBuildOptions;
 //#endregion
-export { type HeadConfig, type HeadDescriptor, type LayoutDefinition, type NamedLayoutDefinition, type PageDefinition, type PageScanResult, type StaticPageDataBuildOptions, generateComponentManifest, renderBodyAttrs, renderHeadToString, renderHtmlAttrs, resolveEffectiveLayoutChain, resolveHead, resolveLayoutChain, resolveNamedLayout, resolveStaticPageDataBuildOptions, scanPages, serializePageData };
+export { type HeadConfig, type HeadDescriptor, type LayoutDefinition, type NamedLayoutDefinition, type PageDefinition, type PageScanResult, type StaticPageDataBuildOptions, generateComponentManifest, renderBodyAttrs, renderHeadToString, renderHtmlAttrs, resolveEffectiveLayoutChain, resolveHead, resolveLayoutChain, resolveNamedLayout, resolvePagesDir, resolveStaticPageDataBuildOptions, scanPages, serializePageData };

package/dist/pages/index.mjs

@@ -1,7 +1,8 @@
-import { a as join } from "../pathe.M-eThtNZ-D-kmWkCS.mjs";
-import { f as readConfig } from "../config-CeRQg3Lz.mjs";
-import { a as resolveNamedLayout, i as resolveLayoutIds, n as resolveEffectiveLayoutChain, r as resolveLayoutChain, t as scanPages } from "../scan-CKpylFj9.mjs";
-import { i as parseRedirectsFile } from "../headers-CuVHn6Kl.mjs";
+import { a as join } from "../pathe.M-eThtNZ-BrPhGF_K.mjs";
+import { r as resolvePagesDir } from "../project-paths-CCMrHYQm.mjs";
+import { f as readConfig } from "../config-BVEC0lti.mjs";
+import { a as resolveNamedLayout, i as resolveLayoutIds, n as resolveEffectiveLayoutChain, r as resolveLayoutChain, t as scanPages } from "../scan-2YmJkYAf.mjs";
+import { i as parseRedirectsFile } from "../headers-wAPJigtE.mjs";
 import { renderBodyAttrs, renderHeadToString, renderHtmlAttrs, resolveHead } from "./head.mjs";
 import { serializePageData } from "./serialize.mjs";
 //#region src/pages/manifest.ts
@@ -73,4 +74,4 @@ function resolveStaticPageDataBuildOptions(root, options = {}) {
 	};
 }
 //#endregion
-export { generateComponentManifest, renderBodyAttrs, renderHeadToString, renderHtmlAttrs, resolveEffectiveLayoutChain, resolveHead, resolveLayoutChain, resolveNamedLayout, resolveStaticPageDataBuildOptions, scanPages, serializePageData };
+export { generateComponentManifest, renderBodyAttrs, renderHeadToString, renderHtmlAttrs, resolveEffectiveLayoutChain, resolveHead, resolveLayoutChain, resolveNamedLayout, resolvePagesDir, resolveStaticPageDataBuildOptions, scanPages, serializePageData };

package/dist/pages/islands-plugin.d.mts

@@ -1,4 +1,4 @@
-import { a as PageScanResult } from "../types-DG_Ynnyd.mjs";
+import { a as PageScanResult } from "../types-C8wsi1hv.mjs";
 import { ResolvedConfig, ViteDevServer } from "vite";
 
 //#region src/pages/islands-plugin.d.ts

package/dist/pages/islands-plugin.mjs

@@ -1,10 +1,15 @@
-import { n as dirname, s as resolve } from "../pathe.M-eThtNZ-D-kmWkCS.mjs";
-import { n as resolveEffectiveLayoutChain, t as scanPages } from "../scan-CKpylFj9.mjs";
+import { c as resolve, n as dirname } from "../pathe.M-eThtNZ-BrPhGF_K.mjs";
+import { n as resolveEffectiveLayoutChain, t as scanPages } from "../scan-2YmJkYAf.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { normalizePath } from "vite";
 //#region src/pages/islands-plugin.ts
 const ISLANDS_RENDERER_ID = "virtual:void-islands-renderer";
 const ISLANDS_CLIENT_ENTRY_ID = "virtual:void-islands-client";
+const ISLAND_IMPORT_RE = /import\s+([$_A-Za-z][$_\w]*)\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*,?\s*\}/g;
+function hasIslandImports(code) {
+	ISLAND_IMPORT_RE.lastIndex = 0;
+	return ISLAND_IMPORT_RE.test(code);
+}
 /** Resolve a relative import specifier to an absolute path by checking extensions. */
 function resolveSpecifier(specifier, importerDir, extensions) {
 	const base = normalizePath(resolve(importerDir, specifier));
@@ -18,7 +23,6 @@ function resolveSpecifier(specifier, importerDir, extensions) {
 * or any .md file has a `<script>` block.
 */
 function needsIslandClientBundle(dir, islandFilePattern, checkStyleBlocks) {
-	const importAttrRe = /import\s+\w+\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:/;
 	const cssImportRe = /import\b[^"']*["'][^"']+\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)["']/;
 	const mdScriptRe = /^<script\b/m;
 	const styleRe = checkStyleBlocks ? /<style\b/ : null;
@@ -31,7 +35,7 @@ function needsIslandClientBundle(dir, islandFilePattern, checkStyleBlocks) {
 			const name = entry.name;
 			if (islandFilePattern.test(name) || name.startsWith("layout.") || name.startsWith("_")) {
 				const content = readFileSync(resolve(entry.parentPath, name), "utf-8");
-				if (importAttrRe.test(content)) return true;
+				if (hasIslandImports(content)) return true;
 				if (styleRe && styleRe.test(content)) return true;
 				if (cssImportRe.test(content)) return true;
 			}
@@ -67,13 +71,10 @@ function extractCssImports(filePath) {
 function computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig) {
 	const mdPlugin = resolvedConfig?.plugins?.find((plugin) => plugin.name === "void-md");
 	const mdScriptIds = new Set(mdPlugin?.api?.getClientScripts?.()?.keys() ?? []);
-	const importAttrRe = /import\s+\w+\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*\}/g;
 	const layoutDirsWithIslands = /* @__PURE__ */ new Set();
 	for (const layout of pageScan.layouts) {
 		if (!layout.island) continue;
-		const code = readFileSync(resolve(pagesDir, layout.filePath), "utf-8");
-		importAttrRe.lastIndex = 0;
-		if (importAttrRe.test(code)) layoutDirsWithIslands.add(layout.directory);
+		if (hasIslandImports(readFileSync(resolve(pagesDir, layout.filePath), "utf-8"))) layoutDirsWithIslands.add(layout.directory);
 	}
 	const result = /* @__PURE__ */ new Set();
 	for (const page of pageScan.pages) {
@@ -82,9 +83,7 @@ function computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig) {
 			result.add(page.componentId);
 			continue;
 		}
-		const code = readFileSync(resolve(pagesDir, page.componentPath), "utf-8");
-		importAttrRe.lastIndex = 0;
-		if (importAttrRe.test(code)) {
+		if (hasIslandImports(readFileSync(resolve(pagesDir, page.componentPath), "utf-8"))) {
 			result.add(page.componentId);
 			continue;
 		}
@@ -107,12 +106,14 @@ function computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig) {
 function watchPagesForRescan(server, pagesDir, root, onRescan) {
 	let pending = null;
 	let debounceTimer = null;
+	const normalizedPagesDir = normalizePath(pagesDir);
 	const scheduleRescan = (path) => {
-		if (!path.startsWith(pagesDir)) return;
+		const normalizedPath = normalizePath(path);
+		if (normalizedPath !== normalizedPagesDir && !normalizedPath.startsWith(normalizedPagesDir + "/")) return;
 		if (debounceTimer) clearTimeout(debounceTimer);
 		debounceTimer = setTimeout(() => {
 			debounceTimer = null;
-			pending = scanPages(root).then((pageScan) => {
+			pending = scanPages(root, { pagesDir }).then((pageScan) => {
 				onRescan(pageScan);
 				for (const env of Object.values(server.environments)) {
 					const mod = env.moduleGraph.getModuleById("\0" + ISLANDS_RENDERER_ID);
@@ -125,7 +126,7 @@ function watchPagesForRescan(server, pagesDir, root, onRescan) {
 	server.watcher.on("add", scheduleRescan);
 	server.watcher.on("unlink", scheduleRescan);
 	server.watcher.on("change", (path) => {
-		if (path.endsWith(".md")) scheduleRescan(path);
+		if (normalizePath(path).endsWith(".md")) scheduleRescan(path);
 	});
 	return { flush: () => pending ?? Promise.resolve() };
 }

package/dist/pages/protocol.d.mts

@@ -1,3 +1,3 @@
-import { S as ValidationError } from "../handler-DJTuxB10.mjs";
-import { a as handlePageMutation, i as handlePageGet, n as PageRenderResult, o as safeJsonStringify, r as flattenValidationErrors, t as PageObject } from "../protocol-D7r_deVZ.mjs";
+import { S as ValidationError } from "../handler-BPhL8AmU.mjs";
+import { a as handlePageMutation, i as handlePageGet, n as PageRenderResult, o as safeJsonStringify, r as flattenValidationErrors, t as PageObject } from "../protocol-mcSsdMij.mjs";
 export { PageObject, PageRenderResult, ValidationError, flattenValidationErrors, handlePageGet, handlePageMutation, safeJsonStringify };

package/dist/pages/protocol.mjs

@@ -1,5 +1,5 @@
 import { isConvertedResponse } from "../runtime/response.mjs";
-import { i as ValidationError, r as separateDeferred, t as DEFERRED } from "../defer-2ARBu8Et.mjs";
+import { i as ValidationError, r as separateDeferred, t as DEFERRED } from "../defer-DkoEwda-.mjs";
 import { resolveHead } from "./head.mjs";
 //#region src/pages/protocol.ts
 const POWERED_BY = { "X-Powered-By": "Void" };

package/dist/{pathe.M-eThtNZ-D-kmWkCS.mjs → pathe.M-eThtNZ-BrPhGF_K.mjs}

@@ -147,4 +147,4 @@ const basename = function(p, extension) {
 	return extension && lastSegment.endsWith(extension) ? lastSegment.slice(0, -extension.length) : lastSegment;
 };
 //#endregion
-export { join as a, isAbsolute as i, dirname as n, relative as o, extname as r, resolve as s, basename as t };
+export { join as a, resolve as c, isAbsolute as i, dirname as n, normalize as o, extname as r, relative as s, basename as t };