vinext 1.0.0-beta.12 → 1.0.0-beta.13

package/dist/init-cloudflare.d.ts

@@ -25,6 +25,7 @@ export type CloudflarePlatformSetupResult = {
 export declare function validateCloudflarePlatformSetup(context: CloudflarePlatformSetupContext, cloudflare: CloudflareInitOptions): void;
 export declare function setupCloudflarePlatform(context: CloudflarePlatformSetupContext, cloudflare: CloudflareInitOptions): CloudflarePlatformSetupResult;
 export declare function generateWranglerConfig(info: CloudflareProjectInfo, options?: CloudflareInitOptions, today?: string): string;
+export declare function compactResourceName(name: string, suffix: string, maxLength: number): string;
 export declare function generateResponseStoreWranglerConfig(appWranglerCode: string, root: string): string;
 export declare function updateWranglerConfigForCloudflare(code: string, options: CloudflareInitOptions, context?: {
   root?: string;
@@ -32,9 +33,9 @@ export declare function updateWranglerConfigForCloudflare(code: string, options:
 export declare function getWranglerImagesBinding(code: string): string;
 export declare function getWranglerVersionMetadataBinding(code: string): string;
 /** Generate vite.config.ts for App Router */
-export declare function generateAppRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean, versionMetadataBinding?: string): string;
+export declare function generateAppRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean, versionMetadataBinding?: string, serviceBinding?: boolean): string;
 /** Generate vite.config.ts for Pages Router */
-export declare function generatePagesRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean, versionMetadataBinding?: string): string;
+export declare function generatePagesRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean, versionMetadataBinding?: string, serviceBinding?: boolean): string;
 export declare function updateViteConfigForCloudflare(filePath: string, code: string, options: {
   isAppRouter: boolean;
   nativeModulesToStub: string[];

package/dist/init-cloudflare.js

@@ -26,6 +26,25 @@ const CACHE_METADATA_EXPORT = {
 };
 const CTX_EXPORTS_DEFAULT_DATE = "2025-11-17";
 function validateCloudflarePlatformSetup(context, cloudflare) {
+	if (cloudflare.experimentalCf) {
+		const existingWrangler = [
+			"wrangler.toml",
+			"wrangler.json",
+			"wrangler.jsonc",
+			RESPONSE_STORE_WRANGLER_CONFIG
+		].find((name) => fs.existsSync(path.join(context.root, name)));
+		if (existingWrangler) throw new Error(`--experimental-cf cannot replace an existing Wrangler config (${existingWrangler}). Migrate its bindings to cloudflare.config.ts first.`);
+		const typedConfigPath = path.join(context.root, "cloudflare.config.ts");
+		if (cloudflare.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding" && fs.existsSync(typedConfigPath) && !fs.readFileSync(typedConfigPath, "utf-8").includes("export const responseStoreServiceBinding")) throw new Error("The existing cloudflare.config.ts must export responseStoreServiceBinding for the Response Store auxiliary Worker. Configure it before rerunning init.");
+		if (context.existingViteConfigPath && cloudflare.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding" && !fs.readFileSync(context.existingViteConfigPath, "utf-8").includes("auxiliaryWorkers: [{ config: responseStoreServiceBinding }]")) throw new Error("--experimental-cf with Response Store service-binding requires a fresh Vite config so the auxiliary Worker is connected. Remove the existing Vite config or configure it manually.");
+		if (context.existingViteConfigPath) updateViteConfigForCloudflare(context.existingViteConfigPath, fs.readFileSync(context.existingViteConfigPath, "utf-8"), {
+			isAppRouter: context.isAppRouter,
+			nativeModulesToStub: detectProject(context.root).nativeModulesToStub,
+			cache: cloudflare,
+			prerender: context.prerender
+		});
+		return;
+	}
 	const tomlPath = path.join(context.root, "wrangler.toml");
 	if (fs.existsSync(tomlPath)) throw new Error("wrangler.toml is not supported by vinext init. Convert it to wrangler.jsonc and rerun.");
 	const projectInfo = detectProject(context.root);
@@ -45,6 +64,7 @@ function validateCloudflarePlatformSetup(context, cloudflare) {
 	});
 }
 function setupCloudflarePlatform(context, cloudflare) {
+	if (cloudflare.experimentalCf) return setupExperimentalCfPlatform(context, cloudflare);
 	const projectInfo = detectProject(context.root);
 	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;
@@ -103,6 +123,96 @@ function setupCloudflarePlatform(context, cloudflare) {
 		nextSteps
 	};
 }
+function setupExperimentalCfPlatform(context, cloudflare) {
+	const projectInfo = detectProject(context.root);
+	const serviceBinding = cloudflare.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding";
+	let generatedViteConfig = false;
+	if (context.existingViteConfigPath) {
+		const current = fs.readFileSync(context.existingViteConfigPath, "utf-8");
+		const updated = updateViteConfigForCloudflare(context.existingViteConfigPath, current, {
+			isAppRouter: context.isAppRouter,
+			nativeModulesToStub: projectInfo.nativeModulesToStub,
+			cache: cloudflare,
+			prerender: context.prerender
+		});
+		if (updated !== current) {
+			fs.writeFileSync(context.existingViteConfigPath, updated, "utf-8");
+			generatedViteConfig = true;
+		}
+	} else {
+		const viteConfig = context.isAppRouter ? generateAppRouterViteConfig(projectInfo, cloudflare, "IMAGES", context.prerender, DEFAULT_VERSION_METADATA_BINDING, serviceBinding) : generatePagesRouterViteConfig(projectInfo, cloudflare, "IMAGES", context.prerender, DEFAULT_VERSION_METADATA_BINDING, serviceBinding);
+		fs.writeFileSync(path.join(context.root, "vite.config.ts"), viteConfig, "utf-8");
+		generatedViteConfig = true;
+	}
+	const configPath = path.join(context.root, "cloudflare.config.ts");
+	const generatedPlatformFiles = [];
+	if (!fs.existsSync(configPath)) {
+		fs.writeFileSync(configPath, generateTypedCloudflareConfig(projectInfo, cloudflare, context.today));
+		generatedPlatformFiles.push("cloudflare.config.ts");
+	}
+	const nextSteps = [];
+	if (cloudflare.dataCache === "kv") nextSteps.push("Cloudflare setup is incomplete until you create a KV namespace:", `   cf kv namespaces create --title=${projectInfo.projectName}-cache`, "Copy its ID into VINEXT_KV_CACHE in cloudflare.config.ts (replace \"<your-kv-namespace-id>\").");
+	if (cloudflare.cdnCache === "response-store") {
+		const bucket = serviceBinding ? compactResourceName(`${projectInfo.projectName}-response-store`, "-cache-bodies", 63) : compactResourceName(projectInfo.projectName, "-response-store-cache-bodies", 63);
+		nextSteps.push(`Create the Response Store R2 bucket if needed: cf r2 buckets create --name=${bucket}`);
+		if (serviceBinding) nextSteps.push("After `vinext build`, deploy the Response Store Worker explicitly (and repeat when its code/config changes):", `   ${context.packageManager ?? "npm"} run deploy:response-store`, "vinext-cloudflare deploy only deploys the application Worker.");
+	}
+	nextSteps.push("For TypeScript, add \".cloudflare/types\" to the include list in tsconfig.json.", "Worker types are generated during dev/build; run `cf workers types` before standalone type-checks.");
+	return {
+		generatedViteConfig,
+		skippedViteConfig: !generatedViteConfig,
+		generatedPlatformFiles,
+		nextSteps
+	};
+}
+function generateTypedCloudflareConfig(info, options, today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0]) {
+	const serviceBinding = options.cdnCache === "response-store" && (options.responseStoreMode ?? "service-binding") === "service-binding";
+	const selfContained = options.cdnCache === "response-store" && !serviceBinding;
+	const workersCache = options.cdnCache === "workers-cache";
+	const helper = serviceBinding ? "createWorkersResponseStoreServiceBindingConfig" : selfContained ? "createWorkersResponseStoreSelfContainedConfig" : workersCache ? "createWorkersCacheConfig" : void 0;
+	const imports = [`import { bindings, defineConfig, defineWorker } from "@cloudflare/vite-plugin/experimental-config";`, ...helper ? [`import { ${helper} } from "@vinext/cloudflare/cache/config";`] : []];
+	const responseStoreName = compactResourceName(info.projectName, "-response-store", 63);
+	const bucket = serviceBinding ? compactResourceName(responseStoreName, "-cache-bodies", 63) : compactResourceName(info.projectName, "-response-store-cache-bodies", 63);
+	const shared = serviceBinding ? `const responseStore = await ${helper}({
+  worker: {
+    name: ${JSON.stringify(responseStoreName)},
+    compatibilityDate: ${JSON.stringify(today)},
+    compatibilityFlags: ["nodejs_compat"],
+  },
+  bucket: ${JSON.stringify(bucket)},
+});
+
+export const responseStoreServiceBinding = responseStore.serviceBindingWorker;
+
+` : selfContained ? `const cache = await ${helper}({
+  worker: ${JSON.stringify(info.projectName)},
+  bucket: ${JSON.stringify(bucket)},
+});
+
+` : workersCache ? `const cache = await ${helper}();\n\n` : "";
+	const cacheSpread = serviceBinding ? "responseStore.applicationWorker" : helper ? "cache" : void 0;
+	const envBindings = [
+		...cacheSpread ? [`...${cacheSpread}.env`] : [],
+		"ASSETS: bindings.assets()",
+		...options.imageOptimization === "cloudflare-images" ? ["IMAGES: bindings.images()"] : [],
+		...options.dataCache === "kv" ? ["VINEXT_KV_CACHE: bindings.kv({ id: \"<your-kv-namespace-id>\" })"] : []
+	];
+	return `${imports.join("\n")}
+
+${shared}export default defineConfig({
+  worker: defineWorker({
+    ${cacheSpread ? `...${cacheSpread},\n    ` : ""}name: ${JSON.stringify(info.projectName)},
+    entrypoint: ${JSON.stringify(resolveWorkerEntry(info.root))},
+    compatibilityDate: ${JSON.stringify(today)},
+    compatibilityFlags: ["nodejs_compat"],
+    assets: { notFoundHandling: "none" },
+    env: {
+      ${envBindings.join(",\n      ")},
+    },
+  }),
+});
+`;
+}
 /**
 * `main` is what makes a Wrangler config a Worker rather than a static-assets
 * project. A custom `worker/index.*` wins when present; otherwise the
@@ -587,11 +697,12 @@ function vinextExpression(options, binding = "vinext", imageBinding = "imagesOpt
 	return optionEntries.length === 0 ? `${binding}()` : `${binding}({\n  ${optionEntries.join(",\n  ")},\n})`;
 }
 /** Generate vite.config.ts for App Router */
-function generateAppRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPTIONS, imagesBinding = "IMAGES", prerender = false, versionMetadataBinding = DEFAULT_VERSION_METADATA_BINDING) {
+function generateAppRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPTIONS, imagesBinding = "IMAGES", prerender = false, versionMetadataBinding = DEFAULT_VERSION_METADATA_BINDING, serviceBinding = false) {
 	const imports = [
 		`import { defineConfig } from "vite";`,
 		`import vinext from "vinext";`,
 		`import { cloudflare } from "@cloudflare/vite-plugin";`,
+		...serviceBinding ? ["import { responseStoreServiceBinding } from \"./cloudflare.config.ts\";"] : [],
 		...cacheImports(options)
 	];
 	if (info?.nativeModulesToStub && info.nativeModulesToStub.length > 0) imports.push(`import path from "node:path";`);
@@ -599,7 +710,7 @@ function generateAppRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPT
 	if (info?.hasMDX) plugins.push(`    // vinext auto-injects @mdx-js/rollup with plugins from next.config`);
 	plugins.push(`    ${vinextExpression(options, "vinext", "imagesOptimizer", imagesBinding, prerender, versionMetadataBinding).replace(/\n/g, "\n    ")},`);
 	plugins.push(`    cloudflare({
-      viteEnvironment: {
+      ${serviceBinding ? "auxiliaryWorkers: [{ config: responseStoreServiceBinding }],\n      " : ""}viteEnvironment: {
         name: "rsc",
         childEnvironments: ["ssr"],
       },
@@ -618,11 +729,12 @@ ${plugins.join("\n")}
 `;
 }
 /** Generate vite.config.ts for Pages Router */
-function generatePagesRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPTIONS, imagesBinding = "IMAGES", prerender = false, versionMetadataBinding = DEFAULT_VERSION_METADATA_BINDING) {
+function generatePagesRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPTIONS, imagesBinding = "IMAGES", prerender = false, versionMetadataBinding = DEFAULT_VERSION_METADATA_BINDING, serviceBinding = false) {
 	const imports = [
 		`import { defineConfig } from "vite";`,
 		`import vinext from "vinext";`,
 		`import { cloudflare } from "@cloudflare/vite-plugin";`,
+		...serviceBinding ? ["import { responseStoreServiceBinding } from \"./cloudflare.config.ts\";"] : [],
 		...cacheImports(options)
 	];
 	if (info?.nativeModulesToStub && info.nativeModulesToStub.length > 0) imports.push(`import path from "node:path";`);
@@ -635,7 +747,7 @@ function generatePagesRouterViteConfig(info, options = DEFAULT_CLOUDFLARE_INIT_O
 export default defineConfig({
   plugins: [
     ${vinextExpression(options, "vinext", "imagesOptimizer", imagesBinding, prerender, versionMetadataBinding).replace(/\n/g, "\n    ")},
-    cloudflare(),
+    cloudflare(${serviceBinding ? "{ auxiliaryWorkers: [{ config: responseStoreServiceBinding }] }" : ""}),
   ],${resolveBlock}
 });
 `;
@@ -1202,4 +1314,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 { generateAppRouterViteConfig, generatePagesRouterViteConfig, generateResponseStoreWranglerConfig, generateWranglerConfig, getWranglerImagesBinding, getWranglerVersionMetadataBinding, setupCloudflarePlatform, updateViteConfigForCloudflare, updateWranglerConfigForCloudflare, usesCommonJsViteConfig, validateCloudflarePlatformSetup };
+export { compactResourceName, generateAppRouterViteConfig, generatePagesRouterViteConfig, generateResponseStoreWranglerConfig, generateWranglerConfig, getWranglerImagesBinding, getWranglerVersionMetadataBinding, setupCloudflarePlatform, updateViteConfigForCloudflare, updateWranglerConfigForCloudflare, usesCommonJsViteConfig, validateCloudflarePlatformSetup };

package/dist/init-platform.d.ts

@@ -11,6 +11,7 @@ export type CloudflareInitOptions = {
   imageOptimization: InitImageOptimization;
   responseStoreMode?: InitResponseStoreMode;
   warmCdnCache?: boolean;
+  experimentalCf?: boolean;
 };
 export declare const INIT_PLATFORMS: {
   cloudflare: {
@@ -42,6 +43,7 @@ export declare function parseImageOptimizationArg(args: string[]): InitImageOpti
 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 parseExperimentalCfArg(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): Promise<boolean>;

package/dist/init-platform.js

@@ -71,6 +71,9 @@ function parsePrerenderArg(args) {
 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.");
 }
+function parseExperimentalCfArg(args) {
+	return parseBooleanArg(args, "--experimental-cf", void 0, "--experimental-cf expects true or false when using the \"--experimental-cf=value\" form.");
+}
 function parseBooleanArg(args, enabledFlag, disabledFlag, errorMessage) {
 	for (const arg of args) {
 		if (arg === enabledFlag) return true;
@@ -113,9 +116,11 @@ async function resolveInitPlatform(args, options = {}) {
 	}
 }
 async function resolveInitOptions(args, options = {}) {
-	const platform = await resolveInitPlatform(args, options);
+	const experimentalCf = parseExperimentalCfArg(args);
+	const platform = experimentalCf && !parsePlatformArg(args) ? "cloudflare" : await resolveInitPlatform(args, options);
 	const platformOptions = await INIT_PLATFORMS[platform].options(args, options);
 	const explicitWarmCdnCache = parseWarmCdnCacheArg(args);
+	if (experimentalCf && platform !== "cloudflare") throw new Error("--experimental-cf requires --platform=cloudflare.");
 	const explicitPrerender = parsePrerenderArg(args);
 	const supportsWarmCdnCache = platformOptions?.cdnCache === "response-store" || platformOptions?.cdnCache === "workers-cache";
 	if (platform === "cloudflare" && !supportsWarmCdnCache) {
@@ -128,7 +133,8 @@ async function resolveInitOptions(args, options = {}) {
 		prerender,
 		cloudflare: platform === "cloudflare" && platformOptions ? {
 			...platformOptions,
-			warmCdnCache
+			warmCdnCache,
+			...experimentalCf ? { experimentalCf } : {}
 		} : void 0
 	};
 }
@@ -305,4 +311,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, parseExperimentalCfArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, parseResponseStoreModeArg, parseWarmCdnCacheArg, resolveCloudflareInitOptions, resolveInitOptions, resolveInitPlatform, resolveInitPrerender, resolveInitWarmCdnCache };

package/dist/init.d.ts

@@ -37,7 +37,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;
@@ -52,12 +52,14 @@ type InitResult = {
 };
 export declare function generateViteConfig(_isAppRouter: boolean, prerender?: boolean): string;
 /**
- * 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.
  */
-export 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;
+  experimentalCf?: boolean;
   scriptNames?: "namespaced" | "standard";
 }): string[];
 export type InitDependencyGroups = {
@@ -72,7 +74,7 @@ export declare function isDepInstalled(root: string, dep: string): boolean;
  * Creates the file if it doesn't exist. Returns true if the file was modified
  * (or created), false if all entries were already present.
  */
-export declare function updateGitignore(root: string, platform?: InitPlatform): boolean;
+export declare function updateGitignore(root: string, platform?: InitPlatform, experimentalCf?: boolean): boolean;
 export declare function init(options: InitOptions): Promise<InitResult>;
 //#endregion
 export { getReactUpgradeDeps };

package/dist/init.js

@@ -1,6 +1,6 @@
 import path 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 { setupCloudflarePlatform, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
+import { compactResourceName, setupCloudflarePlatform, 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";
@@ -67,8 +67,9 @@ export default defineConfig({
 `;
 }
 /**
-* 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.
 */
 function addScripts(root, port, platform = "node", options = {}) {
 	const pkgPath = path.join(root, "package.json");
@@ -78,19 +79,23 @@ function addScripts(root, port, platform = "node", options = {}) {
 		const pkg = JSON.parse(raw);
 		if (!pkg.scripts) pkg.scripts = {};
 		const added = [];
-		const addScript = (name, command) => {
+		const addScript = (name, command, legacyCommands = []) => {
 			const scriptName = options.scriptNames === "standard" ? name : `${name}:vinext`;
-			if (pkg.scripts[scriptName]) return;
+			const existing = pkg.scripts[scriptName];
+			if (existing && !legacyCommands.some((legacy) => typeof legacy === "string" ? existing === legacy : legacy.test(existing))) return;
+			if (existing === command) return;
 			pkg.scripts[scriptName] = command;
 			added.push(scriptName);
 		};
-		addScript("dev", port === false ? "vinext dev" : `vinext dev --port ${port}`);
-		addScript("build", "vinext build");
-		addScript("start", platform === "cloudflare" ? "wrangler dev --config dist/server/wrangler.json" : "vinext start");
+		const devScriptName = options.scriptNames === "standard" ? "dev" : "dev:vinext";
+		const legacyDevScript = pkg.scripts[devScriptName];
+		addScript("dev", port === void 0 && typeof legacyDevScript === "string" && /^vinext dev(?: --port \d+)?$/.test(legacyDevScript) ? legacyDevScript.replace(/^vinext /, "vite ") : port === false ? "vite dev" : `vite dev --port ${port ?? 3001}`, ["vinext dev", /^vinext dev --port \d+$/]);
+		addScript("build", "vite build", ["vinext build"]);
+		addScript("start", platform === "cloudflare" ? options.experimentalCf ? "vite preview" : "wrangler dev --config dist/server/wrangler.json" : "vinext start");
 		if (platform === "cloudflare") {
-			addScript("deploy", options.warmCdnCache ? "vinext-cloudflare deploy --config dist/server/wrangler.json --experimental-warm-cdn-cache" : "vinext-cloudflare deploy --config dist/server/wrangler.json");
+			addScript("deploy", options.experimentalCf ? options.warmCdnCache ? "vinext-cloudflare deploy --experimental-warm-cdn-cache" : "vinext-cloudflare deploy" : options.warmCdnCache ? "vinext-cloudflare deploy --config dist/server/wrangler.json --experimental-warm-cdn-cache" : "vinext-cloudflare deploy --config dist/server/wrangler.json");
 			if (options.deployResponseStore && !pkg.scripts["deploy:response-store"]) {
-				pkg.scripts["deploy:response-store"] = "wrangler deploy --config wrangler.response-store.jsonc";
+				pkg.scripts["deploy:response-store"] = options.experimentalCf ? `cf deploy --prebuilt --mode production --worker ${compactResourceName(detectProject(root).projectName, "-response-store", 63)}` : "wrangler deploy --config wrangler.response-store.jsonc";
 				added.push("deploy:response-store");
 			}
 		}
@@ -110,7 +115,10 @@ function getInitDependencyGroups(isAppRouter, platform, cloudflare) {
 	if (platform === "cloudflare") {
 		dependencies.push("@vinext/cloudflare");
 		if (cloudflare?.cdnCache === "response-store" && (cloudflare.responseStoreMode ?? "service-binding") === "service-binding") dependencies.push("@cloudflare/workers-response-store");
-		devDependencies.push("@cloudflare/vite-plugin", "wrangler");
+		if (cloudflare?.experimentalCf) {
+			devDependencies[0] = "vite@8.3.0";
+			devDependencies.push("@cloudflare/vite-plugin@beta", "cf@latest");
+		} else devDependencies.push("@cloudflare/vite-plugin", "wrangler");
 	}
 	return {
 		dependencies,
@@ -126,11 +134,13 @@ function isDepInstalled(root, dep) {
 	if (!fs.existsSync(pkgPath)) return false;
 	try {
 		const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-		return dep in {
+		const allDeps = {
 			...pkg.dependencies,
 			...pkg.devDependencies,
 			...pkg.peerDependencies
 		};
+		const { name, version, hasExplicitVersion } = parseDependencySpecifier(dep);
+		return name in allDeps && (!hasExplicitVersion || allDeps[name] === version);
 	} catch {
 		return false;
 	}
@@ -201,7 +211,7 @@ function addDependencyEntries(root, deps, { dev }) {
 async function installDeps(root, deps, exec, { dev = true } = {}) {
 	if (deps.length === 0) return "";
 	const baseCmd = detectPackageManager(root);
-	return await exec(`${dev ? baseCmd : baseCmd.replace(/ -D$/, "")} ${deps.join(" ")}`, {
+	return await exec(`${dev ? baseCmd : baseCmd.replace(/ -D$/, "")} ${deps.map((dep) => JSON.stringify(dep)).join(" ")}`, {
 		cwd: root,
 		stdio: "inherit"
 	}) ?? "";
@@ -211,7 +221,7 @@ async function installDeps(root, deps, exec, { dev = true } = {}) {
 * Creates the file if it doesn't exist. Returns true if the file was modified
 * (or created), false if all entries were already present.
 */
-function updateGitignore(root, platform = "node") {
+function updateGitignore(root, platform = "node", experimentalCf = false) {
 	const gitignorePath = path.join(root, ".gitignore");
 	const entries = [
 		{
@@ -232,7 +242,7 @@ function updateGitignore(root, platform = "node") {
 				".vinext"
 			])
 		},
-		...platform === "cloudflare" ? [{
+		...platform === "cloudflare" && !experimentalCf ? [{
 			entry: ".wrangler/",
 			coveredBy: /* @__PURE__ */ new Set([
 				"/.wrangler/",
@@ -240,6 +250,15 @@ function updateGitignore(root, platform = "node") {
 				".wrangler/",
 				".wrangler"
 			])
+		}] : [],
+		...experimentalCf ? [{
+			entry: ".cloudflare/",
+			coveredBy: /* @__PURE__ */ new Set([
+				"/.cloudflare/",
+				"/.cloudflare",
+				".cloudflare/",
+				".cloudflare"
+			])
 		}] : []
 	];
 	let content = "";
@@ -271,7 +290,6 @@ function setupNodePlatform(context) {
 }
 async function init(options) {
 	const root = path.resolve(options.root);
-	const port = options.port ?? 3001;
 	if (!options.platform) throw new Error("A deployment platform must be selected before running vinext init.");
 	const platform = options.platform;
 	if (platform === "cloudflare" && !options.cloudflare) throw new Error("Cloudflare init options must be resolved before running vinext init.");
@@ -343,9 +361,10 @@ async function init(options) {
 		existingViteConfigPath = renamedPath;
 	}
 	const addedTypeModule = ensureESModule(root);
-	const addedScripts = addScripts(root, port, platform, {
+	const addedScripts = addScripts(root, options.port, platform, {
 		deployResponseStore: options.cloudflare?.cdnCache === "response-store" && (options.cloudflare.responseStoreMode ?? "service-binding") === "service-binding",
 		warmCdnCache: options.cloudflare?.warmCdnCache ?? false,
+		experimentalCf: options.cloudflare?.experimentalCf ?? false,
 		scriptNames: options.scriptNames
 	});
 	const setupContext = {
@@ -360,15 +379,15 @@ async function init(options) {
 	};
 	const platformSetup = platform === "cloudflare" ? setupCloudflarePlatform(setupContext, options.cloudflare) : setupNodePlatform(setupContext);
 	const { generatedViteConfig, skippedViteConfig, generatedPlatformFiles } = platformSetup;
-	const updatedGitignore = updateGitignore(root, platform);
+	const updatedGitignore = updateGitignore(root, platform, options.cloudflare?.experimentalCf);
 	const neededDeps = getInitDependencyGroups(isApp, platform, options.cloudflare);
 	const missingDependencies = neededDeps.dependencies.filter((dep) => !isDepInstalled(root, dep));
 	const missingDevDependencies = neededDeps.devDependencies.filter((dep) => !isDepInstalled(root, dep));
 	let dependencyInstallNeedsApproval = false;
 	const dependencyEntriesAdded = [];
 	const devDependencyEntriesAdded = [];
-	if (isApp && missingDependencies.includes("react-server-dom-webpack")) {
-		const reactUpgrade = getReactUpgradeDeps(root);
+	if (isApp && (!shouldInstall || missingDependencies.includes("react-server-dom-webpack"))) {
+		const reactUpgrade = getReactUpgradeDeps(root, { fromManifest: !shouldInstall });
 		if (reactUpgrade.length > 0) {
 			console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Upgrading dependencies:"))}`);
 			console.log(formatList(reactUpgrade.map((dep) => dep.replace(/@latest$/, "")), "    "));
@@ -435,7 +454,7 @@ async function init(options) {
 	if (dependencyInstallNeedsApproval) console.log(`    ${terminalStyle.yellow("!")} Dependency installation is waiting for build-script approval`);
 	if (addedTypeModule) console.log(`    ${terminalStyle.green("✓")} Added "type": "module" to package.json`);
 	for (const [oldName, newName] of renamedConfigs) console.log(`    ${terminalStyle.green("✓")} Renamed ${oldName} \u2192 ${newName}`);
-	for (const script of addedScripts) console.log(`    ${terminalStyle.green("✓")} Added ${script} script`);
+	for (const script of addedScripts) console.log(`    ${terminalStyle.green("✓")} Configured ${script} script`);
 	if (generatedViteConfig) console.log(`    ${terminalStyle.green("✓")} Generated vite.config.ts`);
 	for (const file of generatedPlatformFiles) console.log(`    ${terminalStyle.green("✓")} Generated ${file}`);
 	if (skippedViteConfig) console.log(`    ${terminalStyle.yellow("-")} Skipped vite.config.ts (already exists, use --force to overwrite)`);
@@ -444,7 +463,7 @@ async function init(options) {
 	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");
 	const scriptName = (name) => options.scriptNames === "standard" ? name : `${name}:vinext`;
 	const deployCommandStep = platform === "cloudflare" ? `    ${pmName} run ${scriptName("deploy")} Deploy to Cloudflare Workers\n` : "";
-	const startCommandDescription = platform === "cloudflare" ? "Start the built Worker locally with Wrangler" : "Start vinext production server";
+	const startCommandDescription = platform === "cloudflare" ? options.cloudflare?.experimentalCf ? "Preview the built Worker locally" : "Start the built Worker locally with Wrangler" : "Start vinext production server";
 	console.log(`
   ${terminalStyle.cyan(terminalStyle.bold("Next steps:"))}
 ${nextSteps.map((step) => `    ${step}`).join("\n")}${nextSteps.length > 0 ? "\n" : ""}

package/dist/plugins/dynamic-preload-metadata.js

@@ -1,7 +1,7 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { stripViteModuleQuery } from "../utils/path.js";
 import { hasTrailingComma } from "../utils/has-trailing-comma.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { collectBindingNames, forEachAstChild, stringLiteralValue, walkAst } from "./ast-utils.js";
 import { relativeWithinRoot, tryRealpathSync } from "../build/ssr-manifest.js";
 import { parseAst } from "vite";

package/dist/plugins/extensionless-dynamic-import.js

@@ -1,8 +1,8 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { escapeRegExp } from "../utils/regex.js";
 import { isUnknownRecord } from "../utils/record.js";
-import { NODE_MODULES_PATH_RE } from "../utils/path.js";
+import { escapeRegExp } from "../utils/regex.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { NODE_MODULES_PATH_RE } from "../utils/path.js";
 import { DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, scriptParserLanguage, walkAst } from "./ast-utils.js";
 import { createTransformCache } from "./transform-cache.js";
 import { createRequire } from "node:module";

package/dist/plugins/fonts.js

@@ -1,6 +1,5 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { escapeRegExp } from "../utils/regex.js";
-import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import { lastSignificantChar } from "../utils/has-trailing-comma.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { buildFallbackFontFace, getFallbackFontOverrideMetrics } from "../build/google-fonts/fallback-metrics.js";
@@ -8,6 +7,7 @@ import { validateGoogleFontOptions } from "../build/google-fonts/validate.js";
 import { getFontAxes } from "../build/google-fonts/get-axes.js";
 import { buildGoogleFontsUrl } from "../build/google-fonts/build-url.js";
 import { findFontFilesInCss } from "../build/google-fonts/find-font-files-in-css.js";
+import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import { CONTENT_TYPES } from "../server/static-file-cache.js";
 import fs from "node:fs";
 import { parseAst } from "vite";

package/dist/plugins/ignore-dynamic-requests.js

@@ -1,6 +1,6 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { stripViteModuleQuery } from "../utils/path.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { DYNAMIC_IMPORT_PRESCAN, SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, mayContainDynamicImport, scriptParserLanguage, stringLiteralValue, unwrapExpression } from "./ast-utils.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, hasAstBinding, isFunctionNode } from "./ast-scope.js";
 import { createTransformCache } from "./transform-cache.js";

package/dist/plugins/import-meta-url.js

@@ -1,6 +1,6 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { canonicalizeFilePath, isPathInsideOrEqual, stripViteModuleQuery } from "../utils/path.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { canonicalizeFilePath, isPathInsideOrEqual, stripViteModuleQuery } from "../utils/path.js";
 import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, scriptParserLanguage } from "./ast-utils.js";
 import fs from "node:fs";

package/dist/plugins/instrumentation-client.js

@@ -1,5 +1,5 @@
-import { stripViteModuleQuery } from "../utils/path.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { normalizePath, parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/instrumentation-client.ts