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

package/dist/shims/server.js

@@ -1,10 +1,10 @@
 import { bindRequestContextSnapshot, getRequestContext, isInsideUnifiedScope, queueAfterCallback, trackAfterPromise } from "./unified-request-context.js";
+import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
+import { encodeMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
+import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { getRequestExecutionContext } from "./request-context.js";
-import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
-import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
 import { MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER } from "../server/headers.js";
-import { encodeMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
 import { validateCookieAttributeValue, validateCookieName } from "./internal/cookie-serialize.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
 import { userAgent, userAgentFromString } from "./user-agent.js";

package/dist/utils/built-asset-url.js

@@ -1,5 +1,5 @@
-import { appendDeploymentIdQuery } from "./deployment-id.js";
 import { ASSET_PREFIX_URL_DIR, resolveAssetUrlPrefix, resolveAssetsDir } from "./asset-prefix.js";
+import { appendDeploymentIdQuery } from "./deployment-id.js";
 //#region src/utils/built-asset-url.ts
 function renderVinextBuiltUrl(filename, assetPrefix, deploymentId, hostType, hostId) {
 	const urlPrefix = resolveAssetUrlPrefix(assetPrefix);

package/dist/utils/project.d.ts

@@ -17,17 +17,7 @@ export declare function ensureESModule(root: string): boolean;
  * Returns array of [oldName, newName] pairs that were renamed.
  */
 export declare function renameCJSConfigs(root: string): Array<[string, string]>;
-/**
- * Ensure the project is configured for ESM before Vite loads vite.config.ts.
- *
- * This mirrors what `vinext init` does, but is applied lazily at dev/build
- * time for projects that were set up before `vinext init` added the step.
- *
- * Side effects: may rename `.js` CJS config files to `.cjs` and add
- * `"type": "module"` to package.json.
- *
- * @returns Object describing what was changed, or null if nothing was done.
- */
+/** Preserve the old CLI's ESM migration for projects with a legacy Vite config. */
 export declare function ensureViteConfigCompatibility(root: string): {
   renamed: Array<[string, string]>;
   addedTypeModule: boolean;

package/dist/utils/project.js

@@ -61,40 +61,31 @@ function renameCJSConfigs(root) {
 	}
 	return renamed;
 }
-/**
-* Ensure the project is configured for ESM before Vite loads vite.config.ts.
-*
-* This mirrors what `vinext init` does, but is applied lazily at dev/build
-* time for projects that were set up before `vinext init` added the step.
-*
-* Side effects: may rename `.js` CJS config files to `.cjs` and add
-* `"type": "module"` to package.json.
-*
-* @returns Object describing what was changed, or null if nothing was done.
-*/
+/** Preserve the old CLI's ESM migration for projects with a legacy Vite config. */
 function ensureViteConfigCompatibility(root) {
-	if (!hasViteConfig(root)) return null;
+	const config = findViteConfigPath(root);
+	if (!config || !/\.(?:ts|js)$/.test(config)) return null;
 	const pkgPath = path.join(root, "package.json");
 	if (!fs.existsSync(pkgPath)) return null;
-	let pkg;
 	try {
-		pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+		const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+		if (pkg.type !== void 0) return null;
+		if (config.endsWith(".js") && /\b(?:module\.exports|require\s*\()/.test(fs.readFileSync(config, "utf-8"))) return null;
+		for (const fileName of CJS_CONFIG_FILES) {
+			const source = path.join(root, fileName);
+			const destination = path.join(root, fileName.replace(/\.js$/, ".cjs"));
+			if (fs.existsSync(source) && fs.existsSync(destination) && /\bmodule\.exports\b|\brequire\s*\(/.test(fs.readFileSync(source, "utf-8"))) return null;
+		}
+		const renamed = renameCJSConfigs(root);
+		pkg.type = "module";
+		fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
+		return {
+			renamed,
+			addedTypeModule: true
+		};
 	} catch {
 		return null;
 	}
-	if (pkg.type === "module") return null;
-	if (pkg.type !== void 0) return null;
-	const renamed = renameCJSConfigs(root);
-	let addedTypeModule = false;
-	try {
-		pkg.type = "module";
-		fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
-		addedTypeModule = true;
-	} catch {}
-	return {
-		renamed,
-		addedTypeModule
-	};
 }
 /**
 * Walk from `start` up to the filesystem root, calling `check` on each
@@ -386,7 +377,7 @@ function getMissingDeps(info, _isResolvable = isPackageResolvable) {
 		name: "@cloudflare/vite-plugin",
 		version: "latest"
 	});
-	if (!info.hasWrangler) missing.push({
+	if (!info.hasWrangler && !fs.existsSync(path.join(info.root, "cloudflare.config.ts"))) missing.push({
 		name: "wrangler",
 		version: "latest"
 	});

package/dist/utils/react-version.d.ts

@@ -1,3 +1,5 @@
 //#region src/utils/react-version.d.ts
-export declare function getReactUpgradeDeps(root: string): string[];
+export declare function getReactUpgradeDeps(root: string, options?: {
+  fromManifest?: boolean;
+}): string[];
 //#endregion

package/dist/utils/react-version.js

@@ -12,7 +12,25 @@ function getDependencyUpgradeDeps(root, recommendations) {
 	}
 	return [];
 }
-function getReactUpgradeDeps(root) {
+function getReactUpgradeDeps(root, options = {}) {
+	if (options.fromManifest) {
+		const pkg = JSON.parse(fs.readFileSync(path.join(root, "package.json"), "utf-8"));
+		for (const name of ["react", "react-dom"]) {
+			const declared = pkg.dependencies?.[name] ?? pkg.devDependencies?.[name];
+			const version = /^[~^]?([0-9]+(?:\.[0-9]+){0,2}(?:-[0-9A-Za-z.*-]+)?)(?:\.[x*])?$/.exec(declared ?? "")?.[1];
+			if (version && (version.includes("-") || isVersionBelow(version, [
+				19,
+				2,
+				6
+			]))) {
+				const upgrades = ["react@latest", "react-dom@latest"];
+				const rsdw = pkg.dependencies?.["react-server-dom-webpack"] ?? pkg.devDependencies?.["react-server-dom-webpack"];
+				if (rsdw && rsdw !== "latest") upgrades.push("react-server-dom-webpack@latest");
+				return upgrades;
+			}
+		}
+		return [];
+	}
 	return getDependencyUpgradeDeps(root, { react: {
 		minimumVersion: [
 			19,

package/dist/utils/vite-cli-invocation.d.ts

@@ -0,0 +1,21 @@
+import { InlineConfig } from "vite";
+//#region src/utils/vite-cli-invocation.d.ts
+type Command = "dev" | "build";
+type Invocation = {
+  command: Command;
+  mode: string;
+  root: string;
+  rootArg?: string;
+  configFile?: string;
+};
+export declare function valueOptionName(arg: string): string;
+export declare function findViteRoot(command: Command, args: string[]): {
+  root: string | undefined;
+  shouldPreflight: boolean;
+};
+export declare function getViteCliInvocation(argv?: string[]): Invocation | undefined;
+/** Only the config loaded by the outer CLI may claim its dev lifecycle. */
+export declare function isViteCliConfigFile(configFile: string, inlineConfig?: Pick<InlineConfig, "root" | "configFile">): boolean;
+export declare function isViteCliInvocation(command: Command, argv?: string[]): boolean;
+export declare function claimViteCliBuildInvocation(argv?: string[]): boolean;
+//#endregion

package/dist/utils/vite-cli-invocation.js

@@ -0,0 +1,144 @@
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { findViteConfigPath } from "./project.js";
+//#region src/utils/vite-cli-invocation.ts
+let buildClaimed = false;
+const valued = new Set("--config -c --mode -m --logLevel -l --filter -f --configLoader --port --outDir --target --assetsDir --assetsInlineLimit".split(" "));
+const optional = new Set("--base --debug -d --host --open --profile --ssr --sourcemap --minify --manifest --ssrManifest".split(" "));
+const flags = new Set("--app --clearScreen --cors --emptyOutDir --experimentalBundle --force --strictPort --watch -w --help -h --version -v".split(" "));
+const devOnly = new Set("--host --port --open --cors --strictPort --force --experimentalBundle".split(" "));
+const buildOnly = new Set("--target --outDir --assetsDir --assetsInlineLimit --ssr --sourcemap --minify --manifest --ssrManifest --emptyOutDir --watch -w --app".split(" "));
+function valueOptionName(arg) {
+	const name = arg.split("=", 1)[0];
+	if (!name.startsWith("-") || name.startsWith("--") || name.length <= 2) return name;
+	const parts = name.slice(1).split("").map((part) => `-${part}`);
+	return parts.every((part) => valued.has(part) || optional.has(part) || flags.has(part)) ? parts.at(-1) : name;
+}
+function consumesNext(arg, next) {
+	if (arg.includes("=")) return false;
+	const name = valueOptionName(arg);
+	if (valued.has(name)) return true;
+	if (optional.has(name)) return next !== void 0 && !next.startsWith("-");
+	return flags.has(name) && /^(?:true|false)$/.test(next ?? "");
+}
+function parse(args, command) {
+	let root;
+	let mode;
+	let config;
+	let preflight = true;
+	let uncertainRoot = false;
+	let configs = 0;
+	for (let i = 0; i < args.length; i++) {
+		const arg = args[i];
+		if (arg === "--") break;
+		const name = valueOptionName(arg);
+		const normalized = name.startsWith("--no-") ? `--${name.slice(5)}` : name;
+		const inline = arg.includes("=") ? arg.slice(arg.indexOf("=") + 1) : void 0;
+		const takesNext = consumesNext(arg, args[i + 1]);
+		const value = inline ?? (takesNext ? args[i + 1] : void 0);
+		if (name === "--config" || name === "-c") {
+			configs++;
+			if (command === "dev") config = value;
+			else config ??= value;
+		} else if (name === "--mode" || name === "-m") mode = value;
+		if ((name === "--help" || name === "-h") && value !== "false" || /^-[^-]*h/.test(arg) && arg.length > 2) preflight = false;
+		if (valued.has(name) && (!value || value.startsWith("-"))) {
+			preflight = false;
+			if (!root) uncertainRoot = true;
+		}
+		if ((command === "build" ? devOnly : buildOnly).has(normalized)) preflight = false;
+		if (arg.startsWith("-")) {
+			if (!valued.has(normalized) && !optional.has(normalized) && !flags.has(normalized) || name.startsWith("--no-") && (valued.has(normalized) || inline !== void 0) || /^-[^-]{2,}/.test(arg) && arg.slice(1).split("=", 1)[0].split("").slice(0, -1).some((part) => valued.has(`-${part}`))) {
+				preflight = false;
+				if (!root) uncertainRoot = true;
+			}
+			if (takesNext) i++;
+			continue;
+		}
+		if (root) preflight = false;
+		else root = arg;
+	}
+	if (configs > 1) preflight = false;
+	return {
+		root: uncertainRoot ? void 0 : root,
+		mode,
+		config,
+		preflight
+	};
+}
+function findViteRoot(command, args) {
+	const { root, preflight } = parse(args, command);
+	return {
+		root,
+		shouldPreflight: preflight
+	};
+}
+function commandArguments(argv) {
+	const entry = toSlash(argv[1] ?? "");
+	const vite = entry.endsWith("/vite/bin/vite.js") || entry.endsWith("/vite/node/cli.js") || entry.endsWith("/dist/vite/node/cli.js");
+	let args = argv.slice(2);
+	if (!vite) {
+		if (path.basename(entry) !== "vp") return void 0;
+		if (args[0] === "-C") args = args.slice(2);
+		if (args[0] === "exec" && args[1] === "vite") args = args.slice(2);
+	}
+	for (let i = 0; i < args.length; i++) {
+		const arg = args[i];
+		if (arg === "--") break;
+		if (arg.startsWith("-")) {
+			if (consumesNext(arg, args[i + 1])) i++;
+			continue;
+		}
+		if (arg === "build") return {
+			command: "build",
+			args: args.slice(0, i).concat(args.slice(i + 1))
+		};
+		if (arg === "dev" || arg === "serve") return {
+			command: "dev",
+			args: args.slice(0, i).concat(args.slice(i + 1))
+		};
+		return vite && arg !== "preview" && arg !== "optimize" ? {
+			command: "dev",
+			args
+		} : void 0;
+	}
+	return vite ? {
+		command: "dev",
+		args
+	} : void 0;
+}
+function getViteCliInvocation(argv = process.argv) {
+	const invocation = commandArguments(argv);
+	if (!invocation) return void 0;
+	const { root, mode, config } = parse(invocation.args, invocation.command);
+	const cwd = toSlash(process.cwd());
+	return {
+		command: invocation.command,
+		mode: mode || (invocation.command === "build" ? "production" : "development"),
+		root: path.resolve(cwd, root ?? "."),
+		...root ? { rootArg: root } : {},
+		...config ? { configFile: path.resolve(cwd, config) } : {}
+	};
+}
+/** Only the config loaded by the outer CLI may claim its dev lifecycle. */
+function isViteCliConfigFile(configFile, inlineConfig) {
+	const invocation = getViteCliInvocation();
+	if (!invocation || !path.isAbsolute(configFile)) return false;
+	if (inlineConfig) {
+		if (inlineConfig.root !== invocation.rootArg) return false;
+		if (invocation.configFile) {
+			if (typeof inlineConfig.configFile !== "string" || path.resolve(toSlash(process.cwd()), inlineConfig.configFile) !== invocation.configFile) return false;
+		} else if (inlineConfig.configFile !== void 0) return false;
+	}
+	const expected = invocation.configFile ?? findViteConfigPath(invocation.root);
+	return expected !== void 0 && path.resolve(configFile) === expected;
+}
+function isViteCliInvocation(command, argv = process.argv) {
+	return commandArguments(argv)?.command === command;
+}
+function claimViteCliBuildInvocation(argv = process.argv) {
+	if (buildClaimed || !isViteCliInvocation("build", argv)) return false;
+	buildClaimed = true;
+	return true;
+}
+//#endregion
+export { claimViteCliBuildInvocation, findViteRoot, getViteCliInvocation, isViteCliConfigFile, isViteCliInvocation, valueOptionName };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.13",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",
@@ -138,6 +138,14 @@
       "types": "./dist/build/prerender-paths.d.ts",
       "import": "./dist/build/prerender-paths.js"
     },
+    "./internal/build/lifecycle": {
+      "types": "./dist/build/lifecycle.d.ts",
+      "import": "./dist/build/lifecycle.js"
+    },
+    "./internal/build/report": {
+      "types": "./dist/build/report.d.ts",
+      "import": "./dist/build/report.js"
+    },
     "./internal/cache-adapters": {
       "types": "./dist/cache/cache-adapters-virtual.d.ts",
       "import": "./dist/cache/cache-adapters-virtual.js"
@@ -209,7 +217,7 @@
   },
   "dependencies": {
     "@unpic/react": "^1.0.2",
-    "@vercel/og": "^0.8.6",
+    "@vercel/og": "1.0.3",
     "ipaddr.js": "^2.1.0",
     "magic-string": "^0.30.21",
     "vite-plugin-commonjs": "^0.10.4",