@rsbuild/plugin-babel 0.2.1 → 0.2.3

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { RsbuildPlugin } from '@rsbuild/core';
-import { ChainedConfigWithUtils, NormalizedConfig } from '@rsbuild/shared';
+import { ChainedConfigWithUtils, NormalizedConfig, BundlerChain, ChainIdentifier } from '@rsbuild/shared';
 import { PluginItem, TransformOptions } from '@babel/core';
 export { TransformOptions as BabelTransformOptions } from '@babel/core';
 
@@ -41,6 +41,7 @@ interface ClassicRuntimePresetReactOptions extends SharedBabelPresetReactOptions
     useSpread?: boolean;
 }
 type PresetReactOptions = AutomaticRuntimePresetReactOptions | ClassicRuntimePresetReactOptions;
+type RuleCondition = string | RegExp | (string | RegExp)[];
 type BabelConfigUtils = {
     addPlugins: (plugins: PluginItem[]) => void;
     addPresets: (presets: PluginItem[]) => void;
@@ -52,14 +53,16 @@ type BabelConfigUtils = {
      * use `source.include` instead
      * @deprecated
      */
-    addIncludes: (includes: string | RegExp | (string | RegExp)[]) => void;
+    addIncludes: (includes: RuleCondition) => void;
     /**
      * use `source.exclude` instead
      * @deprecated
      */
-    addExcludes: (excludes: string | RegExp | (string | RegExp)[]) => void;
+    addExcludes: (excludes: RuleCondition) => void;
 };
 type PluginBabelOptions = {
+    include?: RuleCondition;
+    exclude?: RuleCondition;
     babelLoaderOptions?: ChainedConfigWithUtils<TransformOptions, BabelConfigUtils>;
 };
 
@@ -67,5 +70,10 @@ declare const pluginBabel: (options?: PluginBabelOptions) => RsbuildPlugin;
 
 declare const getBabelUtils: (config: TransformOptions) => BabelConfigUtils;
 declare const getUseBuiltIns: (config: NormalizedConfig) => false | "usage" | "entry";
+declare const modifyBabelLoaderOptions: ({ chain, CHAIN_ID, modifier, }: {
+    chain: BundlerChain;
+    CHAIN_ID: ChainIdentifier;
+    modifier: (config: TransformOptions) => TransformOptions;
+}) => void;
 
-export { BabelConfigUtils, PluginBabelOptions, PresetEnvBuiltIns, PresetEnvOptions, PresetEnvTargets, getBabelUtils, getUseBuiltIns, pluginBabel };
+export { BabelConfigUtils, PluginBabelOptions, PresetEnvBuiltIns, PresetEnvOptions, PresetEnvTargets, getBabelUtils, getUseBuiltIns, modifyBabelLoaderOptions, pluginBabel };

package/dist/index.js

@@ -32,6 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   getBabelUtils: () => getBabelUtils,
   getUseBuiltIns: () => getUseBuiltIns,
+  modifyBabelLoaderOptions: () => modifyBabelLoaderOptions,
   pluginBabel: () => pluginBabel
 });
 module.exports = __toCommonJS(src_exports);
@@ -44,6 +45,7 @@ var import_shared2 = require("@rsbuild/shared");
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
 var import_upath = __toESM(require("upath"));
+var BABEL_JS_RULE = "babel-js";
 var normalizeToPosixPath = (p) => import_upath.default.normalizeSafe((0, import_path.normalize)(p || "")).replace(/^([a-zA-Z]+):/, (_, m) => `/${m.toLowerCase()}`);
 var formatPath = (originPath) => {
   if ((0, import_path.isAbsolute)(originPath)) {
@@ -127,7 +129,7 @@ var getBabelUtils = (config) => {
     // It can be overridden by `extraBabelUtils`.
     addIncludes: noop,
     addExcludes: noop,
-    // Compat `presetEnvOptions` and `presetReactOptions` in Eden.
+    // Compat `presetEnvOptions` and `presetReactOptions` in Modern.js
     modifyPresetEnvOptions: (options) => modifyPresetOptions("@babel/preset-env", options, config.presets || []),
     modifyPresetReactOptions: (options) => modifyPresetOptions("@babel/preset-react", options, config.presets || [])
   };
@@ -153,6 +155,21 @@ var getUseBuiltIns = (config) => {
   }
   return polyfill;
 };
+var modifyBabelLoaderOptions = ({
+  chain,
+  CHAIN_ID,
+  modifier
+}) => {
+  const ruleIds = [CHAIN_ID.RULE.JS, CHAIN_ID.RULE.JS_DATA_URI, BABEL_JS_RULE];
+  ruleIds.forEach((ruleId) => {
+    if (chain.module.rules.has(ruleId)) {
+      const rule = chain.module.rule(ruleId);
+      if (rule.uses.has(CHAIN_ID.USE.BABEL)) {
+        rule.use(CHAIN_ID.USE.BABEL).tap(modifier);
+      }
+    }
+  });
+};
 
 // src/plugin.ts
 var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
@@ -169,24 +186,6 @@ var pluginBabel = (options = {}) => ({
   setup(api) {
     api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd }) => {
       const getBabelOptions = () => {
-        const includes2 = [];
-        const excludes2 = [];
-        const babelUtils = {
-          addIncludes(items) {
-            if (Array.isArray(items)) {
-              includes2.push(...items);
-            } else {
-              includes2.push(items);
-            }
-          },
-          addExcludes(items) {
-            if (Array.isArray(items)) {
-              excludes2.push(...items);
-            } else {
-              excludes2.push(items);
-            }
-          }
-        };
         const baseConfig = {
           plugins: [],
           presets: [
@@ -199,30 +198,41 @@ var pluginBabel = (options = {}) => ({
         };
         const userBabelConfig = applyUserBabelConfig(
           (0, import_shared2.cloneDeep)(baseConfig),
-          options.babelLoaderOptions,
-          babelUtils
+          options.babelLoaderOptions
         );
-        const babelOptions2 = {
+        return {
           babelrc: false,
           configFile: false,
           compact: isProd,
           ...userBabelConfig
         };
-        return {
-          babelOptions: babelOptions2,
-          includes: includes2,
-          excludes: excludes2
-        };
       };
-      const { babelOptions, includes = [], excludes = [] } = getBabelOptions();
-      const rule = chain.module.rule(CHAIN_ID.RULE.JS);
-      includes.forEach((condition) => {
-        rule.include.add(condition);
-      });
-      excludes.forEach((condition) => {
-        rule.exclude.add(condition);
-      });
-      rule.test(import_shared2.SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).after(CHAIN_ID.USE.SWC).loader(import_path2.default.resolve(__dirname, "../compiled/babel-loader/index.js")).options(babelOptions);
+      const babelOptions = getBabelOptions();
+      const babelLoader = import_path2.default.resolve(
+        __dirname,
+        "../compiled/babel-loader/index.js"
+      );
+      const { include, exclude } = options;
+      if (include || exclude) {
+        const rule = chain.module.rule(BABEL_JS_RULE);
+        if (include) {
+          (0, import_shared2.castArray)(include).forEach((condition) => {
+            rule.include.add(condition);
+          });
+        }
+        if (exclude) {
+          (0, import_shared2.castArray)(exclude).forEach((condition) => {
+            rule.exclude.add(condition);
+          });
+        }
+        const swcRule = chain.module.rules.get(CHAIN_ID.RULE.JS).use(CHAIN_ID.USE.SWC);
+        const swcLoader = swcRule.get("loader");
+        const swcOptions = swcRule.get("options");
+        rule.test(import_shared2.SCRIPT_REGEX).use(CHAIN_ID.USE.SWC).loader(swcLoader).options(swcOptions).end().use(CHAIN_ID.USE.BABEL).loader(babelLoader).options(babelOptions);
+      } else {
+        const rule = chain.module.rule(CHAIN_ID.RULE.JS);
+        rule.test(import_shared2.SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).after(CHAIN_ID.USE.SWC).loader(babelLoader).options(babelOptions);
+      }
     });
   }
 });
@@ -230,5 +240,6 @@ var pluginBabel = (options = {}) => ({
 0 && (module.exports = {
   getBabelUtils,
   getUseBuiltIns,
+  modifyBabelLoaderOptions,
   pluginBabel
 });

package/dist/index.mjs

@@ -19,7 +19,7 @@ global.require = createRequire(import.meta.url);
 
 // src/plugin.ts
 import path2 from "path";
-import { cloneDeep, SCRIPT_REGEX } from "@rsbuild/shared";
+import { castArray as castArray2, cloneDeep, SCRIPT_REGEX } from "@rsbuild/shared";
 
 // src/helper.ts
 import { isAbsolute, normalize, sep } from "path";
@@ -28,6 +28,7 @@ import {
   mergeChainedOptions
 } from "@rsbuild/shared";
 import upath from "upath";
+var BABEL_JS_RULE = "babel-js";
 var normalizeToPosixPath = (p) => upath.normalizeSafe(normalize(p || "")).replace(/^([a-zA-Z]+):/, (_, m) => `/${m.toLowerCase()}`);
 var formatPath = (originPath) => {
   if (isAbsolute(originPath)) {
@@ -111,7 +112,7 @@ var getBabelUtils = (config) => {
     // It can be overridden by `extraBabelUtils`.
     addIncludes: noop,
     addExcludes: noop,
-    // Compat `presetEnvOptions` and `presetReactOptions` in Eden.
+    // Compat `presetEnvOptions` and `presetReactOptions` in Modern.js
     modifyPresetEnvOptions: (options) => modifyPresetOptions("@babel/preset-env", options, config.presets || []),
     modifyPresetReactOptions: (options) => modifyPresetOptions("@babel/preset-react", options, config.presets || [])
   };
@@ -137,6 +138,21 @@ var getUseBuiltIns = (config) => {
   }
   return polyfill;
 };
+var modifyBabelLoaderOptions = ({
+  chain,
+  CHAIN_ID,
+  modifier
+}) => {
+  const ruleIds = [CHAIN_ID.RULE.JS, CHAIN_ID.RULE.JS_DATA_URI, BABEL_JS_RULE];
+  ruleIds.forEach((ruleId) => {
+    if (chain.module.rules.has(ruleId)) {
+      const rule = chain.module.rule(ruleId);
+      if (rule.uses.has(CHAIN_ID.USE.BABEL)) {
+        rule.use(CHAIN_ID.USE.BABEL).tap(modifier);
+      }
+    }
+  });
+};
 
 // src/plugin.ts
 var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
@@ -153,24 +169,6 @@ var pluginBabel = (options = {}) => ({
   setup(api) {
     api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd }) => {
       const getBabelOptions = () => {
-        const includes2 = [];
-        const excludes2 = [];
-        const babelUtils = {
-          addIncludes(items) {
-            if (Array.isArray(items)) {
-              includes2.push(...items);
-            } else {
-              includes2.push(items);
-            }
-          },
-          addExcludes(items) {
-            if (Array.isArray(items)) {
-              excludes2.push(...items);
-            } else {
-              excludes2.push(items);
-            }
-          }
-        };
         const baseConfig = {
           plugins: [],
           presets: [
@@ -183,35 +181,47 @@ var pluginBabel = (options = {}) => ({
         };
         const userBabelConfig = applyUserBabelConfig(
           cloneDeep(baseConfig),
-          options.babelLoaderOptions,
-          babelUtils
+          options.babelLoaderOptions
         );
-        const babelOptions2 = {
+        return {
           babelrc: false,
           configFile: false,
           compact: isProd,
           ...userBabelConfig
         };
-        return {
-          babelOptions: babelOptions2,
-          includes: includes2,
-          excludes: excludes2
-        };
       };
-      const { babelOptions, includes = [], excludes = [] } = getBabelOptions();
-      const rule = chain.module.rule(CHAIN_ID.RULE.JS);
-      includes.forEach((condition) => {
-        rule.include.add(condition);
-      });
-      excludes.forEach((condition) => {
-        rule.exclude.add(condition);
-      });
-      rule.test(SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).after(CHAIN_ID.USE.SWC).loader(path2.resolve(__dirname, "../compiled/babel-loader/index.js")).options(babelOptions);
+      const babelOptions = getBabelOptions();
+      const babelLoader = path2.resolve(
+        __dirname,
+        "../compiled/babel-loader/index.js"
+      );
+      const { include, exclude } = options;
+      if (include || exclude) {
+        const rule = chain.module.rule(BABEL_JS_RULE);
+        if (include) {
+          castArray2(include).forEach((condition) => {
+            rule.include.add(condition);
+          });
+        }
+        if (exclude) {
+          castArray2(exclude).forEach((condition) => {
+            rule.exclude.add(condition);
+          });
+        }
+        const swcRule = chain.module.rules.get(CHAIN_ID.RULE.JS).use(CHAIN_ID.USE.SWC);
+        const swcLoader = swcRule.get("loader");
+        const swcOptions = swcRule.get("options");
+        rule.test(SCRIPT_REGEX).use(CHAIN_ID.USE.SWC).loader(swcLoader).options(swcOptions).end().use(CHAIN_ID.USE.BABEL).loader(babelLoader).options(babelOptions);
+      } else {
+        const rule = chain.module.rule(CHAIN_ID.RULE.JS);
+        rule.test(SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).after(CHAIN_ID.USE.SWC).loader(babelLoader).options(babelOptions);
+      }
     });
   }
 });
 export {
   getBabelUtils,
   getUseBuiltIns,
+  modifyBabelLoaderOptions,
   pluginBabel
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-babel",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Babel plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -27,13 +27,13 @@
     "@babel/preset-typescript": "^7.23.2",
     "@types/babel__core": "^7.20.3",
     "upath": "2.0.1",
-    "@rsbuild/shared": "0.2.1"
+    "@rsbuild/shared": "0.2.3"
   },
   "devDependencies": {
     "@types/node": "16.x",
     "typescript": "^5.3.0",
-    "@rsbuild/test-helper": "0.2.1",
-    "@rsbuild/core": "0.2.1"
+    "@rsbuild/core": "0.2.3",
+    "@rsbuild/test-helper": "0.2.3"
   },
   "publishConfig": {
     "access": "public",