@rsbuild/plugin-svgr 0.6.14 → 0.7.0-beta.0

package/dist/{index.mjs → index.cjs}

@@ -1,24 +1,41 @@
-import { createRequire } from 'module';
-var require = createRequire(import.meta['url']);
-
-
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.49.2_eslint@8.57.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
-import { fileURLToPath } from "url";
-import path from "path";
-var getFilename = () => fileURLToPath(import.meta.url);
-var getDirname = () => path.dirname(getFilename());
-var __dirname = /* @__PURE__ */ getDirname();
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-import path2 from "path";
-import { PLUGIN_REACT_NAME } from "@rsbuild/plugin-react";
-import {
-  SCRIPT_REGEX,
-  SVG_REGEX,
-  deepmerge,
-  getDistPath,
-  getFilename as getFilename2
-} from "@rsbuild/shared";
+var src_exports = {};
+__export(src_exports, {
+  pluginSvgr: () => pluginSvgr
+});
+module.exports = __toCommonJS(src_exports);
+var import_node_path = __toESM(require("path"));
+var import_plugin_react = require("@rsbuild/plugin-react");
+var import_shared = require("@rsbuild/shared");
 function getSvgoDefaultConfig() {
   return {
     plugins: [
@@ -38,13 +55,13 @@ function getSvgoDefaultConfig() {
 }
 var pluginSvgr = (options = {}) => ({
   name: "rsbuild:svgr",
-  pre: [PLUGIN_REACT_NAME],
+  pre: [import_plugin_react.PLUGIN_REACT_NAME],
   setup(api) {
     api.modifyBundlerChain(async (chain, { isProd, CHAIN_ID }) => {
       const config = api.getNormalizedConfig();
-      const distDir = getDistPath(config, "svg");
-      const filename = getFilename2(config, "svg", isProd);
-      const outputName = path2.posix.join(distDir, filename);
+      const distDir = (0, import_shared.getDistPath)(config, "svg");
+      const filename = (0, import_shared.getFilename)(config, "svg", isProd);
+      const outputName = import_node_path.default.posix.join(distDir, filename);
       const { dataUriLimit } = config.output;
       const maxSize = typeof dataUriLimit === "number" ? dataUriLimit : dataUriLimit.svg;
       let generatorOptions = {};
@@ -52,8 +69,8 @@ var pluginSvgr = (options = {}) => ({
         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);
       }
-      const rule = chain.module.rule(CHAIN_ID.RULE.SVG).test(SVG_REGEX);
-      const svgrOptions = deepmerge(
+      const rule = chain.module.rule(CHAIN_ID.RULE.SVG).test(import_shared.SVG_REGEX);
+      const svgrOptions = (0, import_shared.deepmerge)(
         {
           svgo: true,
           svgoConfig: getSvgoDefaultConfig()
@@ -62,25 +79,25 @@ var pluginSvgr = (options = {}) => ({
       );
       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/);
-      rule.oneOf(CHAIN_ID.ONE_OF.SVG_REACT).type("javascript/auto").resourceQuery(options.query || /react/).use(CHAIN_ID.USE.SVGR).loader(path2.resolve(__dirname, "./loader")).options({
+      rule.oneOf(CHAIN_ID.ONE_OF.SVG_REACT).type("javascript/auto").resourceQuery(options.query || /react/).use(CHAIN_ID.USE.SVGR).loader(import_node_path.default.resolve(__dirname, "./loader.cjs")).options({
         ...svgrOptions,
         exportType: "default"
       }).end();
       const { mixedImport = false } = options;
       if (mixedImport || svgrOptions.exportType) {
         const { exportType = mixedImport ? "named" : void 0 } = svgrOptions;
-        const issuerInclude = [SCRIPT_REGEX, /\.mdx$/];
+        const issuerInclude = [import_shared.SCRIPT_REGEX, /\.mdx$/];
         const issuer = options.excludeImporter ? { and: [issuerInclude, { not: options.excludeImporter }] } : issuerInclude;
         const svgRule = rule.oneOf(CHAIN_ID.ONE_OF.SVG);
         if (options.exclude) {
           svgRule.exclude.add(options.exclude);
         }
-        svgRule.type("javascript/auto").set("issuer", issuer).use(CHAIN_ID.USE.SVGR).loader(path2.resolve(__dirname, "./loader")).options({
+        svgRule.type("javascript/auto").set("issuer", issuer).use(CHAIN_ID.USE.SVGR).loader(import_node_path.default.resolve(__dirname, "./loader.cjs")).options({
           ...svgrOptions,
           exportType
         }).end();
         if (mixedImport && exportType === "named") {
-          svgRule.use(CHAIN_ID.USE.URL).loader(path2.join(__dirname, "../compiled", "url-loader")).options({
+          svgRule.use(CHAIN_ID.USE.URL).loader(import_node_path.default.join(__dirname, "../compiled", "url-loader/index.js")).options({
             limit: maxSize,
             name: outputName
           });
@@ -112,6 +129,7 @@ var pluginSvgr = (options = {}) => ({
     });
   }
 });
-export {
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
   pluginSvgr
-};
+});

package/dist/index.d.ts

@@ -1,8 +1,7 @@
-import { Rspack, RsbuildPlugin } from '@rsbuild/core';
-import { Config } from '@svgr/core';
-
-type SvgDefaultExport = 'component' | 'url';
-type PluginSvgrOptions = {
+import type { RsbuildPlugin, Rspack } from '@rsbuild/core';
+import type { Config } from '@svgr/core';
+export type SvgDefaultExport = 'component' | 'url';
+export type PluginSvgrOptions = {
     /**
      * Configure SVGR options.
      * @see https://react-svgr.com/docs/options/
@@ -27,6 +26,4 @@ type PluginSvgrOptions = {
      */
     excludeImporter?: Rspack.RuleSetCondition;
 };
-declare const pluginSvgr: (options?: PluginSvgrOptions) => RsbuildPlugin;
-
-export { type PluginSvgrOptions, type SvgDefaultExport, pluginSvgr };
+export declare const pluginSvgr: (options?: PluginSvgrOptions) => RsbuildPlugin;

package/dist/index.js

@@ -1,41 +1,24 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+import { createRequire } from 'module';
+var require = createRequire(import.meta['url']);
+
+
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.49.3_eslint@8.57.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
+import { fileURLToPath } from "url";
+import path from "path";
+var getFilename = () => fileURLToPath(import.meta.url);
+var getDirname = () => path.dirname(getFilename());
+var __dirname = /* @__PURE__ */ getDirname();
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  pluginSvgr: () => pluginSvgr
-});
-module.exports = __toCommonJS(src_exports);
-var import_node_path = __toESM(require("path"));
-var import_plugin_react = require("@rsbuild/plugin-react");
-var import_shared = require("@rsbuild/shared");
+import path2 from "path";
+import { PLUGIN_REACT_NAME } from "@rsbuild/plugin-react";
+import {
+  SCRIPT_REGEX,
+  SVG_REGEX,
+  deepmerge,
+  getDistPath,
+  getFilename as getFilename2
+} from "@rsbuild/shared";
 function getSvgoDefaultConfig() {
   return {
     plugins: [
@@ -55,13 +38,13 @@ function getSvgoDefaultConfig() {
 }
 var pluginSvgr = (options = {}) => ({
   name: "rsbuild:svgr",
-  pre: [import_plugin_react.PLUGIN_REACT_NAME],
+  pre: [PLUGIN_REACT_NAME],
   setup(api) {
     api.modifyBundlerChain(async (chain, { isProd, CHAIN_ID }) => {
       const config = api.getNormalizedConfig();
-      const distDir = (0, import_shared.getDistPath)(config, "svg");
-      const filename = (0, import_shared.getFilename)(config, "svg", isProd);
-      const outputName = import_node_path.default.posix.join(distDir, filename);
+      const distDir = getDistPath(config, "svg");
+      const filename = getFilename2(config, "svg", isProd);
+      const outputName = path2.posix.join(distDir, filename);
       const { dataUriLimit } = config.output;
       const maxSize = typeof dataUriLimit === "number" ? dataUriLimit : dataUriLimit.svg;
       let generatorOptions = {};
@@ -69,8 +52,8 @@ var pluginSvgr = (options = {}) => ({
         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);
       }
-      const rule = chain.module.rule(CHAIN_ID.RULE.SVG).test(import_shared.SVG_REGEX);
-      const svgrOptions = (0, import_shared.deepmerge)(
+      const rule = chain.module.rule(CHAIN_ID.RULE.SVG).test(SVG_REGEX);
+      const svgrOptions = deepmerge(
         {
           svgo: true,
           svgoConfig: getSvgoDefaultConfig()
@@ -79,25 +62,25 @@ var pluginSvgr = (options = {}) => ({
       );
       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/);
-      rule.oneOf(CHAIN_ID.ONE_OF.SVG_REACT).type("javascript/auto").resourceQuery(options.query || /react/).use(CHAIN_ID.USE.SVGR).loader(import_node_path.default.resolve(__dirname, "./loader")).options({
+      rule.oneOf(CHAIN_ID.ONE_OF.SVG_REACT).type("javascript/auto").resourceQuery(options.query || /react/).use(CHAIN_ID.USE.SVGR).loader(path2.resolve(__dirname, "./loader.cjs")).options({
         ...svgrOptions,
         exportType: "default"
       }).end();
       const { mixedImport = false } = options;
       if (mixedImport || svgrOptions.exportType) {
         const { exportType = mixedImport ? "named" : void 0 } = svgrOptions;
-        const issuerInclude = [import_shared.SCRIPT_REGEX, /\.mdx$/];
+        const issuerInclude = [SCRIPT_REGEX, /\.mdx$/];
         const issuer = options.excludeImporter ? { and: [issuerInclude, { not: options.excludeImporter }] } : issuerInclude;
         const svgRule = rule.oneOf(CHAIN_ID.ONE_OF.SVG);
         if (options.exclude) {
           svgRule.exclude.add(options.exclude);
         }
-        svgRule.type("javascript/auto").set("issuer", issuer).use(CHAIN_ID.USE.SVGR).loader(import_node_path.default.resolve(__dirname, "./loader")).options({
+        svgRule.type("javascript/auto").set("issuer", issuer).use(CHAIN_ID.USE.SVGR).loader(path2.resolve(__dirname, "./loader.cjs")).options({
           ...svgrOptions,
           exportType
         }).end();
         if (mixedImport && exportType === "named") {
-          svgRule.use(CHAIN_ID.USE.URL).loader(import_node_path.default.join(__dirname, "../compiled", "url-loader")).options({
+          svgRule.use(CHAIN_ID.USE.URL).loader(path2.join(__dirname, "../compiled", "url-loader/index.js")).options({
             limit: maxSize,
             name: outputName
           });
@@ -129,7 +112,6 @@ var pluginSvgr = (options = {}) => ({
     });
   }
 });
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   pluginSvgr
-});
+};

package/dist/loader.d.ts

@@ -1,6 +1,3 @@
-import { Rspack } from '@rsbuild/core';
-import { Config } from '@svgr/core';
-
 /**
  * Copyright (c) 2017, Smooth Code
  *
@@ -8,7 +5,7 @@ import { Config } from '@svgr/core';
  * LICENSE file in the root directory of this source tree.
  * modified from https://github.com/gregberge/svgr/blob/7595d378b73d4826a4cead165b3f32386b07315b/packages/webpack/src/index.ts
  */
-
+import type { Rspack } from '@rsbuild/core';
+import { type Config } from '@svgr/core';
 declare function svgrLoader(this: Rspack.LoaderContext<Config>, contents: string): void;
-
-export { svgrLoader as default };
+export default svgrLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-svgr",
-  "version": "0.6.14",
+  "version": "0.7.0-beta.0",
   "description": "svgr plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -8,15 +8,15 @@
     "directory": "packages/plugin-svgr"
   },
   "license": "MIT",
-  "type": "commonjs",
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "default": "./dist/index.js"
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
     }
   },
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
@@ -26,8 +26,8 @@
     "@svgr/core": "8.1.0",
     "@svgr/plugin-jsx": "8.1.0",
     "@svgr/plugin-svgo": "8.1.0",
-    "@rsbuild/plugin-react": "0.6.14",
-    "@rsbuild/shared": "0.6.14"
+    "@rsbuild/plugin-react": "0.7.0-beta.0",
+    "@rsbuild/shared": "0.7.0-beta.0"
   },
   "devDependencies": {
     "@types/node": "18.x",
@@ -35,11 +35,11 @@
     "prebundle": "1.1.0",
     "typescript": "^5.4.2",
     "url-loader": "4.1.1",
-    "@rsbuild/core": "0.6.14",
-    "@scripts/test-helper": "0.6.14"
+    "@rsbuild/core": "0.7.0-beta.0",
+    "@scripts/test-helper": "0.7.0-beta.0"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^0.6.14"
+    "@rsbuild/core": "^0.7.0-beta.0"
   },
   "publishConfig": {
     "access": "public",