ipx 2.0.1 → 2.1.0

package/dist/cli.cjs

@@ -3,7 +3,7 @@
 const listhen = require('listhen');
 const citty = require('citty');
 const cli = require('listhen/cli');
-const nodeFs = require('./shared/ipx.ebaf2d0c.cjs');
+const nodeFs = require('./shared/ipx.7601f01b.cjs');
 require('defu');
 require('ufo');
 require('h3');
@@ -15,7 +15,7 @@ require('ofetch');
 require('pathe');
 
 const name = "ipx";
-const version = "2.0.1";
+const version = "2.1.0";
 const description = "High performance, secure and easy-to-use image optimizer.";
 
 const serve = citty.defineCommand({

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 import { listen } from 'listhen';
 import { defineCommand, runMain } from 'citty';
 import { getArgs, parseArgs } from 'listhen/cli';
-import { c as createIPX, g as ipxFSStorage, i as ipxHttpStorage, e as createIPXNodeServer } from './shared/ipx.4d79c6c9.mjs';
+import { c as createIPX, g as ipxFSStorage, i as ipxHttpStorage, e as createIPXNodeServer } from './shared/ipx.b027cc1c.mjs';
 import 'defu';
 import 'ufo';
 import 'h3';
@@ -13,7 +13,7 @@ import 'ofetch';
 import 'pathe';
 
 const name = "ipx";
-const version = "2.0.1";
+const version = "2.1.0";
 const description = "High performance, secure and easy-to-use image optimizer.";
 
 const serve = defineCommand({

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
-const nodeFs = require('./shared/ipx.ebaf2d0c.cjs');
+const nodeFs = require('./shared/ipx.7601f01b.cjs');
+const h3 = require('h3');
 require('defu');
 require('ufo');
-require('h3');
 require('image-meta');
 require('destr');
 require('@fastify/accept-negotiator');
@@ -11,8 +11,9 @@ require('etag');
 require('ofetch');
 require('pathe');
 
-function unstorageToIPXStorage(storage, prefix) {
-  const resolveKey = (id) => prefix + ":" + id;
+function unstorageToIPXStorage(storage, _options = {}) {
+  const options = typeof _options === "string" ? { prefix: _options } : _options;
+  const resolveKey = (id) => options.prefix ? `${options.prefix}:${id}` : id;
   return {
     name: "ipx:" + (storage.name || "unstorage"),
     async getMeta(id, opts = {}) {
@@ -28,8 +29,24 @@ function unstorageToIPXStorage(storage, prefix) {
         return;
       }
       const storageKey = resolveKey(id);
-      const data = await storage.getItemRaw(storageKey, opts);
-      return data;
+      let data = await storage.getItemRaw(storageKey, opts);
+      if (!data) {
+        return;
+      }
+      if (data instanceof Blob) {
+        data = await data.arrayBuffer();
+      }
+      try {
+        return Buffer.from(data);
+      } catch (error) {
+        throw h3.createError({
+          statusCode: 500,
+          statusText: `IPX_STORAGE_ERROR`,
+          message: `Failed to parse storage data to Buffer:
+${error.message}`,
+          cause: error
+        });
+      }
     }
   };
 }

package/dist/index.d.cts

@@ -145,11 +145,14 @@ type HTTPStorageOptions = {
 declare function ipxHttpStorage(_options?: HTTPStorageOptions): IPXStorage;
 
 type NodeFSSOptions = {
-    dir?: string;
+    dir?: string | string[];
     maxAge?: number;
 };
 declare function ipxFSStorage(_options?: NodeFSSOptions): IPXStorage;
 
-declare function unstorageToIPXStorage(storage: Storage | Driver, prefix: string): IPXStorage;
+type UnstorageIPXStorageOptions = {
+    prefix?: string;
+};
+declare function unstorageToIPXStorage(storage: Storage | Driver, _options?: UnstorageIPXStorageOptions | string): IPXStorage;
 
-export { type HTTPStorageOptions, type Handler, type HandlerContext, type IPX, type IPXOptions, type IPXStorage, type IPXStorageMeta, type IPXStorageOptions, type NodeFSSOptions, createIPX, createIPXH3App, createIPXH3Handler, createIPXNodeServer, createIPXPlainServer, createIPXWebServer, ipxFSStorage, ipxHttpStorage, unstorageToIPXStorage };
+export { type HTTPStorageOptions, type Handler, type HandlerContext, type IPX, type IPXOptions, type IPXStorage, type IPXStorageMeta, type IPXStorageOptions, type NodeFSSOptions, type UnstorageIPXStorageOptions, createIPX, createIPXH3App, createIPXH3Handler, createIPXNodeServer, createIPXPlainServer, createIPXWebServer, ipxFSStorage, ipxHttpStorage, unstorageToIPXStorage };

package/dist/index.d.mts

@@ -145,11 +145,14 @@ type HTTPStorageOptions = {
 declare function ipxHttpStorage(_options?: HTTPStorageOptions): IPXStorage;
 
 type NodeFSSOptions = {
-    dir?: string;
+    dir?: string | string[];
     maxAge?: number;
 };
 declare function ipxFSStorage(_options?: NodeFSSOptions): IPXStorage;
 
-declare function unstorageToIPXStorage(storage: Storage | Driver, prefix: string): IPXStorage;
+type UnstorageIPXStorageOptions = {
+    prefix?: string;
+};
+declare function unstorageToIPXStorage(storage: Storage | Driver, _options?: UnstorageIPXStorageOptions | string): IPXStorage;
 
-export { type HTTPStorageOptions, type Handler, type HandlerContext, type IPX, type IPXOptions, type IPXStorage, type IPXStorageMeta, type IPXStorageOptions, type NodeFSSOptions, createIPX, createIPXH3App, createIPXH3Handler, createIPXNodeServer, createIPXPlainServer, createIPXWebServer, ipxFSStorage, ipxHttpStorage, unstorageToIPXStorage };
+export { type HTTPStorageOptions, type Handler, type HandlerContext, type IPX, type IPXOptions, type IPXStorage, type IPXStorageMeta, type IPXStorageOptions, type NodeFSSOptions, type UnstorageIPXStorageOptions, createIPX, createIPXH3App, createIPXH3Handler, createIPXNodeServer, createIPXPlainServer, createIPXWebServer, ipxFSStorage, ipxHttpStorage, unstorageToIPXStorage };

package/dist/index.d.ts

@@ -145,11 +145,14 @@ type HTTPStorageOptions = {
 declare function ipxHttpStorage(_options?: HTTPStorageOptions): IPXStorage;
 
 type NodeFSSOptions = {
-    dir?: string;
+    dir?: string | string[];
     maxAge?: number;
 };
 declare function ipxFSStorage(_options?: NodeFSSOptions): IPXStorage;
 
-declare function unstorageToIPXStorage(storage: Storage | Driver, prefix: string): IPXStorage;
+type UnstorageIPXStorageOptions = {
+    prefix?: string;
+};
+declare function unstorageToIPXStorage(storage: Storage | Driver, _options?: UnstorageIPXStorageOptions | string): IPXStorage;
 
-export { type HTTPStorageOptions, type Handler, type HandlerContext, type IPX, type IPXOptions, type IPXStorage, type IPXStorageMeta, type IPXStorageOptions, type NodeFSSOptions, createIPX, createIPXH3App, createIPXH3Handler, createIPXNodeServer, createIPXPlainServer, createIPXWebServer, ipxFSStorage, ipxHttpStorage, unstorageToIPXStorage };
+export { type HTTPStorageOptions, type Handler, type HandlerContext, type IPX, type IPXOptions, type IPXStorage, type IPXStorageMeta, type IPXStorageOptions, type NodeFSSOptions, type UnstorageIPXStorageOptions, createIPX, createIPXH3App, createIPXH3Handler, createIPXNodeServer, createIPXPlainServer, createIPXWebServer, ipxFSStorage, ipxHttpStorage, unstorageToIPXStorage };

package/dist/index.mjs

@@ -1,7 +1,7 @@
-export { c as createIPX, b as createIPXH3App, a as createIPXH3Handler, e as createIPXNodeServer, f as createIPXPlainServer, d as createIPXWebServer, g as ipxFSStorage, i as ipxHttpStorage } from './shared/ipx.4d79c6c9.mjs';
+export { c as createIPX, b as createIPXH3App, a as createIPXH3Handler, e as createIPXNodeServer, f as createIPXPlainServer, d as createIPXWebServer, g as ipxFSStorage, i as ipxHttpStorage } from './shared/ipx.b027cc1c.mjs';
+import { createError } from 'h3';
 import 'defu';
 import 'ufo';
-import 'h3';
 import 'image-meta';
 import 'destr';
 import '@fastify/accept-negotiator';
@@ -9,8 +9,9 @@ import 'etag';
 import 'ofetch';
 import 'pathe';
 
-function unstorageToIPXStorage(storage, prefix) {
-  const resolveKey = (id) => prefix + ":" + id;
+function unstorageToIPXStorage(storage, _options = {}) {
+  const options = typeof _options === "string" ? { prefix: _options } : _options;
+  const resolveKey = (id) => options.prefix ? `${options.prefix}:${id}` : id;
   return {
     name: "ipx:" + (storage.name || "unstorage"),
     async getMeta(id, opts = {}) {
@@ -26,8 +27,24 @@ function unstorageToIPXStorage(storage, prefix) {
         return;
       }
       const storageKey = resolveKey(id);
-      const data = await storage.getItemRaw(storageKey, opts);
-      return data;
+      let data = await storage.getItemRaw(storageKey, opts);
+      if (!data) {
+        return;
+      }
+      if (data instanceof Blob) {
+        data = await data.arrayBuffer();
+      }
+      try {
+        return Buffer.from(data);
+      } catch (error) {
+        throw createError({
+          statusCode: 500,
+          statusText: `IPX_STORAGE_ERROR`,
+          message: `Failed to parse storage data to Buffer:
+${error.message}`,
+          cause: error
+        });
+      }
     }
   };
 }

package/dist/shared/{ipx.ebaf2d0c.cjs → ipx.7601f01b.cjs}

@@ -325,7 +325,9 @@ function createIPX(userOptions) {
   const options = defu.defu(userOptions, {
     alias: getEnv("IPX_ALIAS") || {},
     maxAge: getEnv("IPX_MAX_AGE") ?? 60,
-    sharpOptions: {}
+    sharpOptions: {
+      jpegProgressive: true
+    }
   });
   options.alias = Object.fromEntries(
     Object.entries(options.alias || {}).map((e) => [
@@ -340,8 +342,7 @@ function createIPX(userOptions) {
   });
   const getSVGO = cachedPromise(async () => {
     const { optimize } = await import('svgo');
-    const { xss } = await import('../chunks/svgo-xss.cjs');
-    return { optimize, xss };
+    return { optimize };
   });
   return function ipx(id, modifiers = {}, opts = {}) {
     if (!id) {
@@ -416,10 +417,10 @@ function createIPX(userOptions) {
             meta: imageMeta$1
           };
         } else {
-          const { optimize, xss } = await getSVGO();
+          const { optimize } = await getSVGO();
           const svg = optimize(sourceData.toString("utf8"), {
             ...options.svgo,
-            plugins: [xss, ...options.svgo?.plugins || []]
+            plugins: ["removeScriptElement", ...options.svgo?.plugins || []]
           }).data;
           return {
             data: svg,
@@ -450,8 +451,7 @@ function createIPX(userOptions) {
       }
       if (SUPPORTED_FORMATS.has(format || "")) {
         sharp = sharp.toFormat(format, {
-          quality: handlerContext.quality,
-          progressive: format === "jpeg"
+          quality: handlerContext.quality
         });
       }
       const processedImage = await sharp.toBuffer();
@@ -519,13 +519,6 @@ function createIPXH3Handler(ipx) {
       "content-security-policy",
       "default-src 'none'"
     );
-    if (typeof sourceMeta.maxAge === "number") {
-      sendResponseHeaderIfNotSet(
-        event,
-        "cache-control",
-        `max-age=${+sourceMeta.maxAge}, public, s-maxage=${+sourceMeta.maxAge}`
-      );
-    }
     if (sourceMeta.mtime) {
       sendResponseHeaderIfNotSet(
         event,
@@ -539,6 +532,13 @@ function createIPXH3Handler(ipx) {
       }
     }
     const { data, format } = await img.process();
+    if (typeof sourceMeta.maxAge === "number") {
+      sendResponseHeaderIfNotSet(
+        event,
+        "cache-control",
+        `max-age=${+sourceMeta.maxAge}, public, s-maxage=${+sourceMeta.maxAge}`
+      );
+    }
     const etag = getEtag__default(data);
     sendResponseHeaderIfNotSet(event, "etag", etag);
     if (etag && h3.getRequestHeader(event, "if-none-match") === etag) {
@@ -605,9 +605,9 @@ function safeString(input) {
 
 const HTTP_RE = /^https?:\/\//;
 function ipxHttpStorage(_options = {}) {
-  const allowAllDomains = getEnv("IPX_HTTP_ALLOW_ALL_DOMAINS") ?? false;
+  const allowAllDomains = _options.allowAllDomains ?? getEnv("IPX_HTTP_ALLOW_ALL_DOMAINS") ?? false;
   let _domains = _options.domains || getEnv("IPX_HTTP_DOMAINS") || [];
-  const defaultMaxAge = _options.maxAge || getEnv("IPX_HTTP_MAX_AGE");
+  const defaultMaxAge = _options.maxAge || getEnv("IPX_HTTP_MAX_AGE") || 300;
   const fetchOptions = _options.fetchOptions || getEnv("IPX_HTTP_FETCH_OPTIONS") || {};
   if (typeof _domains === "string") {
     _domains = _domains.split(",").map((s) => s.trim());
@@ -684,56 +684,66 @@ function ipxHttpStorage(_options = {}) {
 }
 
 function ipxFSStorage(_options = {}) {
-  const rootDir = pathe.resolve(_options.dir || getEnv("IPX_FS_DIR") || ".");
+  const dirs = resolveDirs(_options.dir);
   const maxAge = _options.maxAge || getEnv("IPX_FS_MAX_AGE");
-  const _resolve = (id) => {
-    const resolved = pathe.join(rootDir, id);
-    if (!isValidPath(resolved) || !resolved.startsWith(rootDir)) {
+  const _getFS = cachedPromise(
+    () => import('node:fs/promises').catch(() => {
       throw h3.createError({
-        statusCode: 403,
-        statusText: `IPX_FORBIDDEN_PATH`,
-        message: `Forbidden path: ${id}`
+        statusCode: 500,
+        statusText: `IPX_FILESYSTEM_ERROR`,
+        message: `Failed to resolve filesystem module`
       });
-    }
-    return resolved;
-  };
-  const _getFS = cachedPromise(() => import('node:fs/promises'));
-  return {
-    name: "ipx:node-fs",
-    async getMeta(id) {
-      const fsPath = _resolve(id);
-      let stats;
-      try {
-        const fs = await _getFS();
-        stats = await fs.stat(fsPath);
-      } catch (error) {
-        throw error.code === "ENOENT" ? h3.createError({
-          statusCode: 404,
-          statusText: `IPX_FILE_NOT_FOUND`,
-          message: `File not found: ${id}`
-        }) : h3.createError({
+    })
+  );
+  const resolveFile = async (id) => {
+    const fs = await _getFS();
+    for (const dir of dirs) {
+      const filePath = pathe.join(dir, id);
+      if (!isValidPath(filePath) || !filePath.startsWith(dir)) {
+        throw h3.createError({
           statusCode: 403,
-          statusText: `IPX_FORBIDDEN_FILE`,
-          message: `File access forbidden: (${error.code}) ${id}`
+          statusText: `IPX_FORBIDDEN_PATH`,
+          message: `Forbidden path: ${id}`
         });
       }
-      if (!stats.isFile()) {
+      try {
+        const stats = await fs.stat(filePath);
+        if (!stats.isFile()) {
+          continue;
+        }
+        return {
+          stats,
+          read: () => fs.readFile(filePath)
+        };
+      } catch (error) {
+        if (error.code === "ENOENT") {
+          continue;
+        }
         throw h3.createError({
-          statusCode: 400,
-          statusText: `IPX_INVALID_FILE`,
-          message: `Path should be a file: ${id}`
+          statusCode: 403,
+          statusText: `IPX_FORBIDDEN_FILE`,
+          message: `Cannot access file: ${id}`
         });
       }
+    }
+    throw h3.createError({
+      statusCode: 404,
+      statusText: `IPX_FILE_NOT_FOUND`,
+      message: `File not found: ${id}`
+    });
+  };
+  return {
+    name: "ipx:node-fs",
+    async getMeta(id) {
+      const { stats } = await resolveFile(id);
       return {
         mtime: stats.mtime,
         maxAge
       };
     },
     async getData(id) {
-      const fsPath = _resolve(id);
-      const fs = await _getFS();
-      const contents = await fs.readFile(fsPath);
-      return contents;
+      const { read } = await resolveFile(id);
+      return read();
     }
   };
 }
@@ -747,6 +757,13 @@ function isValidPath(fp) {
   }
   return true;
 }
+function resolveDirs(dirs) {
+  if (!dirs || !Array.isArray(dirs)) {
+    const dir = pathe.resolve(dirs || getEnv("IPX_FS_DIR") || ".");
+    return [dir];
+  }
+  return dirs.map((dirs2) => pathe.resolve(dirs2));
+}
 
 exports.createIPX = createIPX;
 exports.createIPXH3App = createIPXH3App;

package/dist/shared/{ipx.4d79c6c9.mjs → ipx.b027cc1c.mjs}

@@ -318,7 +318,9 @@ function createIPX(userOptions) {
   const options = defu(userOptions, {
     alias: getEnv("IPX_ALIAS") || {},
     maxAge: getEnv("IPX_MAX_AGE") ?? 60,
-    sharpOptions: {}
+    sharpOptions: {
+      jpegProgressive: true
+    }
   });
   options.alias = Object.fromEntries(
     Object.entries(options.alias || {}).map((e) => [
@@ -333,8 +335,7 @@ function createIPX(userOptions) {
   });
   const getSVGO = cachedPromise(async () => {
     const { optimize } = await import('svgo');
-    const { xss } = await import('../chunks/svgo-xss.mjs');
-    return { optimize, xss };
+    return { optimize };
   });
   return function ipx(id, modifiers = {}, opts = {}) {
     if (!id) {
@@ -409,10 +410,10 @@ function createIPX(userOptions) {
             meta: imageMeta$1
           };
         } else {
-          const { optimize, xss } = await getSVGO();
+          const { optimize } = await getSVGO();
           const svg = optimize(sourceData.toString("utf8"), {
             ...options.svgo,
-            plugins: [xss, ...options.svgo?.plugins || []]
+            plugins: ["removeScriptElement", ...options.svgo?.plugins || []]
           }).data;
           return {
             data: svg,
@@ -443,8 +444,7 @@ function createIPX(userOptions) {
       }
       if (SUPPORTED_FORMATS.has(format || "")) {
         sharp = sharp.toFormat(format, {
-          quality: handlerContext.quality,
-          progressive: format === "jpeg"
+          quality: handlerContext.quality
         });
       }
       const processedImage = await sharp.toBuffer();
@@ -512,13 +512,6 @@ function createIPXH3Handler(ipx) {
       "content-security-policy",
       "default-src 'none'"
     );
-    if (typeof sourceMeta.maxAge === "number") {
-      sendResponseHeaderIfNotSet(
-        event,
-        "cache-control",
-        `max-age=${+sourceMeta.maxAge}, public, s-maxage=${+sourceMeta.maxAge}`
-      );
-    }
     if (sourceMeta.mtime) {
       sendResponseHeaderIfNotSet(
         event,
@@ -532,6 +525,13 @@ function createIPXH3Handler(ipx) {
       }
     }
     const { data, format } = await img.process();
+    if (typeof sourceMeta.maxAge === "number") {
+      sendResponseHeaderIfNotSet(
+        event,
+        "cache-control",
+        `max-age=${+sourceMeta.maxAge}, public, s-maxage=${+sourceMeta.maxAge}`
+      );
+    }
     const etag = getEtag(data);
     sendResponseHeaderIfNotSet(event, "etag", etag);
     if (etag && getRequestHeader(event, "if-none-match") === etag) {
@@ -598,9 +598,9 @@ function safeString(input) {
 
 const HTTP_RE = /^https?:\/\//;
 function ipxHttpStorage(_options = {}) {
-  const allowAllDomains = getEnv("IPX_HTTP_ALLOW_ALL_DOMAINS") ?? false;
+  const allowAllDomains = _options.allowAllDomains ?? getEnv("IPX_HTTP_ALLOW_ALL_DOMAINS") ?? false;
   let _domains = _options.domains || getEnv("IPX_HTTP_DOMAINS") || [];
-  const defaultMaxAge = _options.maxAge || getEnv("IPX_HTTP_MAX_AGE");
+  const defaultMaxAge = _options.maxAge || getEnv("IPX_HTTP_MAX_AGE") || 300;
   const fetchOptions = _options.fetchOptions || getEnv("IPX_HTTP_FETCH_OPTIONS") || {};
   if (typeof _domains === "string") {
     _domains = _domains.split(",").map((s) => s.trim());
@@ -677,56 +677,66 @@ function ipxHttpStorage(_options = {}) {
 }
 
 function ipxFSStorage(_options = {}) {
-  const rootDir = resolve(_options.dir || getEnv("IPX_FS_DIR") || ".");
+  const dirs = resolveDirs(_options.dir);
   const maxAge = _options.maxAge || getEnv("IPX_FS_MAX_AGE");
-  const _resolve = (id) => {
-    const resolved = join(rootDir, id);
-    if (!isValidPath(resolved) || !resolved.startsWith(rootDir)) {
+  const _getFS = cachedPromise(
+    () => import('node:fs/promises').catch(() => {
       throw createError({
-        statusCode: 403,
-        statusText: `IPX_FORBIDDEN_PATH`,
-        message: `Forbidden path: ${id}`
+        statusCode: 500,
+        statusText: `IPX_FILESYSTEM_ERROR`,
+        message: `Failed to resolve filesystem module`
       });
-    }
-    return resolved;
-  };
-  const _getFS = cachedPromise(() => import('node:fs/promises'));
-  return {
-    name: "ipx:node-fs",
-    async getMeta(id) {
-      const fsPath = _resolve(id);
-      let stats;
-      try {
-        const fs = await _getFS();
-        stats = await fs.stat(fsPath);
-      } catch (error) {
-        throw error.code === "ENOENT" ? createError({
-          statusCode: 404,
-          statusText: `IPX_FILE_NOT_FOUND`,
-          message: `File not found: ${id}`
-        }) : createError({
+    })
+  );
+  const resolveFile = async (id) => {
+    const fs = await _getFS();
+    for (const dir of dirs) {
+      const filePath = join(dir, id);
+      if (!isValidPath(filePath) || !filePath.startsWith(dir)) {
+        throw createError({
           statusCode: 403,
-          statusText: `IPX_FORBIDDEN_FILE`,
-          message: `File access forbidden: (${error.code}) ${id}`
+          statusText: `IPX_FORBIDDEN_PATH`,
+          message: `Forbidden path: ${id}`
         });
       }
-      if (!stats.isFile()) {
+      try {
+        const stats = await fs.stat(filePath);
+        if (!stats.isFile()) {
+          continue;
+        }
+        return {
+          stats,
+          read: () => fs.readFile(filePath)
+        };
+      } catch (error) {
+        if (error.code === "ENOENT") {
+          continue;
+        }
         throw createError({
-          statusCode: 400,
-          statusText: `IPX_INVALID_FILE`,
-          message: `Path should be a file: ${id}`
+          statusCode: 403,
+          statusText: `IPX_FORBIDDEN_FILE`,
+          message: `Cannot access file: ${id}`
         });
       }
+    }
+    throw createError({
+      statusCode: 404,
+      statusText: `IPX_FILE_NOT_FOUND`,
+      message: `File not found: ${id}`
+    });
+  };
+  return {
+    name: "ipx:node-fs",
+    async getMeta(id) {
+      const { stats } = await resolveFile(id);
       return {
         mtime: stats.mtime,
         maxAge
       };
     },
     async getData(id) {
-      const fsPath = _resolve(id);
-      const fs = await _getFS();
-      const contents = await fs.readFile(fsPath);
-      return contents;
+      const { read } = await resolveFile(id);
+      return read();
     }
   };
 }
@@ -740,5 +750,12 @@ function isValidPath(fp) {
   }
   return true;
 }
+function resolveDirs(dirs) {
+  if (!dirs || !Array.isArray(dirs)) {
+    const dir = resolve(dirs || getEnv("IPX_FS_DIR") || ".");
+    return [dir];
+  }
+  return dirs.map((dirs2) => resolve(dirs2));
+}
 
 export { createIPXH3Handler as a, createIPXH3App as b, createIPX as c, createIPXWebServer as d, createIPXNodeServer as e, createIPXPlainServer as f, ipxFSStorage as g, ipxHttpStorage as i };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipx",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "repository": "unjs/ipx",
   "description": "High performance, secure and easy-to-use image optimizer.",
   "license": "MIT",
@@ -38,35 +38,35 @@
   },
   "dependencies": {
     "@fastify/accept-negotiator": "^1.1.0",
-    "citty": "^0.1.4",
+    "citty": "^0.1.5",
     "consola": "^3.2.3",
-    "defu": "^6.1.3",
+    "defu": "^6.1.4",
     "destr": "^2.0.2",
     "etag": "^1.8.1",
-    "h3": "^1.8.2",
+    "h3": "^1.10.0",
     "image-meta": "^0.2.0",
-    "listhen": "^1.5.5",
+    "listhen": "^1.5.6",
     "ofetch": "^1.3.3",
-    "pathe": "^1.1.1",
+    "pathe": "^1.1.2",
     "sharp": "^0.32.6",
-    "svgo": "^3.0.2",
-    "ufo": "^1.3.1",
-    "unstorage": "^1.9.0",
+    "svgo": "^3.2.0",
+    "ufo": "^1.3.2",
+    "unstorage": "^1.10.1",
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@types/etag": "^1.8.2",
-    "@types/is-valid-path": "^0.1.1",
-    "@vitest/coverage-v8": "^0.34.6",
+    "@types/etag": "^1.8.3",
+    "@types/is-valid-path": "^0.1.2",
+    "@vitest/coverage-v8": "^1.1.3",
     "changelogen": "^0.5.5",
-    "eslint": "^8.53.0",
+    "eslint": "^8.56.0",
     "eslint-config-unjs": "^0.2.1",
     "jiti": "^1.21.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.1",
     "serve-handler": "^6.1.5",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.3",
     "unbuild": "^2.0.0",
-    "vitest": "^0.34.6"
+    "vitest": "^1.1.3"
   },
-  "packageManager": "pnpm@8.10.2"
+  "packageManager": "pnpm@8.10.5"
 }

package/dist/chunks/svgo-xss.cjs

@@ -1,116 +0,0 @@
-'use strict';
-
-const xss = {
-  name: "removeXSS",
-  fn() {
-    return {
-      element: {
-        enter: (node, parentNode) => {
-          if (node.name === "script") {
-            parentNode.children = parentNode.children.filter(
-              (child) => child !== node
-            );
-            return;
-          }
-          for (const event of ALL_EVENTS) {
-            if (node.attributes[event] != null) {
-              delete node.attributes[event];
-            }
-          }
-        },
-        exit: (node, parentNode) => {
-          if (node.name !== "a") {
-            return;
-          }
-          for (const attr of Object.keys(node.attributes)) {
-            if (attr === "href" || attr.endsWith(":href")) {
-              if (node.attributes[attr] == null || !node.attributes[attr].trimStart().startsWith("javascript:")) {
-                continue;
-              }
-              const index = parentNode.children.indexOf(node);
-              parentNode.children.splice(index, 1, ...node.children);
-              for (const child of node.children) {
-                Object.defineProperty(child, "parentNode", {
-                  writable: true,
-                  value: parentNode
-                });
-              }
-            }
-          }
-        }
-      }
-    };
-  }
-};
-const ALL_EVENTS = [
-  "onabort",
-  "onactivate",
-  "onbegin",
-  "oncancel",
-  "oncanplay",
-  "oncanplaythrough",
-  "onchange",
-  "onclick",
-  "onclose",
-  "oncopy",
-  "oncuechange",
-  "oncut",
-  "ondblclick",
-  "ondrag",
-  "ondragend",
-  "ondragenter",
-  "ondragleave",
-  "ondragover",
-  "ondragstart",
-  "ondrop",
-  "ondurationchange",
-  "onemptied",
-  "onend",
-  "onended",
-  "onerror",
-  "onfocus",
-  "onfocusin",
-  "onfocusout",
-  "oninput",
-  "oninvalid",
-  "onkeydown",
-  "onkeypress",
-  "onkeyup",
-  "onload",
-  "onloadeddata",
-  "onloadedmetadata",
-  "onloadstart",
-  "onmousedown",
-  "onmouseenter",
-  "onmouseleave",
-  "onmousemove",
-  "onmouseout",
-  "onmouseover",
-  "onmouseup",
-  "onmousewheel",
-  "onpaste",
-  "onpause",
-  "onplay",
-  "onplaying",
-  "onprogress",
-  "onratechange",
-  "onrepeat",
-  "onreset",
-  "onresize",
-  "onscroll",
-  "onseeked",
-  "onseeking",
-  "onselect",
-  "onshow",
-  "onstalled",
-  "onsubmit",
-  "onsuspend",
-  "ontimeupdate",
-  "ontoggle",
-  "onunload",
-  "onvolumechange",
-  "onwaiting",
-  "onzoom"
-];
-
-exports.xss = xss;

package/dist/chunks/svgo-xss.mjs

@@ -1,114 +0,0 @@
-const xss = {
-  name: "removeXSS",
-  fn() {
-    return {
-      element: {
-        enter: (node, parentNode) => {
-          if (node.name === "script") {
-            parentNode.children = parentNode.children.filter(
-              (child) => child !== node
-            );
-            return;
-          }
-          for (const event of ALL_EVENTS) {
-            if (node.attributes[event] != null) {
-              delete node.attributes[event];
-            }
-          }
-        },
-        exit: (node, parentNode) => {
-          if (node.name !== "a") {
-            return;
-          }
-          for (const attr of Object.keys(node.attributes)) {
-            if (attr === "href" || attr.endsWith(":href")) {
-              if (node.attributes[attr] == null || !node.attributes[attr].trimStart().startsWith("javascript:")) {
-                continue;
-              }
-              const index = parentNode.children.indexOf(node);
-              parentNode.children.splice(index, 1, ...node.children);
-              for (const child of node.children) {
-                Object.defineProperty(child, "parentNode", {
-                  writable: true,
-                  value: parentNode
-                });
-              }
-            }
-          }
-        }
-      }
-    };
-  }
-};
-const ALL_EVENTS = [
-  "onabort",
-  "onactivate",
-  "onbegin",
-  "oncancel",
-  "oncanplay",
-  "oncanplaythrough",
-  "onchange",
-  "onclick",
-  "onclose",
-  "oncopy",
-  "oncuechange",
-  "oncut",
-  "ondblclick",
-  "ondrag",
-  "ondragend",
-  "ondragenter",
-  "ondragleave",
-  "ondragover",
-  "ondragstart",
-  "ondrop",
-  "ondurationchange",
-  "onemptied",
-  "onend",
-  "onended",
-  "onerror",
-  "onfocus",
-  "onfocusin",
-  "onfocusout",
-  "oninput",
-  "oninvalid",
-  "onkeydown",
-  "onkeypress",
-  "onkeyup",
-  "onload",
-  "onloadeddata",
-  "onloadedmetadata",
-  "onloadstart",
-  "onmousedown",
-  "onmouseenter",
-  "onmouseleave",
-  "onmousemove",
-  "onmouseout",
-  "onmouseover",
-  "onmouseup",
-  "onmousewheel",
-  "onpaste",
-  "onpause",
-  "onplay",
-  "onplaying",
-  "onprogress",
-  "onratechange",
-  "onrepeat",
-  "onreset",
-  "onresize",
-  "onscroll",
-  "onseeked",
-  "onseeking",
-  "onselect",
-  "onshow",
-  "onstalled",
-  "onsubmit",
-  "onsuspend",
-  "ontimeupdate",
-  "ontoggle",
-  "onunload",
-  "onvolumechange",
-  "onwaiting",
-  "onzoom"
-];
-
-export { xss };