@modern-js/server-utils 2.58.0 → 2.58.2

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

@@ -52,7 +52,7 @@ const existTsConfigFile = (tsconfigAbsolutePath) => {
   const tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-const resolveBabelConfig = (appDirectory, config, option) => {
+const resolveBabelConfig = (appDirectory, config, option, isEsm) => {
   const { alias, babelConfig } = config;
   const aliasConfig = (0, import_utils.getAliasConfig)(alias, {
     appDirectory,
@@ -60,16 +60,18 @@ const resolveBabelConfig = (appDirectory, config, option) => {
   });
   const defaultBabelConfig = (0, import_preset.getBabelConfig)({
     appDirectory,
-    alias: aliasConfig
+    alias: aliasConfig,
+    isEsm
   });
   return (0, import_preset.applyUserBabelConfig)(defaultBabelConfig, babelConfig);
 };
 const compileByBabel = async (appDirectory, config, compileOptions) => {
-  const { sourceDirs, distDir, tsconfigPath } = compileOptions;
+  const { sourceDirs, distDir, tsconfigPath, moduleType } = compileOptions;
+  const isEsm = moduleType === "module";
   const results = await Promise.all(sourceDirs.map(async (sourceDir) => {
     const babelConfig = resolveBabelConfig(appDirectory, config, {
       tsconfigPath: tsconfigPath ? tsconfigPath : ""
-    });
+    }, isEsm);
     if (await import_utils.fs.pathExists(sourceDir)) {
       const basename = path.basename(sourceDir);
       const targetDir = path.join(distDir, basename);

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

@@ -39,10 +39,11 @@ __reExport(preset_exports, require("./types"), module.exports);
 var import_utils = require("@modern-js/utils");
 const getBabelConfig = (libPresetOption) => {
   var _config_presets, _config_plugins;
+  const { isEsm } = libPresetOption;
   const config = (0, import_node.getBabelConfigForNode)({
     presetEnv: {
       loose: true,
-      modules: "commonjs",
+      modules: isEsm ? false : "commonjs",
       targets: [
         "node >= 14"
       ]

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

@@ -19,24 +19,26 @@ var existTsConfigFile = function(tsconfigAbsolutePath) {
   var tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-var resolveBabelConfig = function(appDirectory, config, option) {
+var resolveBabelConfig = function(appDirectory, config, option, isEsm) {
   var alias = config.alias, babelConfig = config.babelConfig;
   var aliasConfig = getAliasConfig(alias, _object_spread({
     appDirectory
   }, option));
   var defaultBabelConfig = getBabelConfig({
     appDirectory,
-    alias: aliasConfig
+    alias: aliasConfig,
+    isEsm
   });
   return applyUserBabelConfig(defaultBabelConfig, babelConfig);
 };
 var compileByBabel = function() {
   var _ref = _async_to_generator(function(appDirectory, config, compileOptions) {
-    var sourceDirs, distDir, tsconfigPath, results;
+    var sourceDirs, distDir, tsconfigPath, moduleType, isEsm, results;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          sourceDirs = compileOptions.sourceDirs, distDir = compileOptions.distDir, tsconfigPath = compileOptions.tsconfigPath;
+          sourceDirs = compileOptions.sourceDirs, distDir = compileOptions.distDir, tsconfigPath = compileOptions.tsconfigPath, moduleType = compileOptions.moduleType;
+          isEsm = moduleType === "module";
           return [
             4,
             Promise.all(sourceDirs.map(function() {
@@ -47,7 +49,7 @@ var compileByBabel = function() {
                     case 0:
                       babelConfig = resolveBabelConfig(appDirectory, config, {
                         tsconfigPath: tsconfigPath ? tsconfigPath : ""
-                      });
+                      }, isEsm);
                       return [
                         4,
                         fs.pathExists(sourceDir)

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

@@ -2,10 +2,11 @@ import { getBabelConfigForNode } from "@modern-js/babel-preset/node";
 import { aliasPlugin } from "./alias";
 var getBabelConfig = function(libPresetOption) {
   var _config_presets, _config_plugins;
+  var isEsm = libPresetOption.isEsm;
   var config = getBabelConfigForNode({
     presetEnv: {
       loose: true,
-      modules: "commonjs",
+      modules: isEsm ? false : "commonjs",
       targets: [
         "node >= 14"
       ]

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

@@ -15,7 +15,7 @@ const existTsConfigFile = (tsconfigAbsolutePath) => {
   const tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-const resolveBabelConfig = (appDirectory, config, option) => {
+const resolveBabelConfig = (appDirectory, config, option, isEsm) => {
   const { alias, babelConfig } = config;
   const aliasConfig = getAliasConfig(alias, {
     appDirectory,
@@ -23,16 +23,18 @@ const resolveBabelConfig = (appDirectory, config, option) => {
   });
   const defaultBabelConfig = getBabelConfig({
     appDirectory,
-    alias: aliasConfig
+    alias: aliasConfig,
+    isEsm
   });
   return applyUserBabelConfig(defaultBabelConfig, babelConfig);
 };
 const compileByBabel = async (appDirectory, config, compileOptions) => {
-  const { sourceDirs, distDir, tsconfigPath } = compileOptions;
+  const { sourceDirs, distDir, tsconfigPath, moduleType } = compileOptions;
+  const isEsm = moduleType === "module";
   const results = await Promise.all(sourceDirs.map(async (sourceDir) => {
     const babelConfig = resolveBabelConfig(appDirectory, config, {
       tsconfigPath: tsconfigPath ? tsconfigPath : ""
-    });
+    }, isEsm);
     if (await fs.pathExists(sourceDir)) {
       const basename = path.basename(sourceDir);
       const targetDir = path.join(distDir, basename);

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

@@ -2,10 +2,11 @@ import { getBabelConfigForNode } from "@modern-js/babel-preset/node";
 import { aliasPlugin } from "./alias";
 const getBabelConfig = (libPresetOption) => {
   var _config_presets, _config_plugins;
+  const { isEsm } = libPresetOption;
   const config = getBabelConfigForNode({
     presetEnv: {
       loose: true,
-      modules: "commonjs",
+      modules: isEsm ? false : "commonjs",
       targets: [
         "node >= 14"
       ]

package/dist/types/common/index.d.ts

@@ -15,6 +15,7 @@ export interface CompileOptions {
     sourceDirs: string[];
     distDir: string;
     tsconfigPath?: string;
+    moduleType?: 'module' | 'commonjs';
 }
 export type CompileFunc = (appDirectory: string, modernConfig: IConfig, compileOptions: CompileOptions) => Promise<void>;
 export declare const FILE_EXTENSIONS: string[];

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

@@ -1,4 +1,4 @@
-import { CompileFunc } from '../../common';
+import { type CompileFunc } from '../../common';
 export * from '@babel/core';
 export interface ITsconfig {
     compilerOptions?: {
@@ -19,5 +19,5 @@ export declare const existTsConfigFile: (tsconfigAbsolutePath: string) => boolea
 export interface IPackageModeValue {
     tsconfigPath: string;
 }
-export declare const resolveBabelConfig: (appDirectory: string, config: Parameters<CompileFunc>[1], option: IPackageModeValue) => any;
+export declare const resolveBabelConfig: (appDirectory: string, config: Parameters<CompileFunc>[1], option: IPackageModeValue, isEsm?: boolean) => any;
 export declare const compileByBabel: CompileFunc;

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

@@ -1,3 +1,3 @@
-import { PluginOptions } from '@babel/core';
+import type { PluginOptions } from '@babel/core';
 import type { AliasOption } from './types';
 export declare const aliasPlugin: (alias: AliasOption) => [string, PluginOptions];

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

@@ -1,4 +1,4 @@
-import { ILibPresetOption } from './types';
+import type { 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

@@ -7,5 +7,6 @@ export interface AliasOption {
 export interface ILibPresetOption {
     appDirectory: string;
     alias?: AliasOption;
+    isEsm?: boolean;
 }
 export type JsxTransformRuntimeType = 'automatic' | 'classic';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.0",
+  "version": "2.58.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -38,10 +38,10 @@
     "@babel/preset-typescript": "^7.24.7",
     "@swc/helpers": "0.5.3",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "@modern-js/babel-compiler": "2.58.0",
-    "@modern-js/utils": "2.58.0",
-    "@modern-js/babel-plugin-module-resolver": "2.58.0",
-    "@modern-js/babel-preset": "2.58.0"
+    "@modern-js/babel-compiler": "2.58.2",
+    "@modern-js/babel-plugin-module-resolver": "2.58.2",
+    "@modern-js/babel-preset": "2.58.2",
+    "@modern-js/utils": "2.58.2"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -50,9 +50,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/server-core": "2.58.0",
-    "@scripts/build": "2.58.0",
-    "@scripts/jest-config": "2.58.0"
+    "@modern-js/server-core": "2.58.2",
+    "@scripts/build": "2.58.2",
+    "@scripts/jest-config": "2.58.2"
   },
   "sideEffects": false,
   "publishConfig": {