@rsbuild/plugin-react 0.3.0 → 0.3.2

package/dist/index.d.ts

@@ -28,6 +28,7 @@ type PluginReactOptions = {
      */
     splitChunks?: SplitReactChunkOptions;
 };
+declare const PLUGIN_REACT_NAME = "rsbuild:react";
 declare const pluginReact: (options?: PluginReactOptions) => RsbuildPlugin;
 
-export { PluginReactOptions, SplitReactChunkOptions, isBeyondReact17, pluginReact };
+export { PLUGIN_REACT_NAME, PluginReactOptions, SplitReactChunkOptions, isBeyondReact17, pluginReact };

package/dist/index.js

@@ -30,10 +30,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  PLUGIN_REACT_NAME: () => PLUGIN_REACT_NAME,
   isBeyondReact17: () => isBeyondReact17,
   pluginReact: () => pluginReact
 });
 module.exports = __toCommonJS(src_exports);
+var import_core = require("@rsbuild/core");
 
 // src/antd.ts
 var import_shared = require("@rsbuild/shared");
@@ -156,27 +158,24 @@ var applyBasicReactSupport = (api, options) => {
   api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd: isProd2, target }) => {
     const config = api.getNormalizedConfig();
     const usingHMR = (0, import_shared4.isUsingHMR)(config, { isProd: isProd2, target });
-    const rule = chain.module.rule(CHAIN_ID.RULE.JS);
     const reactOptions = {
       development: !isProd2,
       refresh: usingHMR,
       runtime: "automatic",
       ...options.swcReactOptions
     };
-    rule.use(CHAIN_ID.USE.SWC).tap((options2) => {
-      options2.jsc.transform.react = {
-        ...reactOptions
-      };
-      return options2;
+    (0, import_shared4.modifySwcLoaderOptions)({
+      chain,
+      modifier: (options2) => {
+        return (0, import_shared4.deepmerge)(options2, {
+          jsc: {
+            transform: {
+              react: reactOptions
+            }
+          }
+        });
+      }
     });
-    if (chain.module.rules.has(CHAIN_ID.RULE.JS_DATA_URI)) {
-      chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).use(CHAIN_ID.USE.SWC).tap((options2) => {
-        options2.jsc.transform.react = {
-          ...reactOptions
-        };
-        return options2;
-      });
-    }
     if (!usingHMR) {
       return;
     }
@@ -207,9 +206,10 @@ var isBeyondReact17 = async (cwd) => {
 };
 
 // src/index.ts
+var PLUGIN_REACT_NAME = "rsbuild:react";
 var pluginReact = (options = {}) => ({
-  name: "rsbuild:react",
-  pre: ["rsbuild:swc"],
+  name: PLUGIN_REACT_NAME,
+  pre: [import_core.PLUGIN_SWC_NAME],
   setup(api) {
     if (api.context.bundlerType === "rspack") {
       applyBasicReactSupport(api, options);
@@ -221,6 +221,7 @@ var pluginReact = (options = {}) => ({
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PLUGIN_REACT_NAME,
   isBeyondReact17,
   pluginReact
 });

package/dist/index.mjs

@@ -14,6 +14,9 @@ import path from "path";
 import { createRequire } from "module";
 global.require = createRequire(import.meta.url);
 
+// src/index.ts
+import { PLUGIN_SWC_NAME } from "@rsbuild/core";
+
 // src/antd.ts
 import { isServerTarget } from "@rsbuild/shared";
 var getAntdMajorVersion = (appDirectory) => {
@@ -135,34 +138,35 @@ var applySplitChunksRule = (api, options = {
 
 // src/react.ts
 import path2 from "path";
-import { isUsingHMR } from "@rsbuild/shared";
+import {
+  deepmerge,
+  isUsingHMR,
+  modifySwcLoaderOptions
+} from "@rsbuild/shared";
 var REACT_REFRESH_PATH = __require.resolve("react-refresh");
 var REACT_REFRESH_DIR_PATH = path2.dirname(REACT_REFRESH_PATH);
 var applyBasicReactSupport = (api, options) => {
   api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd: isProd2, target }) => {
     const config = api.getNormalizedConfig();
     const usingHMR = isUsingHMR(config, { isProd: isProd2, target });
-    const rule = chain.module.rule(CHAIN_ID.RULE.JS);
     const reactOptions = {
       development: !isProd2,
       refresh: usingHMR,
       runtime: "automatic",
       ...options.swcReactOptions
     };
-    rule.use(CHAIN_ID.USE.SWC).tap((options2) => {
-      options2.jsc.transform.react = {
-        ...reactOptions
-      };
-      return options2;
+    modifySwcLoaderOptions({
+      chain,
+      modifier: (options2) => {
+        return deepmerge(options2, {
+          jsc: {
+            transform: {
+              react: reactOptions
+            }
+          }
+        });
+      }
     });
-    if (chain.module.rules.has(CHAIN_ID.RULE.JS_DATA_URI)) {
-      chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).use(CHAIN_ID.USE.SWC).tap((options2) => {
-        options2.jsc.transform.react = {
-          ...reactOptions
-        };
-        return options2;
-      });
-    }
     if (!usingHMR) {
       return;
     }
@@ -193,9 +197,10 @@ var isBeyondReact17 = async (cwd) => {
 };
 
 // src/index.ts
+var PLUGIN_REACT_NAME = "rsbuild:react";
 var pluginReact = (options = {}) => ({
-  name: "rsbuild:react",
-  pre: ["rsbuild:swc"],
+  name: PLUGIN_REACT_NAME,
+  pre: [PLUGIN_SWC_NAME],
   setup(api) {
     if (api.context.bundlerType === "rspack") {
       applyBasicReactSupport(api, options);
@@ -206,6 +211,7 @@ var pluginReact = (options = {}) => ({
   }
 });
 export {
+  PLUGIN_REACT_NAME,
   isBeyondReact17,
   pluginReact
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-react",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "React plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -24,13 +24,13 @@
   "dependencies": {
     "@rspack/plugin-react-refresh": "0.5.0",
     "react-refresh": "^0.14.0",
-    "@rsbuild/shared": "0.3.0"
+    "@rsbuild/shared": "0.3.2"
   },
   "devDependencies": {
     "@types/node": "16.x",
     "typescript": "^5.3.0",
-    "@rsbuild/core": "0.3.0",
-    "@rsbuild/test-helper": "0.3.0"
+    "@rsbuild/core": "0.3.2",
+    "@scripts/test-helper": "1.0.0"
   },
   "publishConfig": {
     "access": "public",