@rsbuild/plugin-babel 0.3.10 → 0.4.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { RsbuildPlugin } from '@rsbuild/core';
-import { ChainedConfigWithUtils, NormalizedConfig, BundlerChain, ChainIdentifier } from '@rsbuild/shared';
+import { ChainedConfigWithUtils, Decorators, NormalizedConfig, BundlerChain, ChainIdentifier } from '@rsbuild/shared';
 import { PluginItem, TransformOptions } from '@babel/core';
 export { TransformOptions as BabelTransformOptions } from '@babel/core';
 
@@ -76,11 +76,11 @@ type PluginBabelOptions = {
     babelLoaderOptions?: ChainedConfigWithUtils<TransformOptions, BabelConfigUtils>;
 };
 
-declare const getDefaultBabelOptions: () => {
+declare const getDefaultBabelOptions: (decorators: Decorators) => {
     babelrc: boolean;
     configFile: boolean;
     compact: boolean;
-    plugins: never[];
+    plugins: (string | Decorators)[][];
     presets: (string | {
         allowNamespaces: boolean;
         allExtensions: boolean;
@@ -89,7 +89,6 @@ declare const getDefaultBabelOptions: () => {
         isTSX: boolean;
     })[][];
 };
-
 declare const pluginBabel: (options?: PluginBabelOptions) => RsbuildPlugin;
 
 declare const getBabelUtils: (config: TransformOptions) => BabelConfigUtils;

package/dist/index.js

@@ -40,7 +40,6 @@ module.exports = __toCommonJS(src_exports);
 
 // src/plugin.ts
 var import_node_path2 = __toESM(require("path"));
-var import_core = require("@rsbuild/core");
 var import_shared2 = require("@rsbuild/shared");
 
 // src/helper.ts
@@ -174,6 +173,7 @@ var modifyBabelLoaderOptions = ({
 };
 
 // src/plugin.ts
+var PLUGIN_BABEL_NAME = "rsbuild:babel";
 var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   allowNamespaces: true,
   allExtensions: true,
@@ -183,12 +183,14 @@ var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   optimizeConstEnums: true,
   isTSX: true
 };
-var getDefaultBabelOptions = () => {
+var getDefaultBabelOptions = (decorators) => {
   return {
     babelrc: false,
     configFile: false,
     compact: (0, import_shared2.isProd)(),
-    plugins: [],
+    plugins: [
+      [require.resolve("@babel/plugin-proposal-decorators"), decorators]
+    ],
     presets: [
       // TODO: only apply preset-typescript for ts file (isTSX & allExtensions false)
       [
@@ -199,42 +201,46 @@ var getDefaultBabelOptions = () => {
   };
 };
 var pluginBabel = (options = {}) => ({
-  name: import_core.PLUGIN_BABEL_NAME,
+  name: PLUGIN_BABEL_NAME,
   setup(api) {
-    api.modifyBundlerChain(async (chain, { CHAIN_ID }) => {
-      const getBabelOptions = () => {
-        const baseConfig = getDefaultBabelOptions();
-        const userBabelConfig = applyUserBabelConfig(
-          (0, import_shared2.cloneDeep)(baseConfig),
-          options.babelLoaderOptions
+    api.modifyBundlerChain({
+      order: "pre",
+      handler: async (chain, { CHAIN_ID }) => {
+        const config = api.getNormalizedConfig();
+        const getBabelOptions = () => {
+          const baseConfig = getDefaultBabelOptions(config.source.decorators);
+          const userBabelConfig = applyUserBabelConfig(
+            (0, import_shared2.cloneDeep)(baseConfig),
+            options.babelLoaderOptions
+          );
+          return userBabelConfig;
+        };
+        const babelOptions = getBabelOptions();
+        const babelLoader = import_node_path2.default.resolve(
+          __dirname,
+          "../compiled/babel-loader/index.js"
         );
-        return userBabelConfig;
-      };
-      const babelOptions = getBabelOptions();
-      const babelLoader = import_node_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 { 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);
         }
-        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);
       }
     });
   }

package/dist/index.mjs

@@ -18,8 +18,12 @@ var __dirname = /* @__PURE__ */ getDirname();
 
 // src/plugin.ts
 import path2 from "path";
-import { PLUGIN_BABEL_NAME } from "@rsbuild/core";
-import { castArray as castArray2, cloneDeep, SCRIPT_REGEX, isProd } from "@rsbuild/shared";
+import {
+  isProd,
+  castArray as castArray2,
+  cloneDeep,
+  SCRIPT_REGEX
+} from "@rsbuild/shared";
 
 // src/helper.ts
 import { isAbsolute, normalize, sep } from "path";
@@ -155,6 +159,7 @@ var modifyBabelLoaderOptions = ({
 };
 
 // src/plugin.ts
+var PLUGIN_BABEL_NAME = "rsbuild:babel";
 var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   allowNamespaces: true,
   allExtensions: true,
@@ -164,12 +169,14 @@ var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   optimizeConstEnums: true,
   isTSX: true
 };
-var getDefaultBabelOptions = () => {
+var getDefaultBabelOptions = (decorators) => {
   return {
     babelrc: false,
     configFile: false,
     compact: isProd(),
-    plugins: [],
+    plugins: [
+      [__require.resolve("@babel/plugin-proposal-decorators"), decorators]
+    ],
     presets: [
       // TODO: only apply preset-typescript for ts file (isTSX & allExtensions false)
       [
@@ -182,40 +189,44 @@ var getDefaultBabelOptions = () => {
 var pluginBabel = (options = {}) => ({
   name: PLUGIN_BABEL_NAME,
   setup(api) {
-    api.modifyBundlerChain(async (chain, { CHAIN_ID }) => {
-      const getBabelOptions = () => {
-        const baseConfig = getDefaultBabelOptions();
-        const userBabelConfig = applyUserBabelConfig(
-          cloneDeep(baseConfig),
-          options.babelLoaderOptions
+    api.modifyBundlerChain({
+      order: "pre",
+      handler: async (chain, { CHAIN_ID }) => {
+        const config = api.getNormalizedConfig();
+        const getBabelOptions = () => {
+          const baseConfig = getDefaultBabelOptions(config.source.decorators);
+          const userBabelConfig = applyUserBabelConfig(
+            cloneDeep(baseConfig),
+            options.babelLoaderOptions
+          );
+          return userBabelConfig;
+        };
+        const babelOptions = getBabelOptions();
+        const babelLoader = path2.resolve(
+          __dirname,
+          "../compiled/babel-loader/index.js"
         );
-        return userBabelConfig;
-      };
-      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 { 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);
         }
-        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);
       }
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/plugin-babel",
-  "version": "0.3.10",
+  "version": "0.4.0",
   "description": "Babel plugin for Rsbuild",
   "repository": {
     "type": "git",
@@ -25,18 +25,19 @@
   "dependencies": {
     "@babel/core": "^7.23.2",
     "@babel/preset-typescript": "^7.23.2",
+    "@babel/plugin-proposal-decorators": "^7.23.2",
     "@types/babel__core": "^7.20.3",
     "upath": "2.0.1",
-    "@rsbuild/shared": "0.3.10"
+    "@rsbuild/shared": "0.4.0"
   },
   "devDependencies": {
     "@types/node": "16.x",
     "typescript": "^5.3.0",
-    "@rsbuild/core": "0.3.10",
-    "@scripts/test-helper": "0.3.10"
+    "@rsbuild/core": "0.4.0",
+    "@scripts/test-helper": "0.4.0"
   },
   "peerDependencies": {
-    "@rsbuild/core": "^0.3.10"
+    "@rsbuild/core": "^0.4.0"
   },
   "publishConfig": {
     "access": "public",