@rsbuild/plugin-svgr 1.2.0 → 1.2.2

package/README.md

@@ -12,7 +12,7 @@ An Rsbuild plugin to use SVGR to transform SVG to React components via SVGR.
 
 ## Documentation
 
-See [Documentation](https://rsbuild.dev/plugins/list/plugin-svgr).
+See [Documentation](https://rsbuild.rs/plugins/list/plugin-svgr).
 
 ## License
 

package/compiled/file-loader/index.js

@@ -1,18 +1,18 @@
 (() => {
   "use strict";
   var __webpack_modules__ = {
-    236: (module, __unused_webpack_exports, __nccwpck_require__) => {
-      const loader = __nccwpck_require__(338);
+    389: (module, __unused_webpack_exports, __nccwpck_require__) => {
+      const loader = __nccwpck_require__(727);
       module.exports = loader.default;
       module.exports.raw = loader.raw;
     },
-    338: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    727: (__unused_webpack_module, exports, __nccwpck_require__) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       exports["default"] = loader;
       exports.raw = void 0;
       var _path = _interopRequireDefault(__nccwpck_require__(928));
       var _loaderUtils = __nccwpck_require__(328);
-      var _utils = __nccwpck_require__(451);
+      var _utils = __nccwpck_require__(394);
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule ? obj : { default: obj };
       }
@@ -73,7 +73,7 @@
       const raw = true;
       exports.raw = raw;
     },
-    451: (__unused_webpack_module, exports) => {
+    394: (__unused_webpack_module, exports) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.normalizePath = normalizePath;
       function normalizePath(path, stripTrailing) {
@@ -128,6 +128,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(236);
+  var __webpack_exports__ = __nccwpck_require__(389);
   module.exports = __webpack_exports__;
 })();

package/compiled/url-loader/index.js

@@ -107,20 +107,20 @@
         });
       }
     },
-    501: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    367: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const loader = __nccwpck_require__(263);
+      const loader = __nccwpck_require__(345);
       module.exports = loader.default;
       module.exports.raw = loader.raw;
     },
-    263: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    345: (__unused_webpack_module, exports, __nccwpck_require__) => {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports["default"] = loader;
       exports.raw = void 0;
       var _path = _interopRequireDefault(__nccwpck_require__(928));
       var _mimeTypes = _interopRequireDefault(__nccwpck_require__(437));
-      var _normalizeFallback = _interopRequireDefault(__nccwpck_require__(732));
+      var _normalizeFallback = _interopRequireDefault(__nccwpck_require__(562));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule ? obj : { default: obj };
       }
@@ -212,7 +212,7 @@
       const raw = true;
       exports.raw = raw;
     },
-    732: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    562: (__unused_webpack_module, exports, __nccwpck_require__) => {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports["default"] = normalizeFallback;
@@ -276,6 +276,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(501);
+  var __webpack_exports__ = __nccwpck_require__(367);
   module.exports = __webpack_exports__;
 })();

package/dist/index.cjs

@@ -69,7 +69,7 @@ let src_dirname = external_node_path_default().dirname((0, external_node_url_nam
                     svgo: !0,
                     svgoConfig: getSvgoDefaultConfig()
                 }, options.svgrOptions || {});
-                svgrOptions.svgoConfig = dedupeSvgoPlugins(svgrOptions.svgoConfig), rule.oneOf(CHAIN_ID.ONE_OF.SVG_URL).type('asset/resource').resourceQuery(/(__inline=false|url)/).set('generator', generatorOptions), rule.oneOf(CHAIN_ID.ONE_OF.SVG_INLINE).type('asset/inline').resourceQuery(/inline/), CHAIN_ID.ONE_OF.SVG_RAW && rule.oneOf(CHAIN_ID.ONE_OF.SVG_RAW).type('asset/source').resourceQuery(/raw/), rule.oneOf(CHAIN_ID.ONE_OF.SVG_REACT).type("javascript/auto").resourceQuery(options.query || /react/).use(CHAIN_ID.USE.SVGR).loader(external_node_path_default().resolve(src_dirname, './loader.mjs')).options({
+                svgrOptions.svgoConfig = dedupeSvgoPlugins(svgrOptions.svgoConfig), rule.oneOf(CHAIN_ID.ONE_OF.SVG_URL).type('asset/resource').resourceQuery(/^\?(__inline=false|url)$/).set('generator', generatorOptions), rule.oneOf(CHAIN_ID.ONE_OF.SVG_INLINE).type('asset/inline').resourceQuery(/^\?inline$/), CHAIN_ID.ONE_OF.SVG_RAW && rule.oneOf(CHAIN_ID.ONE_OF.SVG_RAW).type('asset/source').resourceQuery(/^\?raw$/), rule.oneOf(CHAIN_ID.ONE_OF.SVG_REACT).type("javascript/auto").resourceQuery(options.query || /react/).use(CHAIN_ID.USE.SVGR).loader(external_node_path_default().resolve(src_dirname, './loader.mjs')).options({
                     ...svgrOptions,
                     exportType: 'default'
                 }).end();

package/dist/index.d.ts

@@ -1,5 +1,9 @@
 import type { RsbuildPlugin, Rspack } from '@rsbuild/core';
-import type { Config as SvgrOptions } from '@svgr/core';
+import type { Config as BaseSvgrOptions } from '@svgr/core';
+import type { Config as SvgoConfig } from 'svgo';
+type SvgrOptions = Omit<BaseSvgrOptions, 'svgoConfig'> & {
+    svgoConfig?: SvgoConfig;
+};
 export type SvgDefaultExport = 'component' | 'url';
 export type PluginSvgrOptions = {
     /**
@@ -28,3 +32,4 @@ export type PluginSvgrOptions = {
 };
 export declare const PLUGIN_SVGR_NAME = "rsbuild:svgr";
 export declare const pluginSvgr: (options?: PluginSvgrOptions) => RsbuildPlugin;
+export {};

package/dist/index.js

@@ -1,50 +1,50 @@
-import * as __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__ from "node:path";
-import * as __WEBPACK_EXTERNAL_MODULE_node_url_e96de089__ from "node:url";
-import * as __WEBPACK_EXTERNAL_MODULE__rsbuild_plugin_react_7b149ee4__ from "@rsbuild/plugin-react";
-import * as __WEBPACK_EXTERNAL_MODULE_deepmerge__ from "deepmerge";
-let src_dirname = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.dirname((0, __WEBPACK_EXTERNAL_MODULE_node_url_e96de089__.fileURLToPath)(import.meta.url)), SVG_REGEX = /\.svg$/, getSvgoDefaultConfig = ()=>({
-        plugins: [
-            {
-                name: 'preset-default',
-                params: {
-                    overrides: {
-                        removeViewBox: !1
-                    }
-                }
-            },
-            'prefixIds'
-        ]
-    }), dedupeSvgoPlugins = (config)=>{
-    if (!config.plugins) return config;
-    let mergedPlugins = [];
-    for (let plugin of config.plugins){
-        if ('string' == typeof plugin) {
-            mergedPlugins.find((item)=>item === plugin || 'object' == typeof item && item.name === plugin) || mergedPlugins.push(plugin);
-            continue;
-        }
-        let strIndex = mergedPlugins.findIndex((item)=>'string' == typeof item && item === plugin.name);
-        if (-1 !== strIndex) {
-            mergedPlugins[strIndex] = plugin;
-            continue;
-        }
-        let isMerged = !1;
-        mergedPlugins = mergedPlugins.map((item)=>'object' == typeof item && item.name === plugin.name ? (isMerged = !0, (0, __WEBPACK_EXTERNAL_MODULE_deepmerge__.default)(item, plugin)) : item), isMerged || mergedPlugins.push(plugin);
-    }
-    return config.plugins = mergedPlugins, config;
-}, PLUGIN_SVGR_NAME = 'rsbuild:svgr', pluginSvgr = (options = {})=>({
+import node_path from "node:path";
+import { fileURLToPath } from "node:url";
+import { PLUGIN_REACT_NAME } from "@rsbuild/plugin-react";
+import deepmerge from "deepmerge";
+let src_dirname = node_path.dirname(fileURLToPath(import.meta.url)), SVG_REGEX = /\.svg$/, PLUGIN_SVGR_NAME = 'rsbuild:svgr', pluginSvgr = (options = {})=>({
         name: PLUGIN_SVGR_NAME,
         pre: [
-            __WEBPACK_EXTERNAL_MODULE__rsbuild_plugin_react_7b149ee4__.PLUGIN_REACT_NAME
+            PLUGIN_REACT_NAME
         ],
         setup (api) {
             api.modifyBundlerChain(async (chain, { CHAIN_ID, environment })=>{
                 let { config } = environment, { dataUriLimit } = config.output, maxSize = 'number' == typeof dataUriLimit ? dataUriLimit : dataUriLimit.svg, generatorOptions = {};
                 chain.module.rules.has(CHAIN_ID.RULE.SVG) && (generatorOptions = chain.module.rules.get(CHAIN_ID.RULE.SVG).oneOfs.get(CHAIN_ID.ONE_OF.SVG_URL).get('generator'), chain.module.rules.delete(CHAIN_ID.RULE.SVG));
-                let rule = chain.module.rule(CHAIN_ID.RULE.SVG).test(SVG_REGEX), svgrOptions = (0, __WEBPACK_EXTERNAL_MODULE_deepmerge__.default)({
+                let rule = chain.module.rule(CHAIN_ID.RULE.SVG).test(SVG_REGEX), svgrOptions = deepmerge({
                     svgo: !0,
-                    svgoConfig: getSvgoDefaultConfig()
+                    svgoConfig: {
+                        plugins: [
+                            {
+                                name: 'preset-default',
+                                params: {
+                                    overrides: {
+                                        removeViewBox: !1
+                                    }
+                                }
+                            },
+                            'prefixIds'
+                        ]
+                    }
                 }, options.svgrOptions || {});
-                svgrOptions.svgoConfig = dedupeSvgoPlugins(svgrOptions.svgoConfig), rule.oneOf(CHAIN_ID.ONE_OF.SVG_URL).type('asset/resource').resourceQuery(/(__inline=false|url)/).set('generator', generatorOptions), rule.oneOf(CHAIN_ID.ONE_OF.SVG_INLINE).type('asset/inline').resourceQuery(/inline/), CHAIN_ID.ONE_OF.SVG_RAW && rule.oneOf(CHAIN_ID.ONE_OF.SVG_RAW).type('asset/source').resourceQuery(/raw/), rule.oneOf(CHAIN_ID.ONE_OF.SVG_REACT).type("javascript/auto").resourceQuery(options.query || /react/).use(CHAIN_ID.USE.SVGR).loader(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(src_dirname, './loader.mjs')).options({
+                svgrOptions.svgoConfig = ((config)=>{
+                    if (!config.plugins) return config;
+                    let mergedPlugins = [];
+                    for (let plugin of config.plugins){
+                        if ('string' == typeof plugin) {
+                            mergedPlugins.find((item)=>item === plugin || 'object' == typeof item && item.name === plugin) || mergedPlugins.push(plugin);
+                            continue;
+                        }
+                        let strIndex = mergedPlugins.findIndex((item)=>'string' == typeof item && item === plugin.name);
+                        if (-1 !== strIndex) {
+                            mergedPlugins[strIndex] = plugin;
+                            continue;
+                        }
+                        let isMerged = !1;
+                        mergedPlugins = mergedPlugins.map((item)=>'object' == typeof item && item.name === plugin.name ? (isMerged = !0, deepmerge(item, plugin)) : item), isMerged || mergedPlugins.push(plugin);
+                    }
+                    return config.plugins = mergedPlugins, config;
+                })(svgrOptions.svgoConfig), rule.oneOf(CHAIN_ID.ONE_OF.SVG_URL).type('asset/resource').resourceQuery(/^\?(__inline=false|url)$/).set('generator', generatorOptions), rule.oneOf(CHAIN_ID.ONE_OF.SVG_INLINE).type('asset/inline').resourceQuery(/^\?inline$/), CHAIN_ID.ONE_OF.SVG_RAW && rule.oneOf(CHAIN_ID.ONE_OF.SVG_RAW).type('asset/source').resourceQuery(/^\?raw$/), rule.oneOf(CHAIN_ID.ONE_OF.SVG_REACT).type("javascript/auto").resourceQuery(options.query || /react/).use(CHAIN_ID.USE.SVGR).loader(node_path.resolve(src_dirname, './loader.mjs')).options({
                     ...svgrOptions,
                     exportType: 'default'
                 }).end();
@@ -61,10 +61,10 @@ let src_dirname = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.dirname
                             }
                         ]
                     } : issuerInclude, svgRule = rule.oneOf(CHAIN_ID.ONE_OF.SVG);
-                    options.exclude && svgRule.exclude.add(options.exclude), svgRule.type("javascript/auto").set('issuer', issuer).use(CHAIN_ID.USE.SVGR).loader(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.resolve(src_dirname, './loader.mjs')).options({
+                    options.exclude && svgRule.exclude.add(options.exclude), svgRule.type("javascript/auto").set('issuer', issuer).use(CHAIN_ID.USE.SVGR).loader(node_path.resolve(src_dirname, './loader.mjs')).options({
                         ...svgrOptions,
                         exportType
-                    }).end(), mixedImport && 'named' === exportType && svgRule.use(CHAIN_ID.USE.URL).loader(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.join(src_dirname, '../compiled', 'url-loader/index.js')).options({
+                    }).end(), mixedImport && 'named' === exportType && svgRule.use(CHAIN_ID.USE.URL).loader(node_path.join(src_dirname, '../compiled', 'url-loader/index.js')).options({
                         limit: maxSize,
                         name: null == generatorOptions ? void 0 : generatorOptions.filename
                     });

package/dist/loader.mjs

@@ -1,9 +1,9 @@
-import * as __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__ from "node:path";
-import * as __WEBPACK_EXTERNAL_MODULE_node_util_1b29d436__ from "node:util";
-import * as __WEBPACK_EXTERNAL_MODULE__svgr_core_4799aff5__ from "@svgr/core";
-import * as __WEBPACK_EXTERNAL_MODULE__svgr_plugin_jsx_dba1ddfc__ from "@svgr/plugin-jsx";
-import * as __WEBPACK_EXTERNAL_MODULE__svgr_plugin_svgo_bbb5d7de__ from "@svgr/plugin-svgo";
-const transformSvg = (0, __WEBPACK_EXTERNAL_MODULE_node_util_1b29d436__.callbackify)(async (contents, config, state)=>(0, __WEBPACK_EXTERNAL_MODULE__svgr_core_4799aff5__.transform)(contents, config, state));
+import { normalize } from "node:path";
+import { callbackify } from "node:util";
+import { transform } from "@svgr/core";
+import plugin_jsx from "@svgr/plugin-jsx";
+import plugin_svgo from "@svgr/plugin-svgo";
+const transformSvg = callbackify(async (contents, config, state)=>transform(contents, config, state));
 function svgrLoader(contents) {
     this?.cacheable();
     const callback = this.async();
@@ -18,26 +18,20 @@ function svgrLoader(contents) {
             name: '@rsbuild/plugin-svgr',
             previousExport,
             defaultPlugins: [
-                __WEBPACK_EXTERNAL_MODULE__svgr_plugin_svgo_bbb5d7de__["default"],
-                __WEBPACK_EXTERNAL_MODULE__svgr_plugin_jsx_dba1ddfc__["default"]
+                plugin_svgo,
+                plugin_jsx
             ]
         },
-        filePath: (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(this.resourcePath)
+        filePath: normalize(this.resourcePath)
     };
     if (previousExport) this.fs.readFile(this.resourcePath, (err, result)=>{
-        if (err) {
-            callback(err);
-            return;
-        }
+        if (err) return void callback(err);
         transformSvg(String(result), options, state, (err, content)=>{
-            if (err) {
-                callback(err);
-                return;
-            }
+            if (err) return void callback(err);
             callback(null, content);
         });
     });
     else transformSvg(contents, options, state, callback);
 }
-const loader_rslib_entry_ = svgrLoader;
-export { loader_rslib_entry_ as default };
+const loader = svgrLoader;
+export { loader as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-svgr",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "SVGR plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -31,14 +31,14 @@
     "loader-utils": "^3.3.1"
   },
   "devDependencies": {
-    "@rslib/core": "0.6.1",
-    "@types/node": "^22.14.0",
+    "@rslib/core": "0.11.1",
+    "@types/node": "^22.17.0",
     "file-loader": "6.2.0",
-    "prebundle": "1.3.3",
+    "prebundle": "1.4.0",
     "svgo": "^3.3.2",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "url-loader": "4.1.1",
-    "@rsbuild/core": "1.3.6",
+    "@rsbuild/core": "1.4.14",
     "@scripts/test-helper": "1.0.1"
   },
   "peerDependencies": {
@@ -46,12 +46,12 @@
   },
   "publishConfig": {
     "access": "public",
-    "provenance": true,
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
     "build": "rslib build",
     "dev": "rslib build --watch",
-    "prebundle": "prebundle"
+    "prebundle": "prebundle",
+    "bump": "npx bumpp --no-tag"
   }
 }