vinext 0.0.28 → 0.0.30

package/dist/index.js

@@ -10,6 +10,7 @@ import { createDirectRunner } from "./server/dev-module-runner.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { generateBrowserEntry } from "./entries/app-browser-entry.js";
+import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { loadNextConfig, resolveNextConfig, } from "./config/next-config.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { logRequest, now } from "./server/request-log.js";
@@ -227,6 +228,12 @@ const POSTCSS_CONFIG_FILES = [
     ".postcssrc.yaml",
     ".postcssrc.yml",
 ];
+/**
+ * Module-level cache for resolvePostcssStringPlugins — avoids re-scanning per Vite environment.
+ * Stores the Promise itself so concurrent calls (RSC/SSR/Client config() hooks firing in
+ * parallel) all await the same in-flight scan rather than each starting their own.
+ */
+const _postcssCache = new Map();
 /**
  * Resolve PostCSS string plugin names in a project's PostCSS config.
  *
@@ -239,7 +246,14 @@ const POSTCSS_CONFIG_FILES = [
  * Returns the resolved PostCSS config object to inject into Vite's
  * `css.postcss`, or `undefined` if no resolution is needed.
  */
-async function resolvePostcssStringPlugins(projectRoot) {
+function resolvePostcssStringPlugins(projectRoot) {
+    if (_postcssCache.has(projectRoot))
+        return _postcssCache.get(projectRoot);
+    const promise = _resolvePostcssStringPluginsUncached(projectRoot);
+    _postcssCache.set(projectRoot, promise);
+    return promise;
+}
+async function _resolvePostcssStringPluginsUncached(projectRoot) {
     // Find the PostCSS config file
     let configPath = null;
     for (const name of POSTCSS_CONFIG_FILES) {
@@ -249,8 +263,9 @@ async function resolvePostcssStringPlugins(projectRoot) {
             break;
         }
     }
-    if (!configPath)
+    if (!configPath) {
         return undefined;
+    }
     // Load the config file
     let config;
     try {
@@ -277,11 +292,13 @@ async function resolvePostcssStringPlugins(projectRoot) {
     }
     // Only process array-form plugins that contain string entries
     // (either bare strings or tuple form ["plugin-name", { options }])
-    if (!config || !Array.isArray(config.plugins))
+    if (!config || !Array.isArray(config.plugins)) {
         return undefined;
+    }
     const hasStringPlugins = config.plugins.some((p) => typeof p === "string" || (Array.isArray(p) && typeof p[0] === "string"));
-    if (!hasStringPlugins)
+    if (!hasStringPlugins) {
         return undefined;
+    }
     // Resolve string plugin names to actual plugin functions
     const req = createRequire(path.join(projectRoot, "package.json"));
     const resolved = await Promise.all(config.plugins.filter(Boolean).map(async (plugin) => {
@@ -556,6 +573,7 @@ function augmentSsrManifestFromBundle(ssrManifest, bundle, root, base = "/") {
     return Object.fromEntries(Object.entries(nextManifest).map(([key, files]) => [key, [...files]]));
 }
 export default function vinext(options = {}) {
+    const viteMajorVersion = getViteMajorVersion();
     let root;
     let pagesDir;
     let appDir;
@@ -571,6 +589,11 @@ export default function vinext(options = {}) {
     const shimsDir = path.resolve(__dirname, "shims");
     // Shim alias map — populated in config(), used by resolveId() for .js variants
     let nextShimMap = {};
+    // Build-only cache for og-inline-fetch-assets to avoid repeated file reads
+    // during a single production build. Dev mode skips the cache so asset edits
+    // are picked up without restarting the Vite server.
+    const _ogInlineCache = new Map();
+    let _ogInlineIsBuild = false;
     /**
      * Generate the virtual SSR server entry module.
      * This is the entry point for `vite build --ssr`.
@@ -650,7 +673,8 @@ export default function vinext(options = {}) {
     const plugins = [
         // Resolve tsconfig paths/baseUrl aliases so real-world Next.js repos
         // that use @/*, #/*, or baseUrl imports work out of the box.
-        tsconfigPaths(),
+        // Vite 8+ supports this natively via resolve.tsconfigPaths.
+        ...(viteMajorVersion >= 8 ? [] : [tsconfigPaths()]),
         // React Fast Refresh + JSX transform for client components.
         reactPlugin,
         // Transform CJS require()/module.exports to ESM before other plugins
@@ -661,6 +685,8 @@ export default function vinext(options = {}) {
             enforce: "pre",
             async config(config, env) {
                 root = config.root ?? process.cwd();
+                const userResolve = config.resolve;
+                const shouldEnableNativeTsconfigPaths = viteMajorVersion >= 8 && userResolve?.tsconfigPaths === undefined;
                 // Load .env files into process.env before anything else.
                 // Next.js loads .env files before evaluating next.config.js, so
                 // env vars are available in config, server-side code, and as
@@ -767,33 +793,59 @@ export default function vinext(options = {}) {
                 // Also used to namespace ISR cache keys so old cached entries from a
                 // previous deploy are never served by the new one.
                 defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
-                // Build the shim alias map — used by both resolve.alias and resolveId
-                // (resolveId handles .js extension variants for libraries like nuqs)
+                // Build the shim alias map. Exact `.js` variants are included for the
+                // public Next entrypoints that are file-backed in `next/package.json`.
+                // Some libraries (for example `nuqs`) import `next/navigation.js`
+                // directly; aliasing the `.js` form ensures optimizeDeps pre-bundles
+                // vinext's shim instead of real Next.
                 nextShimMap = {
                     ...nextConfig.aliases,
                     "next/link": path.join(shimsDir, "link"),
+                    "next/link.js": path.join(shimsDir, "link"),
                     "next/head": path.join(shimsDir, "head"),
+                    "next/head.js": path.join(shimsDir, "head"),
                     "next/router": path.join(shimsDir, "router"),
+                    "next/router.js": path.join(shimsDir, "router"),
                     "next/compat/router": path.join(shimsDir, "compat-router"),
+                    "next/compat/router.js": path.join(shimsDir, "compat-router"),
                     "next/image": path.join(shimsDir, "image"),
+                    "next/image.js": path.join(shimsDir, "image"),
                     "next/legacy/image": path.join(shimsDir, "legacy-image"),
+                    "next/legacy/image.js": path.join(shimsDir, "legacy-image"),
                     "next/dynamic": path.join(shimsDir, "dynamic"),
+                    "next/dynamic.js": path.join(shimsDir, "dynamic"),
                     "next/app": path.join(shimsDir, "app"),
+                    "next/app.js": path.join(shimsDir, "app"),
                     "next/document": path.join(shimsDir, "document"),
+                    "next/document.js": path.join(shimsDir, "document"),
                     "next/config": path.join(shimsDir, "config"),
+                    "next/config.js": path.join(shimsDir, "config"),
                     "next/script": path.join(shimsDir, "script"),
+                    "next/script.js": path.join(shimsDir, "script"),
                     "next/server": path.join(shimsDir, "server"),
+                    "next/server.js": path.join(shimsDir, "server"),
                     "next/navigation": path.join(shimsDir, "navigation"),
+                    "next/navigation.js": path.join(shimsDir, "navigation"),
                     "next/headers": path.join(shimsDir, "headers"),
+                    "next/headers.js": path.join(shimsDir, "headers"),
                     "next/font/google": path.join(shimsDir, "font-google"),
+                    "next/font/google.js": path.join(shimsDir, "font-google"),
                     "next/font/local": path.join(shimsDir, "font-local"),
+                    "next/font/local.js": path.join(shimsDir, "font-local"),
                     "next/cache": path.join(shimsDir, "cache"),
+                    "next/cache.js": path.join(shimsDir, "cache"),
                     "next/form": path.join(shimsDir, "form"),
+                    "next/form.js": path.join(shimsDir, "form"),
                     "next/og": path.join(shimsDir, "og"),
+                    "next/og.js": path.join(shimsDir, "og"),
                     "next/web-vitals": path.join(shimsDir, "web-vitals"),
+                    "next/web-vitals.js": path.join(shimsDir, "web-vitals"),
                     "next/amp": path.join(shimsDir, "amp"),
+                    "next/amp.js": path.join(shimsDir, "amp"),
                     "next/error": path.join(shimsDir, "error"),
+                    "next/error.js": path.join(shimsDir, "error"),
                     "next/constants": path.join(shimsDir, "constants"),
+                    "next/constants.js": path.join(shimsDir, "constants"),
                     // Internal next/dist/* paths used by popular libraries
                     // (next-intl, @clerk/nextjs, @sentry/nextjs, next-nprogress-bar, etc.)
                     "next/dist/shared/lib/app-router-context.shared-runtime": path.join(shimsDir, "internal", "app-router-context"),
@@ -819,8 +871,11 @@ export default function vinext(options = {}) {
                     "vinext/fetch-cache": path.join(shimsDir, "fetch-cache"),
                     "vinext/cache-runtime": path.join(shimsDir, "cache-runtime"),
                     "vinext/navigation-state": path.join(shimsDir, "navigation-state"),
+                    "vinext/unified-request-context": path.join(shimsDir, "unified-request-context"),
                     "vinext/router-state": path.join(shimsDir, "router-state"),
                     "vinext/head-state": path.join(shimsDir, "head-state"),
+                    "vinext/i18n-state": path.join(shimsDir, "i18n-state"),
+                    "vinext/i18n-context": path.join(shimsDir, "i18n-context"),
                     "vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
                     "vinext/html": path.resolve(__dirname, "server", "html"),
                 };
@@ -986,6 +1041,7 @@ export default function vinext(options = {}) {
                         // causing cryptic "Invalid hook call" errors. This is a no-op
                         // when only one copy exists.
                         dedupe: ["react", "react-dom", "react/jsx-runtime", "react/jsx-dev-runtime"],
+                        ...(shouldEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}),
                     },
                     // Exclude vinext from dependency optimization so esbuild doesn't
                     // scan dist files containing virtual module imports (virtual:vinext-*)
@@ -998,7 +1054,7 @@ export default function vinext(options = {}) {
                     },
                     // Enable JSX in .tsx/.jsx files
                     // Vite 7 uses `esbuild` for transforms, Vite 8+ uses `oxc`
-                    ...(getViteMajorVersion() >= 8
+                    ...(viteMajorVersion >= 8
                         ? { oxc: { jsx: { runtime: "automatic" } } }
                         : { esbuild: { jsx: "automatic" } }),
                     // Define env vars for client bundle
@@ -1099,6 +1155,10 @@ export default function vinext(options = {}) {
                             consumer: "client",
                             optimizeDeps: {
                                 exclude: ["vinext"],
+                                // Crawl app/ source files up front so client-only deps imported
+                                // by user components are discovered during startup instead of
+                                // triggering a late re-optimisation + full page reload.
+                                entries: appEntries,
                                 // React packages aren't crawled from app/ source files,
                                 // so must be pre-included to avoid late discovery (#25).
                                 include: [
@@ -1193,18 +1253,6 @@ export default function vinext(options = {}) {
                     // ID (with \0 prefix). We need to re-resolve it so the client
                     // environment's import-analysis can find it.
                     const cleanId = id.startsWith("\0") ? id.slice(1) : id;
-                    // Handle next/* imports with .js extension (e.g. "next/navigation.js")
-                    // Libraries like nuqs import "next/navigation.js" which doesn't match
-                    // our resolve.alias for "next/navigation". Strip the .js and resolve
-                    // through our shim map, appending .js to the resolved path.
-                    if (cleanId.startsWith("next/") && cleanId.endsWith(".js")) {
-                        const withoutExt = cleanId.slice(0, -3);
-                        if (nextShimMap[withoutExt]) {
-                            const shimPath = nextShimMap[withoutExt];
-                            // Alias values don't include .js — append it for resolveId
-                            return shimPath.endsWith(".js") ? shimPath : shimPath + ".js";
-                        }
-                    }
                     // Pages Router virtual modules
                     if (cleanId === VIRTUAL_SERVER_ENTRY)
                         return RESOLVED_SERVER_ENTRY;
@@ -1662,7 +1710,8 @@ export default function vinext(options = {}) {
                                     res.end("Only relative URLs allowed");
                                     return;
                                 }
-                                res.writeHead(302, { Location: imgUrl });
+                                const encodedLocation = resolvedImg.pathname + resolvedImg.search;
+                                res.writeHead(302, { Location: encodedLocation });
                                 res.end();
                                 return;
                             }
@@ -1695,7 +1744,7 @@ export default function vinext(options = {}) {
                             // decodeURIComponent prevents /%61dmin bypassing /admin matchers.
                             // normalizePath collapses // and resolves . / .. segments.
                             try {
-                                pathname = normalizePath(decodeURIComponent(pathname));
+                                pathname = normalizePath(normalizePathnameForRouteMatchStrict(pathname));
                             }
                             catch {
                                 // Malformed percent-encoding (e.g. /%E0%A4%A) — return 400 instead of crashing.
@@ -1821,7 +1870,7 @@ export default function vinext(options = {}) {
                                         for (const [key, value] of result.response.headers) {
                                             res.appendHeader(key, value);
                                         }
-                                        const body = await result.response.text();
+                                        const body = Buffer.from(await result.response.arrayBuffer());
                                         res.end(body);
                                         return;
                                     }
@@ -1926,7 +1975,7 @@ export default function vinext(options = {}) {
                                 await proxyExternalRewriteNode(req, res, resolvedUrl);
                                 return;
                             }
-                            const handler = createSSRHandler(server, routes, pagesDir, nextConfig?.i18n, fileMatcher);
+                            const handler = createSSRHandler(server, routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false);
                             const mwStatus = req.__vinextRewriteStatus;
                             // Try rendering the resolved URL
                             const match = matchRoute(resolvedUrl.split("?")[0], routes);
@@ -2462,11 +2511,20 @@ export default function vinext(options = {}) {
         {
             name: "vinext:og-inline-fetch-assets",
             enforce: "pre",
-            transform(code, id) {
+            configResolved(config) {
+                _ogInlineIsBuild = config.command === "build";
+            },
+            buildStart() {
+                if (_ogInlineIsBuild) {
+                    _ogInlineCache.clear();
+                }
+            },
+            async transform(code, id) {
                 // Quick bail-out: only process modules that use new URL(..., import.meta.url)
                 if (!code.includes("import.meta.url")) {
                     return null;
                 }
+                const useCache = _ogInlineIsBuild;
                 const moduleDir = path.dirname(id);
                 let newCode = code;
                 let didReplace = false;
@@ -2478,13 +2536,19 @@ export default function vinext(options = {}) {
                         const fullMatch = match[0];
                         const relPath = match[2]; // e.g. "./noto-sans-v27-latin-regular.ttf"
                         const absPath = path.resolve(moduleDir, relPath);
-                        let fileBase64;
-                        try {
-                            fileBase64 = fs.readFileSync(absPath).toString("base64");
-                        }
-                        catch {
-                            // File not found on disk — skip (may be a runtime-only asset)
-                            continue;
+                        let fileBase64 = useCache ? _ogInlineCache.get(absPath) : undefined;
+                        if (fileBase64 === undefined) {
+                            try {
+                                const buf = await fs.promises.readFile(absPath);
+                                fileBase64 = buf.toString("base64");
+                                if (useCache) {
+                                    _ogInlineCache.set(absPath, fileBase64);
+                                }
+                            }
+                            catch {
+                                // File not found on disk — skip (may be a runtime-only asset)
+                                continue;
+                            }
                         }
                         // Replace fetch(...).then(...) with an inline IIFE that returns Promise<ArrayBuffer>.
                         const inlined = [
@@ -2509,13 +2573,19 @@ export default function vinext(options = {}) {
                         const fullMatch = match[0];
                         const relPath = match[2]; // e.g. "./noto-sans-v27-latin-regular.ttf"
                         const absPath = path.resolve(moduleDir, relPath);
-                        let fileBase64;
-                        try {
-                            fileBase64 = fs.readFileSync(absPath).toString("base64");
-                        }
-                        catch {
-                            // File not found on disk — skip
-                            continue;
+                        let fileBase64 = useCache ? _ogInlineCache.get(absPath) : undefined;
+                        if (fileBase64 === undefined) {
+                            try {
+                                const buf = await fs.promises.readFile(absPath);
+                                fileBase64 = buf.toString("base64");
+                                if (useCache) {
+                                    _ogInlineCache.set(absPath, fileBase64);
+                                }
+                            }
+                            catch {
+                                // File not found on disk — skip
+                                continue;
+                            }
                         }
                         // Replace readFileSync(...) with Buffer.from("<base64>", "base64").
                         // Buffer is always available in Node.js and in the vinext SSR/RSC environments.
@@ -3104,15 +3174,23 @@ function findFileWithExts(dir, name, matcher) {
     }
     return null;
 }
+/** Module-level cache for hasMdxFiles — avoids re-scanning per Vite environment. */
+const _mdxScanCache = new Map();
 /**
  * Check if the project has .mdx files in app/ or pages/ directories.
  */
 function hasMdxFiles(root, appDir, pagesDir) {
+    const cacheKey = `${root}\0${appDir ?? ""}\0${pagesDir ?? ""}`;
+    if (_mdxScanCache.has(cacheKey))
+        return _mdxScanCache.get(cacheKey);
     const dirs = [appDir, pagesDir].filter(Boolean);
     for (const dir of dirs) {
-        if (fs.existsSync(dir) && scanDirForMdx(dir))
+        if (fs.existsSync(dir) && scanDirForMdx(dir)) {
+            _mdxScanCache.set(cacheKey, true);
             return true;
+        }
     }
+    _mdxScanCache.set(cacheKey, false);
     return false;
 }
 function scanDirForMdx(dir) {
@@ -3142,6 +3220,9 @@ export { staticExportPages, staticExportApp } from "./build/static-export.js";
 export { clientManualChunks, clientOutputConfig, clientTreeshakeConfig, computeLazyChunks };
 export { augmentSsrManifestFromBundle as _augmentSsrManifestFromBundle };
 export { resolvePostcssStringPlugins as _resolvePostcssStringPlugins };
+export { _postcssCache };
+export { hasMdxFiles as _hasMdxFiles };
+export { _mdxScanCache };
 export { parseStaticObjectLiteral as _parseStaticObjectLiteral };
 export { stripServerExports as _stripServerExports };
 export { asyncHooksStubPlugin as _asyncHooksStubPlugin };