@modern-js/rsbuild-plugin-esbuild 2.54.6 → 2.56.0

package/dist/index.js

@@ -32,14 +32,56 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_path = __toESM(require("path"));
-var import_shared = require("@rsbuild/shared");
+const JS_REGEX = /\.(?:js|mjs|cjs|jsx)$/;
 const TS_REGEX = /\.(?:ts|mts|cts|tsx)$/;
+const NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/;
+const castArray = (arr) => {
+  if (arr === void 0) {
+    return [];
+  }
+  return Array.isArray(arr) ? arr : [
+    arr
+  ];
+};
+function applyScriptCondition({ rule, chain, config, context, includes, excludes }) {
+  rule.include.add({
+    and: [
+      context.rootPath,
+      {
+        not: NODE_MODULES_REGEX
+      }
+    ]
+  });
+  rule.include.add(/\.(?:ts|tsx|jsx|mts|cts)$/);
+  const target = castArray(chain.get("target"));
+  const legacyTarget = [
+    "es5",
+    "es6",
+    "es2015",
+    "es2016"
+  ];
+  if (legacyTarget.some((item) => target.includes(item))) {
+    rule.include.add(/[\\/]@rsbuild[\\/]core[\\/]dist[\\/]/);
+  }
+  for (const condition of [
+    ...includes,
+    ...config.source.include || []
+  ]) {
+    rule.include.add(condition);
+  }
+  for (const condition of [
+    ...excludes,
+    ...config.source.exclude || []
+  ]) {
+    rule.exclude.add(condition);
+  }
+}
 function pluginEsbuild(userOptions = {}) {
   return {
     name: "modernjs:esbuild",
     setup(api) {
-      api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd, target }) => {
-        const rsbuildConfig = api.getNormalizedConfig();
+      api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd, target, environment }) => {
+        const rsbuildConfig = environment.config;
         const esbuildLoaderPath = import_path.default.join(__dirname, "../compiled/esbuild-loader/index.js");
         const options = {
           loader: {
@@ -56,7 +98,7 @@ function pluginEsbuild(userOptions = {}) {
         if (options.loader !== false) {
           chain.module.rule(CHAIN_ID.RULE.JS).uses.delete(CHAIN_ID.USE.BABEL);
           chain.module.rule(CHAIN_ID.RULE.TS).uses.delete(CHAIN_ID.USE.BABEL).delete(CHAIN_ID.USE.TS);
-          chain.module.rule(CHAIN_ID.RULE.JS).test(import_shared.JS_REGEX).use("esbuild").loader(esbuildLoaderPath).options({
+          chain.module.rule(CHAIN_ID.RULE.JS).test(JS_REGEX).use("esbuild").loader(esbuildLoaderPath).options({
             loader: "jsx",
             ...options === null || options === void 0 ? void 0 : options.loader
           });
@@ -65,7 +107,7 @@ function pluginEsbuild(userOptions = {}) {
             loader: "tsx",
             ...options === null || options === void 0 ? void 0 : options.loader
           });
-          (0, import_shared.applyScriptCondition)({
+          applyScriptCondition({
             chain,
             rule,
             config: rsbuildConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/rsbuild-plugin-esbuild",
-  "version": "2.54.6",
+  "version": "2.56.0",
   "description": "Esbuild Rsbuild plugin and Modern.js",
   "homepage": "https://modernjs.dev",
   "repository": {
@@ -23,15 +23,14 @@
   ],
   "dependencies": {
     "@swc/helpers": "0.5.3",
-    "@rsbuild/shared": "0.7.10",
     "esbuild": "0.17.19",
-    "webpack": "^5.92.0"
+    "webpack": "^5.93.0"
   },
   "devDependencies": {
-    "@rsbuild/core": "0.7.10",
-    "@rsbuild/webpack": "0.7.10",
+    "@rsbuild/core": "1.0.1-beta.3",
+    "@rsbuild/webpack": "1.0.1-beta.3",
     "typescript": "^5.4.2",
-    "@scripts/build": "2.54.6"
+    "@scripts/build": "2.56.0"
   },
   "publishConfig": {
     "access": "public",