@rsbuild/plugin-react 0.0.0-next-20240112061202 → 0.0.0-next-20240227022717

package/dist/index.d.ts

@@ -1,8 +1,6 @@
 import { RsbuildPlugin } from '@rsbuild/core';
 import { SwcReactConfig } from '@rsbuild/shared';
 
-declare const isBeyondReact17: (cwd: string) => Promise<any>;
-
 type SplitReactChunkOptions = {
     /**
      * Whether to enable split chunking for React-related dependencies (e.g., react, react-dom, scheduler).
@@ -28,6 +26,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, pluginReact };

package/dist/index.js

@@ -30,80 +30,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  isBeyondReact17: () => isBeyondReact17,
+  PLUGIN_REACT_NAME: () => PLUGIN_REACT_NAME,
   pluginReact: () => pluginReact
 });
 module.exports = __toCommonJS(src_exports);
 
-// src/antd.ts
-var import_shared = require("@rsbuild/shared");
-var getAntdMajorVersion = (appDirectory) => {
-  try {
-    const pkgJsonPath = require.resolve("antd/package.json", {
-      paths: [appDirectory]
-    });
-    const { version } = require(pkgJsonPath);
-    return Number(version.split(".")[0]);
-  } catch (err) {
-    return null;
-  }
-};
-var applyAntdSupport = (api) => {
-  api.modifyRsbuildConfig((rsbuildConfig) => {
-    rsbuildConfig.source ?? (rsbuildConfig.source = {});
-    if (rsbuildConfig.source.transformImport === false || rsbuildConfig.source.transformImport?.some(
-      (item) => item.libraryName === "antd"
-    )) {
-      return;
-    }
-    const antdMajorVersion = getAntdMajorVersion(api.context.rootPath);
-    if (antdMajorVersion && antdMajorVersion < 5) {
-      rsbuildConfig.source ?? (rsbuildConfig.source = {});
-      rsbuildConfig.source.transformImport = [
-        ...rsbuildConfig.source.transformImport || [],
-        {
-          libraryName: "antd",
-          libraryDirectory: (0, import_shared.isServerTarget)(api.context.targets) ? "lib" : "es",
-          style: true
-        }
-      ];
-    }
-  });
-};
-
-// src/arco.ts
-var import_shared2 = require("@rsbuild/shared");
-var applyArcoSupport = (api) => {
-  const ARCO_NAME = "@arco-design/web-react";
-  const ARCO_ICON = `${ARCO_NAME}/icon`;
-  api.modifyRsbuildConfig((rsbuildConfig) => {
-    const { transformImport = [] } = rsbuildConfig.source || {};
-    if (transformImport === false || !(0, import_shared2.isPackageInstalled)(ARCO_NAME, api.context.rootPath)) {
-      return;
-    }
-    const isUseSSR = (0, import_shared2.isServerTarget)(api.context.targets);
-    if (!transformImport?.some((item) => item.libraryName === ARCO_NAME)) {
-      transformImport.push({
-        libraryName: ARCO_NAME,
-        libraryDirectory: isUseSSR ? "lib" : "es",
-        camelToDashComponentName: false,
-        style: true
-      });
-    }
-    if (!transformImport?.some((item) => item.libraryName === ARCO_ICON)) {
-      transformImport.push({
-        libraryName: ARCO_ICON,
-        libraryDirectory: isUseSSR ? "react-icon-cjs" : "react-icon",
-        camelToDashComponentName: false
-      });
-    }
-    rsbuildConfig.source || (rsbuildConfig.source = {});
-    rsbuildConfig.source.transformImport = transformImport;
-  });
-};
-
 // src/splitChunks.ts
-var import_shared3 = require("@rsbuild/shared");
+var import_shared = require("@rsbuild/shared");
 var applySplitChunksRule = (api, options = {
   react: true,
   router: true
@@ -114,7 +47,7 @@ var applySplitChunksRule = (api, options = {
       return;
     }
     const currentConfig = chain.optimization.splitChunks.values();
-    if (!(0, import_shared3.isPlainObject)(currentConfig)) {
+    if (!(0, import_shared.isPlainObject)(currentConfig)) {
       return;
     }
     const extraGroups = {};
@@ -123,7 +56,7 @@ var applySplitChunksRule = (api, options = {
         "react",
         "react-dom",
         "scheduler",
-        ...(0, import_shared3.isProd)() ? [] : ["react-refresh", /@rspack[\\/]plugin-react-refresh/]
+        ...(0, import_shared.isProd)() ? [] : ["react-refresh", /@rspack[\\/]plugin-react-refresh/]
       ];
     }
     if (options.router) {
@@ -139,9 +72,10 @@ var applySplitChunksRule = (api, options = {
     }
     chain.optimization.splitChunks({
       ...currentConfig,
+      // @ts-expect-error Rspack and Webpack uses different cacheGroups type
       cacheGroups: {
         ...currentConfig.cacheGroups,
-        ...(0, import_shared3.createCacheGroups)(extraGroups)
+        ...(0, import_shared.createCacheGroups)(extraGroups)
       }
     });
   });
@@ -149,75 +83,53 @@ var applySplitChunksRule = (api, options = {
 
 // src/react.ts
 var import_node_path = __toESM(require("path"));
-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 import_shared2 = require("@rsbuild/shared");
 var applyBasicReactSupport = (api, options) => {
-  api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd: isProd2, target }) => {
+  const REACT_REFRESH_PATH = require.resolve("react-refresh");
+  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 usingHMR = (0, import_shared2.isUsingHMR)(config, { isProd: isProd2, target });
     const reactOptions = {
-      development: !isProd2,
+      development: isDev,
       refresh: usingHMR,
       runtime: "automatic",
       ...options.swcReactOptions
     };
-    (0, import_shared4.modifySwcLoaderOptions)({
+    (0, import_shared2.modifySwcLoaderOptions)({
       chain,
-      modifier: (options2) => {
-        return (0, import_shared4.deepmerge)(options2, {
-          jsc: {
-            transform: {
-              react: reactOptions
-            }
-          }
-        });
+      modifier: (opts) => {
+        var _a;
+        opts.jsc ?? (opts.jsc = {});
+        (_a = opts.jsc).transform ?? (_a.transform = {});
+        opts.jsc.transform.react = {
+          ...opts.jsc.transform.react,
+          ...reactOptions
+        };
+        return opts;
       }
     });
     if (!usingHMR) {
       return;
     }
-    chain.resolve.alias.set("react-refresh", REACT_REFRESH_DIR_PATH);
+    chain.resolve.alias.set("react-refresh", import_node_path.default.dirname(REACT_REFRESH_PATH));
     const { default: ReactRefreshRspackPlugin } = await import("@rspack/plugin-react-refresh");
-    chain.plugin(CHAIN_ID.PLUGIN.REACT_FAST_REFRESH).use(ReactRefreshRspackPlugin);
+    chain.plugin(CHAIN_ID.PLUGIN.REACT_FAST_REFRESH).use(ReactRefreshRspackPlugin, [{ include: [import_shared2.SCRIPT_REGEX] }]);
   });
 };
 
-// src/utils.ts
-var import_fs = __toESM(require("fs"));
-var import_semver = __toESM(require("@rsbuild/shared/semver"));
-var import_shared5 = require("@rsbuild/shared");
-var isBeyondReact17 = async (cwd) => {
-  const pkgPath = await (0, import_shared5.findUp)({ cwd, filename: "package.json" });
-  if (!pkgPath) {
-    return false;
-  }
-  const pkgInfo = JSON.parse(import_fs.default.readFileSync(pkgPath, "utf8"));
-  const deps = {
-    ...pkgInfo.devDependencies,
-    ...pkgInfo.dependencies
-  };
-  if (typeof deps.react !== "string") {
-    return false;
-  }
-  return import_semver.default.satisfies(import_semver.default.minVersion(deps.react), ">=17.0.0");
-};
-
 // 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);
     }
-    applyAntdSupport(api);
-    applyArcoSupport(api);
     applySplitChunksRule(api, options?.splitChunks);
   }
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  isBeyondReact17,
+  PLUGIN_REACT_NAME,
   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,84 +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.47.0_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) => {
-  try {
-    const pkgJsonPath = __require.resolve("antd/package.json", {
-      paths: [appDirectory]
-    });
-    const { version } = __require(pkgJsonPath);
-    return Number(version.split(".")[0]);
-  } catch (err) {
-    return null;
-  }
-};
-var applyAntdSupport = (api) => {
-  api.modifyRsbuildConfig((rsbuildConfig) => {
-    rsbuildConfig.source ?? (rsbuildConfig.source = {});
-    if (rsbuildConfig.source.transformImport === false || rsbuildConfig.source.transformImport?.some(
-      (item) => item.libraryName === "antd"
-    )) {
-      return;
-    }
-    const antdMajorVersion = getAntdMajorVersion(api.context.rootPath);
-    if (antdMajorVersion && antdMajorVersion < 5) {
-      rsbuildConfig.source ?? (rsbuildConfig.source = {});
-      rsbuildConfig.source.transformImport = [
-        ...rsbuildConfig.source.transformImport || [],
-        {
-          libraryName: "antd",
-          libraryDirectory: isServerTarget(api.context.targets) ? "lib" : "es",
-          style: true
-        }
-      ];
-    }
-  });
-};
-
-// src/arco.ts
-import {
-  isServerTarget as isServerTarget2,
-  isPackageInstalled
-} from "@rsbuild/shared";
-var applyArcoSupport = (api) => {
-  const ARCO_NAME = "@arco-design/web-react";
-  const ARCO_ICON = `${ARCO_NAME}/icon`;
-  api.modifyRsbuildConfig((rsbuildConfig) => {
-    const { transformImport = [] } = rsbuildConfig.source || {};
-    if (transformImport === false || !isPackageInstalled(ARCO_NAME, api.context.rootPath)) {
-      return;
-    }
-    const isUseSSR = isServerTarget2(api.context.targets);
-    if (!transformImport?.some((item) => item.libraryName === ARCO_NAME)) {
-      transformImport.push({
-        libraryName: ARCO_NAME,
-        libraryDirectory: isUseSSR ? "lib" : "es",
-        camelToDashComponentName: false,
-        style: true
-      });
-    }
-    if (!transformImport?.some((item) => item.libraryName === ARCO_ICON)) {
-      transformImport.push({
-        libraryName: ARCO_ICON,
-        libraryDirectory: isUseSSR ? "react-icon-cjs" : "react-icon",
-        camelToDashComponentName: false
-      });
-    }
-    rsbuildConfig.source || (rsbuildConfig.source = {});
-    rsbuildConfig.source.transformImport = transformImport;
-  });
-};
-
 // src/splitChunks.ts
 import {
   isProd,
@@ -125,6 +54,7 @@ var applySplitChunksRule = (api, options = {
     }
     chain.optimization.splitChunks({
       ...currentConfig,
+      // @ts-expect-error Rspack and Webpack uses different cacheGroups type
       cacheGroups: {
         ...currentConfig.cacheGroups,
         ...createCacheGroups(extraGroups)
@@ -136,77 +66,55 @@ var applySplitChunksRule = (api, options = {
 // src/react.ts
 import path2 from "path";
 import {
-  deepmerge,
   isUsingHMR,
+  SCRIPT_REGEX,
   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 REACT_REFRESH_PATH = __require.resolve("react-refresh");
+  api.modifyBundlerChain(async (chain, { CHAIN_ID, isDev, isProd: isProd2, target }) => {
     const config = api.getNormalizedConfig();
     const usingHMR = isUsingHMR(config, { isProd: isProd2, target });
     const reactOptions = {
-      development: !isProd2,
+      development: isDev,
       refresh: usingHMR,
       runtime: "automatic",
       ...options.swcReactOptions
     };
     modifySwcLoaderOptions({
       chain,
-      modifier: (options2) => {
-        return deepmerge(options2, {
-          jsc: {
-            transform: {
-              react: reactOptions
-            }
-          }
-        });
+      modifier: (opts) => {
+        var _a;
+        opts.jsc ?? (opts.jsc = {});
+        (_a = opts.jsc).transform ?? (_a.transform = {});
+        opts.jsc.transform.react = {
+          ...opts.jsc.transform.react,
+          ...reactOptions
+        };
+        return opts;
       }
     });
     if (!usingHMR) {
       return;
     }
-    chain.resolve.alias.set("react-refresh", REACT_REFRESH_DIR_PATH);
+    chain.resolve.alias.set("react-refresh", path2.dirname(REACT_REFRESH_PATH));
     const { default: ReactRefreshRspackPlugin } = await import("@rspack/plugin-react-refresh");
-    chain.plugin(CHAIN_ID.PLUGIN.REACT_FAST_REFRESH).use(ReactRefreshRspackPlugin);
+    chain.plugin(CHAIN_ID.PLUGIN.REACT_FAST_REFRESH).use(ReactRefreshRspackPlugin, [{ include: [SCRIPT_REGEX] }]);
   });
 };
 
-// src/utils.ts
-import fs from "fs";
-import semver from "@rsbuild/shared/semver";
-import { findUp } from "@rsbuild/shared";
-var isBeyondReact17 = async (cwd) => {
-  const pkgPath = await findUp({ cwd, filename: "package.json" });
-  if (!pkgPath) {
-    return false;
-  }
-  const pkgInfo = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-  const deps = {
-    ...pkgInfo.devDependencies,
-    ...pkgInfo.dependencies
-  };
-  if (typeof deps.react !== "string") {
-    return false;
-  }
-  return semver.satisfies(semver.minVersion(deps.react), ">=17.0.0");
-};
-
 // 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);
     }
-    applyAntdSupport(api);
-    applyArcoSupport(api);
     applySplitChunksRule(api, options?.splitChunks);
   }
 });
 export {
-  isBeyondReact17,
+  PLUGIN_REACT_NAME,
   pluginReact
 };

package/package.json

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