vinext 1.4.4 → 1.4.5

package/dist/plugins/og-assets.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/og-assets.d.ts
 /**
  * Create the `vinext:og-inline-fetch-assets` Vite plugin.
  *
@@ -63,5 +62,4 @@ export declare function copyMissingOgWasm(opts: {
  * target — so it helps Node/self-hosted builds as well as Cloudflare Workers.
  */
 export declare function createOgAssetsPlugin(): Plugin;
-//#endregion
 export {};

package/dist/plugins/og-assets.js

@@ -1,11 +1,11 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
 import { resolveHarfbuzzWasmPath } from "./og-harfbuzz.js";
 import { OgAssetOwnership } from "./og-asset-ownership.js";
+import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import MagicString from "magic-string";
-//#region src/plugins/og-assets.ts
+// src/plugins/og-assets.ts
 /**
 * Create the `vinext:og-inline-fetch-assets` Vite plugin.
 *
@@ -283,5 +283,4 @@ function createOgAssetsPlugin() {
 		}
 	};
 }
-//#endregion
 export { copyMissingOgWasm, createOgAssetsPlugin, createOgInlineFetchAssetsPlugin, matchReadFileSyncAssetUrls };

package/dist/plugins/og-harfbuzz.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/og-harfbuzz.d.ts
 /**
  * Resolve the `hb.wasm` binary that matches the glue inlined in @vercel/og.
  * @vercel/og and satori pin exact versions, so resolving through
@@ -20,5 +19,4 @@ export declare function readWasmFunctionSignatures(wasm: Uint8Array): string[];
  * is a single LEB128 byte.
  */
 export declare function createHarfbuzzCallbackWasm(signature: string): Uint8Array<ArrayBuffer>;
-export declare function createOgHarfbuzzPlugin(): Plugin;
-//#endregion
+export declare function createOgHarfbuzzPlugin(): Plugin;

package/dist/plugins/og-harfbuzz.js

@@ -1,12 +1,12 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { forEachAstChild, getAstName, parseProgram, staticStringValue } from "./ast-utils.js";
-import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
 import { isFunctionNode } from "./ast-scope.js";
 import { createTransformCache } from "./transform-cache.js";
+import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import MagicString from "magic-string";
-//#region src/plugins/og-harfbuzz.ts
+// src/plugins/og-harfbuzz.ts
 /**
 * vinext:og-harfbuzz — load @vercel/og's bundled HarfBuzz under vinext.
 *
@@ -266,5 +266,4 @@ function createOgHarfbuzzPlugin() {
 		}
 	};
 }
-//#endregion
 export { createHarfbuzzCallbackWasm, createOgHarfbuzzPlugin, readWasmFunctionSignatures, resolveHarfbuzzWasmPath };

package/dist/plugins/optimize-imports.d.ts

@@ -1,6 +1,5 @@
 import { ResolvedNextConfig } from "../config/next-config.js";
 import { Plugin } from "vite";
-//#region src/plugins/optimize-imports.d.ts
 type BarrelExportEntry = {
   source: string;
   isNamespace: boolean;
@@ -61,5 +60,4 @@ export declare function buildBarrelExportMap(entryPath: string | null, readFile:
  * @param getRoot - Returns the current project root (set by the vinext:config hook).
  */
 export declare function createOptimizeImportsPlugin(getNextConfig: () => ResolvedNextConfig | undefined, getRoot: () => string): Plugin;
-//#endregion
 export {};

package/dist/plugins/optimize-imports.js

@@ -1,12 +1,12 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { escapeRegExp } from "../utils/regex.js";
 import { collectBindingNames, getAstName, parseProgram } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { escapeRegExp } from "../utils/regex.js";
 import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import { createRequire } from "node:module";
 import fsp from "node:fs/promises";
 import MagicString from "magic-string";
-//#region src/plugins/optimize-imports.ts
+// src/plugins/optimize-imports.ts
 /**
 * Read a file's contents, returning null on any error.
 * Module-level so a single function instance is shared across all transform calls.
@@ -654,5 +654,4 @@ function createOptimizeImportsPlugin(getNextConfig, getRoot) {
 		}
 	};
 }
-//#endregion
 export { DEFAULT_OPTIMIZE_PACKAGES, SUBPATH_OPTIMIZE_PACKAGES, buildBarrelExportMap, createOptimizeImportsPlugin, createOptimizedImportSourceMatcher };

package/dist/plugins/pages-node-externals.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/pages-node-externals.d.ts
 type PagesNodeExternalsOptions = {
   getRoot: () => string;
   getPagesDir: () => string | null;
@@ -20,5 +19,4 @@ type PagesNodeExternalsOptions = {
  * selected `import` export just like Turbopack.
  */
 export declare function createPagesNodeExternalsPlugin(options: PagesNodeExternalsOptions): Plugin;
-//#endregion
 export {};

package/dist/plugins/pages-node-externals.js

@@ -1,10 +1,10 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { SCRIPT_MODULE_ID_RE, mayContainDynamicImport, parseProgram, scriptParserLanguage, staticStringValue, walkAst } from "./ast-utils.js";
 import { canonicalizeFilePath, isPathInsideOrEqual, stripViteModuleQuery } from "../utils/path.js";
-import { isServerEnvironment } from "./environment.js";
 import { packageNameFromSpecifier } from "../utils/package-name.js";
+import { isServerEnvironment } from "./environment.js";
 import fs from "node:fs";
-//#region src/plugins/pages-node-externals.ts
+// src/plugins/pages-node-externals.ts
 const FRAMEWORK_PACKAGES = /* @__PURE__ */ new Set([
 	"@vitejs/plugin-react",
 	"@vitejs/plugin-rsc",
@@ -169,5 +169,4 @@ function createPagesNodeExternalsPlugin(options) {
 		}
 	};
 }
-//#endregion
 export { createPagesNodeExternalsPlugin };

package/dist/plugins/postcss.d.ts

@@ -1,4 +1,3 @@
-//#region src/plugins/postcss.d.ts
 /**
  * PostCSS config file names to search for, in priority order.
  * Matches the same search order as postcss-load-config / lilconfig.
@@ -26,5 +25,4 @@ export declare const postcssCache: Map<string, Promise<{
  */
 export declare function resolvePostcssStringPlugins(projectRoot: string): Promise<{
   plugins: unknown[];
-} | undefined>;
-//#endregion
+} | undefined>;

package/dist/plugins/postcss.js

@@ -2,7 +2,7 @@ import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { importExportWithCommonJsFallback } from "../utils/commonjs-loader.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
-//#region src/plugins/postcss.ts
+// src/plugins/postcss.ts
 async function loadPluginExport(resolvedPath) {
 	return importExportWithCommonJsFallback(resolvedPath);
 }
@@ -92,5 +92,4 @@ async function resolvePostcssStringPluginsUncached(projectRoot) {
 		return;
 	}
 }
-//#endregion
 export { POSTCSS_CONFIG_FILES, postcssCache, resolvePostcssStringPlugins };

package/dist/plugins/remove-console.d.ts

@@ -1,5 +1,4 @@
 import MagicString from "magic-string";
-//#region src/plugins/remove-console.d.ts
 type RemoveConsoleConfig = boolean | {
   exclude: string[];
 };
@@ -16,5 +15,4 @@ type RemoveConsoleResult = {
  * Returns `null` if no console calls are removed.
  */
 export declare function removeConsoleCalls(code: string, config: RemoveConsoleConfig): RemoveConsoleResult | null;
-//#endregion
 export {};

package/dist/plugins/remove-console.js

@@ -1,7 +1,7 @@
 import { parseProgram } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
 import MagicString from "magic-string";
-//#region src/plugins/remove-console.ts
+// src/plugins/remove-console.ts
 const SCOPE_ENTERING_TYPES = /* @__PURE__ */ new Set([
 	"FunctionDeclaration",
 	"FunctionExpression",
@@ -154,5 +154,4 @@ function removeConsoleCalls(code, config) {
 	if (!changed) return null;
 	return magicStringTransformResult(s);
 }
-//#endregion
 export { removeConsoleCalls };

package/dist/plugins/require-condition-resolution.d.ts

@@ -1,5 +1,4 @@
 import { Plugin, createIdResolver } from "vite";
-//#region src/plugins/require-condition-resolution.d.ts
 export declare function isConditionalRequireScriptModuleId(id: string): boolean;
 /**
  * Resolve literal package `require()` calls while Vite still knows they are
@@ -12,5 +11,4 @@ export declare function isConditionalRequireScriptModuleId(id: string): boolean;
 type IdResolverFactory = typeof createIdResolver;
 type CommonJsTransformFilter = (id: string) => boolean | undefined;
 export declare function createRequireConditionResolutionPlugin(createResolver?: IdResolverFactory, commonjsTransformFilter?: CommonJsTransformFilter): Plugin;
-//#endregion
 export {};

package/dist/plugins/require-condition-resolution.js

@@ -1,12 +1,12 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, parseProgram, scriptParserLanguage, staticStringValue, unwrapExpression } 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 { readFile } from "node:fs/promises";
 import { createIdResolver } from "vite";
 import MagicString from "magic-string";
-//#region src/plugins/require-condition-resolution.ts
+// src/plugins/require-condition-resolution.ts
 const LITERAL_REQUIRE_RE = /\brequire\s*\(/;
 const CONDITIONAL_REQUIRE_SCRIPT_ID_RE = /\.vinext-require\.(?:js|jsx|ts|tsx)$/i;
 function isConditionalRequireScriptModuleId(id) {
@@ -162,5 +162,4 @@ function createRequireConditionResolutionPlugin(createResolver = createIdResolve
 		}
 	};
 }
-//#endregion
 export { createRequireConditionResolutionPlugin, isConditionalRequireScriptModuleId };

package/dist/plugins/require-context.d.ts

@@ -1,5 +1,3 @@
 import { Plugin } from "vite";
-//#region src/plugins/require-context.d.ts
 export declare function createRequireContextPlugin(): Plugin;
-export declare function _mayContainRequireContextCall(code: string): boolean;
-//#endregion
+export declare function _mayContainRequireContextCall(code: string): boolean;

package/dist/plugins/require-context.js

@@ -1,10 +1,10 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { SCRIPT_MODULE_ID_RE, booleanLiteralValue, parseProgram, scriptParserLanguage, stringLiteralValue, walkAst } from "./ast-utils.js";
-import { magicStringTransformResult } from "./transform-result.js";
 import { stripViteModuleQuery } from "../utils/path.js";
+import { magicStringTransformResult } from "./transform-result.js";
 import { readdir, realpath, stat } from "node:fs/promises";
 import MagicString from "magic-string";
-//#region src/plugins/require-context.ts
+// src/plugins/require-context.ts
 function createRequireContextPlugin() {
 	const watchedContexts = /* @__PURE__ */ new WeakMap();
 	return {
@@ -286,5 +286,4 @@ function filterFlags(flags) {
 function stripTrailingSlash(value) {
 	return value.endsWith("/") ? value.slice(0, -1) : value;
 }
-//#endregion
 export { _mayContainRequireContextCall, createRequireContextPlugin };

package/dist/plugins/rsc-client-reference-loaders.d.ts

@@ -1,6 +1,5 @@
 import { AppRoute } from "../routing/app-route-graph.js";
 import { Plugin } from "vite";
-//#region src/plugins/rsc-client-reference-loaders.d.ts
 /** Prefixes the module that registers one client reference outside every group. */
 export declare const RESOLVED_CLIENT_REFERENCE_MODULE_PREFIX = "\0virtual:vinext-client-reference-module/";
 export declare const RESOLVED_CLIENT_REFERENCE_CHUNKS_ID = "\0virtual:vinext-client-reference-chunks";
@@ -52,5 +51,4 @@ export declare function createRscClientReferenceLoadersPlugin(options?: {
  * doesn't add the loaders plugin above. The App Router SSR entry imports the
  * plan, and null makes it preload every client reference.
  */
-export declare function createRouteClientReferencesFallbackPlugin(): Plugin;
-//#endregion
+export declare function createRouteClientReferencesFallbackPlugin(): Plugin;

package/dist/plugins/rsc-client-reference-loaders.js

@@ -1,14 +1,14 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
-import { resolveShimRuntimeModule } from "../entries/runtime-entry-module.js";
 import { CLIENT_REFERENCE_GROUP_MAX_COST_BYTES, collectClientReferencePreloadPlan, collectClientReferenceRouteSignatures, measureClientReferenceGroupCosts, planClientReferenceGroups, readClientModuleBindings } from "../build/client-reference-groups.js";
 import { collectAsyncModules, createSideEffectsDeclarationCheck } from "../build/client-reference-async.js";
 import { RESOLVED_EAGER_CLIENT_REFERENCES_ID, hasUserClientChunkGroups } from "../build/client-build-config.js";
+import { resolveShimRuntimeModule } from "../entries/runtime-entry-module.js";
+import { magicStringTransformResult, omitUnusedBuildSourcemap } from "./transform-result.js";
 import fs from "node:fs";
 import { isCSSRequest } from "vite";
 import { randomBytes } from "node:crypto";
 import MagicString from "magic-string";
-//#region src/plugins/rsc-client-reference-loaders.ts
+// src/plugins/rsc-client-reference-loaders.ts
 const CLIENT_REFERENCES_ID = "\0virtual:vite-rsc/client-references";
 const RESOLVED_ID_PROXY_PREFIX = "virtual:vite-rsc/resolved-id/";
 const RESOLVED_CLIENT_REFERENCE_GROUP_PREFIX = `\0virtual:vinext-client-reference-group-`;
@@ -462,5 +462,4 @@ function createRouteClientReferencesFallbackPlugin() {
 		}
 	};
 }
-//#endregion
 export { RESOLVED_CLIENT_REFERENCE_CHUNKS_ID, RESOLVED_CLIENT_REFERENCE_MODULE_PREFIX, createRouteClientReferencesFallbackPlugin, createRscClientReferenceLoadersPlugin };

package/dist/plugins/rsc-client-shim-excludes.d.ts

@@ -1,5 +1,3 @@
-//#region src/plugins/rsc-client-shim-excludes.d.ts
 export declare const VINEXT_OPTIMIZE_DEPS_EXCLUDE: readonly string[];
 export declare const SSR_EXTERNAL_REACT_ENTRIES: readonly string[];
-export declare function mergeOptimizeDepsExclude(...excludeGroups: readonly (readonly string[])[]): string[];
-//#endregion
+export declare function mergeOptimizeDepsExclude(...excludeGroups: readonly (readonly string[])[]): string[];

package/dist/plugins/rsc-client-shim-excludes.js

@@ -1,4 +1,4 @@
-//#region src/plugins/rsc-client-shim-excludes.ts
+// src/plugins/rsc-client-shim-excludes.ts
 const RSC_CLIENT_SHIM_OPTIMIZE_DEPS_EXCLUDE = Object.freeze([
 	"vinext/shims/client-page-root",
 	"vinext/shims/error-boundary",
@@ -34,5 +34,4 @@ function mergeOptimizeDepsExclude(...excludeGroups) {
 	}
 	return [...seen];
 }
-//#endregion
 export { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude };

package/dist/plugins/rsc-reference-validation-normalizer.d.ts

@@ -1,10 +1,8 @@
 import { Plugin } from "vite";
-//#region src/plugins/rsc-reference-validation-normalizer.d.ts
 /**
  * @vitejs/plugin-rsc stores dev virtual client-reference keys in Vite's encoded
  * `/@id/__x00__...` form, but React's SSR consumer can ask validation for the
  * decoded `/@id/\0...` form. Treat those as equivalent and fall through to the
  * upstream validator for all other invalid references.
  */
-export declare function createRscReferenceValidationNormalizerPlugin(): Plugin;
-//#endregion
+export declare function createRscReferenceValidationNormalizerPlugin(): Plugin;

package/dist/plugins/rsc-reference-validation-normalizer.js

@@ -1,4 +1,4 @@
-//#region src/plugins/rsc-reference-validation-normalizer.ts
+// src/plugins/rsc-reference-validation-normalizer.ts
 const REFERENCE_VALIDATION_ID_PREFIX = "\0virtual:vite-rsc/reference-validation?";
 function parseReferenceValidationQuery(id) {
 	const queryStart = id.indexOf("?");
@@ -44,5 +44,4 @@ function createRscReferenceValidationNormalizerPlugin() {
 		}
 	};
 }
-//#endregion
 export { createRscReferenceValidationNormalizerPlugin };

package/dist/plugins/rsc-scan-glob-imports.d.ts

@@ -1,6 +1,5 @@
 import { Plugin, ResolvedConfig } from "vite";
 import { RscPluginManager } from "@vitejs/plugin-rsc";
-//#region src/plugins/rsc-scan-glob-imports.d.ts
 /**
  * @vitejs/plugin-rsc 0.5.36 and 0.5.37 reduce scan-build modules to their
  * import specifiers with es-module-lexer v3, which reports template-literal
@@ -15,5 +14,4 @@ import { RscPluginManager } from "@vitejs/plugin-rsc";
 export declare function isRscScanGlobImportsAffected(version: string): boolean;
 export declare function createRscScanGlobImportsPlugin(options: {
   getManager: (config: ResolvedConfig) => Promise<RscPluginManager | undefined>;
-}): Plugin;
-//#endregion
+}): Plugin;

package/dist/plugins/rsc-scan-glob-imports.js

@@ -1,5 +1,5 @@
 import { isVersionBelow } from "../utils/react-version.js";
-//#region src/plugins/rsc-scan-glob-imports.ts
+// src/plugins/rsc-scan-glob-imports.ts
 /**
 * @vitejs/plugin-rsc 0.5.36 and 0.5.37 reduce scan-build modules to their
 * import specifiers with es-module-lexer v3, which reports template-literal
@@ -46,5 +46,4 @@ function createRscScanGlobImportsPlugin(options) {
 		}
 	};
 }
-//#endregion
 export { createRscScanGlobImportsPlugin, isRscScanGlobImportsAffected };

package/dist/plugins/sass.d.ts

@@ -1,5 +1,4 @@
 import { ResolvedConfig } from "vite";
-//#region src/plugins/sass.d.ts
 type AdditionalData = string | ((source: string, filename: string) => string | Promise<string>);
 type VitePreprocessorOptions = {
   additionalData?: AdditionalData;
@@ -102,5 +101,4 @@ export declare function createSassAwareFileSystemLoader(): {
   };
   setResolvedConfig: (config: ResolvedConfig) => void;
 };
-//#endregion
 export {};

package/dist/plugins/sass.js

@@ -1,11 +1,11 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { NODE_MODULES_PATH_RE } from "../utils/path.js";
 import { markCssUrlAssetReferences, rebaseCssUrlAssetReferences } from "../build/css-url-assets.js";
+import { NODE_MODULES_PATH_RE } from "../utils/path.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { preprocessCSS } from "vite";
-//#region src/plugins/sass.ts
+// src/plugins/sass.ts
 /**
 * Map a Next.js `sassOptions` object onto Vite's
 * `css.preprocessorOptions.scss` / `.sass` shape.
@@ -402,5 +402,4 @@ function createSassAwareFileSystemLoader() {
 		}
 	};
 }
-//#endregion
 export { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter, createSassTsconfigPathImporters };

package/dist/plugins/scan-build-css.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/scan-build-css.d.ts
 /**
  * @vitejs/plugin-rsc discovers client and server references with two
  * write-less scan builds whose output is discarded, and its `rsc:scan-strip`
@@ -8,5 +7,4 @@ import { Plugin } from "vite";
  * the app still ran through PostCSS/Tailwind/Sass in both scans. Empty their
  * source during those scans only; real builds and dev are unchanged.
  */
-export declare function createScanBuildCssPlugin(): Plugin;
-//#endregion
+export declare function createScanBuildCssPlugin(): Plugin;

package/dist/plugins/scan-build-css.js

@@ -1,4 +1,4 @@
-//#region src/plugins/scan-build-css.ts
+// src/plugins/scan-build-css.ts
 const CSS_LANGS_RE = /\.(?:css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
 const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/;
 const VIRTUAL_MODULE_RE = /^\0/;
@@ -35,5 +35,4 @@ function createScanBuildCssPlugin() {
 		}
 	};
 }
-//#endregion
 export { createScanBuildCssPlugin };

package/dist/plugins/server-externals-manifest.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/server-externals-manifest.d.ts
 /**
  * vinext:server-externals-manifest
  *
@@ -20,5 +19,4 @@ import { Plugin } from "vite";
  * `emitStandaloneOutput` reads this file and uses it as the seed list for the
  * BFS `node_modules/` copy, replacing the old regex-scan approach.
  */
-export declare function createServerExternalsManifestPlugin(): Plugin;
-//#endregion
+export declare function createServerExternalsManifestPlugin(): Plugin;

package/dist/plugins/server-externals-manifest.js

@@ -1,7 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { packageNameFromSpecifier } from "../utils/package-name.js";
 import fs from "node:fs";
-//#region src/plugins/server-externals-manifest.ts
+// src/plugins/server-externals-manifest.ts
 /**
 * vinext:server-externals-manifest
 *
@@ -55,5 +55,4 @@ function createServerExternalsManifestPlugin() {
 		}
 	};
 }
-//#endregion
 export { createServerExternalsManifestPlugin };

package/dist/plugins/strip-server-exports.d.ts

@@ -1,5 +1,4 @@
 import MagicString from "magic-string";
-//#region src/plugins/strip-server-exports.d.ts
 export declare function hasServerExportCandidate(code: string): boolean;
 /** Transform prefilter; must admit every module `hasExportAllCandidate` accepts */
 export declare const EXPORT_ALL_CANDIDATE_FILTER: RegExp;
@@ -18,5 +17,4 @@ type StripServerExportsResult = {
  * - crates/next-custom-transforms/src/transforms/strip_page_exports.rs
  */
 export declare function stripServerExports(code: string): StripServerExportsResult | null;
-//#endregion
 export {};

package/dist/plugins/strip-server-exports.js

@@ -1,8 +1,8 @@
+import { findAstBindingScope, walkAstScopes } from "./ast-scope.js";
 import { getAstName, parseProgram } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
-import { findAstBindingScope, walkAstScopes } from "./ast-scope.js";
 import MagicString from "magic-string";
-//#region src/plugins/strip-server-exports.ts
+// src/plugins/strip-server-exports.ts
 const SERVER_EXPORTS = /* @__PURE__ */ new Set([
 	"getServerSideProps",
 	"getStaticProps",
@@ -675,5 +675,4 @@ function stripServerExports(code) {
 	}
 	return magicStringTransformResult(string);
 }
-//#endregion
 export { EXPORT_ALL_CANDIDATE_FILTER, hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports };

package/dist/plugins/styled-jsx.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
-//#region src/plugins/styled-jsx.d.ts
 type NextSwcModule = {
   loadBindings(): Promise<unknown>;
   transform(source: string, options: Record<string, unknown>): Promise<{
@@ -11,5 +10,4 @@ type StyledJsxPluginOptions = {
   importModule?: (url: string) => Promise<NextSwcModule>;
 };
 export declare function createStyledJsxPlugin(initialProjectRoot: string, options?: StyledJsxPluginOptions): Plugin;
-//#endregion
 export {};

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 };