vinext 1.4.3 → 1.4.5

package/dist/plugins/styled-jsx.js

@@ -1,10 +1,11 @@
-import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { SCRIPT_MODULE_ID_RE, parseProgram, walkAst } from "./ast-utils.js";
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { NODE_MODULES_PATH_RE, stripViteModuleQuery } from "../utils/path.js";
+import { SCRIPT_MODULE_ID_RE, parseProgram, walkAst } from "./ast-utils.js";
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
-//#region src/plugins/styled-jsx.ts
+// src/plugins/styled-jsx.ts
 const STYLED_JSX_IMPORT_RE = /^styled-jsx(?:\/.*)?$/;
+const STYLED_JSX_RUNTIME_IDS = ["styled-jsx", "styled-jsx/style"];
 const STYLED_JSX_SOURCE_RE = /(?:<style\b|from\s+["']styled-jsx\/css["']|require\s*\(\s*["']styled-jsx\/css["']\s*\))/;
 const STYLED_JSX_CSS_RE = /(?:from\s+["']styled-jsx\/css["']|require\s*\(\s*["']styled-jsx\/css["']\s*\))/;
 function hasStyledJsxTag(source, id) {
@@ -38,10 +39,9 @@ function hasStyledJsxTag(source, id) {
 function createProjectRequire(projectRoot) {
 	return createRequire(path.join(projectRoot, "package.json"));
 }
-function resolveNextRequire(projectRoot) {
+function resolveNextPackageJson(projectRoot) {
 	try {
-		const projectRequire = createProjectRequire(projectRoot);
-		return createRequire(projectRequire.resolve("next/package.json"));
+		return toSlash(createProjectRequire(projectRoot).resolve("next/package.json"));
 	} catch {
 		return null;
 	}
@@ -61,11 +61,19 @@ function parserOptions(id) {
 function createStyledJsxPlugin(initialProjectRoot, options = {}) {
 	let projectRoot = initialProjectRoot;
 	let development = false;
+	let nextPackageJson;
 	let nextRequire;
 	let compilerPromise = null;
 	const importModule = options.importModule ?? ((url) => import(url));
+	function getNextPackageJson() {
+		if (nextPackageJson === void 0) nextPackageJson = resolveNextPackageJson(projectRoot);
+		return nextPackageJson;
+	}
 	function getNextRequire() {
-		nextRequire ??= resolveNextRequire(projectRoot);
+		if (nextRequire === void 0) {
+			const packageJson = getNextPackageJson();
+			nextRequire = packageJson ? createRequire(packageJson) : null;
+		}
 		return nextRequire;
 	}
 	async function getCompiler() {
@@ -87,13 +95,32 @@ function createStyledJsxPlugin(initialProjectRoot, options = {}) {
 			development = config.command === "serve";
 			if (config.root !== projectRoot) {
 				projectRoot = config.root;
+				nextPackageJson = void 0;
 				nextRequire = void 0;
 				compilerPromise = null;
 			}
+			const clientOptimizeDeps = config.environments.client?.optimizeDeps;
+			const requireFromNext = development && clientOptimizeDeps ? getNextRequire() : null;
+			if (!clientOptimizeDeps || !requireFromNext) return;
+			for (const id of STYLED_JSX_RUNTIME_IDS) {
+				const include = `next > ${id}`;
+				if (clientOptimizeDeps.include?.includes(include)) continue;
+				try {
+					requireFromNext.resolve(id);
+				} catch {
+					continue;
+				}
+				(clientOptimizeDeps.include ??= []).push(include);
+			}
 		},
 		resolveId: {
 			filter: { id: STYLED_JSX_IMPORT_RE },
-			handler(source) {
+			async handler(source, _importer, resolveOptions) {
+				const packageJson = getNextPackageJson();
+				if (development && packageJson && this.environment.name === "client") return this.resolve(source, packageJson, {
+					...resolveOptions,
+					skipSelf: true
+				});
 				try {
 					return getNextRequire()?.resolve(source) ?? null;
 				} catch {}
@@ -143,5 +170,4 @@ function createStyledJsxPlugin(initialProjectRoot, options = {}) {
 		}
 	};
 }
-//#endregion
 export { createStyledJsxPlugin };

package/dist/plugins/transform-cache.d.ts

@@ -1,4 +1,3 @@
-//#region src/plugins/transform-cache.d.ts
 /**
  * Memoizes a pure per-module transform across the repeated build passes
  * (scan client/server references + rsc/client/ssr builds), which feed the
@@ -14,5 +13,4 @@
  * Only safe for transforms whose result depends solely on (id, source,
  * variant) — no filesystem or plugin-state reads inside `compute`.
  */
-export declare function createTransformCache<V, R>(): (id: string, source: string, variant: V, compute: () => R) => R;
-//#endregion
+export declare function createTransformCache<V, R>(): (id: string, source: string, variant: V, compute: () => R) => R;

package/dist/plugins/transform-cache.js

@@ -1,4 +1,4 @@
-//#region src/plugins/transform-cache.ts
+// src/plugins/transform-cache.ts
 /**
 * Memoizes a pure per-module transform across the repeated build passes
 * (scan client/server references + rsc/client/ssr builds), which feed the
@@ -32,5 +32,4 @@ function createTransformCache() {
 		return value;
 	};
 }
-//#endregion
 export { createTransformCache };

package/dist/plugins/transform-result.d.ts

@@ -1,5 +1,4 @@
 import MagicString from "magic-string";
-//#region src/plugins/transform-result.d.ts
 export type MagicStringTransformResult<TMap = ReturnType<MagicString["generateMap"]>> = {
   code: string;
   map: TMap;
@@ -18,6 +17,18 @@ type SourcemapEnvironment = {
 };
 /** Build the standard code + sourcemap result returned by source transforms. */
 export declare function magicStringTransformResult<TMap = ReturnType<MagicString["generateMap"]>>(output: MagicStringOutput<TMap>, options?: Parameters<MagicString["generateMap"]>[0]): MagicStringTransformResult<TMap>;
+/**
+ * Build the result of a transform that replaces a module with Server Function
+ * reference proxies. Like @vitejs/plugin-rsc's `rsc:use-server`, builds return
+ * an empty map so the replaced module's source doesn't ship in sourcemaps.
+ * Rolldown < 1.2.18 (Vite < 8.3.7) refills empty maps with the module's
+ * original code, so this needs Rolldown >= 1.2.18 to take effect.
+ */
+export declare function serverReferenceProxyResult<TMap = ReturnType<MagicString["generateMap"]>>(environment: {
+  mode: string;
+}, output: MagicStringOutput<TMap>, options?: Parameters<MagicString["generateMap"]>[0]): MagicStringTransformResult<TMap | {
+  mappings: "";
+}>;
 /**
  * Drop the sourcemap from a transform result when the build environment
  * discards it, mirroring Vite's own transforms
@@ -28,5 +39,4 @@ export declare function omitUnusedBuildSourcemap<TMap = ReturnType<MagicString["
   code: string;
   map: TMap | null;
 } | null;
-//#endregion
 export {};

package/dist/plugins/transform-result.js

@@ -1,4 +1,4 @@
-//#region src/plugins/transform-result.ts
+// src/plugins/transform-result.ts
 /** Build the standard code + sourcemap result returned by source transforms. */
 function magicStringTransformResult(output, options = { hires: "boundary" }) {
 	let source = output;
@@ -15,6 +15,20 @@ function magicStringTransformResult(output, options = { hires: "boundary" }) {
 	};
 }
 /**
+* Build the result of a transform that replaces a module with Server Function
+* reference proxies. Like @vitejs/plugin-rsc's `rsc:use-server`, builds return
+* an empty map so the replaced module's source doesn't ship in sourcemaps.
+* Rolldown < 1.2.18 (Vite < 8.3.7) refills empty maps with the module's
+* original code, so this needs Rolldown >= 1.2.18 to take effect.
+*/
+function serverReferenceProxyResult(environment, output, options) {
+	if (environment.mode === "build") return {
+		code: output.toString(),
+		map: { mappings: "" }
+	};
+	return magicStringTransformResult(output, options);
+}
+/**
 * Drop the sourcemap from a transform result when the build environment
 * discards it, mirroring Vite's own transforms
 * (`config.build.sourcemap ? s.generateMap(...) : null`). Dev and builds with
@@ -27,5 +41,4 @@ function omitUnusedBuildSourcemap(environment, result) {
 		map: null
 	};
 }
-//#endregion
-export { magicStringTransformResult, omitUnusedBuildSourcemap };
+export { magicStringTransformResult, omitUnusedBuildSourcemap, serverReferenceProxyResult };

package/dist/plugins/transitive-externals.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/transitive-externals.d.ts
 /**
  * Mirrors the path-equality portion of Next.js's `baseResolveCheck` for
  * `serverExternalPackages`.
@@ -19,5 +18,4 @@ import { Plugin } from "vite";
 export declare function createTransitiveExternalsPlugin(options: {
   getRoot: () => string | undefined;
   getExternalPackages: () => readonly string[];
-}): Plugin;
-//#endregion
+}): Plugin;

package/dist/plugins/transitive-externals.js

@@ -1,10 +1,10 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { BARE_PACKAGE_SPECIFIER_RE, packageNameFromSpecifier } from "../utils/package-name.js";
 import { canonicalizeFilePath, stripViteModuleQuery } from "../utils/path.js";
 import { isServerEnvironment } from "./environment.js";
-import { BARE_PACKAGE_SPECIFIER_RE, packageNameFromSpecifier } from "../utils/package-name.js";
 import { createRequire } from "node:module";
 import { createIdResolver } from "vite";
-//#region src/plugins/transitive-externals.ts
+// src/plugins/transitive-externals.ts
 function moduleMode(kind) {
 	return kind === "require-call" ? "require" : "import";
 }
@@ -103,5 +103,4 @@ function createTransitiveExternalsPlugin(options) {
 		}
 	};
 }
-//#endregion
 export { createTransitiveExternalsPlugin };

package/dist/plugins/typeof-window.d.ts

@@ -1,5 +1,4 @@
 import { MagicStringTransformResult } from "./transform-result.js";
-//#region src/plugins/typeof-window.d.ts
 type WindowType = "object" | "undefined";
 export declare const consumerEnvironmentConditionFilter: RegExp;
 export type ConsumerEnvironmentReplacements = {
@@ -25,5 +24,4 @@ export declare function getTypeofWindowReplacement(environment: EnvironmentLike)
 export declare function mayFoldChangeScannedImports(code: string): boolean;
 export declare function replaceTypeofWindow(code: string, replacement: WindowType, id?: string): MagicStringTransformResult<import("magic-string").SourceMap> | null;
 export declare function replaceConsumerEnvironmentConditions(code: string, replacements: ConsumerEnvironmentReplacements, id?: string): MagicStringTransformResult<import("magic-string").SourceMap> | null;
-//#endregion
 export {};

package/dist/plugins/typeof-window.js

@@ -1,11 +1,11 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { DYNAMIC_IMPORT_PRESCAN, booleanLiteralValue, collectBindingNames, forEachAstChild, isIdentifierNamed, stringLiteralValue } from "./ast-utils.js";
+import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode } from "./ast-scope.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import { stripViteModuleQuery } from "../utils/path.js";
-import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode } from "./ast-scope.js";
 import { parseSync } from "vite";
 import MagicString from "magic-string";
-//#region src/plugins/typeof-window.ts
+// src/plugins/typeof-window.ts
 const sourceEscapePattern = /\\(?:\r\n|[\n\r\u2028\u2029]|[^\n\r\u2028\u2029])/;
 const consumerEnvironmentConditionFilter = new RegExp(String.raw`\btypeof\s+window\b|${/\\(?:u(?:[\da-fA-F]{4}|\{[\da-fA-F]+\})|x[\da-fA-F]{2})/.source}|\bprocess\b[\s)]*(?:(?:\?\.|\.)\s*(?:browser\b|\/[/*])|(?:\?\.\s*)?\[[\s(]*(?:["']browser["']|["'][^"'\\\n\r]*\\|\/[/*])|\/[/*])`);
 const SCANNED_IMPORT_FOLD_PRESCAN = new RegExp(String.raw`${DYNAMIC_IMPORT_PRESCAN.source}|\bimport\s*\.`);
@@ -259,5 +259,4 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 	if (!changed) return null;
 	return magicStringTransformResult(output);
 }
-//#endregion
 export { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions, replaceTypeofWindow };

package/dist/plugins/use-cache-callable.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/use-cache-callable.d.ts
 type RscTransforms = typeof import("@vitejs/plugin-rsc/transforms");
 type Options = {
   projectRoot: string;
@@ -29,5 +28,4 @@ export type UseCacheCallableApi = {
 };
 declare const PLUGIN_NAME = "vinext:server-function-directives";
 export declare function createUseCacheCallablePlugin(options: Options): Promise<[Plugin<UseCacheCallableApi>, Plugin]>;
-//#endregion
 export { PLUGIN_NAME as USE_CACHE_PLUGIN_NAME };

package/dist/plugins/use-cache-callable.js

@@ -1,15 +1,15 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { getServerActionsKeyCacheFsDeny, loadOrGenerateServerActionsEncryptionKey } from "../build/server-actions-encryption-key.js";
 import { parseProgramAsync } from "./ast-utils.js";
-import { magicStringTransformResult } from "./transform-result.js";
 import { NODE_MODULES_PATH_RE } from "../utils/path.js";
-import { getServerActionsKeyCacheFsDeny, loadOrGenerateServerActionsEncryptionKey } from "../build/server-actions-encryption-key.js";
+import { magicStringTransformResult, serverReferenceProxyResult } from "./transform-result.js";
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
 import { createHmac } from "node:crypto";
-//#region src/plugins/use-cache-callable.ts
+// src/plugins/use-cache-callable.ts
 const PLUGIN_NAME = "vinext:server-function-directives";
-const SOURCE_MODULE_ID_RE = /\.(?:tsx?|jsx?|mjs)(?:\?.*)?$/;
-const NODE_MODULES_SOURCE_MODULE_ID_RE = /[\\/]node_modules[\\/].*\.(?:tsx?|jsx?|mjs)(?:\?.*)?$/;
+const SOURCE_MODULE_ID_RE = /\.(?:m?[jt]s|[jt]sx)(?:\?.*)?$/;
+const NODE_MODULES_SOURCE_MODULE_ID_RE = /[\\/]node_modules[\\/].*\.(?:m?[jt]s|[jt]sx)(?:\?.*)?$/;
 const RESOLVED_VIRTUAL_MODULE_ID_RE = new RegExp(`^${String.fromCharCode(0)}`);
 const USE_CACHE_DIRECTIVE = /^use cache(?:: ([^\s].*))?$/;
 const USE_CACHE_DIRECTIVE_CANDIDATE = /^use cache.*$/;
@@ -72,7 +72,7 @@ function acceptsSecondArgument(meta) {
 }
 function shouldTransformModuleExport(name, id, meta) {
 	if (meta.isFunction === false && (name !== "default" && meta.valueNode?.type === "Literal" || meta.valueNode?.type === "ObjectExpression" || meta.valueNode?.type === "ArrayExpression")) return false;
-	if (/\/(layout|template)\.(tsx?|jsx?|mjs)$/.test(id) && name === "default") return false;
+	if (/\/(layout|template)\.(?:m?[jt]s|[jt]sx)$/.test(id) && name === "default") return false;
 	return true;
 }
 function validateModuleExport(transforms, meta) {
@@ -204,7 +204,7 @@ async function createUseCacheCallablePlugin(options) {
 			});
 			const runtimeEnvironment = this.environment.name === "client" ? "browser" : "ssr";
 			result.output.prepend(`import * as $$ReactClient from "@vitejs/plugin-rsc/react/${runtimeEnvironment}";\n`);
-			return magicStringTransformResult(result.output, {
+			return serverReferenceProxyResult(this.environment, result.output, {
 				hires: "boundary",
 				source: id
 			});
@@ -329,5 +329,4 @@ async function createUseCacheCallablePlugin(options) {
 		}
 	}];
 }
-//#endregion
 export { PLUGIN_NAME as USE_CACHE_PLUGIN_NAME, createUseCacheCallablePlugin };

package/dist/plugins/wasm-module-import.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/wasm-module-import.d.ts
 /**
  * vinext:wasm-module-import — handle `import x from '*.wasm?module'`.
  *
@@ -9,5 +8,4 @@ import { Plugin } from "vite";
  *
  * Fixes #1351.
  */
-export declare function createWasmModuleImportPlugin(): Plugin;
-//#endregion
+export declare function createWasmModuleImportPlugin(): Plugin;

package/dist/plugins/wasm-module-import.js

@@ -1,6 +1,6 @@
 import { stripViteModuleQuery } from "../utils/path.js";
 import fs from "node:fs";
-//#region src/plugins/wasm-module-import.ts
+// src/plugins/wasm-module-import.ts
 /**
 * vinext:wasm-module-import — handle `import x from '*.wasm?module'`.
 *
@@ -46,5 +46,4 @@ function createWasmModuleImportPlugin() {
 		}
 	};
 }
-//#endregion
 export { createWasmModuleImportPlugin };

package/dist/plugins/worker-image-imports.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/worker-image-imports.d.ts
 export declare const WORKER_IMAGE_METADATA_PREFIX = "\0vinext-worker-image-meta:";
 /**
  * Preserve Next.js's StaticImageData shape for dynamic image imports inside
@@ -8,5 +7,4 @@ export declare const WORKER_IMAGE_METADATA_PREFIX = "\0vinext-worker-image-meta:
  */
 export declare function createWorkerImageImportsPlugin(options?: {
   deploymentId?: string;
-}): Plugin;
-//#endregion
+}): Plugin;

package/dist/plugins/worker-image-imports.js

@@ -1,11 +1,11 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { parseModuleRecord, quotedStringAt } from "./ast-utils.js";
-import { magicStringTransformResult } from "./transform-result.js";
 import { appendDeploymentIdQuery } from "../utils/deployment-id.js";
 import { NODE_MODULES_PATH_RE, stripViteModuleQuery } from "../utils/path.js";
+import { parseModuleRecord, quotedStringAt } from "./ast-utils.js";
+import { magicStringTransformResult } from "./transform-result.js";
 import fs from "node:fs";
 import MagicString from "magic-string";
-//#region src/plugins/worker-image-imports.ts
+// src/plugins/worker-image-imports.ts
 const WORKER_IMAGE_METADATA_PREFIX = "\0vinext-worker-image-meta:";
 const WORKER_IMAGE_METADATA_RE = /^\0vinext-worker-image-meta:/;
 const WORKER_SCRIPT_RE = /\.(?:[cm]?[jt]sx?)$/;
@@ -127,5 +127,4 @@ function createWorkerImageImportsPlugin(options = {}) {
 		}
 	};
 }
-//#endregion
 export { WORKER_IMAGE_METADATA_PREFIX, createWorkerImageImportsPlugin };

package/dist/plugins/worker-server-only-imports.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/worker-server-only-imports.d.ts
 export declare const SERVER_ONLY_SPECIFIER_RE: RegExp;
 /**
  * Reject `server-only` imports inside browser Web Worker bundles.
@@ -16,5 +15,4 @@ export declare const SERVER_ONLY_SPECIFIER_RE: RegExp;
  * modules need no exemption: `vinext:worker-use-server` replaces them with
  * Server Function references, so their imports are never resolved.
  */
-export declare function createWorkerServerOnlyImportsPlugin(): Plugin;
-//#endregion
+export declare function createWorkerServerOnlyImportsPlugin(): Plugin;

package/dist/plugins/worker-server-only-imports.js

@@ -1,4 +1,4 @@
-//#region src/plugins/worker-server-only-imports.ts
+// src/plugins/worker-server-only-imports.ts
 const SERVER_ONLY_SPECIFIER_RE = /^server-only$/;
 /**
 * Reject `server-only` imports inside browser Web Worker bundles.
@@ -27,5 +27,4 @@ function createWorkerServerOnlyImportsPlugin() {
 		}
 	};
 }
-//#endregion
 export { SERVER_ONLY_SPECIFIER_RE, createWorkerServerOnlyImportsPlugin };

package/dist/plugins/worker-use-server.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/worker-use-server.d.ts
 type RscPluginModule = typeof import("@vitejs/plugin-rsc");
 /**
  * Replace `"use server"` modules in browser Web Worker bundles with Server
@@ -22,5 +21,4 @@ export declare function createWorkerUseServerPlugins(options: {
   rscPluginModule: Promise<RscPluginModule>;
   rscPluginPath: string;
 }): Promise<Plugin[]>;
-//#endregion
 export {};

package/dist/plugins/worker-use-server.js

@@ -1,13 +1,13 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { escapeRegExp } from "../utils/regex.js";
 import { parseProgramAsync } from "./ast-utils.js";
-import { magicStringTransformResult } from "./transform-result.js";
+import { escapeRegExp } from "../utils/regex.js";
+import { serverReferenceProxyResult } from "./transform-result.js";
 import { USE_CACHE_PLUGIN_NAME as PLUGIN_NAME } from "./use-cache-callable.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
 import { isCSSRequest, transformWithOxc } from "vite";
-//#region src/plugins/worker-use-server.ts
+// src/plugins/worker-use-server.ts
 const WORKER_REFERENCE_RUNTIME_ID = "\0vinext:worker-server-reference";
 const WORKER_REFERENCE_RUNTIME_ID_RE = /^\0vinext:worker-server-reference$/;
 function workerReferenceRuntime(browserRuntime) {
@@ -111,7 +111,7 @@ async function createWorkerUseServerPlugins(options) {
 				}));
 				if (!result?.output.hasChanged()) return null;
 				result.output.prepend(`import { createWorkerServerReference as ${runtime} } from ${JSON.stringify(WORKER_REFERENCE_RUNTIME_ID)};\n`);
-				return magicStringTransformResult(result.output);
+				return serverReferenceProxyResult(this.environment, result.output);
 			}
 		}
 	};
@@ -127,7 +127,7 @@ async function createWorkerUseServerPlugins(options) {
 				const output = await withPositionedError(this, () => api.transformWorkerModule(code, id, (referenceId, name) => `${runtime}(${JSON.stringify(referenceId)}, ${JSON.stringify(name)})`));
 				if (!output) return null;
 				output.prepend(`import { createWorkerServerReference as ${runtime} } from ${JSON.stringify(WORKER_REFERENCE_RUNTIME_ID)};\n`);
-				return magicStringTransformResult(output);
+				return serverReferenceProxyResult(this.environment, output);
 			}
 		}
 	};
@@ -149,5 +149,4 @@ async function createWorkerUseServerPlugins(options) {
 		useServerPlugin
 	];
 }
-//#endregion
 export { createWorkerUseServerPlugins };

package/dist/routing/app-route-graph.d.ts

@@ -1,6 +1,5 @@
 import { isInvisibleSegment } from "./utils.js";
 import { ValidFileMatcher } from "./file-matcher.js";
-//#region src/routing/app-route-graph.d.ts
 type InterceptingRoute = {
   /** Graph-owned identity for this interception edge. */
   id?: string;
@@ -481,5 +480,4 @@ export declare function computeAppRouteStaticSiblings(allRoutes: readonly {
 }[], matchedRoute: {
   patternParts?: readonly string[] | null;
 }): string[];
-//#endregion
 export { isInvisibleSegment };

package/dist/routing/app-route-graph.js

@@ -1,12 +1,12 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { findFileWithExts, scanWithExtensions } from "./file-matcher.js";
 import { decodeRouteSegment, isInvisibleSegment, sortRoutes } from "./utils.js";
+import { findFileWithExts, scanWithExtensions } from "./file-matcher.js";
 import { validateRoutePatterns } from "./route-validation.js";
 import { compareStrings } from "../utils/compare.js";
 import { createAppRouteGraphInterceptionId } from "./app-route-ids.js";
 import fs from "node:fs";
 import { createHash } from "node:crypto";
-//#region src/routing/app-route-graph.ts
+// src/routing/app-route-graph.ts
 /**
 * App Router route graph construction.
 *
@@ -1844,5 +1844,4 @@ function computeAppRouteStaticSiblings(allRoutes, matchedRoute) {
 	}
 	return Array.from(siblings);
 }
-//#endregion
 export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, findOwnerRouteForDir, findSlotPageTreePosition, isInvisibleSegment, patternsStructurallyEquivalent };

package/dist/routing/app-route-ids.d.ts

@@ -1,3 +1 @@
-//#region src/routing/app-route-ids.d.ts
-export declare function createAppRouteGraphInterceptionId(slotId: string, sourcePattern: string, targetPattern: string): string;
-//#endregion
+export declare function createAppRouteGraphInterceptionId(slotId: string, sourcePattern: string, targetPattern: string): string;

package/dist/routing/app-route-ids.js

@@ -1,6 +1,5 @@
-//#region src/routing/app-route-ids.ts
+// src/routing/app-route-ids.ts
 function createAppRouteGraphInterceptionId(slotId, sourcePattern, targetPattern) {
 	return `interception:${slotId}:${sourcePattern}->${targetPattern}`;
 }
-//#endregion
 export { createAppRouteGraphInterceptionId };

package/dist/routing/app-router.d.ts

@@ -1,6 +1,5 @@
 import { ValidFileMatcher } from "./file-matcher.js";
 import { AppRoute, AppRouteGraphRoute, RouteManifest, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts } from "./app-route-graph.js";
-//#region src/routing/app-router.d.ts
 type AppRouteGraph = {
   routes: AppRouteGraphRoute[];
   routeManifest: RouteManifest;
@@ -40,5 +39,4 @@ export declare function matchAppRoute(url: string, routes: AppRoute[]): {
   route: AppRoute;
   params: Record<string, string | string[]>;
 } | null;
-//#endregion
 export { type AppRoute, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts };

package/dist/routing/app-router.js

@@ -1,7 +1,7 @@
 import { createValidFileMatcher } from "./file-matcher.js";
-import { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts } from "./app-route-graph.js";
 import { createRouteTrieCache, matchRouteWithTrie } from "./route-matching.js";
-//#region src/routing/app-router.ts
+import { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts } from "./app-route-graph.js";
+// src/routing/app-router.ts
 /**
 * App Router file-system routing.
 *
@@ -87,5 +87,4 @@ const appTrieCache = createRouteTrieCache();
 function matchAppRoute(url, routes) {
 	return matchRouteWithTrie(url, routes, appTrieCache);
 }
-//#endregion
 export { appRouteGraph, appRouteHasMainTreeLoadingBoundary, appRouteLayoutStaticParamsGroups, appRouter, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, invalidateAppRouteCache, matchAppRoute };

package/dist/routing/browser-route-manifest.d.ts

@@ -1,5 +1,4 @@
 import { GraphVersion, RouteManifest, RouteManifestInterception, RouteManifestLayout, RouteManifestRootBoundary, RouteManifestRoute, RouteManifestSlotBinding } from "./app-route-graph.js";
-//#region src/routing/browser-route-manifest.d.ts
 export type BrowserRouteManifestRoute = Pick<RouteManifestRoute, "id" | "patternParts" | "isDynamic" | "paramNames" | "rootBoundaryId" | "pageId" | "layoutIds" | "slotIds">;
 type BrowserRouteManifestLayout = Pick<RouteManifestLayout, "id" | "patternParts" | "rootBoundaryId">;
 type BrowserRouteManifestSlotBinding = Pick<RouteManifestSlotBinding, "id" | "routeId" | "slotId" | "ownerLayoutId" | "state" | "routeSegments" | "slotPatternParts" | "slotParamNames">;
@@ -40,5 +39,4 @@ export type BrowserRouteManifestWire = {
 };
 export declare function toBrowserRouteManifestWire(routeManifest: RouteManifest): BrowserRouteManifestWire;
 export declare function decodeBrowserRouteManifest(wire: BrowserRouteManifestWire): BrowserRouteManifest;
-//#endregion
 export {};

package/dist/routing/browser-route-manifest.js

@@ -1,5 +1,5 @@
 import { buildOptimisticRouteTrie } from "./optimistic-route-trie.js";
-//#region src/routing/browser-route-manifest.ts
+// src/routing/browser-route-manifest.ts
 function createRouteIdFromPatternParts(patternParts) {
 	return `route:/${patternParts.join("/")}`;
 }
@@ -191,5 +191,4 @@ function decodeBrowserRouteManifest(wire) {
 		}
 	};
 }
-//#endregion
 export { decodeBrowserRouteManifest, toBrowserRouteManifestWire };

package/dist/routing/file-matcher.d.ts

@@ -1,4 +1,3 @@
-//#region src/routing/file-matcher.d.ts
 export declare const DEFAULT_PAGE_EXTENSIONS: readonly ["tsx", "ts", "jsx", "js"];
 export declare function normalizePageExtensions(pageExtensions?: readonly string[] | null): string[];
 export type ValidFileMatcher = {
@@ -56,5 +55,4 @@ export declare function normalizeViteResolveExtensions(extensions: readonly stri
  * separators on Windows, so each match goes through `toSlash` — this is the
  * boundary where external fs output enters the canonical forward-slash space.
  */
-export declare function scanWithExtensions(stem: string, cwd: string, extensions: readonly string[], exclude?: (name: string) => boolean): AsyncGenerator<string>;
-//#endregion
+export declare function scanWithExtensions(stem: string, cwd: string, extensions: readonly string[], exclude?: (name: string) => boolean): AsyncGenerator<string>;

package/dist/routing/file-matcher.js

@@ -2,7 +2,7 @@ import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist
 import { escapeRegExp } from "../utils/regex.js";
 import { existsSync } from "node:fs";
 import { glob } from "node:fs/promises";
-//#region src/routing/file-matcher.ts
+// src/routing/file-matcher.ts
 const DEFAULT_PAGE_EXTENSIONS = [
 	"tsx",
 	"ts",
@@ -151,5 +151,4 @@ async function* scanWithExtensions(stem, cwd, extensions, exclude) {
 		...exclude ? { exclude } : {}
 	})) yield toSlash(file);
 }
-//#endregion
 export { DEFAULT_PAGE_EXTENSIONS, buildViteResolveExtensions, createValidFileMatcher, findFileWithExtensions, findFileWithExts, normalizePageExtensions, normalizeViteResolveExtensions, scanWithExtensions };

package/dist/routing/hashed-route-patterns.d.ts

@@ -1,4 +1,2 @@
-//#region src/routing/hashed-route-patterns.d.ts
 export declare function hashRoutePatternParts(patternParts: readonly string[]): string[];
-export declare function hashRoutePathname(pathname: string): string;
-//#endregion
+export declare function hashRoutePathname(pathname: string): string;

package/dist/routing/hashed-route-patterns.js

@@ -1,6 +1,6 @@
-import { splitPathnameForRouteMatch } from "./utils.js";
 import { fnv1a64 } from "../utils/hash.js";
-//#region src/routing/hashed-route-patterns.ts
+import { splitPathnameForRouteMatch } from "./utils.js";
+// src/routing/hashed-route-patterns.ts
 /**
 * Hybrid App/Pages clients need App route handler patterns only to decide
 * route ownership, so they receive them with every static segment hashed and
@@ -18,5 +18,4 @@ function hashRoutePatternParts(patternParts) {
 function hashRoutePathname(pathname) {
 	return "/" + splitPathnameForRouteMatch(pathname).map(hashRouteSegment).join("/");
 }
-//#endregion
 export { hashRoutePathname, hashRoutePatternParts };

package/dist/routing/optimistic-route-trie.d.ts

@@ -1,4 +1,3 @@
-//#region src/routing/optimistic-route-trie.d.ts
 type OptimisticTrieRoute = {
   readonly patternParts: readonly string[];
 };
@@ -24,5 +23,4 @@ export type OptimisticRouteTrieMatch<Route extends OptimisticTrieRoute> = {
 };
 export declare function buildOptimisticRouteTrie<Route extends OptimisticTrieRoute>(routes: Iterable<Route>, onDynamicSegmentConflict?: (existingParamName: string, part: string) => void): OptimisticRouteTrieNode<Route>;
 export declare function matchOptimisticRouteTrie<Route extends OptimisticTrieRoute>(trie: OptimisticRouteTrieNode<Route>, urlParts: readonly string[]): OptimisticRouteTrieMatch<Route> | null;
-//#endregion
 export {};

package/dist/routing/optimistic-route-trie.js

@@ -1,5 +1,5 @@
 import { buildParams } from "./utils.js";
-//#region src/routing/optimistic-route-trie.ts
+// src/routing/optimistic-route-trie.ts
 function createNode() {
 	return {
 		catchAllChild: null,
@@ -98,5 +98,4 @@ function matchNode(node, urlParts, index, entries) {
 function matchOptimisticRouteTrie(trie, urlParts) {
 	return matchNode(trie, urlParts, 0, []);
 }
-//#endregion
 export { buildOptimisticRouteTrie, matchOptimisticRouteTrie };