@rsbuild/plugin-svgr 2.0.0-alpha.3 → 2.0.0-rc.3

package/dist/assetLoader.d.ts

@@ -0,0 +1,11 @@
+import type { Rspack } from '@rsbuild/core';
+type FilenameTemplate = string | ((resourcePath: string, resourceQuery?: string) => string);
+export type SvgAssetLoaderOptions = {
+    limit: number;
+    name: FilenameTemplate;
+};
+type RawLoaderDefinition<OptionsType = {}> = ((this: Rspack.LoaderContext<OptionsType>, content: Buffer) => string | Buffer | void | Promise<string | Buffer | void>) & {
+    raw: true;
+};
+declare const assetLoader: RawLoaderDefinition<SvgAssetLoaderOptions>;
+export default assetLoader;

package/dist/assetLoader.mjs

@@ -0,0 +1,25 @@
+import node_path from "node:path";
+import { interpolateName } from "loader-utils";
+const SVG_MIME_TYPE = 'image/svg+xml';
+const HASH_TEMPLATE_REGEX = /\[(?:[^:\]]+:)?(?:hash|contenthash)(?::[^\]]+)?]/i;
+const normalizePath = (value)=>value.replace(/\\/g, '/');
+const assetLoader = function(content) {
+    const { limit, name } = this.getOptions();
+    if (content.length <= limit) {
+        const dataUrl = `data:${SVG_MIME_TYPE};base64,${content.toString('base64')}`;
+        return `export default ${JSON.stringify(dataUrl)}`;
+    }
+    const filename = interpolateName(this, name, {
+        context: this.rootContext,
+        content
+    });
+    const assetInfo = {
+        sourceFilename: normalizePath(node_path.relative(this.rootContext, this.resourcePath))
+    };
+    if ('string' == typeof name && HASH_TEMPLATE_REGEX.test(name)) assetInfo.immutable = true;
+    this.emitFile(filename, content, void 0, assetInfo);
+    return `export default __webpack_public_path__ + ${JSON.stringify(filename)};`;
+};
+assetLoader.raw = true;
+const src_assetLoader = assetLoader;
+export default src_assetLoader;

package/dist/index.js

@@ -1,14 +1,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 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({
@@ -44,7 +47,7 @@ let src_dirname = node_path.dirname(fileURLToPath(import.meta.url)), SVG_REGEX =
                         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.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(node_path.join(import.meta.dirname, 'loader.mjs')).options({
                     ...svgrOptions,
                     exportType: 'default'
                 }).end();
@@ -61,10 +64,10 @@ let src_dirname = node_path.dirname(fileURLToPath(import.meta.url)), SVG_REGEX =
                             }
                         ]
                     } : 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(node_path.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.join(import.meta.dirname, 'loader.mjs')).options({
                         ...svgrOptions,
                         exportType
-                    }).end(), mixedImport && 'named' === exportType && svgRule.use(CHAIN_ID.USE.URL).loader(node_path.join(src_dirname, '../compiled', 'url-loader/index.js')).options({
+                    }).end(), mixedImport && 'named' === exportType && svgRule.use(CHAIN_ID.USE.URL).loader(node_path.join(import.meta.dirname, 'assetLoader.mjs')).options({
                         limit: maxSize,
                         name: generatorOptions?.filename
                     });
@@ -74,12 +77,12 @@ let src_dirname = node_path.dirname(fileURLToPath(import.meta.url)), SVG_REGEX =
                         maxSize
                     }
                 }).set('generator', generatorOptions);
-                let jsRule = chain.module.rules.get(CHAIN_ID.RULE.JS).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
                 ].some((jsUseId)=>{
-                    let use = jsRule.uses.get(jsUseId);
+                    let use = jsMainRule.uses.get(jsUseId);
                     if (!use) return !1;
                     for (let oneOfId of [
                         CHAIN_ID.ONE_OF.SVG,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-svgr",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-rc.3",
   "description": "SVGR plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -12,18 +12,15 @@
   "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"
+    "dist"
   ],
   "dependencies": {
-    "@rsbuild/plugin-react": "^2.0.0-0",
+    "@rsbuild/plugin-react": "^2.0.0-rc.3",
     "@svgr/core": "8.1.0",
     "@svgr/plugin-jsx": "8.1.0",
     "@svgr/plugin-svgo": "8.1.0",
@@ -31,27 +28,28 @@
     "loader-utils": "^3.3.1"
   },
   "devDependencies": {
-    "@rslib/core": "0.19.3",
-    "@types/node": "^24.10.9",
-    "file-loader": "6.2.0",
-    "prebundle": "1.6.2",
-    "svgo": "^3.3.2",
-    "typescript": "^5.9.3",
-    "url-loader": "4.1.1",
-    "@rsbuild/core": "2.0.0-alpha.3",
-    "@scripts/test-helper": "1.0.1"
+    "@rsbuild/core-v1": "npm:@rsbuild/core@^1.7.5",
+    "@rslib/core": "0.21.0",
+    "@types/node": "^24.12.2",
+    "svgo": "^3.3.3",
+    "typescript": "^6.0.2",
+    "@scripts/test-helper": "1.0.0",
+    "@rsbuild/core": "2.0.0-rc.3"
   },
   "peerDependencies": {
     "@rsbuild/core": "^2.0.0-0"
   },
+  "peerDependenciesMeta": {
+    "@rsbuild/core": {
+      "optional": true
+    }
+  },
   "publishConfig": {
     "access": "public",
     "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"
   }
 }

package/compiled/file-loader/index.d.ts

@@ -1 +0,0 @@
-export = any;

package/compiled/file-loader/index.js

@@ -1,133 +0,0 @@
-(() => {
-  "use strict";
-  var __webpack_modules__ = {
-    910: (module, __unused_webpack_exports, __nccwpck_require__) => {
-      const loader = __nccwpck_require__(156);
-      module.exports = loader.default;
-      module.exports.raw = loader.raw;
-    },
-    156: (__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__(245);
-      function _interopRequireDefault(obj) {
-        return obj && obj.__esModule ? obj : { default: obj };
-      }
-      function loader(content) {
-        const options = this.getOptions() || {};
-        const context = options.context || this.rootContext;
-        const name = options.name || "[contenthash].[ext]";
-        const url = (0, _loaderUtils.interpolateName)(this, name, {
-          context,
-          content,
-          regExp: options.regExp,
-        });
-        let outputPath = url;
-        if (options.outputPath) {
-          if (typeof options.outputPath === "function") {
-            outputPath = options.outputPath(url, this.resourcePath, context);
-          } else {
-            outputPath = _path.default.posix.join(options.outputPath, url);
-          }
-        }
-        let publicPath = `__webpack_public_path__ + ${JSON.stringify(outputPath)}`;
-        if (options.publicPath) {
-          if (typeof options.publicPath === "function") {
-            publicPath = options.publicPath(url, this.resourcePath, context);
-          } else {
-            publicPath = `${options.publicPath.endsWith("/") ? options.publicPath : `${options.publicPath}/`}${url}`;
-          }
-          publicPath = JSON.stringify(publicPath);
-        }
-        if (options.postTransformPublicPath) {
-          publicPath = options.postTransformPublicPath(publicPath);
-        }
-        if (typeof options.emitFile === "undefined" || options.emitFile) {
-          const assetInfo = {};
-          if (typeof name === "string") {
-            let normalizedName = name;
-            const idx = normalizedName.indexOf("?");
-            if (idx >= 0) {
-              normalizedName = normalizedName.substr(0, idx);
-            }
-            const isImmutable =
-              /\[([^:\]]+:)?(hash|contenthash)(:[^\]]+)?]/gi.test(
-                normalizedName,
-              );
-            if (isImmutable === true) {
-              assetInfo.immutable = true;
-            }
-          }
-          assetInfo.sourceFilename = (0, _utils.normalizePath)(
-            _path.default.relative(this.rootContext, this.resourcePath),
-          );
-          this.emitFile(outputPath, content, null, assetInfo);
-        }
-        const esModule =
-          typeof options.esModule !== "undefined" ? options.esModule : true;
-        return `${esModule ? "export default" : "module.exports ="} ${publicPath};`;
-      }
-      const raw = true;
-      exports.raw = raw;
-    },
-    245: (__unused_webpack_module, exports) => {
-      Object.defineProperty(exports, "__esModule", { value: true });
-      exports.normalizePath = normalizePath;
-      function normalizePath(path, stripTrailing) {
-        if (path === "\\" || path === "/") {
-          return "/";
-        }
-        const len = path.length;
-        if (len <= 1) {
-          return path;
-        }
-        let prefix = "";
-        if (len > 4 && path[3] === "\\") {
-          const ch = path[2];
-          if ((ch === "?" || ch === ".") && path.slice(0, 2) === "\\\\") {
-            path = path.slice(2);
-            prefix = "//";
-          }
-        }
-        const segs = path.split(/[/\\]+/);
-        if (stripTrailing !== false && segs[segs.length - 1] === "") {
-          segs.pop();
-        }
-        return prefix + segs.join("/");
-      }
-    },
-    328: (module) => {
-      module.exports = require("loader-utils");
-    },
-    928: (module) => {
-      module.exports = require("path");
-    },
-  };
-  var __webpack_module_cache__ = {};
-  function __nccwpck_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (cachedModule !== undefined) {
-      return cachedModule.exports;
-    }
-    var module = (__webpack_module_cache__[moduleId] = { exports: {} });
-    var threw = true;
-    try {
-      __webpack_modules__[moduleId](
-        module,
-        module.exports,
-        __nccwpck_require__,
-      );
-      threw = false;
-    } finally {
-      if (threw) delete __webpack_module_cache__[moduleId];
-    }
-    return module.exports;
-  }
-  if (typeof __nccwpck_require__ !== "undefined")
-    __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(910);
-  module.exports = __webpack_exports__;
-})();

package/compiled/file-loader/license

@@ -1,20 +0,0 @@
-Copyright JS Foundation and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/compiled/file-loader/package.json

@@ -1 +0,0 @@
-{"name":"file-loader","author":"Tobias Koppers @sokra","version":"6.2.0","funding":{"type":"opencollective","url":"https://opencollective.com/webpack"},"license":"MIT","types":"index.d.ts","type":"commonjs"}

package/compiled/url-loader/index.d.ts

@@ -1 +0,0 @@
-export = any;