@rsbuild/plugin-svgr 2.0.0 → 2.0.2

package/dist/assetLoader.d.ts

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

package/dist/assetLoader.mjs

@@ -1,24 +1,27 @@
 import node_path from "node:path";
+import { Buffer } from "node:buffer";
 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')}`;
+    const { limit, name, publicPath } = this.getOptions();
+    const buffer = Buffer.isBuffer(content) ? content : Buffer.from(content, 'utf8');
+    if (buffer.length <= limit) {
+        const dataUrl = `data:${SVG_MIME_TYPE};base64,${buffer.toString('base64')}`;
         return `export default ${JSON.stringify(dataUrl)}`;
     }
     const filename = interpolateName(this, name, {
         context: this.rootContext,
-        content
+        content: buffer
     });
     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)};`;
+    this.emitFile(filename, buffer, void 0, assetInfo);
+    const publicPathCode = 'function' == typeof publicPath ? JSON.stringify(publicPath(filename, this.resourcePath, this.rootContext)) : 'string' == typeof publicPath ? JSON.stringify(`${publicPath.endsWith('/') ? publicPath : `${publicPath}/`}${filename}`) : `__webpack_public_path__ + ${JSON.stringify(filename)}`;
+    return `export default ${publicPathCode};`;
 };
 assetLoader.raw = true;
 const src_assetLoader = assetLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-svgr",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "SVGR plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -29,12 +29,12 @@
   },
   "devDependencies": {
     "@rsbuild/core-v1": "npm:@rsbuild/core@^1.7.5",
-    "@rslib/core": "0.21.2",
+    "@rslib/core": "0.21.3",
     "@types/node": "^24.12.2",
     "svgo": "^3.3.3",
     "typescript": "^6.0.3",
-    "@scripts/test-helper": "1.0.0",
-    "@rsbuild/core": "2.0.0"
+    "@rsbuild/core": "2.0.3",
+    "@scripts/test-helper": "1.0.0"
   },
   "peerDependencies": {
     "@rsbuild/core": "^2.0.0-0"