@bleedingdev/modern-js-image 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

package/dist/cli.d.ts

@@ -0,0 +1,8 @@
+import type { AppTools, CliPlugin } from '@modern-js/app-tools';
+import { type PluginImageOptions as BuilderPluginImageOptions, type ExtendedIPXOptions } from '@rsbuild-image/core';
+export interface ImagePluginOptions extends Omit<BuilderPluginImageOptions, 'ipx'> {
+    /** Options for the dev server's IPX route, `/_modern/ipx` by default. */
+    ipx?: ExtendedIPXOptions;
+}
+export declare const imagePlugin: (options?: ImagePluginOptions) => CliPlugin<AppTools>;
+export default imagePlugin;

package/dist/index.cjs

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -31,16 +40,64 @@ __webpack_require__.d(__webpack_exports__, {
     default: ()=>cli,
     imagePlugin: ()=>imagePlugin
 });
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const core_namespaceObject = require("@rsbuild-image/core");
 const imagePlugin = (options = {})=>({
         name: '@modern-js/image',
         setup: (api)=>{
-            const { ...builderPluginOptions } = options;
-            builderPluginOptions.ipx ||= {};
-            builderPluginOptions.ipx.assetPrefix ??= '/_modern/ipx';
+            const { ipx = {}, ...builderPluginOptions } = options;
+            const { assetPrefix = '/_modern/ipx', ...ipxOptions } = ipx;
+            const route = `${assetPrefix.replace(/\/+$/, '')}/`;
+            let web;
+            api.onAfterCreateCompiler(({ compiler })=>{
+                const all = 'compilers' in compiler ? compiler.compilers : [
+                    compiler
+                ];
+                web = all.find((item)=>'web' === item.name) ?? all[0];
+            });
+            const output = (method, id)=>new Promise((resolve, reject)=>{
+                    const outputFileSystem = web?.outputFileSystem;
+                    const read = outputFileSystem?.[method];
+                    if (!web || !read) return reject(new Error('No web compiler output'));
+                    const file = external_node_path_default().resolve(web.outputPath, `.${external_node_path_default().sep}${id}`);
+                    const inside = external_node_path_default().relative(web.outputPath, file);
+                    if ('..' === inside || inside.startsWith(`..${external_node_path_default().sep}`) || external_node_path_default().isAbsolute(inside)) return reject(new Error(`IPX source outside the dev output: ${id}`));
+                    read.call(outputFileSystem, file, (error, value)=>error ? reject(error) : resolve(value));
+                });
+            let handler;
+            const serveIPX = ()=>handler ??= import("ipx").then(({ createIPX, createIPXNodeHandler })=>createIPXNodeHandler(createIPX({
+                        storage: {
+                            name: '@modern-js/image:dev-output',
+                            getMeta: async (id)=>({
+                                    mtime: (await output('stat', id)).mtime
+                                }),
+                            getData: (id)=>output('readFile', id)
+                        },
+                        ...ipxOptions
+                    })));
             api.config(()=>({
+                    source: {
+                        define: {
+                            __RSBUILD_IMAGE_IPX_ASSET_PREFIX__: JSON.stringify(assetPrefix)
+                        }
+                    },
+                    dev: {
+                        setupMiddlewares: [
+                            (middlewares)=>{
+                                middlewares.push((req, res, next)=>{
+                                    if (!req.url?.startsWith(route)) return next();
+                                    req.url = req.url.slice(route.length - 1);
+                                    serveIPX().then((serve)=>serve(req, res)).catch(next);
+                                });
+                            }
+                        ]
+                    },
                     builderPlugins: [
-                        (0, core_namespaceObject.pluginImage)(builderPluginOptions)
+                        (0, core_namespaceObject.pluginImage)({
+                            ...builderPluginOptions,
+                            loader: builderPluginOptions.loader ?? ('dev' === api.getAppContext().command ? require.resolve('@rsbuild-image/core/image-loader') : void 0)
+                        })
                     ]
                 }));
         }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@bleedingdev/modern-js-image",
-  "version": "3.9.0-ultramodern.2",
+  "version": "3.9.0-ultramodern.21",
   "type": "module",
   "main": "./dist/index.cjs",
-  "types": "./dist/types/index.d.ts",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/types/index.d.ts",
+      "types": "./dist/index.d.ts",
       "default": "./dist/index.cjs"
     },
     "./runtime": {
-      "types": "./dist/types/runtime.d.ts",
+      "types": "./dist/runtime.d.ts",
       "default": "./dist/runtime.js"
     },
     "./types": {
-      "types": "./dist/types/types.d.ts"
+      "types": "./dist/types.d.ts"
     }
   },
   "typesVersions": {
@@ -34,18 +34,18 @@
     "dist"
   ],
   "dependencies": {
-    "@rsbuild-image/core": "npm:@bleedingdev/rsbuild-image-core@0.1.0",
+    "@rsbuild-image/core": "0.0.1-next.36",
     "@rsbuild-image/react": "0.0.1-next.36",
-    "ipx": "npm:@bleedingdev/ipx@3.2.1",
+    "ipx": "^4.0.0-beta.1",
     "sharp": "^0.35.4"
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.2",
-    "@rslib/core": "1.0.0",
-    "@types/node": "^26.4.1",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.21",
+    "@rslib/core": "1.0.2",
+    "@types/node": "^26.6.2",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
     "typescript": "^7.0.2"
   },
   "scripts": {

package/dist/types/cli.d.ts

@@ -1,6 +0,0 @@
-import type { AppTools, CliPlugin } from '@modern-js/app-tools';
-import { type PluginImageOptions as BuilderPluginImageOptions } from '@rsbuild-image/core';
-export interface ImagePluginOptions extends BuilderPluginImageOptions {
-}
-export declare const imagePlugin: (options?: ImagePluginOptions) => CliPlugin<AppTools>;
-export default imagePlugin;