vinext 1.0.0-beta.9 → 1.0.0

package/dist/init-platform.d.ts

@@ -1,16 +1,20 @@
 import { Readable, Writable } from "node:stream";
 //#region src/init-platform.d.ts
-type InitPlatform = "cloudflare" | "node";
-type InitDataCache = "kv" | "none";
-type InitCdnCache = "data-cache" | "workers-cache";
-type InitImageOptimization = "cloudflare-images" | "none";
-type CloudflareInitOptions = {
+export type InitPlatform = "cloudflare" | "node";
+export type InitDataCache = "kv" | "none";
+export type InitCdnCache = "data-cache" | "none" | "response-store" | "static-assets" | "workers-cache";
+export type InitImageOptimization = "cloudflare-images" | "none";
+export type InitResponseStoreMode = "self-contained" | "service-binding";
+export type CloudflareInitOptions = {
   dataCache: InitDataCache;
   cdnCache: InitCdnCache;
   imageOptimization: InitImageOptimization;
+  responseStoreMode?: InitResponseStoreMode;
   warmCdnCache?: boolean;
+  legacyWrangler?: boolean;
+  prerender?: boolean;
 };
-declare const INIT_PLATFORMS: {
+export declare const INIT_PLATFORMS: {
   cloudflare: {
     name: string;
     options: typeof resolveCloudflareInitOptions;
@@ -20,29 +24,29 @@ declare const INIT_PLATFORMS: {
     options: () => Promise<undefined>;
   };
 };
-type PlatformPromptOptions = {
+export type PlatformPromptOptions = {
   env?: Record<string, string | undefined>;
   input?: Readable;
   output?: Writable;
   isInteractive?: boolean;
   question?: (prompt: string) => Promise<string>;
 };
-type ResolvedInitOptions = {
+export type ResolvedInitOptions = {
   platform: InitPlatform;
   cloudflare?: CloudflareInitOptions;
   prerender: boolean;
 };
-declare function isAgentEnvironment(env?: Record<string, string | undefined>): boolean;
-declare function parsePlatformArg(args: string[]): InitPlatform | undefined;
-declare function parseDataCacheArg(args: string[]): InitDataCache | undefined;
-declare function parseCdnCacheArg(args: string[]): InitCdnCache | undefined;
-declare function parseImageOptimizationArg(args: string[]): InitImageOptimization | undefined;
-declare function parsePrerenderArg(args: string[]): boolean | undefined;
-declare function parseWarmCdnCacheArg(args: string[]): boolean | undefined;
-declare function resolveInitPlatform(args: string[], options?: PlatformPromptOptions): Promise<InitPlatform>;
-declare function resolveInitOptions(args: string[], options?: PlatformPromptOptions): Promise<ResolvedInitOptions>;
-declare function resolveInitPrerender(args: string[], options?: PlatformPromptOptions): Promise<boolean>;
-declare function resolveInitWarmCdnCache(args: string[], options?: PlatformPromptOptions): Promise<boolean>;
-declare function resolveCloudflareInitOptions(args: string[], options?: PlatformPromptOptions): Promise<CloudflareInitOptions>;
-//#endregion
-export { CloudflareInitOptions, INIT_PLATFORMS, InitCdnCache, InitDataCache, InitImageOptimization, InitPlatform, PlatformPromptOptions, ResolvedInitOptions, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, parseWarmCdnCacheArg, resolveCloudflareInitOptions, resolveInitOptions, resolveInitPlatform, resolveInitPrerender, resolveInitWarmCdnCache };
+export declare function isAgentEnvironment(env?: Record<string, string | undefined>): boolean;
+export declare function parsePlatformArg(args: string[]): InitPlatform | undefined;
+export declare function parseDataCacheArg(args: string[]): InitDataCache | undefined;
+export declare function parseCdnCacheArg(args: string[]): InitCdnCache | undefined;
+export declare function parseImageOptimizationArg(args: string[]): InitImageOptimization | undefined;
+export declare function parseResponseStoreModeArg(args: string[]): InitResponseStoreMode | undefined;
+export declare function parsePrerenderArg(args: string[]): boolean | undefined;
+export declare function parseWarmCdnCacheArg(args: string[]): boolean | undefined;
+export declare function resolveInitPlatform(args: string[], options?: PlatformPromptOptions): Promise<InitPlatform>;
+export declare function resolveInitOptions(args: string[], options?: PlatformPromptOptions): Promise<ResolvedInitOptions>;
+export declare function resolveInitPrerender(args: string[], options?: PlatformPromptOptions, platform?: InitPlatform): Promise<boolean>;
+export declare function resolveInitWarmCdnCache(args: string[], options?: PlatformPromptOptions): Promise<boolean>;
+export declare function resolveCloudflareInitOptions(args: string[], options?: PlatformPromptOptions): Promise<CloudflareInitOptions>;
+//#endregion

package/dist/init-platform.js

@@ -52,16 +52,25 @@ function parseDataCacheArg(args) {
 	return parseChoiceArg(args, "--data-cache", ["kv", "none"]);
 }
 function parseCdnCacheArg(args) {
-	return parseChoiceArg(args, "--cdn-cache", ["workers-cache", "data-cache"]);
+	return parseChoiceArg(args, "--cdn-cache", [
+		"none",
+		"response-store",
+		"workers-cache",
+		"static-assets",
+		"data-cache"
+	]);
 }
 function parseImageOptimizationArg(args) {
 	return parseChoiceArg(args, "--image-optimization", ["cloudflare-images", "none"]);
 }
+function parseResponseStoreModeArg(args) {
+	return parseChoiceArg(args, "--response-store-mode", ["service-binding", "self-contained"]);
+}
 function parsePrerenderArg(args) {
 	return parseBooleanArg(args, "--prerender", "--no-prerender", "--prerender expects true or false when using the \"--prerender=value\" form.");
 }
 function parseWarmCdnCacheArg(args) {
-	return parseBooleanArg(args, "--experimental-warm-cdn-cache", "--no-experimental-warm-cdn-cache", "--experimental-warm-cdn-cache expects true or false when using the \"--experimental-warm-cdn-cache=value\" form.");
+	return parseBooleanArg(args, "--warm-cache", "--no-warm-cache", "--warm-cache expects true or false when using the \"--warm-cache=value\" form.") ?? parseBooleanArg(args, "--experimental-warm-cdn-cache", "--no-experimental-warm-cdn-cache", "--warm-cache expects true or false when using the \"--warm-cache=value\" form.");
 }
 function parseBooleanArg(args, enabledFlag, disabledFlag, errorMessage) {
 	for (const arg of args) {
@@ -105,24 +114,31 @@ async function resolveInitPlatform(args, options = {}) {
 	}
 }
 async function resolveInitOptions(args, options = {}) {
-	const platform = await resolveInitPlatform(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 platform = legacyWrangler && !parsePlatformArg(args) ? "cloudflare" : await resolveInitPlatform(args, options);
 	const platformOptions = await INIT_PLATFORMS[platform].options(args, options);
 	const explicitWarmCdnCache = parseWarmCdnCacheArg(args);
-	if (platform === "cloudflare" && platformOptions?.cdnCache !== "workers-cache") {
-		if (explicitWarmCdnCache === true) throw new Error("--experimental-warm-cdn-cache requires --cdn-cache=workers-cache.");
+	if (legacyWrangler && platform !== "cloudflare") throw new Error("--legacy-wrangler-cloudflare-init 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";
+	if (platform === "cloudflare" && !supportsWarmCdnCache) {
+		if (explicitWarmCdnCache === true) throw new Error("--warm-cache requires --cdn-cache=response-store or workers-cache.");
 	}
-	const prerender = await resolveInitPrerender(args, options);
-	const warmCdnCache = platform === "cloudflare" && platformOptions?.cdnCache === "workers-cache" ? await resolveInitWarmCdnCache(args, options) : false;
+	const prerender = platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" ? false : explicitPrerender ?? await resolveInitPrerender(args, options, platform);
+	const warmCdnCache = platform === "cloudflare" && supportsWarmCdnCache ? await resolveInitWarmCdnCache(args, options) : false;
 	return {
 		platform,
 		prerender,
 		cloudflare: platform === "cloudflare" && platformOptions ? {
 			...platformOptions,
-			warmCdnCache
+			warmCdnCache,
+			...legacyWrangler ? { legacyWrangler } : {},
+			...prerender ? { prerender: true } : {}
 		} : void 0
 	};
 }
-async function resolveInitPrerender(args, options = {}) {
+async function resolveInitPrerender(args, options = {}, platform = "node") {
 	const explicitPrerender = parsePrerenderArg(args);
 	if (explicitPrerender !== void 0) return explicitPrerender;
 	const env = options.env ?? process.env;
@@ -137,7 +153,7 @@ async function resolveInitPrerender(args, options = {}) {
 	const question = options.question ?? ((prompt) => readline.question(prompt));
 	try {
 		while (true) {
-			const answer = (await question("  Pre-render all static routes after build? [y/N]: ")).trim().toLowerCase();
+			const answer = (await question(platform === "cloudflare" ? "  Pre-render all static routes after build? (not served by Cloudflare deploy unless using Static Assets) [y/N]: " : "  Pre-render all static routes after build? [y/N]: ")).trim().toLowerCase();
 			if (answer === "") {
 				output.write("\n");
 				return false;
@@ -171,7 +187,7 @@ async function resolveInitWarmCdnCache(args, options = {}) {
 	const question = options.question ?? ((prompt) => readline.question(prompt));
 	try {
 		while (true) {
-			const answer = (await question("  Enable Workers Cache experimental pre-warm during deploy? [y/N]: ")).trim().toLowerCase();
+			const answer = (await question("  Enable cache pre-warm during deploy? [y/N]: ")).trim().toLowerCase();
 			if (answer === "") {
 				output.write("\n");
 				return false;
@@ -192,21 +208,31 @@ async function resolveInitWarmCdnCache(args, options = {}) {
 }
 async function resolveCloudflareInitOptions(args, options = {}) {
 	const explicitDataCache = parseDataCacheArg(args);
-	const explicitCdnCache = parseCdnCacheArg(args);
+	const requestedCdnCache = parseCdnCacheArg(args);
+	const explicitResponseStoreMode = parseResponseStoreModeArg(args);
+	if (explicitResponseStoreMode && requestedCdnCache && requestedCdnCache !== "response-store") throw new Error("--response-store-mode can only be used with --cdn-cache=response-store.");
+	const explicitCdnCache = requestedCdnCache ?? (explicitResponseStoreMode ? "response-store" : void 0);
 	const explicitImageOptimization = parseImageOptimizationArg(args);
-	if (explicitCdnCache && explicitDataCache && explicitImageOptimization) return {
-		dataCache: explicitDataCache,
+	if ((explicitCdnCache === "response-store" || explicitCdnCache === "none") && explicitDataCache === "kv") throw new Error(`--cdn-cache=${explicitCdnCache} cannot be combined with --data-cache=kv.`);
+	if (explicitCdnCache === "data-cache" && explicitDataCache === "none") throw new Error("--cdn-cache=data-cache requires --data-cache=kv.");
+	if (explicitCdnCache && (explicitCdnCache === "response-store" || explicitCdnCache === "none" || explicitCdnCache === "data-cache" || explicitDataCache) && explicitImageOptimization) return {
+		dataCache: explicitCdnCache === "response-store" || explicitCdnCache === "none" ? "none" : explicitDataCache ?? "kv",
 		cdnCache: explicitCdnCache,
-		imageOptimization: explicitImageOptimization
+		imageOptimization: explicitImageOptimization,
+		...explicitCdnCache === "response-store" ? { responseStoreMode: explicitResponseStoreMode ?? "service-binding" } : {}
 	};
-	if (isAgentEnvironment(options.env ?? process.env)) throw new Error("vinext init needs Cloudflare cache and image choices. Ask the user which CDN cache (workers-cache or data-cache), data cache (kv or none), and image optimization (cloudflare-images or none) they want, then re-run with --cdn-cache=..., --data-cache=..., and --image-optimization=....");
+	if (isAgentEnvironment(options.env ?? process.env)) throw new Error("vinext init needs Cloudflare cache and image choices. Ask the user whether they want no cache or which CDN cache (response-store, workers-cache, static-assets, or data-cache), the Response Store mode when selected (service-binding or self-contained), data cache (kv or none), and image optimization (cloudflare-images or none) they want, then re-run with --cdn-cache=..., --response-store-mode=..., --data-cache=..., and --image-optimization=....");
 	const input = options.input ?? process.stdin;
 	const output = options.output ?? process.stdout;
-	if (!(options.isInteractive ?? Boolean(process.stdin.isTTY && process.stdout.isTTY))) return {
-		dataCache: explicitDataCache ?? "kv",
-		cdnCache: explicitCdnCache ?? "workers-cache",
-		imageOptimization: explicitImageOptimization ?? "cloudflare-images"
-	};
+	if (!(options.isInteractive ?? Boolean(process.stdin.isTTY && process.stdout.isTTY))) {
+		const cdnCache = explicitCdnCache ?? (explicitDataCache === "kv" ? "data-cache" : "none");
+		return {
+			dataCache: cdnCache === "response-store" || cdnCache === "none" ? "none" : explicitDataCache ?? "kv",
+			cdnCache,
+			imageOptimization: explicitImageOptimization ?? "cloudflare-images",
+			...cdnCache === "response-store" ? { responseStoreMode: explicitResponseStoreMode ?? "service-binding" } : {}
+		};
+	}
 	const readline = options.question ? void 0 : createInterface({
 		input,
 		output
@@ -229,16 +255,45 @@ async function resolveCloudflareInitOptions(args, options = {}) {
 				output.write(`  ${error}\n`);
 			}
 		};
-		const cdnCache = await promptChoice(explicitCdnCache, "  Choose a CDN cache:\n    1. Workers Cache (default)\n    2. Data cache\n  CDN cache [1]: ", {
-			"1": "workers-cache",
+		let selectedCdnCache = explicitCdnCache ?? (explicitDataCache === "kv" ? "data-cache" : void 0);
+		if (!selectedCdnCache) while (true) {
+			const answer = (await question("  Enable caching? [y/N]: ")).trim().toLowerCase();
+			if (answer === "" || answer === "n" || answer === "no") {
+				output.write("\n");
+				selectedCdnCache = "none";
+				break;
+			}
+			if (answer === "y" || answer === "yes") {
+				output.write("\n");
+				break;
+			}
+			output.write("  Please answer yes or no.\n");
+		}
+		const cdnCache = await promptChoice(selectedCdnCache, "  Choose a CDN cache:\n    1. Workers Response Store (default)\n    2. Workers Cache\n    3. Data cache\n    4. Static Assets (read-only; App Router only)\n  CDN cache [1]: ", {
+			"1": "response-store",
+			"response-store": "response-store",
+			"2": "workers-cache",
 			"workers-cache": "workers-cache",
 			workers: "workers-cache",
-			"2": "data-cache",
+			"3": "data-cache",
 			"data-cache": "data-cache",
-			data: "data-cache"
-		}, "workers-cache", "Please choose Workers Cache (1) or Data cache (2).");
+			data: "data-cache",
+			"4": "static-assets",
+			"static-assets": "static-assets",
+			static: "static-assets"
+		}, "response-store", "Please choose Workers Response Store (1), Workers Cache (2), Data cache (3), or Static Assets (4).");
+		if ((cdnCache === "response-store" || cdnCache === "none") && explicitDataCache === "kv") throw new Error(`--cdn-cache=${cdnCache} cannot be combined with --data-cache=kv.`);
+		if (cdnCache === "data-cache" && explicitDataCache === "none") throw new Error("--cdn-cache=data-cache requires --data-cache=kv.");
+		const responseStoreMode = cdnCache === "response-store" ? await promptChoice(explicitResponseStoreMode, "  Choose a Workers Response Store mode:\n    1. Service binding (default)\n    2. Self-contained\n  Response Store mode [1]: ", {
+			"1": "service-binding",
+			"service-binding": "service-binding",
+			service: "service-binding",
+			"2": "self-contained",
+			"self-contained": "self-contained",
+			self: "self-contained"
+		}, "service-binding", "Please choose Service binding (1) or Self-contained (2).") : void 0;
 		return {
-			dataCache: await promptChoice(explicitDataCache, "  Choose a data cache:\n    1. Cloudflare KV (default)\n    2. None\n  Data cache [1]: ", {
+			dataCache: cdnCache === "response-store" || cdnCache === "none" ? "none" : cdnCache === "data-cache" ? "kv" : await promptChoice(explicitDataCache, "  Choose a data cache:\n    1. Cloudflare KV (default)\n    2. None\n  Data cache [1]: ", {
 				"1": "kv",
 				kv: "kv",
 				"2": "none",
@@ -251,11 +306,12 @@ async function resolveCloudflareInitOptions(args, options = {}) {
 				images: "cloudflare-images",
 				"2": "none",
 				none: "none"
-			}, "cloudflare-images", "Please choose Cloudflare Images (1) or None (2).")
+			}, "cloudflare-images", "Please choose Cloudflare Images (1) or None (2)."),
+			...responseStoreMode ? { responseStoreMode } : {}
 		};
 	} finally {
 		readline?.close();
 	}
 }
 //#endregion
-export { INIT_PLATFORMS, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, parseWarmCdnCacheArg, resolveCloudflareInitOptions, resolveInitOptions, resolveInitPlatform, resolveInitPrerender, resolveInitWarmCdnCache };
+export { INIT_PLATFORMS, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, parseResponseStoreModeArg, parseWarmCdnCacheArg, resolveCloudflareInitOptions, resolveInitOptions, resolveInitPlatform, resolveInitPrerender, resolveInitWarmCdnCache };

package/dist/init.d.ts

@@ -1,13 +1,15 @@
 import { CloudflareInitOptions, InitPlatform } from "./init-platform.js";
 import { getReactUpgradeDeps } from "./utils/react-version.js";
 //#region src/init.d.ts
-type InitOptions = {
+export type InitOptions = {
   /** Project root directory */
   root: string;
   /** Dev server port (default: 3001), or false to omit the port flag. */
   port?: number | false;
   /** Skip the compatibility check step */
   skipCheck?: boolean;
+  /** @internal — skip CSS Modules migration in the Next.js deploy harness. */
+  skipCssModules?: boolean;
   /** Force overwrite even if vite.config.ts exists */
   force?: boolean;
   /** Deployment target selected by the user */
@@ -37,7 +39,7 @@ type InitResult = {
   addedTypeModule: boolean;
   /** CJS config files that were renamed ([old, new] pairs) */
   renamedConfigs: Array<[string, string]>;
-  /** Whether scripts were added to package.json */
+  /** Scripts added to package.json or migrated from older generated values */
   addedScripts: string[];
   /** Whether vite.config.ts was generated */
   generatedViteConfig: boolean;
@@ -50,28 +52,32 @@ type InitResult = {
   /** Platform-specific deployment files generated by init */
   generatedPlatformFiles: string[];
 };
-declare function generateViteConfig(_isAppRouter: boolean, prerender?: boolean): string;
+export declare function generateViteConfig(_isAppRouter: boolean, prerender?: boolean, hasCssModules?: boolean): string;
+export declare function scanCssModuleFiles(root: string): boolean;
 /**
- * Add vinext scripts to package.json without overwriting existing scripts.
- * Returns the list of script names that were added.
+ * Add Vite scripts to package.json without overwriting custom scripts.
+ * Exact scripts generated by older vinext versions are migrated in place.
+ * Returns the list of script names that were added or migrated.
  */
-declare function addScripts(root: string, port: number | false, platform?: InitPlatform, options?: {
+export declare function addScripts(root: string, port?: number | false, platform?: InitPlatform, options?: {
+  deployResponseStore?: boolean;
   warmCdnCache?: boolean;
+  legacyWrangler?: boolean;
   scriptNames?: "namespaced" | "standard";
 }): string[];
-type InitDependencyGroups = {
+export type InitDependencyGroups = {
   dependencies: string[];
   devDependencies: string[];
 };
-declare function getInitDependencyGroups(isAppRouter: boolean, platform: InitPlatform): InitDependencyGroups;
-declare function getInitDeps(isAppRouter: boolean, platform: InitPlatform): string[];
-declare function isDepInstalled(root: string, dep: string): boolean;
+export declare function getInitDependencyGroups(isAppRouter: boolean, platform: InitPlatform, cloudflare?: CloudflareInitOptions, hasCssModules?: boolean): InitDependencyGroups;
+export declare function getInitDeps(isAppRouter: boolean, platform: InitPlatform, cloudflare?: CloudflareInitOptions, hasCssModules?: boolean): string[];
+export declare function isDepInstalled(root: string, dep: string): boolean;
 /**
  * Ensure vinext-generated output directories are listed in .gitignore.
  * Creates the file if it doesn't exist. Returns true if the file was modified
  * (or created), false if all entries were already present.
  */
-declare function updateGitignore(root: string, platform?: InitPlatform): boolean;
-declare function init(options: InitOptions): Promise<InitResult>;
+export declare function updateGitignore(root: string, platform?: InitPlatform, legacyWrangler?: boolean): boolean;
+export declare function init(options: InitOptions): Promise<InitResult>;
 //#endregion
-export { InitDependencyGroups, InitOptions, addScripts, generateViteConfig, getInitDependencyGroups, getInitDeps, getReactUpgradeDeps, init, isDepInstalled, updateGitignore };
+export { getReactUpgradeDeps };