vinext 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/utils/vinext-root.js

@@ -1,4 +1,4 @@
-import path from "node:path";
+import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { fileURLToPath } from "node:url";
 //#region src/utils/vinext-root.ts
 /**

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

@@ -8,6 +8,9 @@ declare function getDepOptimizeNodeEnvOptions(nodeEnvDefine: string): {
     moduleTypes?: Record<string, "jsx">;
   };
 };
-declare function assertSupportedViteVersion(): number;
+declare function supportsNativeTypeofWindowFolding(viteVersion: string, bundledRolldownVersion?: string): boolean;
+declare function assertSupportedViteVersion(): {
+  supportsNativeTypeofWindowFolding: boolean;
+};
 //#endregion
-export { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine };
+export { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine, supportsNativeTypeofWindowFolding };

package/dist/utils/vite-version.js

@@ -1,5 +1,5 @@
+import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { createRequire } from "node:module";
-import path from "node:path";
 //#region src/utils/vite-version.ts
 /**
 * Vite major-version detection.
@@ -20,13 +20,9 @@ function getDepOptimizeNodeEnvOptions(nodeEnvDefine) {
 		}
 	} };
 }
-/**
-* Detect Vite major version at runtime. Prefer the project cwd, then fall back
-* to vinext's own dependency graph for tests and linked source checkouts.
-*/
-function getViteMajorVersion() {
+function getViteToolchainVersion() {
 	try {
-		return getViteMajorVersionFromRequire(createRequire(path.join(process.cwd(), "package.json")));
+		return getViteToolchainVersionFromRequire(createRequire(path.join(process.cwd(), "package.json")));
 	} catch (error) {
 		if (!isModuleNotFoundError(error)) {
 			const message = error instanceof Error ? error.message : String(error);
@@ -34,27 +30,57 @@ function getViteMajorVersion() {
 		}
 	}
 	try {
-		return getViteMajorVersionFromRequire(createRequire(import.meta.url));
+		return getViteToolchainVersionFromRequire(createRequire(import.meta.url));
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		throw new Error(`[vinext] Vite 8 or newer is required, but vinext could not resolve vite/package.json (${message})`);
 	}
 }
-function getViteMajorVersionFromRequire(require) {
+function getViteToolchainVersionFromRequire(require) {
 	const vitePkg = require("vite/package.json");
-	const viteMajor = parseInt(vitePkg?.version, 10);
-	if (vitePkg?.name === "vite" && Number.isFinite(viteMajor)) return viteMajor;
-	const bundledViteMajor = parseInt(vitePkg?.bundledVersions?.vite, 10);
-	if (Number.isFinite(bundledViteMajor)) return bundledViteMajor;
+	if (vitePkg?.name === "vite" && parseViteVersion(vitePkg.version)) return { vite: vitePkg.version };
+	const bundledViteVersion = vitePkg?.bundledVersions?.vite;
+	if (parseViteVersion(bundledViteVersion)) {
+		const bundledRolldownVersion = vitePkg?.bundledVersions?.rolldown;
+		return {
+			vite: bundledViteVersion,
+			rolldown: parseViteVersion(bundledRolldownVersion) ? bundledRolldownVersion : void 0
+		};
+	}
 	throw new Error(`could not determine Vite version from ${vitePkg?.name ?? "vite/package.json"}`);
 }
+function parseViteVersion(version) {
+	if (typeof version !== "string") return null;
+	const match = /^(\d+)\.(\d+)\.(\d+)(-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.exec(version);
+	if (!match) return null;
+	return [
+		Number(match[1]),
+		Number(match[2]),
+		Number(match[3]),
+		!!match[4]
+	];
+}
 function isModuleNotFoundError(error) {
 	return !!error && typeof error === "object" && "code" in error && error.code === "MODULE_NOT_FOUND";
 }
+function supportsNativeTypeofWindowFolding(viteVersion, bundledRolldownVersion) {
+	if (bundledRolldownVersion !== void 0) return isVersionAtLeast(bundledRolldownVersion, 1, 1, 4);
+	return isVersionAtLeast(viteVersion, 8, 1, 4);
+}
+function isVersionAtLeast(version, requiredMajor, requiredMinor, requiredPatch) {
+	const parsedVersion = parseViteVersion(version);
+	if (!parsedVersion) return false;
+	const [major, minor, patch, prerelease] = parsedVersion;
+	if (major !== requiredMajor) return major > requiredMajor;
+	if (minor !== requiredMinor) return minor > requiredMinor;
+	if (patch !== requiredPatch) return patch > requiredPatch;
+	return !prerelease;
+}
 function assertSupportedViteVersion() {
-	const viteMajorVersion = getViteMajorVersion();
-	if (viteMajorVersion < 8) throw new Error(`[vinext] Vite 8 or newer is required. Detected Vite ${viteMajorVersion}.`);
-	return viteMajorVersion;
+	const toolchainVersion = getViteToolchainVersion();
+	const [major] = parseViteVersion(toolchainVersion.vite);
+	if (major < 8) throw new Error(`[vinext] Vite 8 or newer is required. Detected Vite ${major}.`);
+	return { supportsNativeTypeofWindowFolding: supportsNativeTypeofWindowFolding(toolchainVersion.vite, toolchainVersion.rolldown) };
 }
 //#endregion
-export { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine };
+export { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine, supportsNativeTypeofWindowFolding };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.2",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {
@@ -25,6 +25,12 @@
       "types": "./dist/cache.d.ts",
       "import": "./dist/cache.js"
     },
+    "./types": {
+      "types": "./dist/shims/next-shims-public.d.ts"
+    },
+    "./types/augmentations": {
+      "types": "./dist/shims/next-shims-augmentations.d.ts"
+    },
     "./shims/*": {
       "types": "./dist/shims/*.d.ts",
       "import": "./dist/shims/*.js"
@@ -152,6 +158,10 @@
     "./internal/utils/prerender-output-paths": {
       "types": "./dist/utils/prerender-output-paths.d.ts",
       "import": "./dist/utils/prerender-output-paths.js"
+    },
+    "./internal/utils/hash": {
+      "types": "./dist/utils/hash.d.ts",
+      "import": "./dist/utils/hash.js"
     }
   },
   "dependencies": {
@@ -161,7 +171,8 @@
     "ipaddr.js": "^2.1.0",
     "magic-string": "^0.30.21",
     "vite-plugin-commonjs": "^0.10.4",
-    "web-vitals": "^4.2.4"
+    "web-vitals": "^4.2.4",
+    "@vinext/types": "^1.0.0-beta.2"
   },
   "devDependencies": {
     "@types/node": "^25.9.2",
@@ -170,9 +181,10 @@
     "@vitejs/plugin-react": "^6.0.1",
     "@vitejs/plugin-rsc": "^0.5.27",
     "am-i-vibing": "^0.5.0",
+    "pathslash": "^0.1.0",
     "react-server-dom-webpack": "^19.2.7",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.1",
-    "vite-plus": "0.2.1"
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.2",
+    "vite-plus": "0.2.2"
   },
   "peerDependencies": {
     "@mdx-js/rollup": "^3.0.0",