vinext 0.1.1 → 0.1.2

package/dist/index.js

@@ -1,9 +1,9 @@
 import { detectPackageManager } from "./utils/project.js";
+import { normalizePathSeparators, stripViteModuleQuery } from "./utils/path.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
-import { normalizePathSeparators } from "./utils/path.js";
-import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
+import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { proxyExternalRequest } from "./config/config-matchers.js";
 import { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
@@ -40,7 +40,6 @@ import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-mani
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
-import { manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
@@ -49,23 +48,24 @@ import { createInstrumentationClientTransformPlugin } from "./plugins/instrument
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
+import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
+import { createDynamicPreloadMetadataPlugin } from "./plugins/dynamic-preload-metadata.js";
 import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins/og-assets.js";
 import { generateRouteTypes } from "./typegen.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
-import { computeLazyChunks } from "./utils/lazy-chunks.js";
-import { findClientEntryFile, findPagesClientEntryFile, readClientBuildManifest } from "./utils/client-build-manifest.js";
-import { VINEXT_CLIENT_ENTRY_MANIFEST, findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest } from "./utils/client-entry-manifest.js";
+import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
+import { buildRuntimeGlobalsScript, computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
-import { buildSassPreprocessorOptions } from "./plugins/sass.js";
-import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassTildeImporter } from "./plugins/sass.js";
+import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
-import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { stripServerExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
+import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
@@ -80,10 +80,6 @@ import MagicString from "magic-string";
 import tsconfigPaths from "vite-tsconfig-paths";
 //#region src/index.ts
 installSocketErrorBackstop();
-function stripViteModuleQuery(id) {
-	const queryIndex = id.search(/[?#]/);
-	return queryIndex === -1 ? id : id.slice(0, queryIndex);
-}
 function isInsideDirectory(dir, filePath) {
 	const relativePath = path.relative(dir, filePath);
 	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
@@ -148,10 +144,10 @@ function resolveShimModulePath(shimsDir, moduleName) {
 		".tsx",
 		".js"
 	]) {
-		const candidate = path.join(shimsDir, `${moduleName}${ext}`);
+		const candidate = path.posix.join(shimsDir, `${moduleName}${ext}`);
 		if (fs.existsSync(candidate)) return candidate;
 	}
-	return path.join(shimsDir, `${moduleName}.js`);
+	return path.posix.join(shimsDir, `${moduleName}.js`);
 }
 function isVercelOgImport(id) {
 	return id === "@vercel/og" || id === "@vercel/og.js";
@@ -300,8 +296,14 @@ const RESOLVED_INSTRUMENTATION_CLIENT = `\0${VIRTUAL_INSTRUMENTATION_CLIENT}.mjs
 /** Image file extensions handled by the vinext:image-imports plugin.
 *  Shared between the Rolldown hook filter and the transform handler regex. */
 const IMAGE_EXTS = "png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?";
-/** Absolute path to vinext's shims directory, used by clientManualChunks. */
-const _shimsDir = path.resolve(__dirname, "shims") + "/";
+/**
+* Absolute path to vinext's shims directory, with a trailing slash. Normalized
+* to forward slashes because it is prefix-matched against Vite module ids (which
+* Vite always normalizes to forward slashes) in the font plugins and
+* clientManualChunks — a raw path.resolve value has backslashes on Windows and
+* the `id.startsWith(_shimsDir)` checks would never match.
+*/
+const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
@@ -386,6 +388,7 @@ const clientManualChunks = createClientManualChunks(_shimsDir);
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
 function getClientOutputConfigForVite(viteMajorVersion, assetsDir) {
 	return viteMajorVersion >= 8 ? {
+		...createClientFileNameConfig(assetsDir),
 		assetFileNames: createClientAssetFileNames(assetsDir),
 		codeSplitting: clientCodeSplittingConfig
 	} : createClientOutputConfig(clientManualChunks, assetsDir);
@@ -409,6 +412,7 @@ function vinext(options = {}) {
 	let hasNitroPlugin = false;
 	let rscCompatibilityId;
 	const draftModeSecret = randomUUID();
+	const sassComposesLoader = createSassAwareFileSystemLoader();
 	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => tryRealpathSync(p) ?? p;
@@ -547,7 +551,7 @@ function vinext(options = {}) {
 			name: "vinext:config",
 			enforce: "pre",
 			async config(config, env) {
-				root = config.root ?? process.cwd();
+				root = normalizePathSeparators(config.root ?? process.cwd());
 				const userResolve = config.resolve;
 				const shouldEnableNativeTsconfigPaths = viteMajorVersion >= 8 && userResolve?.tsconfigPaths === void 0;
 				const tsconfigPathAliases = resolveTsconfigAliases(root);
@@ -560,18 +564,18 @@ function vinext(options = {}) {
 				else resolvedNodeEnv = "development";
 				if (process.env.NODE_ENV !== resolvedNodeEnv) process.env.NODE_ENV = resolvedNodeEnv;
 				let baseDir;
-				if (options.appDir) baseDir = path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir);
+				if (options.appDir) baseDir = normalizePathSeparators(path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir));
 				else {
-					const hasRootApp = fs.existsSync(path.join(root, "app"));
-					const hasRootPages = fs.existsSync(path.join(root, "pages"));
-					const hasSrcApp = fs.existsSync(path.join(root, "src", "app"));
-					const hasSrcPages = fs.existsSync(path.join(root, "src", "pages"));
+					const hasRootApp = fs.existsSync(path.posix.join(root, "app"));
+					const hasRootPages = fs.existsSync(path.posix.join(root, "pages"));
+					const hasSrcApp = fs.existsSync(path.posix.join(root, "src", "app"));
+					const hasSrcPages = fs.existsSync(path.posix.join(root, "src", "pages"));
 					if (hasRootApp || hasRootPages) baseDir = root;
-					else if (hasSrcApp || hasSrcPages) baseDir = path.join(root, "src");
+					else if (hasSrcApp || hasSrcPages) baseDir = path.posix.join(root, "src");
 					else baseDir = root;
 				}
-				pagesDir = path.join(baseDir, "pages");
-				appDir = path.join(baseDir, "app");
+				pagesDir = path.posix.join(baseDir, "pages");
+				appDir = path.posix.join(baseDir, "app");
 				hasPagesDir = fs.existsSync(pagesDir);
 				hasAppDir = !options.disableAppRouter && fs.existsSync(appDir);
 				if (!nextConfig) {
@@ -612,6 +616,7 @@ function vinext(options = {}) {
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
 				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
+				defines["process.env.__NEXT_GESTURE_TRANSITION"] = JSON.stringify(nextConfig.gestureTransition);
 				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
@@ -645,9 +650,10 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
 				defines["process.env.NEXT_DEPLOYMENT_ID"] = nextConfig.deploymentId ? JSON.stringify(nextConfig.deploymentId) : "false";
+				defines["process.env.NEXT_RUNTIME"] = "\"\"";
 				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
 				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(nextConfig.appShells);
-				defines["process.env.__NEXT_CACHE_COMPONENTS"] = JSON.stringify(String(nextConfig.cacheComponents ?? false));
+				defines["process.env.__NEXT_CACHE_COMPONENTS"] = JSON.stringify(nextConfig.cacheComponents ?? false);
 				for (const [key, value] of Object.entries(nextConfig.compilerDefine)) {
 					if (key in defines) throw new Error(`The \`compiler.define\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 					defines[key] = value;
@@ -735,6 +741,7 @@ function vinext(options = {}) {
 					...typeof config.server?.hmr === "object" ? config.server.hmr : {},
 					overlay: false
 				};
+				const cssModulesOverride = config.css?.modules === false || typeof config.css?.modules === "object" && "Loader" in config.css.modules ? {} : { modules: { Loader: sassComposesLoader.Loader } };
 				const viteConfig = {
 					appType: "custom",
 					build: {
@@ -801,13 +808,21 @@ function vinext(options = {}) {
 						const dirPrefix = resolveAssetsDir(nextConfig.assetPrefix) + "/";
 						return urlPrefix + (filename.startsWith(dirPrefix) ? filename.slice(dirPrefix.length) : filename.startsWith(`_next/static/`) ? filename.slice(ASSET_PREFIX_URL_DIR.length + 1) : filename);
 					} } } : {},
-					...postcssOverride || sassPreprocessorOptions ? { css: {
+					css: {
 						...postcssOverride ? { postcss: postcssOverride } : {},
-						...sassPreprocessorOptions ? { preprocessorOptions: {
-							scss: sassPreprocessorOptions,
-							sass: sassPreprocessorOptions
-						} } : {}
-					} } : {}
+						preprocessorOptions: (() => {
+							const tildeImporter = createSassTildeImporter(root);
+							const baseOpts = {
+								...sassPreprocessorOptions,
+								importers: [tildeImporter, ...sassPreprocessorOptions?.importers ?? []]
+							};
+							return {
+								scss: baseOpts,
+								sass: baseOpts
+							};
+						})(),
+						...cssModulesOverride
+					}
 				};
 				const nextServerExternal = nextConfig?.serverExternalPackages ?? [];
 				const userSsrExternal = Array.isArray(config.ssr?.external) ? [...config.ssr.external, ...nextServerExternal] : config.ssr?.external === true ? true : nextServerExternal;
@@ -884,7 +899,7 @@ function vinext(options = {}) {
 								])]
 							},
 							build: {
-								...hasCloudflarePlugin || hasPagesDir ? { manifest: true } : {},
+								manifest: true,
 								...hasPagesDir ? { ssrManifest: true } : {},
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions(viteMajorVersion, {
@@ -952,6 +967,7 @@ function vinext(options = {}) {
 				return viteConfig;
 			},
 			configResolved(config) {
+				sassComposesLoader.setResolvedConfig(config);
 				if (hasAppDir) {
 					const ssrEnv = config.environments?.ssr;
 					if (ssrEnv?.resolve?.external === true && Array.isArray(ssrEnv.resolve.noExternal)) ssrEnv.resolve.noExternal = ssrEnv.resolve.noExternal.filter((entry) => typeof entry !== "string" || !SSR_EXTERNAL_REACT_ENTRIES.includes(entry));
@@ -1444,7 +1460,10 @@ function vinext(options = {}) {
 									pathname = dataMatch.pagePathname;
 									req.url = url;
 								} else {
-									res.writeHead(404, { "Content-Type": "application/json" });
+									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
+									const notFoundHeaders = { "Content-Type": "application/json" };
+									if (deploymentId) notFoundHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
+									res.writeHead(404, notFoundHeaders);
 									res.end("{}");
 									return;
 								}
@@ -1629,9 +1648,9 @@ function vinext(options = {}) {
 			configEnvironment(name) {
 				if (name === "client") return null;
 				const serverDefines = { ...nextConfig.compilerDefineServer };
+				serverDefines["process.env.NEXT_RUNTIME"] = JSON.stringify("nodejs");
 				const sharedRevalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
 				if (sharedRevalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(sharedRevalidateSecret);
-				if (Object.keys(serverDefines).length === 0) return null;
 				return { define: serverDefines };
 			}
 		},
@@ -1721,6 +1740,7 @@ function vinext(options = {}) {
 		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),
 		createLocalFontsPlugin(_shimsDir),
 		createOptimizeImportsPlugin(() => nextConfig, () => root),
+		createDynamicPreloadMetadataPlugin(),
 		{
 			name: "vinext:use-cache",
 			transform: {
@@ -2057,22 +2077,15 @@ function vinext(options = {}) {
 					const distDir = path.resolve(buildRoot, "dist");
 					if (!fs.existsSync(distDir)) return;
 					const clientDir = path.resolve(buildRoot, "dist", "client");
-					const clientBase = envConfig.base ?? "/";
-					let lazyChunksData = null;
-					let clientEntryFile = null;
-					const clientEntryManifest = readClientEntryManifest(clientDir);
-					clientEntryFile = (hasAppDir && hasPagesDir ? findPagesClientEntryFileFromVinextManifest : findClientEntryFileFromVinextManifest)(clientEntryManifest, clientBase) ?? null;
-					const buildManifest = readClientBuildManifest(path.join(clientDir, ".vite", "manifest.json"));
-					if (buildManifest) {
-						if (!clientEntryFile) clientEntryFile = (hasAppDir && hasPagesDir ? findPagesClientEntryFile : findClientEntryFile)({
-							buildManifest,
-							clientDir,
-							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
-							assetBase: clientBase
-						}) ?? null;
-						const lazy = manifestFilesWithBase(computeLazyChunks(buildManifest), clientBase);
-						if (lazy.length > 0) lazyChunksData = lazy;
-					}
+					const runtimeMetadata = computeClientRuntimeMetadata({
+						clientDir,
+						assetBase: envConfig.base ?? "/",
+						assetPrefix: nextConfig.assetPrefix,
+						includeClientEntry: !hasAppDir ? true : hasPagesDir ? "pages-client-entry" : false
+					});
+					const lazyChunksData = runtimeMetadata.lazyChunks ?? null;
+					const dynamicPreloadsData = runtimeMetadata.dynamicPreloads ?? null;
+					let clientEntryFile = runtimeMetadata.clientEntryFile ?? null;
 					let ssrManifestData = null;
 					const ssrManifestPath = path.join(clientDir, ".vite", "ssr-manifest.json");
 					if (fs.existsSync(ssrManifestPath)) try {
@@ -2080,19 +2093,17 @@ function vinext(options = {}) {
 					} catch {}
 					if (hasAppDir) {
 						const workerEntry = path.resolve(distDir, "server", "index.js");
-						if (!clientEntryFile && hasPagesDir) clientEntryFile = findPagesClientEntryFile({
-							clientDir,
-							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
-							assetBase: clientBase
-						}) ?? null;
-						if (fs.existsSync(workerEntry) && (lazyChunksData || ssrManifestData || hasPagesDir && clientEntryFile)) {
-							let code = fs.readFileSync(workerEntry, "utf-8");
-							const globals = [];
-							if (hasPagesDir && clientEntryFile) globals.push(`globalThis.__VINEXT_CLIENT_ENTRY__ = ${JSON.stringify(clientEntryFile)};`);
-							if (ssrManifestData) globals.push(`globalThis.__VINEXT_SSR_MANIFEST__ = ${JSON.stringify(ssrManifestData)};`);
-							if (lazyChunksData) globals.push(`globalThis.__VINEXT_LAZY_CHUNKS__ = ${JSON.stringify(lazyChunksData)};`);
-							code = globals.join("\n") + "\n" + code;
-							fs.writeFileSync(workerEntry, code);
+						if (fs.existsSync(workerEntry)) {
+							const script = buildRuntimeGlobalsScript({
+								clientEntryFile,
+								ssrManifest: ssrManifestData,
+								lazyChunks: lazyChunksData,
+								dynamicPreloads: dynamicPreloadsData
+							});
+							if (script) {
+								const code = fs.readFileSync(workerEntry, "utf-8");
+								fs.writeFileSync(workerEntry, script + "\n" + code);
+							}
 						}
 					} else {
 						let workerOutDir = null;
@@ -2107,19 +2118,15 @@ function vinext(options = {}) {
 						if (!workerOutDir) return;
 						const workerEntry = path.join(workerOutDir, "index.js");
 						if (!fs.existsSync(workerEntry)) return;
-						if (!clientEntryFile) clientEntryFile = findClientEntryFile({
-							clientDir,
-							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
-							assetBase: clientBase
-						}) ?? null;
-						if (clientEntryFile || ssrManifestData || lazyChunksData) {
-							let code = fs.readFileSync(workerEntry, "utf-8");
-							const globals = [];
-							if (clientEntryFile) globals.push(`globalThis.__VINEXT_CLIENT_ENTRY__ = ${JSON.stringify(clientEntryFile)};`);
-							if (ssrManifestData) globals.push(`globalThis.__VINEXT_SSR_MANIFEST__ = ${JSON.stringify(ssrManifestData)};`);
-							if (lazyChunksData) globals.push(`globalThis.__VINEXT_LAZY_CHUNKS__ = ${JSON.stringify(lazyChunksData)};`);
-							code = globals.join("\n") + "\n" + code;
-							fs.writeFileSync(workerEntry, code);
+						const script = buildRuntimeGlobalsScript({
+							clientEntryFile,
+							ssrManifest: ssrManifestData,
+							lazyChunks: lazyChunksData,
+							dynamicPreloads: dynamicPreloadsData
+						});
+						if (script) {
+							const code = fs.readFileSync(workerEntry, "utf-8");
+							fs.writeFileSync(workerEntry, script + "\n" + code);
 						}
 					}
 					const headersPath = path.join(clientDir, "_headers");
@@ -2137,6 +2144,7 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		createWasmModuleImportPlugin(),
 		{
 			name: "vinext:og-font-patch",
 			enforce: "pre",

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

@@ -0,0 +1,13 @@
+import { Plugin } from "vite";
+import MagicString from "magic-string";
+
+//#region src/plugins/dynamic-preload-metadata.d.ts
+type TransformResult = {
+  code: string;
+  map: ReturnType<MagicString["generateMap"]>;
+};
+type ResolveDynamicImport = (specifier: string, importer: string) => Promise<string | null>;
+declare function transformNextDynamicPreloadMetadata(code: string, id: string, root: string, resolveDynamicImport: ResolveDynamicImport): Promise<TransformResult | null>;
+declare function createDynamicPreloadMetadataPlugin(): Plugin;
+//#endregion
+export { createDynamicPreloadMetadataPlugin, transformNextDynamicPreloadMetadata };