vinext 0.0.53 → 0.0.54

package/dist/index.js

@@ -1,6 +1,6 @@
 import { detectPackageManager } from "./utils/project.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
-import { createValidFileMatcher } from "./routing/file-matcher.js";
+import { buildViteResolveExtensions, createValidFileMatcher } from "./routing/file-matcher.js";
 import { hasBasePath } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
@@ -8,12 +8,12 @@ import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-r
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { isExternalUrl, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.js";
 import { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
-import { mergeRewriteQuery } from "./utils/query.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache } from "./routing/app-router.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
+import { mergeRewriteQuery } from "./utils/query.js";
 import { logRequest, now } from "./server/request-log.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { createSSRHandler } from "./server/dev-server.js";
@@ -26,7 +26,7 @@ import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.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 { generateBrowserEntry, isLinkPrefetchRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
@@ -35,6 +35,7 @@ import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsP
 import { findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
+import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
 import { manifestFileWithBase, manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
@@ -55,6 +56,7 @@ import { buildSassPreprocessorOptions } from "./plugins/sass.js";
 import { createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.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 { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
@@ -389,7 +391,8 @@ function vinext(options = {}) {
 	* __NEXT_DATA__ to determine which page to hydrate.
 	*/
 	async function generateClientEntry$1() {
-		return generateClientEntry(pagesDir, nextConfig, fileMatcher);
+		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).filter(isLinkPrefetchRoute).map(toLinkPrefetchRoute) : [];
+		return generateClientEntry(pagesDir, nextConfig, fileMatcher, { appPrefetchRoutes });
 	}
 	async function writeRouteTypes() {
 		if (!hasAppDir) return;
@@ -553,6 +556,7 @@ function vinext(options = {}) {
 					defines[`process.env.${key}`] = JSON.stringify(value);
 				}
 				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_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 ?? []));
@@ -585,8 +589,14 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
 				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_VERSION"] = JSON.stringify(getVinextVersion());
 				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(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;
+				}
+				for (const key of Object.keys(nextConfig.compilerDefineServer)) if (key in defines) throw new Error(`The \`compiler.defineServer\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 				nextShimMap = Object.fromEntries(Object.entries({
 					"next/link": path.join(shimsDir, "link"),
 					"next/head": path.join(shimsDir, "head"),
@@ -704,6 +714,7 @@ function vinext(options = {}) {
 							...nextConfig.aliases,
 							...nextShimMap
 						},
+						extensions: buildViteResolveExtensions(nextConfig.pageExtensions),
 						dedupe: [
 							"react",
 							"react-dom",
@@ -924,8 +935,10 @@ function vinext(options = {}) {
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
 						htmlLimitedBots: nextConfig?.htmlLimitedBots,
+						clientTraceMetadata: nextConfig?.clientTraceMetadata,
 						assetPrefix: nextConfig?.assetPrefix,
 						expireTime: nextConfig?.expireTime,
+						inlineCss: nextConfig?.inlineCss,
 						i18n: nextConfig?.i18n,
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root),
@@ -1415,7 +1428,7 @@ function vinext(options = {}) {
 								await proxyExternalRewriteNode(req, res, resolvedUrl);
 								return;
 							}
-							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null);
+							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, nextConfig?.clientTraceMetadata);
 							const mwStatus = req.__vinextMiddlewareStatus;
 							if (match) {
 								applyDeferredMwHeaders();
@@ -1471,6 +1484,32 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		{
+			name: "vinext:remove-console",
+			apply: "build",
+			transform: {
+				filter: { id: /\.(tsx?|jsx?|mjs)$/ },
+				handler(code, id) {
+					if (this.environment?.name !== "client") return null;
+					if (!nextConfig.removeConsole) return null;
+					if (id.includes("/node_modules/")) return null;
+					const result = removeConsoleCalls(code, nextConfig.removeConsole);
+					if (!result) return null;
+					return {
+						code: result,
+						map: null
+					};
+				}
+			}
+		},
+		{
+			name: "vinext:compiler-define-server",
+			configEnvironment(name) {
+				if (Object.keys(nextConfig.compilerDefineServer).length === 0) return null;
+				if (name === "client") return null;
+				return { define: { ...nextConfig.compilerDefineServer } };
+			}
+		},
 		{
 			name: "vinext:image-imports",
 			enforce: "pre",
@@ -1818,6 +1857,25 @@ function vinext(options = {}) {
 				}
 			};
 		})(),
+		{
+			name: "vinext:inline-css-manifest",
+			apply: "build",
+			enforce: "post",
+			closeBundle: {
+				sequential: true,
+				order: "post",
+				handler() {
+					if (this.environment?.name !== "client") return;
+					if (!hasAppDir || nextConfig?.inlineCss !== true) return;
+					const envConfig = this.environment?.config;
+					if (!envConfig) return;
+					const buildRoot = envConfig.root ?? process.cwd();
+					const manifest = collectInlineCssManifest(path.resolve(buildRoot, "dist", "client"), nextConfig.assetPrefix);
+					const rscOutDir = path.resolve(buildRoot, options.rscOutDir ?? path.join("dist", "server"));
+					for (const entryFile of ["index.js", "index.mjs"]) if (injectInlineCssManifestGlobal(path.join(rscOutDir, entryFile), manifest)) break;
+				}
+			}
+		},
 		{
 			name: "vinext:cloudflare-build",
 			apply: "build",