npm - @bleedingdev/modern-js-image - Versions diffs - 3.9.0-ultramodern.9 → 3.9.3-ultramodern.2 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/cli.d.ts CHANGED Viewed

@@ -1,6 +1,8 @@
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
-import { type PluginImageOptions as BuilderPluginImageOptions } from '@rsbuild-image/core';
-export interface ImagePluginOptions extends BuilderPluginImageOptions {
+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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bleedingdev/modern-js-image",
-  "version": "3.9.0-ultramodern.9",
+  "version": "3.9.3-ultramodern.2",
   "type": "module",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -34,33 +34,35 @@
     "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",
-    "sharp": "^0.35.4"
+    "ipx": "^4.0.0-beta.1",
+    "sharp": "^0.35.5"
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.9",
-    "@rslib/core": "1.0.0",
-    "@types/node": "^26.4.1",
-    "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
-    "typescript": "^7.0.2"
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.3-ultramodern.2",
+    "@rslib/core": "1.0.3",
+    "@types/node": "^26.6.3",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
+    "typescript": "7.0.2"
   },
   "scripts": {
     "build": "rslib build",
     "dev": "rslib build --watch"
   },
-  "homepage": "https://github.com/BleedingDev/ultramodern.js#readme",
+  "homepage": "https://github.com/ultramodernjs/ultramodern.js#readme",
   "bugs": {
-    "url": "https://github.com/BleedingDev/ultramodern.js/issues"
+    "url": "https://github.com/ultramodernjs/ultramodern.js/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/BleedingDev/ultramodern.js.git"
+    "url": "git+https://github.com/ultramodernjs/ultramodern.js.git"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "ultramodern": {
+    "sourceName": "@modern-js/image"
   }
 }