vinext 1.1.0 → 1.2.0

package/dist/init-cloudflare.js

@@ -1,5 +1,6 @@
 import path from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { detectProject } from "./utils/project.js";
+import { validateWorkerName } from "./init-platform.js";
 import { isUnknownRecord } from "./utils/record.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
@@ -13,6 +14,10 @@ const DEFAULT_CLOUDFLARE_INIT_OPTIONS = {
 	imageOptimization: "cloudflare-images"
 };
 const DEFAULT_VERSION_METADATA_BINDING = "CF_VERSION_METADATA";
+const BUILD_OUTPUT_EXCLUSIONS = ["!/_next/static/*", "!/*/_next/static/*"];
+const DEFAULT_RUN_WORKER_FIRST = ["/*", ...BUILD_OUTPUT_EXCLUSIONS];
+const HTML_HANDLING = "none";
+const STATIC_ASSETS_CACHE_ROUTE = "/_vinext/static-cache/*";
 const RESPONSE_STORE_WRANGLER_CONFIG = "wrangler.response-store.jsonc";
 const RESPONSE_STORE_BINDING = "RESPONSE_STORE";
 const RESPONSE_STORE_ENTRYPOINT = "ResponseStoreService";
@@ -26,6 +31,7 @@ const CACHE_METADATA_EXPORT = {
 };
 const CTX_EXPORTS_DEFAULT_DATE = "2025-11-17";
 function validateCloudflarePlatformSetup(context, cloudflare) {
+	if (cloudflare.name !== void 0) validateWorkerName(cloudflare.name);
 	if (!cloudflare.legacyWrangler) {
 		const existingWrangler = [
 			"wrangler.toml",
@@ -54,7 +60,10 @@ function validateCloudflarePlatformSetup(context, cloudflare) {
 	const wranglerPath = ["wrangler.jsonc", "wrangler.json"].map((fileName) => path.join(context.root, fileName)).find((candidate) => fs.existsSync(candidate));
 	const wranglerCode = wranglerPath ? fs.readFileSync(wranglerPath, "utf-8") : void 0;
 	if (!wranglerCode && cloudflare.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding" && fs.existsSync(path.join(context.root, RESPONSE_STORE_WRANGLER_CONFIG))) readResponseStoreServiceName(context.root, {});
-	const updatedWranglerCode = wranglerCode ? updateWranglerConfigForCloudflare(wranglerCode, cloudflare, { root: context.root }) : void 0;
+	const updatedWranglerCode = wranglerCode ? updateWranglerConfigForCloudflare(wranglerCode, cloudflare, {
+		root: context.root,
+		isStaticExport: context.isStaticExport
+	}) : void 0;
 	const imagesBinding = updatedWranglerCode ? getWranglerImagesBinding(updatedWranglerCode) : "IMAGES";
 	const assetsBinding = updatedWranglerCode ? getWranglerAssetsBinding(updatedWranglerCode) : "ASSETS";
 	const assetsDirectory = updatedWranglerCode ? getWranglerAssetsDirectory(updatedWranglerCode) : "dist/client";
@@ -74,10 +83,13 @@ function validateCloudflarePlatformSetup(context, cloudflare) {
 }
 function setupCloudflarePlatform(context, cloudflare) {
 	if (!cloudflare.legacyWrangler) return setupCfPlatform(context, cloudflare);
-	const projectInfo = detectProject(context.root);
+	const projectInfo = detectCloudflareProject(context.root, cloudflare);
 	const wranglerPath = ["wrangler.jsonc", "wrangler.json"].map((fileName) => path.join(context.root, fileName)).find((candidate) => fs.existsSync(candidate));
 	const wranglerCode = wranglerPath ? fs.readFileSync(wranglerPath, "utf-8") : void 0;
-	const updatedWranglerCode = wranglerCode ? updateWranglerConfigForCloudflare(wranglerCode, cloudflare, { root: context.root }) : void 0;
+	const updatedWranglerCode = wranglerCode ? updateWranglerConfigForCloudflare(wranglerCode, cloudflare, {
+		root: context.root,
+		isStaticExport: context.isStaticExport
+	}) : void 0;
 	const imagesBinding = updatedWranglerCode ? getWranglerImagesBinding(updatedWranglerCode) : "IMAGES";
 	const assetsBinding = updatedWranglerCode ? getWranglerAssetsBinding(updatedWranglerCode) : "ASSETS";
 	const assetsDirectory = updatedWranglerCode ? getWranglerAssetsDirectory(updatedWranglerCode) : "dist/client";
@@ -112,7 +124,10 @@ function setupCloudflarePlatform(context, cloudflare) {
 	}
 	const generatedPlatformFiles = [];
 	if (!wranglerPath) {
-		fs.writeFileSync(path.join(context.root, "wrangler.jsonc"), generateWranglerConfig(projectInfo, cloudflare, context.today), "utf-8");
+		fs.writeFileSync(path.join(context.root, "wrangler.jsonc"), generateWranglerConfig({
+			...projectInfo,
+			isStaticExport: context.isStaticExport
+		}, cloudflare, context.today), "utf-8");
 		generatedPlatformFiles.push("wrangler.jsonc");
 	} else if (wranglerCode && updatedWranglerCode) {
 		if (updatedWranglerCode !== wranglerCode) {
@@ -139,8 +154,23 @@ function setupCloudflarePlatform(context, cloudflare) {
 		preservedExistingGenerateScopedName
 	};
 }
+/**
+* The existing config that keeps its own Worker name, if `--name` was given.
+* Init doesn't rename the Worker in an existing config, so callers warn instead.
+*/
+function findConfigKeepingWorkerName(root, cloudflare) {
+	if (cloudflare.name === void 0) return void 0;
+	return (cloudflare.legacyWrangler ? ["wrangler.jsonc", "wrangler.json"] : ["cloudflare.config.ts"]).find((name) => fs.existsSync(path.join(root, name)));
+}
+function detectCloudflareProject(root, cloudflare) {
+	const projectInfo = detectProject(root);
+	return cloudflare.name ? {
+		...projectInfo,
+		projectName: cloudflare.name
+	} : projectInfo;
+}
 function setupCfPlatform(context, cloudflare) {
-	const projectInfo = detectProject(context.root);
+	const projectInfo = detectCloudflareProject(context.root, cloudflare);
 	const serviceBinding = cloudflare.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding";
 	let generatedViteConfig = false;
 	let preservedExistingGenerateScopedName = false;
@@ -168,7 +198,10 @@ function setupCfPlatform(context, cloudflare) {
 	const configPath = path.join(context.root, "cloudflare.config.ts");
 	const generatedPlatformFiles = [];
 	if (!fs.existsSync(configPath)) {
-		fs.writeFileSync(configPath, generateTypedCloudflareConfig(projectInfo, cloudflare, context.today));
+		fs.writeFileSync(configPath, generateTypedCloudflareConfig({
+			...projectInfo,
+			isStaticExport: context.isStaticExport
+		}, cloudflare, context.today));
 		generatedPlatformFiles.push("cloudflare.config.ts");
 	}
 	const nextSteps = [];
@@ -215,6 +248,12 @@ export const responseStoreServiceBinding = responseStore.serviceBindingWorker;
 		...options.imageOptimization === "cloudflare-images" ? ["IMAGES: bindings.images()"] : [],
 		...options.dataCache === "kv" ? ["VINEXT_KV_CACHE: bindings.kv()"] : []
 	];
+	const routing = defaultAssetRouting(info, options);
+	const assetLines = [
+		...routing.htmlHandling ? [`htmlHandling: ${JSON.stringify(routing.htmlHandling)}`] : [],
+		"notFoundHandling: \"none\"",
+		...routing.runWorkerFirst ? [`runWorkerFirst: [${routing.runWorkerFirst.map((pattern) => JSON.stringify(pattern)).join(", ")}]`] : []
+	];
 	return `${imports.join("\n")}
 
 ${shared}export default defineConfig({
@@ -223,7 +262,9 @@ ${shared}export default defineConfig({
     entrypoint: ${JSON.stringify(resolveWorkerEntry(info.root))},
     compatibilityDate: ${JSON.stringify(today)},
     compatibilityFlags: ["nodejs_compat"],
-    assets: { notFoundHandling: "none"${options.cdnCache === "static-assets" ? ", runWorkerFirst: [\"/_vinext/static-cache/*\"]" : ""} },
+    assets: {
+      ${assetLines.join(",\n      ")},
+    },
     env: {
       ${envBindings.join(",\n      ")},
     },
@@ -242,8 +283,21 @@ function resolveWorkerEntry(root) {
 	if (fs.existsSync(path.join(root, "worker", "index.js"))) return "./worker/index.js";
 	return "vinext/server/fetch-handler";
 }
+/**
+* Next.js runs no middleware for a static export, and an export with
+* `trailingSlash` relies on the default html_handling to serve `/about/` from
+* `about/index.html`, so export apps keep asset-first serving.
+*/
+function defaultAssetRouting(info, options) {
+	if (!info.isStaticExport) return {
+		htmlHandling: HTML_HANDLING,
+		runWorkerFirst: DEFAULT_RUN_WORKER_FIRST
+	};
+	return options.cdnCache === "static-assets" ? { runWorkerFirst: [STATIC_ASSETS_CACHE_ROUTE] } : {};
+}
 function generateWranglerConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPTIONS, today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0]) {
 	const workerEntry = resolveWorkerEntry(info.root);
+	const routing = defaultAssetRouting(info, options);
 	const config = {
 		$schema: "node_modules/wrangler/config-schema.json",
 		name: info.projectName,
@@ -252,15 +306,13 @@ function generateWranglerConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPTIONS,
 		main: workerEntry,
 		assets: {
 			directory: "dist/client",
+			...routing.htmlHandling ? { html_handling: routing.htmlHandling } : {},
 			not_found_handling: "none",
 			binding: "ASSETS",
-			...options.cdnCache === "static-assets" ? { run_worker_first: ["/_vinext/static-cache/*"] } : {}
+			...routing.runWorkerFirst ? { run_worker_first: routing.runWorkerFirst } : {}
 		}
 	};
-	if (options.cdnCache === "workers-cache") {
-		config.cache = { enabled: true };
-		config.version_metadata = { binding: DEFAULT_VERSION_METADATA_BINDING };
-	}
+	if (options.cdnCache === "workers-cache") config.version_metadata = { binding: DEFAULT_VERSION_METADATA_BINDING };
 	if (options.imageOptimization === "cloudflare-images") config.images = { binding: "IMAGES" };
 	if (options.dataCache === "kv") config.kv_namespaces = [{ binding: "VINEXT_KV_CACHE" }];
 	const code = `${JSON.stringify(config, null, 2)}\n`;
@@ -305,6 +357,19 @@ function stripJsonComments(code) {
 	}
 	return output.replace(/,\s*([}\]])/g, "$1");
 }
+/** Offset of the first JSONC token in `code`, after whitespace and comments. */
+function skipJsonWhitespaceAndComments(code) {
+	let index = 0;
+	while (index < code.length) if (/\s/.test(code[index])) index++;
+	else if (code.startsWith("//", index)) {
+		const lineEnd = code.indexOf("\n", index);
+		index = lineEnd === -1 ? code.length : lineEnd;
+	} else if (code.startsWith("/*", index)) {
+		const commentEnd = code.indexOf("*/", index + 2);
+		index = commentEnd === -1 ? code.length : commentEnd + 2;
+	} else break;
+	return index;
+}
 function findTopLevelJsonProperty(code, name) {
 	let depth = 0;
 	let inString = false;
@@ -457,7 +522,7 @@ function readResponseStoreServiceName(root, appConfig) {
 		const durableBindings = isUnknownRecord(responseStoreConfig.durable_objects) ? responseStoreConfig.durable_objects.bindings : void 0;
 		const hasCacheMetadata = Array.isArray(durableBindings) && durableBindings.some((binding) => isUnknownRecord(binding) && binding.name === CACHE_METADATA_BINDING && binding.class_name === CACHE_METADATA_CLASS && binding.script_name === void 0);
 		const hasNoMigrations = responseStoreConfig.migrations === void 0 || Array.isArray(responseStoreConfig.migrations) && responseStoreConfig.migrations.length === 0;
-		if (!isUnknownRecord(responseStoreConfig.cache) || responseStoreConfig.cache.enabled !== true || !isUnknownRecord(responseStoreExport) || !isUnknownRecord(responseStoreExport.cache) || responseStoreExport.cache.enabled !== true || !hasCacheBodies || !hasCacheMetadata || !isCacheMetadataExport(cacheMetadataExport) || !hasNoMigrations) throw new Error(`${RESPONSE_STORE_WRANGLER_CONFIG} is missing required Response Store bindings.`);
+		if (responseStoreConfig.cache !== void 0 && (!isUnknownRecord(responseStoreConfig.cache) || typeof responseStoreConfig.cache.enabled !== "boolean") || !isUnknownRecord(responseStoreExport) || !isUnknownRecord(responseStoreExport.cache) || responseStoreExport.cache.enabled !== true || !hasCacheBodies || !hasCacheMetadata || !isCacheMetadataExport(cacheMetadataExport) || !hasNoMigrations) throw new Error(`${RESPONSE_STORE_WRANGLER_CONFIG} is missing required Response Store bindings.`);
 		const compatibilityFlags = responseStoreConfig.compatibility_flags;
 		if (compatibilityFlags !== void 0 && (!Array.isArray(compatibilityFlags) || compatibilityFlags.some((flag) => typeof flag !== "string"))) throw new Error(`${RESPONSE_STORE_WRANGLER_CONFIG} has invalid compatibility flags.`);
 		const flags = compatibilityFlags ?? [];
@@ -481,7 +546,7 @@ function configureResponseStoreWrangler(code, config, mode, root) {
 	if (cache !== void 0 && !isUnknownRecord(cache)) throw new Error("The existing Wrangler config has an invalid cache value.");
 	code = setTopLevelJsonProperty(code, "cache", {
 		...cache,
-		enabled: mode === "self-contained"
+		enabled: false
 	});
 	const exportsConfig = config.exports;
 	if (exportsConfig !== void 0 && !isUnknownRecord(exportsConfig)) throw new Error("The existing Wrangler config has an invalid exports value.");
@@ -593,7 +658,7 @@ function generateResponseStoreWranglerConfig(appWranglerCode, root) {
 		compatibility_flags: compatibilityFlags,
 		workers_dev: false,
 		preview_urls: false,
-		cache: { enabled: true },
+		cache: { enabled: false },
 		exports: {
 			default: {
 				type: "worker",
@@ -629,15 +694,25 @@ function updateWranglerConfigForCloudflare(code, options, context = {}) {
 		const workerEntry = resolveWorkerEntry(context.root ?? process.cwd());
 		output = appendTopLevelJsonProperty(output, `  "main": ${JSON.stringify(workerEntry)}`);
 	}
-	if (!findTopLevelJsonProperty(output, "assets")) output = appendTopLevelJsonProperty(output, "  \"assets\": { \"directory\": \"dist/client\", \"not_found_handling\": \"none\", \"binding\": \"ASSETS\" }");
+	if (!findTopLevelJsonProperty(output, "assets")) {
+		const routing = defaultAssetRouting(context, {});
+		const assets = JSON.stringify({
+			directory: "dist/client",
+			...routing.htmlHandling ? { html_handling: routing.htmlHandling } : {},
+			not_found_handling: "none",
+			binding: "ASSETS",
+			...routing.runWorkerFirst ? { run_worker_first: routing.runWorkerFirst } : {}
+		}, null, 2).replaceAll("\n", "\n  ");
+		output = appendTopLevelJsonProperty(output, `  "assets": ${assets}`);
+	}
 	if (options.cdnCache === "static-assets") {
 		const assetsProperty = findTopLevelJsonProperty(output, "assets");
 		const assets = JSON.parse(stripJsonComments(output.slice(assetsProperty.valueStart, assetsProperty.valueEnd)));
 		if (!assets || typeof assets !== "object" || Array.isArray(assets)) throw new Error("The existing Wrangler config has an invalid assets value.");
 		const workerFirst = assets.run_worker_first;
 		if (workerFirst !== void 0 && typeof workerFirst !== "boolean" && !Array.isArray(workerFirst)) throw new Error("The existing Wrangler config has an invalid assets.run_worker_first value.");
-		if (Array.isArray(workerFirst) && workerFirst.some((pattern) => typeof pattern !== "string" || pattern.startsWith("!"))) throw new Error("Static Assets cache requires run_worker_first without exclusion patterns. Use true or an array of positive path patterns.");
-		const protectedRouting = workerFirst === true ? true : [.../* @__PURE__ */ new Set([...Array.isArray(workerFirst) ? workerFirst : [], "/_vinext/static-cache/*"])];
+		if (Array.isArray(workerFirst) && workerFirst.some((pattern) => typeof pattern !== "string" || pattern.startsWith("!") && !BUILD_OUTPUT_EXCLUSIONS.includes(pattern))) throw new Error(`Static Assets cache requires run_worker_first without exclusion patterns other than ${BUILD_OUTPUT_EXCLUSIONS.join(" and ")}. Use an array of positive path patterns, optionally with those exclusions.`);
+		const protectedRouting = workerFirst === true ? true : Array.isArray(workerFirst) && workerFirst.includes("/*") ? workerFirst : [.../* @__PURE__ */ new Set([...Array.isArray(workerFirst) ? workerFirst : [], STATIC_ASSETS_CACHE_ROUTE])];
 		if (typeof assets.directory !== "string" || assets.directory.length === 0 || typeof assets.binding !== "string" || assets.binding.length === 0 || JSON.stringify(workerFirst) !== JSON.stringify(protectedRouting)) {
 			const updatedAssets = JSON.stringify({
 				...assets,
@@ -649,18 +724,6 @@ function updateWranglerConfigForCloudflare(code, options, context = {}) {
 		}
 	}
 	if (options.cdnCache === "workers-cache") {
-		const cacheProperty = findTopLevelJsonProperty(output, "cache");
-		if (!cacheProperty) output = appendTopLevelJsonProperty(output, "  \"cache\": { \"enabled\": true }");
-		else {
-			const cache = JSON.parse(stripJsonComments(output.slice(cacheProperty.valueStart, cacheProperty.valueEnd)));
-			if (!cache || cache.enabled !== true) {
-				const updatedCache = JSON.stringify({
-					...cache,
-					enabled: true
-				});
-				output = `${output.slice(0, cacheProperty.valueStart)}${updatedCache}${output.slice(cacheProperty.valueEnd)}`;
-			}
-		}
 		const versionMetadataProperty = findTopLevelJsonProperty(output, "version_metadata");
 		if (!versionMetadataProperty) output = appendTopLevelJsonProperty(output, `  "version_metadata": { "binding": "${DEFAULT_VERSION_METADATA_BINDING}" }`);
 		else {
@@ -668,6 +731,19 @@ function updateWranglerConfigForCloudflare(code, options, context = {}) {
 			if (!versionMetadata || typeof versionMetadata.binding !== "string" || versionMetadata.binding.length === 0) output = `${output.slice(0, versionMetadataProperty.valueStart)}{ "binding": "${DEFAULT_VERSION_METADATA_BINDING}" }${output.slice(versionMetadataProperty.valueEnd)}`;
 		}
 	}
+	if (options.cdnCache !== "response-store") {
+		const cacheProperty = findTopLevelJsonProperty(output, "cache");
+		if (cacheProperty) {
+			const cacheCode = output.slice(cacheProperty.valueStart, cacheProperty.valueEnd);
+			const cache = JSON.parse(stripJsonComments(cacheCode));
+			const enabledProperty = findTopLevelJsonProperty(cacheCode, "enabled");
+			const enabledToken = enabledProperty ? enabledProperty.valueStart + skipJsonWhitespaceAndComments(cacheCode.slice(enabledProperty.valueStart, enabledProperty.valueEnd)) : -1;
+			if (isUnknownRecord(cache) && cache.enabled === true && cacheCode.startsWith("true", enabledToken)) {
+				const enabledStart = cacheProperty.valueStart + enabledToken;
+				output = `${output.slice(0, enabledStart)}false${output.slice(enabledStart + 4)}`;
+			}
+		}
+	}
 	if (options.imageOptimization === "cloudflare-images") {
 		const imagesProperty = findTopLevelJsonProperty(output, "images");
 		if (!imagesProperty) output = appendTopLevelJsonProperty(output, "  \"images\": { \"binding\": \"IMAGES\" }");
@@ -1540,4 +1616,4 @@ function usesCommonJsViteConfig(filePath, code) {
 	return parseViteConfig(filePath, code).body.some((statement) => statement.type === "ExpressionStatement" && statement.expression.type === "AssignmentExpression" && statement.expression.left.type === "MemberExpression" && statement.expression.left.object.type === "Identifier" && statement.expression.left.object.name === "module" && statement.expression.left.property.type === "Identifier" && statement.expression.left.property.name === "exports");
 }
 //#endregion
-export { compactResourceName, cssModulesConfigSource, generateAppRouterViteConfig, generatePagesRouterViteConfig, generateResponseStoreWranglerConfig, generateWranglerConfig, getWranglerImagesBinding, getWranglerVersionMetadataBinding, setupCloudflarePlatform, updateViteConfigForCloudflare, updateViteConfigForCssModules, updateWranglerConfigForCloudflare, usesCommonJsViteConfig, validateCloudflarePlatformSetup };
+export { compactResourceName, cssModulesConfigSource, findConfigKeepingWorkerName, generateAppRouterViteConfig, generatePagesRouterViteConfig, generateResponseStoreWranglerConfig, generateWranglerConfig, getWranglerImagesBinding, getWranglerVersionMetadataBinding, setupCloudflarePlatform, updateViteConfigForCloudflare, updateViteConfigForCssModules, updateWranglerConfigForCloudflare, usesCommonJsViteConfig, validateCloudflarePlatformSetup };

package/dist/init-platform.d.ts

@@ -13,6 +13,8 @@ export type CloudflareInitOptions = {
   warmCdnCache?: boolean;
   legacyWrangler?: boolean;
   prerender?: boolean;
+  /** Worker name for generated config, instead of one derived from package.json. */
+  name?: string;
 };
 export declare const INIT_PLATFORMS: {
   cloudflare: {
@@ -38,6 +40,8 @@ export type ResolvedInitOptions = {
 };
 export declare function isAgentEnvironment(env?: Record<string, string | undefined>): boolean;
 export declare function parsePlatformArg(args: string[]): InitPlatform | undefined;
+export declare function parseNameArg(args: string[]): string | undefined;
+export declare function validateWorkerName(value: string): void;
 export declare function parseDataCacheArg(args: string[]): InitDataCache | undefined;
 export declare function parseCdnCacheArg(args: string[]): InitCdnCache | undefined;
 export declare function parseImageOptimizationArg(args: string[]): InitImageOptimization | undefined;

package/dist/init-platform.js

@@ -31,6 +31,28 @@ function parsePlatformArg(args) {
 		}
 	}
 }
+const WORKER_NAME_PATTERN = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/;
+const WORKER_NAME_MAX_LENGTH = 63;
+function parseNameArg(args) {
+	for (let index = 0; index < args.length; index++) {
+		const arg = args[index];
+		let value;
+		if (arg === "--name") {
+			value = args[index + 1];
+			if (!value || value.startsWith("-")) throw new Error("--name requires a Worker name.");
+		} else if (arg.startsWith("--name=")) {
+			value = arg.slice(7);
+			if (!value) throw new Error("--name requires a Worker name.");
+		}
+		if (value) {
+			validateWorkerName(value);
+			return value;
+		}
+	}
+}
+function validateWorkerName(value) {
+	if (value.length > WORKER_NAME_MAX_LENGTH || !WORKER_NAME_PATTERN.test(value)) throw new Error(`Invalid --name value "${value}". Worker names must be at most ${WORKER_NAME_MAX_LENGTH} characters of lowercase letters, numbers, and dashes, and cannot start or end with a dash.`);
+}
 function parseChoiceArg(args, flag, choices, displayedChoices = choices) {
 	for (let index = 0; index < args.length; index++) {
 		const arg = args[index];
@@ -115,10 +137,12 @@ async function resolveInitPlatform(args, options = {}) {
 }
 async function resolveInitOptions(args, options = {}) {
 	const legacyWrangler = parseBooleanArg(args, "--legacy-wrangler-cloudflare-init", void 0, "--legacy-wrangler-cloudflare-init expects true or false when using the \"--legacy-wrangler-cloudflare-init=value\" form.");
+	const name = parseNameArg(args);
 	const platform = legacyWrangler && !parsePlatformArg(args) ? "cloudflare" : await resolveInitPlatform(args, options);
 	const platformOptions = await INIT_PLATFORMS[platform].options(args, options);
 	const explicitWarmCdnCache = parseWarmCdnCacheArg(args);
 	if (legacyWrangler && platform !== "cloudflare") throw new Error("--legacy-wrangler-cloudflare-init requires --platform=cloudflare.");
+	if (name && platform !== "cloudflare") throw new Error("--name requires --platform=cloudflare.");
 	const explicitPrerender = parsePrerenderArg(args);
 	if (platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" && explicitPrerender === false) throw new Error("--no-prerender cannot be used with --cdn-cache=static-assets, which requires build-time prerendering.");
 	const supportsWarmCdnCache = platformOptions?.cdnCache === "response-store" || platformOptions?.cdnCache === "workers-cache";
@@ -134,7 +158,8 @@ async function resolveInitOptions(args, options = {}) {
 			...platformOptions,
 			warmCdnCache,
 			...legacyWrangler ? { legacyWrangler } : {},
-			...prerender ? { prerender: true } : {}
+			...prerender ? { prerender: true } : {},
+			...name ? { name } : {}
 		} : void 0
 	};
 }
@@ -314,4 +339,4 @@ async function resolveCloudflareInitOptions(args, options = {}) {
 	}
 }
 //#endregion
-export { INIT_PLATFORMS, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, parseResponseStoreModeArg, parseWarmCdnCacheArg, resolveCloudflareInitOptions, resolveInitOptions, resolveInitPlatform, resolveInitPrerender, resolveInitWarmCdnCache };
+export { INIT_PLATFORMS, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parseNameArg, parsePlatformArg, parsePrerenderArg, parseResponseStoreModeArg, parseWarmCdnCacheArg, resolveCloudflareInitOptions, resolveInitOptions, resolveInitPlatform, resolveInitPrerender, resolveInitWarmCdnCache, validateWorkerName };

package/dist/init.d.ts

@@ -64,6 +64,7 @@ export declare function addScripts(root: string, port?: number | false, platform
   warmCdnCache?: boolean;
   legacyWrangler?: boolean;
   scriptNames?: "namespaced" | "standard";
+  workerName?: string;
 }): string[];
 export type InitDependencyGroups = {
   dependencies: string[];

package/dist/init.js

@@ -1,6 +1,6 @@
 import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { detectPackageManager, detectPackageManagerName, detectProject, ensureESModule, findViteConfigPath, hasViteConfig, renameCJSConfigs } from "./utils/project.js";
-import { compactResourceName, cssModulesConfigSource, setupCloudflarePlatform, updateViteConfigForCssModules, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
+import { compactResourceName, cssModulesConfigSource, findConfigKeepingWorkerName, setupCloudflarePlatform, updateViteConfigForCssModules, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
 import { getReactUpgradeDeps } from "./utils/react-version.js";
 import fs from "node:fs";
 import { spawn, spawnSync } from "node:child_process";
@@ -123,7 +123,7 @@ function addScripts(root, port, platform = "node", options = {}) {
 		if (platform === "cloudflare") {
 			addScript("deploy", !options.legacyWrangler ? options.warmCdnCache ? "vinext-cloudflare deploy --warm-cache" : "vinext-cloudflare deploy" : options.warmCdnCache ? "vinext-cloudflare deploy --config dist/server/wrangler.json --warm-cache" : "vinext-cloudflare deploy --config dist/server/wrangler.json");
 			if (options.deployResponseStore && !pkg.scripts["deploy:response-store"]) {
-				pkg.scripts["deploy:response-store"] = !options.legacyWrangler ? `cf deploy --prebuilt --mode production --worker ${compactResourceName(detectProject(root).projectName, "-response-store", 63)}` : "wrangler deploy --config wrangler.response-store.jsonc";
+				pkg.scripts["deploy:response-store"] = !options.legacyWrangler ? `cf deploy --prebuilt --mode production --worker ${compactResourceName(options.workerName ?? detectProject(root).projectName, "-response-store", 63)}` : "wrangler deploy --config wrangler.response-store.jsonc";
 				added.push("deploy:response-store");
 			}
 		}
@@ -302,6 +302,64 @@ function updateGitignore(root, platform = "node", legacyWrangler = false) {
 	fs.writeFileSync(gitignorePath, content + separator + missingEntries.join("\n") + "\n", "utf-8");
 	return true;
 }
+/**
+* Read `output` from the Next.js config as `vinext build` does: an inline
+* `vinext({ nextConfig })` in the Vite config wins over next.config, and both
+* are evaluated with NODE_ENV set to production and `.env.production` loaded as
+* the build loads it. The Vite config is read as written, without running
+* plugin `config` hooks, so a plugin that changes `root`, `envDir` or `mode` is
+* not seen. A config that cannot load here keeps the Worker-first default.
+* The loader is imported lazily because it needs Vite, which create-vinext-app
+* runs without.
+*/
+async function resolvesToStaticExport(root, viteConfigPath) {
+	let configModule;
+	let dotenvModule;
+	try {
+		[configModule, dotenvModule] = await Promise.all([import("./config/next-config.js"), import("./config/dotenv.js")]);
+	} catch {
+		return false;
+	}
+	const { findVinextNextConfigInPlugins, loadNextConfig, PHASE_PRODUCTION_BUILD, resolveNextConfigInput } = configModule;
+	const savedEnv = { ...process.env };
+	Reflect.set(process.env, "NODE_ENV", "production");
+	try {
+		dotenvModule.loadDotenv({
+			root,
+			mode: "production"
+		});
+		let mode = "production";
+		let inline = null;
+		let configRoot = root;
+		let envDir;
+		if (viteConfigPath) try {
+			const { loadConfigFromFile } = await import("vite");
+			const loaded = await loadConfigFromFile({
+				command: "build",
+				mode: "production",
+				isSsrBuild: false,
+				isPreview: false
+			}, viteConfigPath, root, "silent");
+			if (typeof loaded?.config.mode === "string") mode = loaded.config.mode;
+			if (typeof loaded?.config.root === "string") configRoot = path.resolve(root, loaded.config.root);
+			const configuredEnvDir = loaded?.config.envDir;
+			if (configuredEnvDir === false) envDir = false;
+			else if (typeof configuredEnvDir === "string") envDir = path.resolve(root, configuredEnvDir);
+			inline = await findVinextNextConfigInPlugins(loaded?.config.plugins);
+		} catch {}
+		if (envDir !== false) dotenvModule.loadDotenv({
+			root: envDir ?? configRoot,
+			mode
+		});
+		Reflect.set(process.env, "NODE_ENV", "production");
+		return (inline ? await resolveNextConfigInput(inline, PHASE_PRODUCTION_BUILD) : await loadNextConfig(configRoot, PHASE_PRODUCTION_BUILD))?.output === "export";
+	} catch {
+		return false;
+	} finally {
+		for (const key of Object.keys(process.env)) if (!Object.hasOwn(savedEnv, key)) delete process.env[key];
+		Object.assign(process.env, savedEnv);
+	}
+}
 function setupNodePlatform(context) {
 	if (context.viteConfigExists && !context.force) {
 		if (context.hasCssModules && context.existingViteConfigPath) {
@@ -389,14 +447,17 @@ async function init(options) {
 	const hasCssModules = !options.skipCssModules && scanCssModuleFiles(root);
 	const pmName = detectPackageManagerName(root);
 	const shouldInstall = options.install ?? true;
+	const isStaticExport = platform === "cloudflare" && await resolvesToStaticExport(root, existingViteConfigPath);
 	if (platform === "cloudflare") validateCloudflarePlatformSetup({
 		root,
 		isAppRouter: isApp,
 		existingViteConfigPath,
 		hasCssModules,
+		isStaticExport,
 		today: options._today
 	}, cloudflareOptions);
 	else if (hasCssModules && existingViteConfigPath && !options.force) updateViteConfigForCssModules(existingViteConfigPath, fs.readFileSync(existingViteConfigPath, "utf-8"));
+	const configKeepingWorkerName = platform === "cloudflare" ? findConfigKeepingWorkerName(root, cloudflareOptions) : void 0;
 	if (!options.skipCheck) {
 		console.log("  Running compatibility check...\n");
 		const { runCheck, formatReport } = await import("./check.js");
@@ -417,7 +478,8 @@ async function init(options) {
 		deployResponseStore,
 		warmCdnCache: options.cloudflare?.warmCdnCache ?? false,
 		legacyWrangler: options.cloudflare?.legacyWrangler,
-		scriptNames: options.scriptNames
+		scriptNames: options.scriptNames,
+		workerName: configKeepingWorkerName ? void 0 : options.cloudflare?.name
 	});
 	const setupContext = {
 		root,
@@ -428,6 +490,7 @@ async function init(options) {
 		force: options.force ?? false,
 		prerender: options.prerender,
 		hasCssModules,
+		isStaticExport,
 		today: options._today
 	};
 	const platformSetup = platform === "cloudflare" ? setupCloudflarePlatform(setupContext, cloudflareOptions) : setupNodePlatform(setupContext);
@@ -513,6 +576,7 @@ async function init(options) {
 	if (skippedViteConfig) console.log(`    ${terminalStyle.yellow("-")} Skipped vite.config.ts (already exists, use --force to overwrite)`);
 	if (updatedGitignore) console.log(`    ${terminalStyle.green("✓")} Added vinext output directories to .gitignore`);
 	if (hasCssModules) console.log(`    ${terminalStyle.green("✓")} Configured vite-css-modules for CSS Modules`);
+	if (configKeepingWorkerName) console.log(`    ${terminalStyle.yellow("!")} Kept the Worker name in the existing ${configKeepingWorkerName}; --name was not applied, so update it there if it should be "${cloudflareOptions.name}"`);
 	if (platformSetup.preservedExistingGenerateScopedName) console.log(`    ${terminalStyle.yellow("!")} Preserved existing css.modules.generateScopedName; verify it produces identical class names in SSR and client builds`);
 	const nextSteps = [...platformSetup.nextSteps];
 	if (dependencyInstallNeedsApproval) nextSteps.push("Dependency installation is incomplete because pnpm blocked dependency build scripts:", "1. Review and approve the required build scripts:", "   pnpm approve-builds", "2. Finish installing dependencies:", "   pnpm install");

package/dist/plugins/ast-scope.d.ts

@@ -11,4 +11,11 @@ export declare function collectDirectScopeBindings(node: ESTree.Node, scope: Ast
 export declare function collectLoopScopeBindings(node: ESTree.ForStatement | ESTree.ForInStatement | ESTree.ForOfStatement, scope: AstScope, onVariableDeclarator?: (declaration: ESTree.VariableDeclaration, declarator: ESTree.VariableDeclarator) => void): void;
 export declare function collectSwitchScopeBindings(node: ESTree.SwitchStatement, scope: AstScope, onVariableDeclarator?: (declaration: ESTree.VariableDeclaration, declarator: ESTree.VariableDeclarator) => void): void;
 export declare function collectVarScopeBindings(node: ESTree.Node, scope: AstScope, root?: boolean): void;
+/** The nearest scope declaring `name`, or `null` for an unbound (global) name. */
+export declare function findAstBindingScope(scope: AstScope, name: string): AstScope | null;
+/**
+ * Visit every node with the scope it is evaluated in. The root scope holds the
+ * program's own bindings, including every `var` outside a function.
+ */
+export declare function walkAstScopes(root: ESTree.Program, visitor: (node: ESTree.Node, scope: AstScope) => void): AstScope;
 //#endregion

package/dist/plugins/ast-scope.js

@@ -23,7 +23,7 @@ function collectDirectScopeBindings(node, scope, onVariableDeclarator) {
 			for (const specifier of declaration.specifiers) if (specifier.type !== "ImportSpecifier" || specifier.importKind !== "type") collectBindingNames(specifier.local, scope.bindings);
 		} else if (declaration.type === "TSImportEqualsDeclaration" && declaration.importKind !== "type") collectBindingNames(declaration.id, scope.bindings);
 		else if (declaration.type === "VariableDeclaration" && declaration.declare !== true) for (const declarator of declaration.declarations) {
-			collectBindingNames(declarator.id, scope.bindings);
+			if (declaration.kind !== "var") collectBindingNames(declarator.id, scope.bindings);
 			onVariableDeclarator?.(declaration, declarator);
 		}
 		else if ((declaration.type === "FunctionDeclaration" || declaration.type === "ClassDeclaration") && declaration.declare !== true) collectBindingNames(declaration.id, scope.bindings);
@@ -34,7 +34,7 @@ function collectLoopScopeBindings(node, scope, onVariableDeclarator) {
 	const declarationValue = node.type === "ForStatement" ? node.init : node.left;
 	if (!declarationValue || declarationValue.type !== "VariableDeclaration" || declarationValue.declare === true) return;
 	for (const declarator of declarationValue.declarations) {
-		collectBindingNames(declarator.id, scope.bindings);
+		if (declarationValue.kind !== "var") collectBindingNames(declarator.id, scope.bindings);
 		onVariableDeclarator?.(declarationValue, declarator);
 	}
 }
@@ -46,5 +46,61 @@ function collectVarScopeBindings(node, scope, root = true) {
 	if (node.type === "VariableDeclaration" && node.kind === "var" && node.declare !== true) for (const declarator of node.declarations) collectBindingNames(declarator.id, scope.bindings);
 	forEachAstChild(node, (child) => collectVarScopeBindings(child, scope, false));
 }
+/** The nearest scope declaring `name`, or `null` for an unbound (global) name. */
+function findAstBindingScope(scope, name) {
+	for (let current = scope; current; current = current.parent) if (current.bindings.has(name)) return current;
+	return null;
+}
+/**
+* Visit every node with the scope it is evaluated in. The root scope holds the
+* program's own bindings, including every `var` outside a function.
+*/
+function walkAstScopes(root, visitor) {
+	const rootScope = createAstScope(null);
+	collectDirectScopeBindings(root, rootScope);
+	collectVarScopeBindings(root, rootScope);
+	function visit(node, parentScope) {
+		visitor(node, parentScope);
+		let scope = parentScope;
+		if (isFunctionNode(node)) {
+			const parameterScope = createAstScope(parentScope);
+			if (node.type === "FunctionExpression") collectBindingNames(node.id, parameterScope.bindings);
+			for (const parameter of node.params) collectBindingNames(parameter, parameterScope.bindings);
+			if (node.id) visit(node.id, node.type === "FunctionExpression" ? parameterScope : parentScope);
+			for (const parameter of node.params) visit(parameter, parameterScope);
+			if (!node.body) return;
+			const bodyScope = createAstScope(parameterScope);
+			collectDirectScopeBindings(node.body, bodyScope);
+			collectVarScopeBindings(node.body, bodyScope);
+			if (node.body.type === "BlockStatement") for (const statement of node.body.body) visit(statement, bodyScope);
+			else visit(node.body, bodyScope);
+			return;
+		}
+		if (node.type === "SwitchStatement") {
+			visit(node.discriminant, parentScope);
+			const switchScope = createAstScope(parentScope);
+			collectSwitchScopeBindings(node, switchScope);
+			for (const switchCase of node.cases) visit(switchCase, switchScope);
+			return;
+		}
+		if (node.type === "BlockStatement" || node.type === "StaticBlock" || node.type === "TSModuleBlock") {
+			scope = createAstScope(parentScope);
+			collectDirectScopeBindings(node, scope);
+			if (node.type === "StaticBlock" || node.type === "TSModuleBlock") collectVarScopeBindings(node, scope);
+		} else if (node.type === "CatchClause") {
+			scope = createAstScope(parentScope);
+			collectBindingNames(node.param, scope.bindings);
+		} else if (node.type === "ForStatement" || node.type === "ForInStatement" || node.type === "ForOfStatement") {
+			scope = createAstScope(parentScope);
+			collectLoopScopeBindings(node, scope);
+		} else if (node.type === "ClassExpression" && node.id) {
+			scope = createAstScope(parentScope);
+			collectBindingNames(node.id, scope.bindings);
+		}
+		forEachAstChild(node, (child) => visit(child, scope));
+	}
+	for (const statement of root.body) visit(statement, rootScope);
+	return rootScope;
+}
 //#endregion
-export { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode };
+export { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, findAstBindingScope, hasAstBinding, isFunctionNode, walkAstScopes };

package/dist/plugins/cache-flight-codec.d.ts

@@ -14,6 +14,6 @@ export declare function readFlightCodecVersion(id: string): string;
  * minimum supported version.
  * https://github.com/facebook/react/blob/v19.3.0/packages/react-client/src/ReactFlightReplyClient.js#L486
  */
-export declare function patchCacheFlightCodec(code: string, id: string, version?: string): MagicStringTransformResult | null;
+export declare function patchCacheFlightCodec(code: string, id: string, version?: string): MagicStringTransformResult<import("magic-string").SourceMap> | null;
 export declare function cacheFlightCodecPlugin(): Plugin;
 //#endregion

package/dist/plugins/dynamic-preload-metadata.d.ts

@@ -7,5 +7,5 @@ type TransformResult = {
 };
 type ResolveDynamicImport = (specifier: string, importer: string) => Promise<string | null>;
 export declare function transformNextDynamicPreloadMetadata(code: string, id: string, root: string, resolveDynamicImport: ResolveDynamicImport): Promise<TransformResult | null>;
-export declare function createDynamicPreloadMetadataPlugin(): Plugin;
+export declare function createDynamicPreloadMetadataPlugin(getTranspiledPackages: () => readonly string[]): Plugin;
 //#endregion