@modern-js/server-utils 2.58.1 → 2.58.3

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

@@ -36,8 +36,8 @@ __export(babel_exports, {
 });
 module.exports = __toCommonJS(babel_exports);
 var path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
 var import_babel_compiler = require("@modern-js/babel-compiler");
+var import_utils = require("@modern-js/utils");
 var import_common = require("../../common");
 var import_preset = require("./preset");
 __reExport(babel_exports, require("@babel/core"), module.exports);
@@ -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/alias.js

@@ -32,8 +32,8 @@ __export(alias_exports, {
 });
 module.exports = __toCommonJS(alias_exports);
 var import_path = __toESM(require("path"));
-var import_tsconfig_paths = require("@modern-js/utils/tsconfig-paths");
 var import_utils = require("@modern-js/utils");
+var import_tsconfig_paths = require("@modern-js/utils/tsconfig-paths");
 const { resolvePath } = require("@modern-js/babel-plugin-module-resolver");
 const defaultPaths = {
   "@": [

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/cjs/compilers/typescript/index.js

@@ -33,8 +33,8 @@ __export(typescript_exports, {
 module.exports = __toCommonJS(typescript_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_typescriptLoader = require("./typescriptLoader");
 var import_tsconfigPathsPlugin = require("./tsconfigPathsPlugin");
+var import_typescriptLoader = require("./typescriptLoader");
 const readTsConfigByFile = (tsConfigFile, tsInstance) => {
   const parsedCmd = tsInstance.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, tsInstance.sys);
   const { options, fileNames, projectReferences } = parsedCmd;

package/dist/cjs/compilers/typescript/tsconfigPathsPlugin.js

@@ -33,8 +33,8 @@ __export(tsconfigPathsPlugin_exports, {
 module.exports = __toCommonJS(tsconfigPathsPlugin_exports);
 var os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
-var ts = __toESM(require("typescript"));
 var import_tsconfig_paths = require("@modern-js/utils/tsconfig-paths");
+var ts = __toESM(require("typescript"));
 const isRegExpKey = (str) => {
   return str.startsWith("^") || str.endsWith("$");
 };

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

@@ -2,10 +2,10 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 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 { fs, getAliasConfig, json5 } from "@modern-js/utils";
 import { FILE_EXTENSIONS } from "../../common";
-import { getBabelConfig, applyUserBabelConfig } from "./preset";
+import { applyUserBabelConfig, getBabelConfig } from "./preset";
 export * from "@babel/core";
 var readTsConfig = function(tsconfigPath) {
   var noExistReturn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
@@ -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/alias.js

@@ -2,8 +2,8 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import path from "path";
-import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
 import { getUserAlias } from "@modern-js/utils";
+import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
 var resolvePath = require("@modern-js/babel-plugin-module-resolver").resolvePath;
 var defaultPaths = {
   "@": [

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/compilers/typescript/index.js

@@ -3,9 +3,9 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { logger, getAliasConfig, fs } from "@modern-js/utils";
-import { TypescriptLoader } from "./typescriptLoader";
+import { fs, getAliasConfig, logger } from "@modern-js/utils";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfigPathsPlugin";
+import { TypescriptLoader } from "./typescriptLoader";
 var readTsConfigByFile = function(tsConfigFile, tsInstance) {
   var parsedCmd = tsInstance.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, tsInstance.sys);
   var options = parsedCmd.options, fileNames = parsedCmd.fileNames, projectReferences = parsedCmd.projectReferences;

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

@@ -3,8 +3,8 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import * as os from "os";
 import path, { dirname, posix } from "path";
-import * as ts from "typescript";
 import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
+import * as ts from "typescript";
 var isRegExpKey = function(str) {
   return str.startsWith("^") || str.endsWith("$");
 };

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

@@ -1,8 +1,8 @@
 import * as path from "path";
-import { fs, json5, getAliasConfig } from "@modern-js/utils";
 import { compiler } from "@modern-js/babel-compiler";
+import { fs, getAliasConfig, json5 } from "@modern-js/utils";
 import { FILE_EXTENSIONS } from "../../common";
-import { getBabelConfig, applyUserBabelConfig } from "./preset";
+import { applyUserBabelConfig, getBabelConfig } from "./preset";
 export * from "@babel/core";
 const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   if (!fs.existsSync(tsconfigPath)) {
@@ -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/alias.js

@@ -1,6 +1,6 @@
 import path from "path";
-import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
 import { getUserAlias } from "@modern-js/utils";
+import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
 const { resolvePath } = require("@modern-js/babel-plugin-module-resolver");
 const defaultPaths = {
   "@": [

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/esm-node/compilers/typescript/index.js

@@ -1,7 +1,7 @@
 import path from "path";
-import { logger, getAliasConfig, fs } from "@modern-js/utils";
-import { TypescriptLoader } from "./typescriptLoader";
+import { fs, getAliasConfig, logger } from "@modern-js/utils";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfigPathsPlugin";
+import { TypescriptLoader } from "./typescriptLoader";
 const readTsConfigByFile = (tsConfigFile, tsInstance) => {
   const parsedCmd = tsInstance.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, tsInstance.sys);
   const { options, fileNames, projectReferences } = parsedCmd;

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

@@ -1,7 +1,7 @@
 import * as os from "os";
 import path, { dirname, posix } from "path";
-import * as ts from "typescript";
 import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
+import * as ts from "typescript";
 const isRegExpKey = (str) => {
   return str.startsWith("^") || str.endsWith("$");
 };

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.1",
+  "version": "2.58.3",
   "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.1",
-    "@modern-js/babel-preset": "2.58.1",
-    "@modern-js/babel-plugin-module-resolver": "2.58.1",
-    "@modern-js/utils": "2.58.1"
+    "@modern-js/babel-compiler": "2.58.3",
+    "@modern-js/babel-plugin-module-resolver": "2.58.3",
+    "@modern-js/babel-preset": "2.58.3",
+    "@modern-js/utils": "2.58.3"
   },
   "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.1",
-    "@scripts/build": "2.58.1",
-    "@scripts/jest-config": "2.58.1"
+    "@modern-js/server-core": "2.58.3",
+    "@scripts/build": "2.58.3",
+    "@scripts/jest-config": "2.58.3"
   },
   "sideEffects": false,
   "publishConfig": {