@modern-js/server-utils 2.35.1 → 2.37.0

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

@@ -1,37 +1,32 @@
-import { getBaseBabelChain } from "@modern-js/babel-preset-base";
+import { getBabelConfigForNode } from "@rsbuild/babel-preset/node";
 import { aliasPlugin } from "./alias";
-export 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";
-export { applyUserBabelConfig } from "@modern-js/utils";
+import { applyUserBabelConfig } from "@modern-js/utils";
+export {
+  applyUserBabelConfig,
+  getBabelConfig
+};

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

@@ -1 +0,0 @@
-export {};

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

@@ -22,7 +22,7 @@ const copyFiles = async (from, to, appDirectory, tsconfigPath) => {
     });
   }
 };
-export const compileByTs = async (appDirectory, config, compileOptions) => {
+const compileByTs = async (appDirectory, config, compileOptions) => {
   logger.info(`Running ts compile...`);
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
   if (!tsconfigPath) {
@@ -83,3 +83,6 @@ const getFormatHost = (ts) => {
     getNewLine: () => ts.sys.newLine
   };
 };
+export {
+  compileByTs
+};

package/dist/esm-node/compilers/typescript/tsconfigPathsPlugin.js

@@ -51,7 +51,7 @@ const createAliasMatcher = (baseUrl, alias) => {
 const isDynamicImport = (tsBinary, node) => {
   return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
 };
-export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
+function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   const tsPaths = {};
   const alias = {};
   Object.keys(paths).forEach((key) => {
@@ -165,3 +165,6 @@ function getNotAliasedPath(sf, matcher, text) {
   const resolvedPath = posix.relative(dirname(sf.fileName), result) || "./";
   return resolvedPath[0] === "." ? resolvedPath : `./${resolvedPath}`;
 }
+export {
+  tsconfigPathsBeforeHookFactory
+};

package/dist/esm-node/compilers/typescript/typescriptLoader.js

@@ -1,5 +1,5 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-export class TypescriptLoader {
+class TypescriptLoader {
   load() {
     if (this.tsBinary) {
       return this.tsBinary;
@@ -22,3 +22,6 @@ export class TypescriptLoader {
     this.appDirectory = appDirectory;
   }
 }
+export {
+  TypescriptLoader
+};

package/dist/esm-node/index.js

@@ -1,2 +1,5 @@
 export * from "./compilers/babel";
-export { compile } from "./common";
+import { compile } from "./common";
+export {
+  compile
+};

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.35.1",
+  "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.35.1",
-    "@modern-js/babel-preset-base": "2.35.1",
-    "@modern-js/utils": "2.35.1",
-    "@modern-js/babel-plugin-module-resolver": "2.35.1"
+    "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",
-    "@scripts/build": "2.35.1",
-    "@scripts/jest-config": "2.35.1",
-    "@modern-js/server-core": "2.35.1"
+    "@modern-js/server-core": "2.37.0",
+    "@scripts/build": "2.37.0",
+    "@scripts/jest-config": "2.37.0"
   },
   "sideEffects": false,
   "publishConfig": {