@rsbuild/plugin-svgr 1.3.1 → 2.0.0-rc.2

package/compiled/url-loader/index.js

@@ -107,20 +107,20 @@
         });
       }
     },
-    357: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    899: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const loader = __nccwpck_require__(359);
+      const loader = __nccwpck_require__(29);
       module.exports = loader.default;
       module.exports.raw = loader.raw;
     },
-    359: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    29: (__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__(574));
-      var _normalizeFallback = _interopRequireDefault(__nccwpck_require__(140));
+      var _normalizeFallback = _interopRequireDefault(__nccwpck_require__(358));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule ? obj : { default: obj };
       }
@@ -212,7 +212,7 @@
       const raw = true;
       exports.raw = raw;
     },
-    140: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    358: (__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__(357);
+  var __webpack_exports__ = __nccwpck_require__(899);
   module.exports = __webpack_exports__;
 })();

package/dist/index.js

@@ -2,13 +2,17 @@ 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 = {})=>({
+let src_dirname = node_path.dirname(fileURLToPath(import.meta.url)), SVG_REGEX = /\.svg$/, PLUGIN_SVGR_NAME = 'rsbuild:svgr';
+function assertCoreVersion(version) {
+    if ('1' === version.split('.')[0]) throw Error('"@rsbuild/plugin-svgr" v2 requires "@rsbuild/core" >= 2.0. Please upgrade "@rsbuild/core" or use "@rsbuild/plugin-svgr" v1.');
+}
+let pluginSvgr = (options = {})=>({
         name: PLUGIN_SVGR_NAME,
         pre: [
             PLUGIN_REACT_NAME
         ],
         setup (api) {
-            api.modifyBundlerChain((chain, { CHAIN_ID, environment })=>{
+            assertCoreVersion(api.context.version), api.modifyBundlerChain((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 = deepmerge({
@@ -74,7 +78,7 @@ let src_dirname = node_path.dirname(fileURLToPath(import.meta.url)), SVG_REGEX =
                         maxSize
                     }
                 }).set('generator', generatorOptions);
-                let isV1 = api.context.version.startsWith('1.'), jsRule = chain.module.rules.get(CHAIN_ID.RULE.JS), jsMainRule = isV1 ? jsRule : jsRule.oneOfs.get(CHAIN_ID.ONE_OF.JS_MAIN);
+                let jsMainRule = chain.module.rules.get(CHAIN_ID.RULE.JS).oneOfs.get(CHAIN_ID.ONE_OF.JS_MAIN);
                 [
                     CHAIN_ID.USE.SWC,
                     CHAIN_ID.USE.BABEL

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-svgr",
-  "version": "1.3.1",
+  "version": "2.0.0-rc.2",
   "description": "SVGR plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -12,18 +12,16 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
     }
   },
-  "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "compiled"
   ],
   "dependencies": {
-    "@rsbuild/plugin-react": "^1.4.6",
+    "@rsbuild/plugin-react": "^2.0.0-rc.2",
     "@svgr/core": "8.1.0",
     "@svgr/plugin-jsx": "8.1.0",
     "@svgr/plugin-svgo": "8.1.0",
@@ -31,19 +29,19 @@
     "loader-utils": "^3.3.1"
   },
   "devDependencies": {
-    "@rsbuild/core-v1": "npm:@rsbuild/core@^1.7.3",
-    "@rslib/core": "0.20.0",
-    "@types/node": "^24.12.0",
+    "@rsbuild/core-v1": "npm:@rsbuild/core@^1.7.5",
+    "@rslib/core": "0.21.0",
+    "@types/node": "^24.12.2",
     "file-loader": "6.2.0",
-    "prebundle": "1.6.2",
+    "prebundle": "1.6.4",
     "svgo": "^3.3.3",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.2",
     "url-loader": "4.1.1",
-    "@rsbuild/core": "2.0.0-beta.8",
+    "@rsbuild/core": "2.0.0-rc.1",
     "@scripts/test-helper": "1.0.0"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^1.0.0 || ^2.0.0-0"
+    "@rsbuild/core": "^2.0.0-0"
   },
   "peerDependenciesMeta": {
     "@rsbuild/core": {
@@ -55,9 +53,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "rslib build",
-    "dev": "rslib build -w",
-    "prebundle": "prebundle",
-    "bump": "pnpx bumpp --no-tag"
+    "build": "rslib",
+    "dev": "rslib -w",
+    "prebundle": "prebundle"
   }
 }

package/dist/index.cjs

@@ -1,136 +0,0 @@
-"use strict";
-const __rslib_import_meta_url__ = "u" < typeof document ? new (require('url'.replace('', ''))).URL('file:' + __filename).href : document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href;
-var __webpack_require__ = {};
-__webpack_require__.n = (module)=>{
-    var getter = module && module.__esModule ? ()=>module.default : ()=>module;
-    return __webpack_require__.d(getter, {
-        a: getter
-    }), getter;
-}, __webpack_require__.d = (exports1, definition)=>{
-    for(var key in definition)__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key) && Object.defineProperty(exports1, key, {
-        enumerable: !0,
-        get: definition[key]
-    });
-}, __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop), __webpack_require__.r = (exports1)=>{
-    "u" > typeof Symbol && Symbol.toStringTag && Object.defineProperty(exports1, Symbol.toStringTag, {
-        value: 'Module'
-    }), Object.defineProperty(exports1, '__esModule', {
-        value: !0
-    });
-};
-var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__), __webpack_require__.d(__webpack_exports__, {
-    pluginSvgr: ()=>pluginSvgr,
-    PLUGIN_SVGR_NAME: ()=>PLUGIN_SVGR_NAME
-});
-const external_node_path_namespaceObject = require("node:path");
-var external_node_path_default = __webpack_require__.n(external_node_path_namespaceObject);
-const external_node_url_namespaceObject = require("node:url"), plugin_react_namespaceObject = require("@rsbuild/plugin-react"), external_deepmerge_namespaceObject = require("deepmerge");
-var external_deepmerge_default = __webpack_require__.n(external_deepmerge_namespaceObject);
-const src_dirname = external_node_path_default().dirname((0, external_node_url_namespaceObject.fileURLToPath)(__rslib_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, external_deepmerge_default()(item, plugin)) : item), isMerged || mergedPlugins.push(plugin);
-    }
-    return config.plugins = mergedPlugins, config;
-}, PLUGIN_SVGR_NAME = 'rsbuild:svgr', pluginSvgr = (options = {})=>({
-        name: PLUGIN_SVGR_NAME,
-        pre: [
-            plugin_react_namespaceObject.PLUGIN_REACT_NAME
-        ],
-        setup (api) {
-            api.modifyBundlerChain((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 = external_deepmerge_default()({
-                    svgo: !0,
-                    svgoConfig: getSvgoDefaultConfig()
-                }, options.svgrOptions || {});
-                svgrOptions.svgoConfig = dedupeSvgoPlugins(svgrOptions.svgoConfig), rule.oneOf(CHAIN_ID.ONE_OF.SVG_URL).type('asset/resource').resourceQuery(/^\?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();
-                let { mixedImport = !1 } = options;
-                if (mixedImport || svgrOptions.exportType) {
-                    let { exportType = mixedImport ? 'named' : void 0 } = svgrOptions, issuerInclude = [
-                        /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/,
-                        /\.mdx$/
-                    ], issuer = options.excludeImporter ? {
-                        and: [
-                            issuerInclude,
-                            {
-                                not: options.excludeImporter
-                            }
-                        ]
-                    } : 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(external_node_path_default().resolve(src_dirname, './loader.mjs')).options({
-                        ...svgrOptions,
-                        exportType
-                    }).end(), mixedImport && 'named' === exportType && svgRule.use(CHAIN_ID.USE.URL).loader(external_node_path_default().join(src_dirname, '../compiled', 'url-loader/index.js')).options({
-                        limit: maxSize,
-                        name: generatorOptions?.filename
-                    });
-                }
-                rule.oneOf(CHAIN_ID.ONE_OF.SVG_ASSET).type('asset').parser({
-                    dataUrlCondition: {
-                        maxSize
-                    }
-                }).set('generator', generatorOptions);
-                let isV1 = api.context.version.startsWith('1.'), jsRule = chain.module.rules.get(CHAIN_ID.RULE.JS), jsMainRule = isV1 ? jsRule : jsRule.oneOfs.get(CHAIN_ID.ONE_OF.JS_MAIN);
-                [
-                    CHAIN_ID.USE.SWC,
-                    CHAIN_ID.USE.BABEL
-                ].some((jsUseId)=>{
-                    let use = jsMainRule.uses.get(jsUseId);
-                    if (!use) return !1;
-                    for (let oneOfId of [
-                        CHAIN_ID.ONE_OF.SVG,
-                        CHAIN_ID.ONE_OF.SVG_REACT
-                    ]){
-                        if (!rule.oneOfs.has(oneOfId)) continue;
-                        let loaderOptions = use.get('options');
-                        jsUseId === CHAIN_ID.USE.SWC && (loaderOptions = external_deepmerge_default()(loaderOptions, {
-                            jsc: {
-                                transform: {
-                                    react: {
-                                        refresh: !1
-                                    }
-                                }
-                            }
-                        })), rule.oneOf(oneOfId).use(jsUseId).before(CHAIN_ID.USE.SVGR).loader(use.get('loader')).options(loaderOptions);
-                    }
-                    return !0;
-                });
-            });
-        }
-    });
-for(var __rspack_i in exports.PLUGIN_SVGR_NAME = __webpack_exports__.PLUGIN_SVGR_NAME, exports.pluginSvgr = __webpack_exports__.pluginSvgr, __webpack_exports__)-1 === [
-    "PLUGIN_SVGR_NAME",
-    "pluginSvgr"
-].indexOf(__rspack_i) && (exports[__rspack_i] = __webpack_exports__[__rspack_i]);
-Object.defineProperty(exports, '__esModule', {
-    value: !0
-});