@modern-js/server-utils 2.36.0 → 2.37.0

package/dist/cjs/compilers/babel/index.js

@@ -58,40 +58,17 @@ const resolveBabelConfig = (appDirectory, config, option) => {
     appDirectory,
     ...option
   });
-  const babelChain = (0, import_preset.getBabelChain)({
+  const defaultBabelConfig = (0, import_preset.getBabelConfig)({
     appDirectory,
-    enableReactPreset: true,
-    enableTypescriptPreset: true,
     alias: aliasConfig
-  }, {
-    type: option.type,
-    syntax: option.syntax
   });
-  const envOptions = babelChain.preset("@babel/preset-env").options();
-  babelChain.preset("@babel/preset-env").use(require.resolve("@babel/preset-env"), [
-    {
-      ...envOptions[0],
-      loose: true
-    }
-  ]);
-  babelChain.plugin("babel-plugin-transform-typescript-metadata").use(require.resolve("babel-plugin-transform-typescript-metadata"), []);
-  babelChain.plugin("@babel/plugin-proposal-decorators").use(require.resolve("@babel/plugin-proposal-decorators"), [
-    {
-      legacy: true
-    }
-  ]);
-  const internalBabelConfig = {
-    ...babelChain.toJSON()
-  };
-  return (0, import_preset.applyUserBabelConfig)(internalBabelConfig, babelConfig);
+  return (0, import_preset.applyUserBabelConfig)(defaultBabelConfig, babelConfig);
 };
 const compileByBabel = async (appDirectory, config, compileOptions) => {
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
   const results = await Promise.all(sourceDirs.map(async (sourceDir) => {
     const babelConfig = resolveBabelConfig(appDirectory, config, {
-      tsconfigPath: tsconfigPath ? tsconfigPath : "",
-      syntax: "es6+",
-      type: "commonjs"
+      tsconfigPath: tsconfigPath ? tsconfigPath : ""
     });
     if (await import_utils.fs.pathExists(sourceDir)) {
       const basename = path.basename(sourceDir);

package/dist/cjs/compilers/babel/preset/alias.js

@@ -95,7 +95,7 @@ const aliasPlugin = (alias) => {
     ".mjs"
   ];
   return [
-    "@modern-js/babel-plugin-module-resolver",
+    require.resolve("@modern-js/babel-plugin-module-resolver"),
     {
       root: absoluteBaseUrl,
       alias: mergedPaths,

package/dist/cjs/compilers/babel/preset/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,53 +18,52 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var preset_exports = {};
 __export(preset_exports, {
   applyUserBabelConfig: () => import_utils.applyUserBabelConfig,
-  getBabelChain: () => getBabelChain
+  getBabelConfig: () => getBabelConfig
 });
 module.exports = __toCommonJS(preset_exports);
-var import_babel_preset_base = require("@modern-js/babel-preset-base");
+var import_node = require("@rsbuild/babel-preset/node");
 var import_alias = require("./alias");
 __reExport(preset_exports, require("./types"), module.exports);
 var import_utils = require("@modern-js/utils");
-const getBabelChain = (libPresetOption, syntaxOption) => {
-  const { appDirectory, jsxTransformRuntime, enableReactPreset, enableTypescriptPreset, styledComponentsOptions } = libPresetOption;
-  const { syntax, type } = syntaxOption;
-  const chain = (0, import_babel_preset_base.getBaseBabelChain)({
-    appDirectory,
-    type,
-    syntax,
-    presets: {
-      envOptions: true,
-      reactOptions: enableReactPreset,
-      typescriptOptions: enableTypescriptPreset ? {
-        allowDeclareFields: true,
-        allExtensions: true
-      } : false
+const getBabelConfig = (libPresetOption) => {
+  var _config_presets, _config_plugins;
+  const config = (0, import_node.getBabelConfigForNode)({
+    presetEnv: {
+      loose: true,
+      modules: "commonjs"
     },
-    plugins: {
-      transformRuntime: {
-        corejs: false,
-        // for es5 code need helper functions
-        helpers: syntaxOption.syntax === "es5"
-      },
-      styledComponentsOptions
-    },
-    jsxTransformRuntime
+    pluginDecorators: {
+      version: "legacy"
+    }
   });
+  (_config_presets = config.presets) === null || _config_presets === void 0 ? void 0 : _config_presets.push([
+    require.resolve("@babel/preset-react"),
+    {
+      runtime: "automatic"
+    }
+  ]);
   if (libPresetOption.alias) {
-    const [name, opt] = (0, import_alias.aliasPlugin)(libPresetOption.alias);
-    chain.plugin(name).use(require.resolve(name), [
-      opt
-    ]);
+    var _config_plugins1;
+    (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push((0, import_alias.aliasPlugin)(libPresetOption.alias));
   }
-  return chain;
+  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(require.resolve("babel-plugin-transform-typescript-metadata"));
+  return config;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyUserBabelConfig,
-  getBabelChain,
+  getBabelConfig,
   ...require("./types")
 });

package/dist/esm/compilers/babel/index.js

@@ -1,12 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
 import { fs, json5, getAliasConfig } from "@modern-js/utils";
 import { compiler } from "@modern-js/babel-compiler";
 import { FILE_EXTENSIONS } from "../../common";
-import { getBabelChain, applyUserBabelConfig } from "./preset";
+import { getBabelConfig, applyUserBabelConfig } from "./preset";
 export * from "@babel/core";
 var readTsConfig = function(tsconfigPath) {
   var noExistReturn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
@@ -25,29 +24,11 @@ var resolveBabelConfig = function(appDirectory, config, option) {
   var aliasConfig = getAliasConfig(alias, _object_spread({
     appDirectory
   }, option));
-  var babelChain = getBabelChain({
+  var defaultBabelConfig = getBabelConfig({
     appDirectory,
-    enableReactPreset: true,
-    enableTypescriptPreset: true,
     alias: aliasConfig
-  }, {
-    type: option.type,
-    syntax: option.syntax
   });
-  var envOptions = babelChain.preset("@babel/preset-env").options();
-  babelChain.preset("@babel/preset-env").use(require.resolve("@babel/preset-env"), [
-    _object_spread_props(_object_spread({}, envOptions[0]), {
-      loose: true
-    })
-  ]);
-  babelChain.plugin("babel-plugin-transform-typescript-metadata").use(require.resolve("babel-plugin-transform-typescript-metadata"), []);
-  babelChain.plugin("@babel/plugin-proposal-decorators").use(require.resolve("@babel/plugin-proposal-decorators"), [
-    {
-      legacy: true
-    }
-  ]);
-  var internalBabelConfig = _object_spread({}, babelChain.toJSON());
-  return applyUserBabelConfig(internalBabelConfig, babelConfig);
+  return applyUserBabelConfig(defaultBabelConfig, babelConfig);
 };
 var compileByBabel = function() {
   var _ref = _async_to_generator(function(appDirectory, config, compileOptions) {
@@ -65,9 +46,7 @@ var compileByBabel = function() {
                   switch (_state2.label) {
                     case 0:
                       babelConfig = resolveBabelConfig(appDirectory, config, {
-                        tsconfigPath: tsconfigPath ? tsconfigPath : "",
-                        syntax: "es6+",
-                        type: "commonjs"
+                        tsconfigPath: tsconfigPath ? tsconfigPath : ""
                       });
                       return [
                         4,

package/dist/esm/compilers/babel/preset/alias.js

@@ -56,7 +56,7 @@ var aliasPlugin = function(alias) {
     ".mjs"
   ];
   return [
-    "@modern-js/babel-plugin-module-resolver",
+    require.resolve("@modern-js/babel-plugin-module-resolver"),
     {
       root: absoluteBaseUrl,
       alias: mergedPaths,

package/dist/esm/compilers/babel/preset/index.js

@@ -1,42 +1,32 @@
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import { getBaseBabelChain } from "@modern-js/babel-preset-base";
+import { getBabelConfigForNode } from "@rsbuild/babel-preset/node";
 import { aliasPlugin } from "./alias";
-var getBabelChain = function(libPresetOption, syntaxOption) {
-  var appDirectory = libPresetOption.appDirectory, jsxTransformRuntime = libPresetOption.jsxTransformRuntime, enableReactPreset = libPresetOption.enableReactPreset, enableTypescriptPreset = libPresetOption.enableTypescriptPreset, styledComponentsOptions = libPresetOption.styledComponentsOptions;
-  var syntax = syntaxOption.syntax, type = syntaxOption.type;
-  var chain = getBaseBabelChain({
-    appDirectory,
-    type,
-    syntax,
-    presets: {
-      envOptions: true,
-      reactOptions: enableReactPreset,
-      typescriptOptions: enableTypescriptPreset ? {
-        allowDeclareFields: true,
-        allExtensions: true
-      } : false
+var getBabelConfig = function(libPresetOption) {
+  var _config_presets, _config_plugins;
+  var config = getBabelConfigForNode({
+    presetEnv: {
+      loose: true,
+      modules: "commonjs"
     },
-    plugins: {
-      transformRuntime: {
-        corejs: false,
-        // for es5 code need helper functions
-        helpers: syntaxOption.syntax === "es5"
-      },
-      styledComponentsOptions
-    },
-    jsxTransformRuntime
+    pluginDecorators: {
+      version: "legacy"
+    }
   });
+  (_config_presets = config.presets) === null || _config_presets === void 0 ? void 0 : _config_presets.push([
+    require.resolve("@babel/preset-react"),
+    {
+      runtime: "automatic"
+    }
+  ]);
   if (libPresetOption.alias) {
-    var _aliasPlugin = _sliced_to_array(aliasPlugin(libPresetOption.alias), 2), name = _aliasPlugin[0], opt = _aliasPlugin[1];
-    chain.plugin(name).use(require.resolve(name), [
-      opt
-    ]);
+    var _config_plugins1;
+    (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(aliasPlugin(libPresetOption.alias));
   }
-  return chain;
+  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(require.resolve("babel-plugin-transform-typescript-metadata"));
+  return config;
 };
 export * from "./types";
 import { applyUserBabelConfig } from "@modern-js/utils";
 export {
   applyUserBabelConfig,
-  getBabelChain
+  getBabelConfig
 };

package/dist/esm-node/compilers/babel/index.js

@@ -2,7 +2,7 @@ import * as path from "path";
 import { fs, json5, getAliasConfig } from "@modern-js/utils";
 import { compiler } from "@modern-js/babel-compiler";
 import { FILE_EXTENSIONS } from "../../common";
-import { getBabelChain, applyUserBabelConfig } from "./preset";
+import { getBabelConfig, applyUserBabelConfig } from "./preset";
 export * from "@babel/core";
 const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   if (!fs.existsSync(tsconfigPath)) {
@@ -21,40 +21,17 @@ const resolveBabelConfig = (appDirectory, config, option) => {
     appDirectory,
     ...option
   });
-  const babelChain = getBabelChain({
+  const defaultBabelConfig = getBabelConfig({
     appDirectory,
-    enableReactPreset: true,
-    enableTypescriptPreset: true,
     alias: aliasConfig
-  }, {
-    type: option.type,
-    syntax: option.syntax
   });
-  const envOptions = babelChain.preset("@babel/preset-env").options();
-  babelChain.preset("@babel/preset-env").use(require.resolve("@babel/preset-env"), [
-    {
-      ...envOptions[0],
-      loose: true
-    }
-  ]);
-  babelChain.plugin("babel-plugin-transform-typescript-metadata").use(require.resolve("babel-plugin-transform-typescript-metadata"), []);
-  babelChain.plugin("@babel/plugin-proposal-decorators").use(require.resolve("@babel/plugin-proposal-decorators"), [
-    {
-      legacy: true
-    }
-  ]);
-  const internalBabelConfig = {
-    ...babelChain.toJSON()
-  };
-  return applyUserBabelConfig(internalBabelConfig, babelConfig);
+  return applyUserBabelConfig(defaultBabelConfig, babelConfig);
 };
 const compileByBabel = async (appDirectory, config, compileOptions) => {
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
   const results = await Promise.all(sourceDirs.map(async (sourceDir) => {
     const babelConfig = resolveBabelConfig(appDirectory, config, {
-      tsconfigPath: tsconfigPath ? tsconfigPath : "",
-      syntax: "es6+",
-      type: "commonjs"
+      tsconfigPath: tsconfigPath ? tsconfigPath : ""
     });
     if (await fs.pathExists(sourceDir)) {
       const basename = path.basename(sourceDir);

package/dist/esm-node/compilers/babel/preset/alias.js

@@ -62,7 +62,7 @@ const aliasPlugin = (alias) => {
     ".mjs"
   ];
   return [
-    "@modern-js/babel-plugin-module-resolver",
+    require.resolve("@modern-js/babel-plugin-module-resolver"),
     {
       root: absoluteBaseUrl,
       alias: mergedPaths,

package/dist/esm-node/compilers/babel/preset/index.js

@@ -1,41 +1,32 @@
-import { getBaseBabelChain } from "@modern-js/babel-preset-base";
+import { getBabelConfigForNode } from "@rsbuild/babel-preset/node";
 import { aliasPlugin } from "./alias";
-const getBabelChain = (libPresetOption, syntaxOption) => {
-  const { appDirectory, jsxTransformRuntime, enableReactPreset, enableTypescriptPreset, styledComponentsOptions } = libPresetOption;
-  const { syntax, type } = syntaxOption;
-  const chain = getBaseBabelChain({
-    appDirectory,
-    type,
-    syntax,
-    presets: {
-      envOptions: true,
-      reactOptions: enableReactPreset,
-      typescriptOptions: enableTypescriptPreset ? {
-        allowDeclareFields: true,
-        allExtensions: true
-      } : false
+const getBabelConfig = (libPresetOption) => {
+  var _config_presets, _config_plugins;
+  const config = getBabelConfigForNode({
+    presetEnv: {
+      loose: true,
+      modules: "commonjs"
     },
-    plugins: {
-      transformRuntime: {
-        corejs: false,
-        // for es5 code need helper functions
-        helpers: syntaxOption.syntax === "es5"
-      },
-      styledComponentsOptions
-    },
-    jsxTransformRuntime
+    pluginDecorators: {
+      version: "legacy"
+    }
   });
+  (_config_presets = config.presets) === null || _config_presets === void 0 ? void 0 : _config_presets.push([
+    require.resolve("@babel/preset-react"),
+    {
+      runtime: "automatic"
+    }
+  ]);
   if (libPresetOption.alias) {
-    const [name, opt] = aliasPlugin(libPresetOption.alias);
-    chain.plugin(name).use(require.resolve(name), [
-      opt
-    ]);
+    var _config_plugins1;
+    (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(aliasPlugin(libPresetOption.alias));
   }
-  return chain;
+  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(require.resolve("babel-plugin-transform-typescript-metadata"));
+  return config;
 };
 export * from "./types";
 import { applyUserBabelConfig } from "@modern-js/utils";
 export {
   applyUserBabelConfig,
-  getBabelChain
+  getBabelConfig
 };

package/dist/types/compilers/babel/index.d.ts

@@ -17,8 +17,6 @@ export interface ITsconfig {
 export declare const readTsConfig: <T extends ITsconfig | null>(tsconfigPath: string, noExistReturn?: T) => ITsconfig | T;
 export declare const existTsConfigFile: (tsconfigAbsolutePath: string) => boolean;
 export interface IPackageModeValue {
-  type: 'module' | 'commonjs';
-  syntax: 'es5' | 'es6+';
   tsconfigPath: string;
 }
 export declare const resolveBabelConfig: (appDirectory: string, config: Parameters<CompileFunc>[1], option: IPackageModeValue) => any;

package/dist/types/compilers/babel/preset/index.d.ts

@@ -1,4 +1,4 @@
-import { ISyntaxOption, ILibPresetOption } from './types';
-export declare const getBabelChain: (libPresetOption: ILibPresetOption, syntaxOption: ISyntaxOption) => import("@modern-js/babel-preset-base").BabelChain;
+import { ILibPresetOption } from './types';
+export declare const getBabelConfig: (libPresetOption: ILibPresetOption) => import("@babel/core").TransformOptions;
 export * from './types';
 export { applyUserBabelConfig } from '@modern-js/utils';

package/dist/types/compilers/babel/preset/types.d.ts

@@ -1,8 +1,3 @@
-import type { IStyledComponentOptions } from '@modern-js/babel-preset-base';
-export interface ISyntaxOption {
-  syntax: 'es5' | 'es6+';
-  type: 'module' | 'commonjs';
-}
 export interface AliasOption {
   absoluteBaseUrl: string;
   paths?: Record<string, string | string[]>;
@@ -11,10 +6,6 @@ export interface AliasOption {
 }
 export interface ILibPresetOption {
   appDirectory: string;
-  enableTypescriptPreset?: boolean;
-  enableReactPreset?: boolean;
   alias?: AliasOption;
-  jsxTransformRuntime?: JsxTransformRuntimeType;
-  styledComponentsOptions?: IStyledComponentOptions;
 }
 export type JsxTransformRuntimeType = 'automatic' | 'classic';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.36.0",
+  "version": "2.37.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -34,13 +34,14 @@
     "@babel/core": "^7.22.15",
     "@babel/plugin-proposal-decorators": "^7.22.15",
     "@babel/preset-env": "^7.22.15",
+    "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.22.15",
-    "babel-plugin-transform-typescript-metadata": "^0.3.2",
+    "@rsbuild/babel-preset": "0.0.7",
     "@swc/helpers": "0.5.1",
-    "@modern-js/babel-compiler": "2.36.0",
-    "@modern-js/babel-preset-base": "2.36.0",
-    "@modern-js/utils": "2.36.0",
-    "@modern-js/babel-plugin-module-resolver": "2.36.0"
+    "babel-plugin-transform-typescript-metadata": "^0.3.2",
+    "@modern-js/babel-compiler": "2.37.0",
+    "@modern-js/utils": "2.37.0",
+    "@modern-js/babel-plugin-module-resolver": "2.37.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -49,9 +50,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/server-core": "2.36.0",
-    "@scripts/build": "2.36.0",
-    "@scripts/jest-config": "2.36.0"
+    "@modern-js/server-core": "2.37.0",
+    "@scripts/build": "2.37.0",
+    "@scripts/jest-config": "2.37.0"
   },
   "sideEffects": false,
   "publishConfig": {