@rsbuild/plugin-babel 1.0.1-rc.5 → 1.0.2

package/dist/index.js

@@ -1,268 +1,212 @@
-import { createRequire } from 'module';
-var require = createRequire(import.meta['url']);
-
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
-// ../../node_modules/.pnpm/@modern-js+module-tools@2.58.3_typescript@5.5.2/node_modules/@modern-js/module-tools/shims/esm.js
-import path from "path";
-import { fileURLToPath } from "url";
-var getFilename = () => fileURLToPath(import.meta.url);
-var getDirname = () => path.dirname(getFilename());
-var __dirname = /* @__PURE__ */ getDirname();
-
-// src/plugin.ts
-import fs from "fs";
-import path2, { isAbsolute as isAbsolute2, join } from "path";
-import deepmerge from "deepmerge";
-
-// src/helper.ts
-import { isAbsolute, normalize, sep } from "path";
-import { reduceConfigsWithContext } from "reduce-configs";
-import upath from "upath";
-var BABEL_JS_RULE = "babel-js";
-var castArray = (arr) => {
-  if (arr === void 0) {
-    return [];
-  }
-  return Array.isArray(arr) ? arr : [arr];
+import { fileURLToPath as __webpack_fileURLToPath__ } from "url";
+import { dirname as __webpack_dirname__ } from "path";
+import * as __WEBPACK_EXTERNAL_MODULE_node_fs__ from "node:fs";
+import * as __WEBPACK_EXTERNAL_MODULE_node_module__ from "node:module";
+import * as __WEBPACK_EXTERNAL_MODULE_node_path__ from "node:path";
+import * as __WEBPACK_EXTERNAL_MODULE_deepmerge__ from "deepmerge";
+import * as __WEBPACK_EXTERNAL_MODULE_reduce_configs__ from "reduce-configs";
+import * as __WEBPACK_EXTERNAL_MODULE_upath__ from "upath";
+const BABEL_JS_RULE = 'babel-js';
+const castArray = (arr)=>{
+    if (void 0 === arr) return [];
+    return Array.isArray(arr) ? arr : [
+        arr
+    ];
 };
-var normalizeToPosixPath = (p) => upath.normalizeSafe(normalize(p || "")).replace(/^([a-zA-Z]+):/, (_, m) => `/${m.toLowerCase()}`);
-var formatPath = (originPath) => {
-  if (isAbsolute(originPath)) {
-    return originPath.split(sep).join("/");
-  }
-  return originPath;
+const normalizeToPosixPath = (p)=>__WEBPACK_EXTERNAL_MODULE_upath__["default"].normalizeSafe((0, __WEBPACK_EXTERNAL_MODULE_node_path__.normalize)(p || '')).replace(/^([a-zA-Z]+):/, (_, m)=>`/${m.toLowerCase()}`);
+// compatible with windows path
+const formatPath = (originPath)=>{
+    if ((0, __WEBPACK_EXTERNAL_MODULE_node_path__.isAbsolute)(originPath)) return originPath.split(__WEBPACK_EXTERNAL_MODULE_node_path__.sep).join('/');
+    return originPath;
 };
-var getPluginItemName = (item) => {
-  if (typeof item === "string") {
-    return formatPath(item);
-  }
-  if (Array.isArray(item) && typeof item[0] === "string") {
-    return formatPath(item[0]);
-  }
-  return null;
+const getPluginItemName = (item)=>{
+    if ('string' == typeof item) return formatPath(item);
+    if (Array.isArray(item) && 'string' == typeof item[0]) return formatPath(item[0]);
+    return null;
 };
-var addPlugins = (plugins, config) => {
-  if (config.plugins) {
-    config.plugins.push(...plugins);
-  } else {
-    config.plugins = plugins;
-  }
+const addPlugins = (plugins, config)=>{
+    if (config.plugins) config.plugins.push(...plugins);
+    else config.plugins = plugins;
 };
-var addPresets = (presets, config) => {
-  if (config.presets) {
-    config.presets.push(...presets);
-  } else {
-    config.presets = presets;
-  }
+const addPresets = (presets, config)=>{
+    if (config.presets) config.presets.push(...presets);
+    else config.presets = presets;
 };
-var removePlugins = (plugins, config) => {
-  if (!config.plugins) {
-    return;
-  }
-  const removeList = castArray(plugins);
-  config.plugins = config.plugins.filter((item) => {
-    const name = getPluginItemName(item);
-    if (name) {
-      return !removeList.find((removeItem) => name.includes(removeItem));
-    }
-    return true;
-  });
-};
-var removePresets = (presets, config) => {
-  if (!config.presets) {
-    return;
-  }
-  const removeList = castArray(presets);
-  config.presets = config.presets.filter((item) => {
-    const name = getPluginItemName(item);
-    if (name) {
-      return !removeList.find((removeItem) => name.includes(removeItem));
-    }
-    return true;
-  });
+const removePlugins = (plugins, config)=>{
+    if (!config.plugins) return;
+    const removeList = castArray(plugins);
+    config.plugins = config.plugins.filter((item)=>{
+        const name = getPluginItemName(item);
+        if (name) return !removeList.find((removeItem)=>name.includes(removeItem));
+        return true;
+    });
 };
-var modifyPresetOptions = (presetName, options, presets = []) => {
-  presets.forEach((preset, index) => {
-    if (Array.isArray(preset)) {
-      if (typeof preset[0] === "string" && normalizeToPosixPath(preset[0]).includes(presetName)) {
-        preset[1] = {
-          ...preset[1] || {},
-          ...options
-          // `options` is specific to different presets
-        };
-      }
-    } else if (typeof preset === "string" && normalizeToPosixPath(preset).includes(presetName)) {
-      presets[index] = [preset, options];
-    }
-  });
+const removePresets = (presets, config)=>{
+    if (!config.presets) return;
+    const removeList = castArray(presets);
+    config.presets = config.presets.filter((item)=>{
+        const name = getPluginItemName(item);
+        if (name) return !removeList.find((removeItem)=>name.includes(removeItem));
+        return true;
+    });
 };
-var getBabelUtils = (config) => {
-  const noop = () => {
-  };
-  return {
-    addPlugins: (plugins) => addPlugins(plugins, config),
-    addPresets: (presets) => addPresets(presets, config),
-    removePlugins: (plugins) => removePlugins(plugins, config),
-    removePresets: (presets) => removePresets(presets, config),
-    // `addIncludes` and `addExcludes` are noop functions by default,
-    // It can be overridden by `extraBabelUtils`.
-    addIncludes: noop,
-    addExcludes: noop,
-    // 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 || [])
-  };
+const modifyPresetOptions = function(presetName, options) {
+    let presets = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : [];
+    presets.forEach((preset, index)=>{
+        // 1. ['@babel/preset-env', ...]
+        if (Array.isArray(preset)) {
+            if ('string' == typeof preset[0] && normalizeToPosixPath(preset[0]).includes(presetName)) preset[1] = {
+                ...preset[1] || {},
+                ...options
+            };
+        } else if ('string' == typeof preset && normalizeToPosixPath(preset).includes(presetName)) // 2. '@babel/preset-env'
+        presets[index] = [
+            preset,
+            options
+        ];
+    });
 };
-var applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) => {
-  if (userBabelConfig) {
-    const babelUtils = {
-      ...getBabelUtils(defaultOptions),
-      ...extraBabelUtils
+const getBabelUtils = (config)=>{
+    const noop = ()=>{};
+    return {
+        addPlugins: (plugins)=>addPlugins(plugins, config),
+        addPresets: (presets)=>addPresets(presets, config),
+        removePlugins: (plugins)=>removePlugins(plugins, config),
+        removePresets: (presets)=>removePresets(presets, config),
+        // `addIncludes` and `addExcludes` are noop functions by default,
+        // It can be overridden by `extraBabelUtils`.
+        addIncludes: noop,
+        addExcludes: noop,
+        // 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 || [])
     };
-    return reduceConfigsWithContext({
-      initial: defaultOptions,
-      config: userBabelConfig,
-      ctx: babelUtils
-    });
-  }
-  return defaultOptions;
 };
-var modifyBabelLoaderOptions = ({
-  chain,
-  CHAIN_ID,
-  modifier
-}) => {
-  const ruleIds = [CHAIN_ID.RULE.JS, CHAIN_ID.RULE.JS_DATA_URI, BABEL_JS_RULE];
-  for (const ruleId of ruleIds) {
-    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);
-      }
+const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils)=>{
+    if (userBabelConfig) {
+        const babelUtils = {
+            ...getBabelUtils(defaultOptions),
+            ...extraBabelUtils
+        };
+        return (0, __WEBPACK_EXTERNAL_MODULE_reduce_configs__.reduceConfigsWithContext)({
+            initial: defaultOptions,
+            config: userBabelConfig,
+            ctx: babelUtils
+        });
+    }
+    return defaultOptions;
+};
+const modifyBabelLoaderOptions = (param)=>{
+    let { chain, CHAIN_ID, modifier } = param;
+    const ruleIds = [
+        CHAIN_ID.RULE.JS,
+        CHAIN_ID.RULE.JS_DATA_URI,
+        BABEL_JS_RULE
+    ];
+    for (const ruleId of ruleIds)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 PLUGIN_BABEL_NAME = "rsbuild:babel";
-var SCRIPT_REGEX = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/;
-var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
-  allowNamespaces: true,
-  allExtensions: true,
-  allowDeclareFields: true,
-  // aligns Babel's behavior with TypeScript's default behavior.
-  // https://babeljs.io/docs/en/babel-preset-typescript#optimizeconstenums
-  optimizeConstEnums: true,
-  isTSX: true
+var plugin_dirname = __webpack_dirname__(__webpack_fileURLToPath__(import.meta.url));
+const plugin_require = (0, __WEBPACK_EXTERNAL_MODULE_node_module__.createRequire)(import.meta.url);
+const PLUGIN_BABEL_NAME = 'rsbuild:babel';
+const SCRIPT_REGEX = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/;
+/**
+ * The `@babel/preset-typescript` default options.
+ */ const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
+    allowNamespaces: true,
+    allExtensions: true,
+    allowDeclareFields: true,
+    // aligns Babel's behavior with TypeScript's default behavior.
+    // https://babeljs.io/docs/en/babel-preset-typescript#optimizeconstenums
+    optimizeConstEnums: true,
+    isTSX: true
 };
 function getCacheDirectory(context, cacheDirectory) {
-  if (cacheDirectory) {
-    return isAbsolute2(cacheDirectory) ? cacheDirectory : join(context.rootPath, cacheDirectory);
-  }
-  return join(context.cachePath);
+    if (cacheDirectory) return (0, __WEBPACK_EXTERNAL_MODULE_node_path__.isAbsolute)(cacheDirectory) ? cacheDirectory : (0, __WEBPACK_EXTERNAL_MODULE_node_path__.join)(context.rootPath, cacheDirectory);
+    return (0, __WEBPACK_EXTERNAL_MODULE_node_path__.join)(context.cachePath);
 }
 async function getCacheIdentifier(options) {
-  let identifier = `${process.env.NODE_ENV}${JSON.stringify(options)}`;
-  const { version: coreVersion } = await import("@babel/core");
-  const rawPkgJson = await fs.promises.readFile(
-    join(__dirname, "../compiled/babel-loader/package.json"),
-    "utf-8"
-  );
-  const loaderVersion = JSON.parse(rawPkgJson).version ?? "";
-  identifier += `@babel/core@${coreVersion}`;
-  identifier += `babel-loader@${loaderVersion}`;
-  return identifier;
+    let identifier = `${process.env.NODE_ENV}${JSON.stringify(options)}`;
+    const { version: coreVersion } = await import("@babel/core");
+    const rawPkgJson = await __WEBPACK_EXTERNAL_MODULE_node_fs__["default"].promises.readFile((0, __WEBPACK_EXTERNAL_MODULE_node_path__.join)(plugin_dirname, '../compiled/babel-loader/package.json'), 'utf-8');
+    const loaderVersion = JSON.parse(rawPkgJson).version ?? '';
+    identifier += `@babel/core@${coreVersion}`;
+    identifier += `babel-loader@${loaderVersion}`;
+    return identifier;
 }
-var getDefaultBabelOptions = (config, context) => {
-  const isLegacyDecorators = config.source.decorators.version === "legacy";
-  const options = {
-    babelrc: false,
-    configFile: false,
-    compact: config.mode === "production",
-    plugins: [
-      [
-        __require.resolve("@babel/plugin-proposal-decorators"),
-        config.source.decorators
-      ],
-      // If you are using @babel/preset-env and legacy decorators, you must ensure the class elements transform is enabled regardless of your targets, because Babel only supports compiling legacy decorators when also compiling class properties:
-      // see https://babeljs.io/docs/babel-plugin-proposal-decorators#legacy
-      ...isLegacyDecorators ? [__require.resolve("@babel/plugin-transform-class-properties")] : []
-    ],
-    presets: [
-      // TODO: only apply preset-typescript for ts file (isTSX & allExtensions false)
-      [
-        __require.resolve("@babel/preset-typescript"),
-        DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS
-      ]
-    ]
-  };
-  const { buildCache } = config.performance;
-  if (buildCache && context.bundlerType === "rspack") {
-    const cacheDirectory = getCacheDirectory(
-      context,
-      typeof buildCache === "boolean" ? void 0 : buildCache.cacheDirectory
-    );
-    options.cacheCompression = false;
-    options.cacheDirectory = join(cacheDirectory, "babel-loader");
-  }
-  return options;
-};
-var pluginBabel = (options = {}) => ({
-  name: PLUGIN_BABEL_NAME,
-  setup(api) {
-    const getBabelOptions = async (environment) => {
-      const { config } = environment;
-      const baseOptions = getDefaultBabelOptions(config, api.context);
-      const mergedOptions = applyUserBabelConfig(
-        deepmerge({}, baseOptions),
-        options.babelLoaderOptions
-      );
-      if (mergedOptions.cacheDirectory && !mergedOptions.cacheIdentifier) {
-        mergedOptions.cacheIdentifier = await getCacheIdentifier(mergedOptions);
-      }
-      return mergedOptions;
+const getDefaultBabelOptions = (config, context)=>{
+    const isLegacyDecorators = 'legacy' === config.source.decorators.version;
+    const options = {
+        babelrc: false,
+        configFile: false,
+        compact: 'production' === config.mode,
+        plugins: [
+            [
+                plugin_require.resolve('@babel/plugin-proposal-decorators'),
+                config.source.decorators
+            ],
+            // If you are using @babel/preset-env and legacy decorators, you must ensure the class elements transform is enabled regardless of your targets, because Babel only supports compiling legacy decorators when also compiling class properties:
+            // see https://babeljs.io/docs/babel-plugin-proposal-decorators#legacy
+            ...isLegacyDecorators ? [
+                plugin_require.resolve('@babel/plugin-transform-class-properties')
+            ] : []
+        ],
+        presets: [
+            // TODO: only apply preset-typescript for ts file (isTSX & allExtensions false)
+            [
+                plugin_require.resolve('@babel/preset-typescript'),
+                DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS
+            ]
+        ]
     };
-    api.modifyBundlerChain({
-      order: "pre",
-      handler: async (chain, { CHAIN_ID, environment }) => {
-        const babelOptions = await getBabelOptions(environment);
-        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).after(CHAIN_ID.RULE.JS);
-          if (include) {
-            for (const condition of castArray(include)) {
-              rule.include.add(condition);
-            }
-          }
-          if (exclude) {
-            for (const condition of castArray(exclude)) {
-              rule.exclude.add(condition);
-            }
-          }
-          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);
+    const { buildCache } = config.performance;
+    // Rspack does not yet support persistent cache
+    // so we use babel-loader's cache to improve rebuild performance
+    if (buildCache && 'rspack' === context.bundlerType) {
+        const cacheDirectory = getCacheDirectory(context, 'boolean' == typeof buildCache ? void 0 : buildCache.cacheDirectory);
+        // turn off compression to reduce overhead
+        options.cacheCompression = false;
+        options.cacheDirectory = (0, __WEBPACK_EXTERNAL_MODULE_node_path__.join)(cacheDirectory, 'babel-loader');
+    }
+    return options;
+};
+const pluginBabel = function() {
+    let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
+    return {
+        name: PLUGIN_BABEL_NAME,
+        setup (api) {
+            const getBabelOptions = async (environment)=>{
+                const { config } = environment;
+                const baseOptions = getDefaultBabelOptions(config, api.context);
+                const mergedOptions = applyUserBabelConfig((0, __WEBPACK_EXTERNAL_MODULE_deepmerge__["default"])({}, baseOptions), options.babelLoaderOptions);
+                // calculate cacheIdentifier with the merged options
+                if (mergedOptions.cacheDirectory && !mergedOptions.cacheIdentifier) mergedOptions.cacheIdentifier = await getCacheIdentifier(mergedOptions);
+                return mergedOptions;
+            };
+            api.modifyBundlerChain({
+                order: 'pre',
+                handler: async (chain, param)=>{
+                    let { CHAIN_ID, environment } = param;
+                    const babelOptions = await getBabelOptions(environment);
+                    const babelLoader = __WEBPACK_EXTERNAL_MODULE_node_path__["default"].resolve(plugin_dirname, '../compiled/babel-loader/index.js');
+                    const { include, exclude } = options;
+                    if (include || exclude) {
+                        const rule = chain.module.rule(BABEL_JS_RULE) // run babel loader before the builtin SWC loader
+                        // https://stackoverflow.com/questions/32234329/what-is-the-loader-order-for-webpack
+                        .after(CHAIN_ID.RULE.JS);
+                        if (include) for (const condition of castArray(include))rule.include.add(condition);
+                        if (exclude) for (const condition of castArray(exclude))rule.exclude.add(condition);
+                        rule.test(SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).loader(babelLoader).options(babelOptions);
+                    } else {
+                        // already set source.include / exclude in plugin-swc
+                        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 {
-  PLUGIN_BABEL_NAME,
-  getBabelUtils,
-  getDefaultBabelOptions,
-  modifyBabelLoaderOptions,
-  pluginBabel
+    };
 };
+export { PLUGIN_BABEL_NAME, getBabelUtils, getDefaultBabelOptions, modifyBabelLoaderOptions, pluginBabel };

package/{dist-types → dist}/plugin.d.ts

@@ -1,5 +1,5 @@
 import type { NormalizedEnvironmentConfig, RsbuildContext, RsbuildPlugin } from '@rsbuild/core';
-import type { BabelLoaderOptions, PluginBabelOptions } from './types';
+import type { BabelLoaderOptions, PluginBabelOptions } from './types.js';
 export declare const PLUGIN_BABEL_NAME = "rsbuild:babel";
 /**
  * The `@babel/preset-typescript` default options.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-babel",
-  "version": "1.0.1-rc.5",
+  "version": "1.0.2",
   "description": "Babel plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -11,23 +11,22 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist-types/index.d.ts",
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     }
   },
   "main": "./dist/index.cjs",
-  "types": "./dist-types/index.d.ts",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist",
-    "compiled",
-    "dist-types"
+    "compiled"
   ],
   "dependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@babel/plugin-transform-class-properties": "^7.25.4",
-    "@babel/preset-typescript": "^7.24.7",
+    "@babel/core": "^7.25.8",
+    "@babel/plugin-proposal-decorators": "^7.25.7",
+    "@babel/plugin-transform-class-properties": "^7.25.7",
+    "@babel/preset-typescript": "^7.25.7",
     "@types/babel__core": "^7.20.5",
     "deepmerge": "^4.3.1",
     "reduce-configs": "^1.0.0",
@@ -35,14 +34,14 @@
   },
   "devDependencies": {
     "@types/node": "18.x",
-    "babel-loader": "9.1.3",
+    "babel-loader": "9.2.1",
     "prebundle": "1.2.2",
-    "typescript": "^5.5.2",
-    "@rsbuild/core": "1.0.1-rc.5",
-    "@scripts/test-helper": "1.0.1-rc.5"
+    "typescript": "^5.6.3",
+    "@rsbuild/core": "1.0.14",
+    "@scripts/test-helper": "1.0.1"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^1.0.1-rc.4"
+    "@rsbuild/core": "1.x || ^1.0.1-rc.0"
   },
   "publishConfig": {
     "access": "public",
@@ -50,8 +49,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "modern build",
-    "dev": "modern build --watch",
+    "build": "rslib build",
+    "dev": "rslib build --watch",
     "prebundle": "prebundle"
   }
 }

package/dist-types/package.json

@@ -1 +0,0 @@
-{"//":"This file is for making TypeScript work with moduleResolution node16+.","version":"1.0.0"}