@rsbuild/plugin-babel 1.1.1 → 1.2.0

package/compiled/babel-loader/index.js

@@ -1,6 +1,6 @@
 (() => {
   var __webpack_modules__ = {
-    297: (module) => {
+    482: (module) => {
       const STRIP_FILENAME_RE = /^[^:]+: /;
       const format = (err) => {
         if (err instanceof SyntaxError) {
@@ -26,7 +26,7 @@
       }
       module.exports = LoaderError;
     },
-    69: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    686: (module, __unused_webpack_exports, __nccwpck_require__) => {
       const os = __nccwpck_require__(857);
       const path = __nccwpck_require__(928);
       const zlib = __nccwpck_require__(106);
@@ -34,8 +34,8 @@
       const { readFile, writeFile, mkdir } = __nccwpck_require__(943);
       const { sync: findUpSync } = __nccwpck_require__(48);
       const { env } = process;
-      const transform = __nccwpck_require__(499);
-      const serialize = __nccwpck_require__(641);
+      const transform = __nccwpck_require__(816);
+      const serialize = __nccwpck_require__(946);
       let defaultCacheDirectory = null;
       const gunzip = promisify(zlib.gunzip);
       const gzip = promisify(zlib.gzip);
@@ -129,6 +129,10 @@
         }
         logger.debug(`applying Babel transform`);
         const result = await transform(source, options);
+        if (!result) {
+          logger.debug(`no result from Babel transform, skipping cache write`);
+          return null;
+        }
         await addTimestamps(result.externalDependencies, getFileTimestamp);
         try {
           logger.debug(`writing result to cache file '${file}'`);
@@ -141,7 +145,7 @@
         }
         return result;
       };
-      module.exports = async function (params) {
+      module.exports = async function cache(params) {
         let directory;
         if (typeof params.cacheDirectory === "string") {
           directory = params.cacheDirectory;
@@ -158,14 +162,19 @@
         ) {
           return path.join(env.CACHE_DIR, name);
         }
-        const rootPkgJSONPath = path.dirname(findUpSync("package.json"));
+        const rootPkgJSONPath = findUpSync("package.json");
         if (rootPkgJSONPath) {
-          return path.join(rootPkgJSONPath, "node_modules", ".cache", name);
+          return path.join(
+            path.dirname(rootPkgJSONPath),
+            "node_modules",
+            ".cache",
+            name,
+          );
         }
         return os.tmpdir();
       }
     },
-    523: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    688: (module, __unused_webpack_exports, __nccwpck_require__) => {
       let babel;
       try {
         babel = __nccwpck_require__(571);
@@ -184,10 +193,10 @@
         );
       }
       const { version } = __nccwpck_require__(344);
-      const cache = __nccwpck_require__(69);
-      const transform = __nccwpck_require__(499);
-      const injectCaller = __nccwpck_require__(257);
-      const schema = __nccwpck_require__(652);
+      const cache = __nccwpck_require__(686);
+      const transform = __nccwpck_require__(816);
+      const injectCaller = __nccwpck_require__(515);
+      const schema = __nccwpck_require__(919);
       const { isAbsolute } = __nccwpck_require__(928);
       const { promisify } = __nccwpck_require__(23);
       function subscribe(subscriber, metadata, context) {
@@ -199,13 +208,14 @@
       module.exports.custom = makeLoader;
       function makeLoader(callback) {
         const overrides = callback ? callback(babel) : undefined;
-        return function (source, inputSourceMap) {
+        const webpackLoader = function (source, inputSourceMap) {
           const callback = this.async();
           loader.call(this, source, inputSourceMap, overrides).then(
             (args) => callback(null, ...args),
             (err) => callback(err),
           );
         };
+        return webpackLoader;
       }
       async function loader(source, inputSourceMap, overrides) {
         const filename = this.resourcePath;
@@ -373,9 +383,10 @@
         return [source, inputSourceMap];
       }
     },
-    257: (module) => {
+    515: (module) => {
       module.exports = function injectCaller(opts, target) {
-        return Object.assign({}, opts, {
+        return {
+          ...opts,
           caller: Object.assign(
             {
               name: "babel-loader",
@@ -386,10 +397,10 @@
             },
             opts.caller,
           ),
-        });
+        };
       };
     },
-    641: (module) => {
+    946: (module) => {
       var objToString = Object.prototype.toString;
       var objKeys = Object.getOwnPropertyNames;
       function serialize(val, isArrayProp) {
@@ -455,15 +466,15 @@
         }
       };
     },
-    499: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    816: (module, __unused_webpack_exports, __nccwpck_require__) => {
       const babel = __nccwpck_require__(571);
       const { promisify } = __nccwpck_require__(23);
-      const LoaderError = __nccwpck_require__(297);
-      const transform = promisify(babel.transform);
-      module.exports = async function (source, options) {
+      const LoaderError = __nccwpck_require__(482);
+      const babelTransform = babel.transformAsync ?? promisify(babel.transform);
+      module.exports = async function transform(source, options) {
         let result;
         try {
-          result = await transform(source, options);
+          result = await babelTransform(source, options);
         } catch (err) {
           throw err.message && err.codeFrame ? new LoaderError(err) : err;
         }
@@ -809,7 +820,7 @@
       "use strict";
       module.exports = require("zlib");
     },
-    652: (module) => {
+    919: (module) => {
       "use strict";
       module.exports = JSON.parse(
         '{"title":"Babel Loader options","type":"object","properties":{"cacheDirectory":{"anyOf":[{"type":"boolean"},{"type":"string"}],"default":false},"cacheIdentifier":{"type":"string"},"cacheCompression":{"type":"boolean","default":true},"customize":{"anyOf":[{"type":"null"},{"type":"string"}],"default":null},"metadataSubscribers":{"type":"array"}},"additionalProperties":true}',
@@ -838,6 +849,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(523);
+  var __webpack_exports__ = __nccwpck_require__(688);
   module.exports = __webpack_exports__;
 })();

package/compiled/babel-loader/package.json

@@ -1 +1 @@
-{"name":"babel-loader","author":"Luis Couto <hello@luiscouto.pt>","version":"10.0.0","license":"MIT","types":"index.d.ts","type":"commonjs"}
+{"name":"babel-loader","author":"Luis Couto <hello@luiscouto.pt>","version":"10.1.1","license":"MIT","types":"index.d.ts","type":"commonjs"}

package/dist/helper.d.ts

@@ -1,9 +1,10 @@
 import type { ChainIdentifier, RspackChain } from '@rsbuild/core';
 import type { BabelConfigUtils, BabelLoaderOptions, BabelTransformOptions, PluginBabelOptions } from './types.js';
 export declare const BABEL_JS_RULE = "babel-js";
+export declare const getBabelRuleId: (chain: RspackChain) => string;
 export declare const castArray: <T>(arr?: T | T[]) => T[];
 export declare const getBabelUtils: (config: BabelTransformOptions) => BabelConfigUtils;
-export declare const applyUserBabelConfig: (defaultOptions: BabelLoaderOptions, userBabelConfig?: PluginBabelOptions["babelLoaderOptions"], extraBabelUtils?: Partial<BabelConfigUtils>) => BabelLoaderOptions;
+export declare const applyUserBabelConfig: (defaultOptions: BabelLoaderOptions, userBabelConfig?: PluginBabelOptions['babelLoaderOptions'], extraBabelUtils?: Partial<BabelConfigUtils>) => BabelLoaderOptions;
 export declare const modifyBabelLoaderOptions: ({ chain, CHAIN_ID, modifier, }: {
     chain: RspackChain;
     CHAIN_ID: ChainIdentifier;

package/dist/index.cjs

@@ -20,15 +20,19 @@ __webpack_require__.n = (module)=>{
 };
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__), __webpack_require__.d(__webpack_exports__, {
-    getDefaultBabelOptions: ()=>getDefaultBabelOptions,
+    PLUGIN_BABEL_NAME: ()=>PLUGIN_BABEL_NAME,
     getBabelUtils: ()=>getBabelUtils,
+    getDefaultBabelOptions: ()=>getDefaultBabelOptions,
     modifyBabelLoaderOptions: ()=>modifyBabelLoaderOptions,
-    PLUGIN_BABEL_NAME: ()=>PLUGIN_BABEL_NAME,
     pluginBabel: ()=>pluginBabel
 });
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = __webpack_require__.n(external_node_path_namespaceObject);
-const external_reduce_configs_namespaceObject = require("reduce-configs"), BABEL_JS_RULE = 'babel-js', castArray = (arr)=>void 0 === arr ? [] : Array.isArray(arr) ? arr : [
+const external_reduce_configs_namespaceObject = require("reduce-configs"), BABEL_JS_RULE = 'babel-js', BABEL_JS_RULE_REGEXP = /^babel-js(?:-\d+)?$/, getBabelRuleId = (chain)=>{
+    let id = BABEL_JS_RULE, index = 0;
+    for(; chain.module.rules.has(id);)id = `${BABEL_JS_RULE}-${++index}`;
+    return id;
+}, isBabelRuleId = (id)=>BABEL_JS_RULE_REGEXP.test(id), getBabelRules = (chain)=>Object.keys(chain.module.rules.entries()).filter(isBabelRuleId).map((id)=>chain.module.rules.get(id)), castArray = (arr)=>void 0 === arr ? [] : Array.isArray(arr) ? arr : [
         arr
     ], normalizeToPosixPath = (p)=>(0, external_node_path_namespaceObject.normalize)(p || '').replace(/\\/g, '/').replace(/^([a-zA-Z]+):/, (_, m)=>`/${m.toLowerCase()}`), formatPath = (originPath)=>(0, external_node_path_namespaceObject.isAbsolute)(originPath) ? originPath.split(external_node_path_namespaceObject.sep).join('/') : originPath, getPluginItemName = (item)=>'string' == typeof item ? formatPath(item) : Array.isArray(item) && 'string' == typeof item[0] ? formatPath(item[0]) : null, addPlugins = (plugins, config)=>{
     config.plugins ? config.plugins.push(...plugins) : config.plugins = plugins;
@@ -99,7 +103,7 @@ const external_reduce_configs_namespaceObject = require("reduce-configs"), BABEL
     for (let rule of [
         chain.module.rules.get(CHAIN_ID.RULE.JS).oneOfs.get(CHAIN_ID.ONE_OF.JS_MAIN),
         chain.module.rules.get(CHAIN_ID.RULE.JS_DATA_URI),
-        chain.module.rules.get(BABEL_JS_RULE)
+        ...getBabelRules(chain)
     ].filter(Boolean))rule.uses.has(CHAIN_ID.USE.BABEL) && rule.use(CHAIN_ID.USE.BABEL).tap(modifier);
 }, external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = __webpack_require__.n(external_node_fs_namespaceObject);
@@ -160,7 +164,7 @@ const pluginBabel = (options = {})=>({
                 handler: async (chain, { CHAIN_ID, environment })=>{
                     let babelOptions = await getBabelOptions(environment), babelLoader = external_node_path_default().resolve(plugin_dirname, '../compiled/babel-loader/index.js'), { include, exclude } = options;
                     if (include || exclude) {
-                        let rule = chain.module.rule(BABEL_JS_RULE).after(CHAIN_ID.RULE.JS);
+                        let rule = chain.module.rule(getBabelRuleId(chain)).after(CHAIN_ID.RULE.JS);
                         if (include) for (let condition of castArray(include))rule.include.add(condition);
                         if (exclude) for (let condition of castArray(exclude))rule.exclude.add(condition);
                         rule.test(SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).loader(babelLoader).options(babelOptions);

package/dist/index.js

@@ -3,7 +3,7 @@ import { reduceConfigsWithContext } from "reduce-configs";
 import node_fs from "node:fs";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
-let BABEL_JS_RULE = 'babel-js', castArray = (arr)=>void 0 === arr ? [] : Array.isArray(arr) ? arr : [
+let BABEL_JS_RULE = 'babel-js', BABEL_JS_RULE_REGEXP = /^babel-js(?:-\d+)?$/, isBabelRuleId = (id)=>BABEL_JS_RULE_REGEXP.test(id), castArray = (arr)=>void 0 === arr ? [] : Array.isArray(arr) ? arr : [
         arr
     ], normalizeToPosixPath = (p)=>normalize(p || '').replace(/\\/g, '/').replace(/^([a-zA-Z]+):/, (_, m)=>`/${m.toLowerCase()}`), formatPath = (originPath)=>isAbsolute(originPath) ? originPath.split(sep).join('/') : originPath, getPluginItemName = (item)=>'string' == typeof item ? formatPath(item) : Array.isArray(item) && 'string' == typeof item[0] ? formatPath(item[0]) : null, modifyPresetOptions = (presetName, options, presets = [])=>{
     presets.forEach((preset, index)=>{
@@ -57,7 +57,7 @@ let BABEL_JS_RULE = 'babel-js', castArray = (arr)=>void 0 === arr ? [] : Array.i
     for (let rule of [
         chain.module.rules.get(CHAIN_ID.RULE.JS).oneOfs.get(CHAIN_ID.ONE_OF.JS_MAIN),
         chain.module.rules.get(CHAIN_ID.RULE.JS_DATA_URI),
-        chain.module.rules.get(BABEL_JS_RULE)
+        ...Object.keys(chain.module.rules.entries()).filter(isBabelRuleId).map((id)=>chain.module.rules.get(id))
     ].filter(Boolean))rule.uses.has(CHAIN_ID.USE.BABEL) && rule.use(CHAIN_ID.USE.BABEL).tap(modifier);
 }, plugin_dirname = node_path.dirname(fileURLToPath(import.meta.url)), plugin_require = createRequire(import.meta.url), PLUGIN_BABEL_NAME = 'rsbuild:babel', SCRIPT_REGEX = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/, DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
     allowNamespaces: !0,
@@ -108,7 +108,7 @@ let pluginBabel = (options = {})=>({
         name: PLUGIN_BABEL_NAME,
         setup (api) {
             let getBabelOptions = async (environment)=>{
-                let { config } = environment, mergedOptions = ((defaultOptions, userBabelConfig, extraBabelUtils)=>{
+                let { config } = environment, mergedOptions = ((defaultOptions, userBabelConfig)=>{
                     if (userBabelConfig) {
                         let babelUtils = {
                             ...getBabelUtils(defaultOptions),
@@ -129,7 +129,11 @@ let pluginBabel = (options = {})=>({
                 handler: async (chain, { CHAIN_ID, environment })=>{
                     let babelOptions = await getBabelOptions(environment), babelLoader = node_path.resolve(plugin_dirname, '../compiled/babel-loader/index.js'), { include, exclude } = options;
                     if (include || exclude) {
-                        let rule = chain.module.rule(BABEL_JS_RULE).after(CHAIN_ID.RULE.JS);
+                        let rule = chain.module.rule(((chain)=>{
+                            let id = BABEL_JS_RULE, index = 0;
+                            for(; chain.module.rules.has(id);)id = `${BABEL_JS_RULE}-${++index}`;
+                            return id;
+                        })(chain)).after(CHAIN_ID.RULE.JS);
                         if (include) for (let condition of castArray(include))rule.include.add(condition);
                         if (exclude) for (let condition of castArray(exclude))rule.exclude.add(condition);
                         rule.test(SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).loader(babelLoader).options(babelOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-babel",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Babel plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -16,7 +16,6 @@
       "require": "./dist/index.cjs"
     }
   },
-  "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
@@ -25,32 +24,36 @@
   "dependencies": {
     "@babel/core": "^7.29.0",
     "@babel/plugin-proposal-decorators": "^7.29.0",
-    "@babel/plugin-transform-class-properties": "^7.28.6",
-    "@babel/preset-typescript": "^7.28.5",
+    "@babel/plugin-transform-class-properties": "^7.29.7",
+    "@babel/preset-typescript": "^7.29.7",
     "@types/babel__core": "^7.20.5",
-    "reduce-configs": "^1.1.1"
+    "reduce-configs": "^1.1.2"
   },
   "devDependencies": {
-    "@rsbuild/core-v1": "npm:@rsbuild/core@^1.7.3",
-    "@rslib/core": "0.19.6",
-    "@types/node": "^24.11.0",
-    "babel-loader": "10.0.0",
-    "prebundle": "1.6.2",
-    "typescript": "^5.9.3",
-    "@rsbuild/core": "2.0.0-beta.6",
-    "@scripts/test-helper": "1.0.1"
+    "@rsbuild/core-v1": "npm:@rsbuild/core@^1.7.5",
+    "@rslib/core": "0.21.5",
+    "@types/node": "^24.12.4",
+    "babel-loader": "10.1.1",
+    "prebundle": "1.6.4",
+    "typescript": "^6.0.3",
+    "@rsbuild/core": "2.0.7",
+    "@scripts/test-helper": "1.0.0"
   },
   "peerDependencies": {
     "@rsbuild/core": "^1.0.0 || ^2.0.0-0"
   },
+  "peerDependenciesMeta": {
+    "@rsbuild/core": {
+      "optional": true
+    }
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "rslib build",
-    "dev": "rslib build -w",
-    "prebundle": "prebundle",
-    "bump": "pnpx bumpp --no-tag"
+    "build": "rslib",
+    "dev": "rslib -w",
+    "prebundle": "prebundle"
   }
 }