@qzsy/vinext 0.1.9 → 0.1.10

package/dist/index.js

@@ -341,6 +341,22 @@ const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 const _appBrowserServerActionClientPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-browser-server-action-client");
 const _appRscHandlerPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-rsc-handler");
 const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
+const _defaultImageLoaderShimPath = resolveShimModulePath(_shimsDir, "default-image-loader");
+/** Absolute path to `images.loaderFile` when configured; set in vinext:config. */
+let _imageLoaderFile;
+function isImageShimModule(importer) {
+	if (!importer) return false;
+	const normalized = normalizePathSeparators(importer.split("?")[0]);
+	return /\/shims\/image\.(tsx?|jsx?)$/.test(normalized);
+}
+function isDefaultImageLoaderRequest(id, importer) {
+	const cleanId = id.startsWith("\0") ? id.slice(1) : id;
+	const normalizedId = normalizePathSeparators(cleanId.split("?")[0]);
+	if (normalizedId === normalizePathSeparators(_defaultImageLoaderShimPath)) return true;
+	if (/\/shims\/default-image-loader\.(tsx?|jsx?)$/.test(normalizedId)) return true;
+	if (isImageShimModule(importer) && (cleanId === "./default-image-loader.js" || cleanId === "./default-image-loader" || cleanId === "./default-image-loader.ts" || cleanId === "./default-image-loader.tsx")) return true;
+	return false;
+}
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
 }
@@ -623,6 +639,16 @@ function vinext(options = {}) {
 			serverOnlyShimPath: resolveShimModulePath(shimsDir, "server-only")
 		}),
 		dataUrlCssPlugin(),
+		{
+			name: "vinext:image-loader-file",
+			enforce: "pre",
+			resolveId: {
+				filter: { id: /default-image-loader/ },
+				handler(id, importer) {
+					if (_imageLoaderFile && isDefaultImageLoaderRequest(id, importer)) return _imageLoaderFile;
+				}
+			}
+		},
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -827,9 +853,7 @@ function vinext(options = {}) {
 					overlay: false
 				};
 				const cssModulesOverride = config.css?.modules === false || typeof config.css?.modules === "object" && "Loader" in config.css.modules ? {} : { modules: { Loader: sassComposesLoader.Loader } };
-				const defaultImageLoaderShimPath = resolveShimModulePath(shimsDir, "default-image-loader");
-				const imageLoaderFile = nextConfig.images?.loaderFile;
-				const imageLoaderAlias = imageLoaderFile != null ? { [defaultImageLoaderShimPath]: imageLoaderFile } : {};
+				_imageLoaderFile = nextConfig.images?.loaderFile;
 				const viteConfig = {
 					appType: "custom",
 					build: {
@@ -877,8 +901,7 @@ function vinext(options = {}) {
 						alias: {
 							...tsconfigPathAliases,
 							...nextConfig.aliases,
-							...nextShimMap,
-							...imageLoaderAlias
+							...nextShimMap
 						},
 						dedupe: [
 							"react",
@@ -922,10 +945,10 @@ function vinext(options = {}) {
 				const incomingInclude = config.optimizeDeps?.include ?? [];
 				const depOptimizeAliasPlugin = {
 					name: "vinext:dep-optimize-alias",
-					resolveId(id) {
+					resolveId(id, importer) {
 						const shimBase = _reactServerShims.get(id);
 						if (shimBase !== void 0) return resolveShimModulePath(shimsDir, shimBase);
-						if (imageLoaderFile != null && id === defaultImageLoaderShimPath) return imageLoaderFile;
+						if (_imageLoaderFile && isDefaultImageLoaderRequest(id, importer)) return _imageLoaderFile;
 					}
 				};
 				const depOptimizeNodeEnvOptions = getDepOptimizeNodeEnvOptions(viteMajorVersion, nodeEnvDefine);

package/dist/server/app-rsc-handler.js

@@ -17,11 +17,11 @@ import "./app-page-response.js";
 import { buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./pages-data-route.js";
 import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
+import { flattenErrorCauses } from "../utils/error-cause.js";
 import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
-import { flattenErrorCauses } from "../utils/error-cause.js";
 import { finalizeAppRscResponse } from "./app-rsc-response-finalizer.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
 import { runWithPrerenderWorkUnit } from "./prerender-work-unit-setup.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qzsy/vinext",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {