@rsbuild/plugin-babel 1.1.0 → 1.1.2

package/compiled/babel-loader/index.js

@@ -1,6 +1,6 @@
 (() => {
   var __webpack_modules__ = {
-    605: (module) => {
+    718: (module) => {
       const STRIP_FILENAME_RE = /^[^:]+: /;
       const format = (err) => {
         if (err instanceof SyntaxError) {
@@ -26,7 +26,8 @@
       }
       module.exports = LoaderError;
     },
-    329: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    818: (module, __unused_webpack_exports, __nccwpck_require__) => {
+      const nodeModule = __nccwpck_require__(995);
       const os = __nccwpck_require__(857);
       const path = __nccwpck_require__(928);
       const zlib = __nccwpck_require__(106);
@@ -34,11 +35,18 @@
       const { readFile, writeFile, mkdir } = __nccwpck_require__(943);
       const { sync: findUpSync } = __nccwpck_require__(48);
       const { env } = process;
-      const transform = __nccwpck_require__(703);
-      const serialize = __nccwpck_require__(725);
+      const transform = __nccwpck_require__(180);
+      const serialize = __nccwpck_require__(790);
       let defaultCacheDirectory = null;
       const gunzip = promisify(zlib.gunzip);
       const gzip = promisify(zlib.gzip);
+      const findRootPackageJSON = () => {
+        if (nodeModule.findPackageJSON) {
+          return nodeModule.findPackageJSON("..", __filename);
+        } else {
+          return findUpSync("package.json");
+        }
+      };
       const read = async function (filename, compress) {
         const data = await readFile(filename + (compress ? ".gz" : ""));
         const content = compress ? await gunzip(data) : data;
@@ -129,6 +137,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 +153,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 +170,19 @@
         ) {
           return path.join(env.CACHE_DIR, name);
         }
-        const rootPkgJSONPath = path.dirname(findUpSync("package.json"));
+        const rootPkgJSONPath = findRootPackageJSON();
         if (rootPkgJSONPath) {
-          return path.join(rootPkgJSONPath, "node_modules", ".cache", name);
+          return path.join(
+            path.dirname(rootPkgJSONPath),
+            "node_modules",
+            ".cache",
+            name,
+          );
         }
         return os.tmpdir();
       }
     },
-    799: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    556: (module, __unused_webpack_exports, __nccwpck_require__) => {
       let babel;
       try {
         babel = __nccwpck_require__(571);
@@ -184,10 +201,10 @@
         );
       }
       const { version } = __nccwpck_require__(344);
-      const cache = __nccwpck_require__(329);
-      const transform = __nccwpck_require__(703);
-      const injectCaller = __nccwpck_require__(714);
-      const schema = __nccwpck_require__(280);
+      const cache = __nccwpck_require__(818);
+      const transform = __nccwpck_require__(180);
+      const injectCaller = __nccwpck_require__(516);
+      const schema = __nccwpck_require__(625);
       const { isAbsolute } = __nccwpck_require__(928);
       const { promisify } = __nccwpck_require__(23);
       function subscribe(subscriber, metadata, context) {
@@ -199,13 +216,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 +391,10 @@
         return [source, inputSourceMap];
       }
     },
-    714: (module) => {
+    516: (module) => {
       module.exports = function injectCaller(opts, target) {
-        return Object.assign({}, opts, {
+        return {
+          ...opts,
           caller: Object.assign(
             {
               name: "babel-loader",
@@ -386,10 +405,10 @@
             },
             opts.caller,
           ),
-        });
+        };
       };
     },
-    725: (module) => {
+    790: (module) => {
       var objToString = Object.prototype.toString;
       var objKeys = Object.getOwnPropertyNames;
       function serialize(val, isArrayProp) {
@@ -455,15 +474,15 @@
         }
       };
     },
-    703: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    180: (module, __unused_webpack_exports, __nccwpck_require__) => {
       const babel = __nccwpck_require__(571);
       const { promisify } = __nccwpck_require__(23);
-      const LoaderError = __nccwpck_require__(605);
-      const transform = promisify(babel.transform);
-      module.exports = async function (source, options) {
+      const LoaderError = __nccwpck_require__(718);
+      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;
         }
@@ -793,6 +812,10 @@
       "use strict";
       module.exports = require("fs/promises");
     },
+    995: (module) => {
+      "use strict";
+      module.exports = require("node:module");
+    },
     857: (module) => {
       "use strict";
       module.exports = require("os");
@@ -809,7 +832,7 @@
       "use strict";
       module.exports = require("zlib");
     },
-    280: (module) => {
+    625: (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 +861,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(799);
+  var __webpack_exports__ = __nccwpck_require__(556);
   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.0","license":"MIT","types":"index.d.ts","type":"commonjs"}

package/dist/index.cjs

@@ -28,11 +28,9 @@ __webpack_require__.r(__webpack_exports__), __webpack_require__.d(__webpack_expo
 });
 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"), external_upath_namespaceObject = require("upath");
-var external_upath_default = __webpack_require__.n(external_upath_namespaceObject);
-const 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', castArray = (arr)=>void 0 === arr ? [] : Array.isArray(arr) ? arr : [
         arr
-    ], normalizeToPosixPath = (p)=>external_upath_default().normalizeSafe((0, external_node_path_namespaceObject.normalize)(p || '')).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)=>{
+    ], 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;
 }, addPresets = (presets, config)=>{
     config.presets ? config.presets.push(...presets) : config.presets = presets;
@@ -105,9 +103,7 @@ const BABEL_JS_RULE = 'babel-js', castArray = (arr)=>void 0 === arr ? [] : Array
     ].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);
-const external_node_module_namespaceObject = require("node:module"), external_node_url_namespaceObject = require("node:url"), external_deepmerge_namespaceObject = require("deepmerge");
-var external_deepmerge_default = __webpack_require__.n(external_deepmerge_namespaceObject);
-const plugin_dirname = external_node_path_default().dirname((0, external_node_url_namespaceObject.fileURLToPath)(__rslib_import_meta_url__)), plugin_require = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__), PLUGIN_BABEL_NAME = 'rsbuild:babel', SCRIPT_REGEX = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/, DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
+const external_node_module_namespaceObject = require("node:module"), external_node_url_namespaceObject = require("node:url"), plugin_dirname = external_node_path_default().dirname((0, external_node_url_namespaceObject.fileURLToPath)(__rslib_import_meta_url__)), plugin_require = (0, external_node_module_namespaceObject.createRequire)(__rslib_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,
     allExtensions: !0,
     allowDeclareFields: !0,
@@ -129,7 +125,9 @@ function getDefaultBabelOptions(config, context) {
         plugins: [
             [
                 plugin_require.resolve('@babel/plugin-proposal-decorators'),
-                config.source.decorators
+                {
+                    ...config.source.decorators
+                }
             ],
             ...isLegacyDecorators ? [
                 plugin_require.resolve('@babel/plugin-transform-class-properties')
@@ -138,7 +136,9 @@ function getDefaultBabelOptions(config, context) {
         presets: [
             [
                 plugin_require.resolve("@babel/preset-typescript"),
-                DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS
+                {
+                    ...DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS
+                }
             ]
         ]
     }, { buildCache = !0 } = config.performance;
@@ -152,7 +152,7 @@ const pluginBabel = (options = {})=>({
         name: PLUGIN_BABEL_NAME,
         setup (api) {
             let getBabelOptions = async (environment)=>{
-                let { config } = environment, baseOptions = getDefaultBabelOptions(config, api.context), mergedOptions = applyUserBabelConfig(external_deepmerge_default()({}, baseOptions), options.babelLoaderOptions);
+                let { config } = environment, mergedOptions = applyUserBabelConfig(getDefaultBabelOptions(config, api.context), options.babelLoaderOptions);
                 return mergedOptions.cacheDirectory && !mergedOptions.cacheIdentifier && (mergedOptions.cacheIdentifier = await getCacheIdentifier(mergedOptions)), mergedOptions;
             };
             api.modifyBundlerChain({

package/dist/index.js

@@ -1,13 +1,11 @@
 import node_path, { isAbsolute, join, normalize, sep } from "node:path";
 import { reduceConfigsWithContext } from "reduce-configs";
-import upath from "upath";
 import node_fs from "node:fs";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
-import deepmerge from "deepmerge";
 let BABEL_JS_RULE = 'babel-js', castArray = (arr)=>void 0 === arr ? [] : Array.isArray(arr) ? arr : [
         arr
-    ], normalizeToPosixPath = (p)=>upath.normalizeSafe(normalize(p || '')).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 = [])=>{
+    ], 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)=>{
         Array.isArray(preset) ? 'string' == typeof preset[0] && normalizeToPosixPath(preset[0]).includes(presetName) && (preset[1] = {
             ...preset[1] || {},
@@ -83,7 +81,9 @@ function getDefaultBabelOptions(config, context) {
         plugins: [
             [
                 plugin_require.resolve('@babel/plugin-proposal-decorators'),
-                config.source.decorators
+                {
+                    ...config.source.decorators
+                }
             ],
             ...isLegacyDecorators ? [
                 plugin_require.resolve('@babel/plugin-transform-class-properties')
@@ -92,7 +92,9 @@ function getDefaultBabelOptions(config, context) {
         presets: [
             [
                 plugin_require.resolve("@babel/preset-typescript"),
-                DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS
+                {
+                    ...DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS
+                }
             ]
         ]
     }, { buildCache = !0 } = config.performance;
@@ -106,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),
@@ -119,7 +121,7 @@ let pluginBabel = (options = {})=>({
                         });
                     }
                     return defaultOptions;
-                })(deepmerge({}, getDefaultBabelOptions(config, api.context)), options.babelLoaderOptions);
+                })(getDefaultBabelOptions(config, api.context), options.babelLoaderOptions);
                 return mergedOptions.cacheDirectory && !mergedOptions.cacheIdentifier && (mergedOptions.cacheIdentifier = await getCacheIdentifier(mergedOptions)), mergedOptions;
             };
             api.modifyBundlerChain({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-babel",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Babel plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -23,28 +23,31 @@
     "compiled"
   ],
   "dependencies": {
-    "@babel/core": "^7.28.6",
-    "@babel/plugin-proposal-decorators": "^7.28.6",
+    "@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",
     "@types/babel__core": "^7.20.5",
-    "deepmerge": "^4.3.1",
-    "reduce-configs": "^1.1.1",
-    "upath": "2.0.1"
+    "reduce-configs": "^1.1.1"
   },
   "devDependencies": {
-    "@rsbuild/core-v1": "npm:@rsbuild/core@^1.7.2",
-    "@rslib/core": "0.19.3",
-    "@types/node": "^24.10.9",
-    "babel-loader": "10.0.0",
+    "@rsbuild/core-v1": "npm:@rsbuild/core@^1.7.3",
+    "@rslib/core": "0.20.0",
+    "@types/node": "^24.12.0",
+    "babel-loader": "10.1.0",
     "prebundle": "1.6.2",
     "typescript": "^5.9.3",
-    "@scripts/test-helper": "1.0.1",
-    "@rsbuild/core": "2.0.0-alpha.3"
+    "@scripts/test-helper": "1.0.0",
+    "@rsbuild/core": "2.0.0-beta.8"
   },
   "peerDependencies": {
     "@rsbuild/core": "^1.0.0 || ^2.0.0-0"
   },
+  "peerDependenciesMeta": {
+    "@rsbuild/core": {
+      "optional": true
+    }
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"