@rsbuild/plugin-babel 0.7.1 → 0.7.3

package/compiled/babel-loader/index.js

@@ -1,7 +1,7 @@
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 477:
+/***/ 258:
 /***/ ((module) => {
 
 const STRIP_FILENAME_RE = /^[^:]+: /;
@@ -36,7 +36,7 @@ module.exports = LoaderError;
 
 /***/ }),
 
-/***/ 8:
+/***/ 249:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 /**
@@ -61,7 +61,7 @@ const {
   mkdir
 } = __nccwpck_require__(292);
 const findCacheDirP = __nccwpck_require__.e(/* import() */ 672).then(__nccwpck_require__.bind(__nccwpck_require__, 672));
-const transform = __nccwpck_require__(183);
+const transform = __nccwpck_require__(418);
 // Lazily instantiated when needed
 let defaultCacheDirectory = null;
 let hashType = "sha256";
@@ -220,7 +220,7 @@ module.exports = async function (params) {
 
 /***/ }),
 
-/***/ 482:
+/***/ 802:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 let babel;
@@ -241,10 +241,10 @@ if (/^6\./.test(babel.version)) {
 const {
   version
 } = __nccwpck_require__(684);
-const cache = __nccwpck_require__(8);
-const transform = __nccwpck_require__(183);
-const injectCaller = __nccwpck_require__(713);
-const schema = __nccwpck_require__(441);
+const cache = __nccwpck_require__(249);
+const transform = __nccwpck_require__(418);
+const injectCaller = __nccwpck_require__(747);
+const schema = __nccwpck_require__(50);
 const {
   isAbsolute
 } = __nccwpck_require__(17);
@@ -404,7 +404,7 @@ async function loader(source, inputSourceMap, overrides) {
 
 /***/ }),
 
-/***/ 713:
+/***/ 747:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const babel = __nccwpck_require__(718);
@@ -451,14 +451,14 @@ function supportsCallerOption() {
 
 /***/ }),
 
-/***/ 183:
+/***/ 418:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const babel = __nccwpck_require__(718);
 const {
   promisify
 } = __nccwpck_require__(837);
-const LoaderError = __nccwpck_require__(477);
+const LoaderError = __nccwpck_require__(258);
 const transform = promisify(babel.transform);
 module.exports = async function (source, options) {
   let result;
@@ -603,7 +603,7 @@ module.exports = require("zlib");
 
 /***/ }),
 
-/***/ 441:
+/***/ 50:
 /***/ ((module) => {
 
 "use strict";
@@ -748,7 +748,7 @@ module.exports = JSON.parse('{"type":"object","properties":{"cacheDirectory":{"o
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module is referenced by other modules so it can't be inlined
-/******/ 	var __webpack_exports__ = __nccwpck_require__(482);
+/******/ 	var __webpack_exports__ = __nccwpck_require__(802);
 /******/ 	module.exports = __webpack_exports__;
 /******/ 	
 /******/ })()

package/dist/index.cjs

@@ -141,10 +141,10 @@ var applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) =>
       ...getBabelUtils(defaultOptions),
       ...extraBabelUtils
     };
-    return (0, import_shared.mergeChainedOptions)({
-      defaults: defaultOptions,
-      options: userBabelConfig,
-      utils: babelUtils
+    return (0, import_shared.reduceConfigsWithContext)({
+      initial: defaultOptions,
+      config: userBabelConfig,
+      ctx: babelUtils
     });
   }
   return defaultOptions;
@@ -256,7 +256,7 @@ var pluginBabel = (options = {}) => ({
         );
         const { include, exclude } = options;
         if (include || exclude) {
-          const rule = chain.module.rule(BABEL_JS_RULE);
+          const rule = chain.module.rule(BABEL_JS_RULE).after(CHAIN_ID.RULE.JS);
           if (include) {
             for (const condition of (0, import_shared2.castArray)(include)) {
               rule.include.add(condition);
@@ -267,10 +267,7 @@ var pluginBabel = (options = {}) => ({
               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);
+          rule.test(import_shared2.SCRIPT_REGEX).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);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ChainedConfigWithUtils, NormalizedConfig, RsbuildContext, RsbuildPlugin, BundlerChain, ChainIdentifier } from '@rsbuild/core';
+import { ConfigChainWithContext, NormalizedConfig, RsbuildContext, RsbuildPlugin, BundlerChain, ChainIdentifier } from '@rsbuild/core';
 import { PluginItem, TransformOptions } from '@babel/core';
 export { TransformOptions as BabelTransformOptions } from '@babel/core';
 
@@ -94,7 +94,7 @@ type PluginBabelOptions = {
      * Options passed to `babel-loader`.
      * @see https://github.com/babel/babel-loader
      */
-    babelLoaderOptions?: ChainedConfigWithUtils<BabelLoaderOptions, BabelConfigUtils>;
+    babelLoaderOptions?: ConfigChainWithContext<BabelLoaderOptions, BabelConfigUtils>;
 };
 
 declare const getDefaultBabelOptions: (config: NormalizedConfig, context: RsbuildContext) => BabelLoaderOptions;

package/dist/index.js

@@ -9,7 +9,7 @@ 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.50.0_eslint@9.3.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
+// ../../node_modules/.pnpm/@modern-js+module-tools@2.51.0_eslint@9.4.0_typescript@5.4.5/node_modules/@modern-js/module-tools/shims/esm.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);
@@ -29,7 +29,7 @@ import {
 
 // src/helper.ts
 import { isAbsolute, normalize, sep } from "path";
-import { castArray, mergeChainedOptions } from "@rsbuild/shared";
+import { castArray, reduceConfigsWithContext } 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()}`);
@@ -126,10 +126,10 @@ var applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) =>
       ...getBabelUtils(defaultOptions),
       ...extraBabelUtils
     };
-    return mergeChainedOptions({
-      defaults: defaultOptions,
-      options: userBabelConfig,
-      utils: babelUtils
+    return reduceConfigsWithContext({
+      initial: defaultOptions,
+      config: userBabelConfig,
+      ctx: babelUtils
     });
   }
   return defaultOptions;
@@ -241,7 +241,7 @@ var pluginBabel = (options = {}) => ({
         );
         const { include, exclude } = options;
         if (include || exclude) {
-          const rule = chain.module.rule(BABEL_JS_RULE);
+          const rule = chain.module.rule(BABEL_JS_RULE).after(CHAIN_ID.RULE.JS);
           if (include) {
             for (const condition of castArray2(include)) {
               rule.include.add(condition);
@@ -252,10 +252,7 @@ var pluginBabel = (options = {}) => ({
               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);
+          rule.test(SCRIPT_REGEX).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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-babel",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Babel plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -23,24 +23,24 @@
     "compiled"
   ],
   "dependencies": {
-    "@babel/core": "^7.24.5",
-    "@babel/plugin-proposal-decorators": "^7.24.1",
-    "@babel/plugin-transform-class-properties": "^7.24.1",
-    "@babel/preset-typescript": "^7.24.1",
+    "@babel/core": "^7.24.6",
+    "@babel/plugin-proposal-decorators": "^7.24.6",
+    "@babel/plugin-transform-class-properties": "^7.24.6",
+    "@babel/preset-typescript": "^7.24.6",
     "@types/babel__core": "^7.20.5",
     "upath": "2.0.1",
-    "@rsbuild/shared": "0.7.1"
+    "@rsbuild/shared": "0.7.3"
   },
   "devDependencies": {
     "@types/node": "18.x",
     "babel-loader": "9.1.3",
     "prebundle": "1.1.0",
     "typescript": "^5.4.2",
-    "@rsbuild/core": "0.7.1",
-    "@scripts/test-helper": "0.7.1"
+    "@rsbuild/core": "0.7.3",
+    "@scripts/test-helper": "0.7.3"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^0.7.1"
+    "@rsbuild/core": "^0.7.3"
   },
   "publishConfig": {
     "access": "public",