@rsbuild/plugin-react 0.0.0-next-20240109105933 → 0.0.0-next-20240131063127

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, type PluginReactOptions, type SplitReactChunkOptions, isBeyondReact17, pluginReact };

package/dist/index.js

@@ -30,6 +30,7 @@ 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
 });
@@ -153,30 +154,27 @@ var import_shared4 = require("@rsbuild/shared");
 var REACT_REFRESH_PATH = require.resolve("react-refresh");
 var REACT_REFRESH_DIR_PATH = import_node_path.default.dirname(REACT_REFRESH_PATH);
 var applyBasicReactSupport = (api, options) => {
-  api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd: isProd2, target }) => {
+  api.modifyBundlerChain(async (chain, { CHAIN_ID, isDev, 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,
+      development: isDev,
       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;
     }
@@ -187,7 +185,7 @@ var applyBasicReactSupport = (api, options) => {
 };
 
 // src/utils.ts
-var import_fs = __toESM(require("fs"));
+var import_node_fs = __toESM(require("fs"));
 var import_semver = __toESM(require("@rsbuild/shared/semver"));
 var import_shared5 = require("@rsbuild/shared");
 var isBeyondReact17 = async (cwd) => {
@@ -195,7 +193,7 @@ var isBeyondReact17 = async (cwd) => {
   if (!pkgPath) {
     return false;
   }
-  const pkgInfo = JSON.parse(import_fs.default.readFileSync(pkgPath, "utf8"));
+  const pkgInfo = JSON.parse(import_node_fs.default.readFileSync(pkgPath, "utf8"));
   const deps = {
     ...pkgInfo.devDependencies,
     ...pkgInfo.dependencies
@@ -207,9 +205,9 @@ 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,
   setup(api) {
     if (api.context.bundlerType === "rspack") {
       applyBasicReactSupport(api, options);
@@ -221,6 +219,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

@@ -1,3 +1,6 @@
+import { createRequire } from 'module';
+var require = createRequire(import.meta['url']);
+
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -6,14 +9,10 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.45.0_typescript@5.3.2/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.46.1_typescript@5.3.2/node_modules/@modern-js/module-tools/shims/esm.js
 import { fileURLToPath } from "url";
 import path from "path";
 
-// ../../scripts/requireShims.js
-import { createRequire } from "module";
-global.require = createRequire(import.meta.url);
-
 // src/antd.ts
 import { isServerTarget } from "@rsbuild/shared";
 var getAntdMajorVersion = (appDirectory) => {
@@ -135,34 +134,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 }) => {
+  api.modifyBundlerChain(async (chain, { CHAIN_ID, isDev, 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,
+      development: isDev,
       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 +193,9 @@ 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,
   setup(api) {
     if (api.context.bundlerType === "rspack") {
       applyBasicReactSupport(api, options);
@@ -206,6 +206,7 @@ var pluginReact = (options = {}) => ({
   }
 });
 export {
+  PLUGIN_REACT_NAME,
   isBeyondReact17,
   pluginReact
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-react",
-  "version": "0.0.0-next-20240109105933",
+  "version": "0.0.0-next-20240131063127",
   "description": "React plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -22,15 +22,18 @@
     "dist"
   ],
   "dependencies": {
-    "@rspack/plugin-react-refresh": "0.4.5-canary-be59383-20240105051840",
+    "@rspack/plugin-react-refresh": "0.5.3",
     "react-refresh": "^0.14.0",
-    "@rsbuild/shared": "0.0.0-next-20240109105933"
+    "@rsbuild/shared": "0.0.0-next-20240131063127"
   },
   "devDependencies": {
     "@types/node": "16.x",
     "typescript": "^5.3.0",
-    "@rsbuild/core": "0.0.0-next-20240109105933",
-    "@rsbuild/test-helper": "0.0.0-next-20240109105933"
+    "@rsbuild/core": "0.0.0-next-20240131063127",
+    "@scripts/test-helper": "0.0.0-next-20240131063127"
+  },
+  "peerDependencies": {
+    "@rsbuild/core": "0.0.0-next-20240131063127"
   },
   "publishConfig": {
     "access": "public",