@modern-js/server-utils 2.22.0 → 2.22.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/server-utils
 
+## 2.22.1
+
+### Patch Changes
+
+- 4be1da5: chore: merge babel-preset-lib to server-utils, remove unused codes
+
+  chore: 合并 babel-preset-lib 到 server-utils，移除无用代码
+
+- Updated dependencies [e2848a2]
+- Updated dependencies [d4045ed]
+  - @modern-js/utils@2.22.1
+  - @modern-js/babel-preset-base@2.22.1
+  - @modern-js/babel-compiler@2.22.1
+
 ## 2.22.0
 
 ### Patch Changes

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

@@ -16,9 +16,6 @@ _export(exports, {
   existTsConfigFile: function() {
     return existTsConfigFile;
   },
-  getBabelConfig: function() {
-    return getBabelConfig;
-  },
   resolveBabelConfig: function() {
     return resolveBabelConfig;
   },
@@ -29,10 +26,10 @@ _export(exports, {
 const _export_star = require("@swc/helpers/_/_export_star");
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
-const _babelpresetlib = require("@modern-js/babel-preset-lib");
 const _utils = require("@modern-js/utils");
 const _babelcompiler = require("@modern-js/babel-compiler");
 const _common = require("../../common");
+const _preset = require("./preset");
 _export_star._(require("@babel/core"), exports);
 const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   if (!_utils.fs.existsSync(tsconfigPath)) {
@@ -45,25 +42,17 @@ const existTsConfigFile = (tsconfigAbsolutePath) => {
   const tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-const getBabelConfig = (libPresetOption, syntaxOption) => {
-  const chain = (0, _babelpresetlib.getBabelChain)(libPresetOption, syntaxOption);
-  return {
-    sourceType: "unambiguous",
-    ...chain.toJSON()
-  };
-};
 const resolveBabelConfig = (appDirectory, config, option) => {
   const { alias, babelConfig } = config;
   const aliasConfig = (0, _utils.getAliasConfig)(alias, {
     appDirectory,
     ...option
   });
-  const babelChain = (0, _babelpresetlib.getBabelChain)({
+  const babelChain = (0, _preset.getBabelChain)({
     appDirectory,
     enableReactPreset: true,
     enableTypescriptPreset: true,
-    alias: aliasConfig,
-    envVars: []
+    alias: aliasConfig
   }, {
     type: option.type,
     syntax: option.syntax
@@ -89,7 +78,7 @@ const resolveBabelConfig = (appDirectory, config, option) => {
   const internalBabelConfig = {
     ...babelChain.toJSON()
   };
-  return (0, _babelpresetlib.applyUserBabelConfig)(internalBabelConfig, babelConfig);
+  return (0, _preset.applyUserBabelConfig)(internalBabelConfig, babelConfig);
 };
 const compileByBabel = async (appDirectory, config, compileOptions) => {
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;

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

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "aliasPlugin", {
+  enumerable: true,
+  get: function() {
+    return aliasPlugin;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _tsconfigpaths = require("@modern-js/utils/tsconfig-paths");
+const _utils = require("@modern-js/utils");
+const { resolvePath } = require("babel-plugin-module-resolver");
+const defaultPaths = {
+  "@": [
+    "./src"
+  ]
+};
+const aliasPlugin = (alias) => {
+  const { absoluteBaseUrl, isTsPath, isTsProject = false } = alias;
+  const mergedPaths = isTsPath ? alias.paths || {} : {
+    ...defaultPaths,
+    ...alias.paths || {}
+  };
+  let tsPaths = {};
+  if (isTsProject) {
+    tsPaths = (0, _utils.getUserAlias)(mergedPaths);
+  }
+  tsPaths = Object.keys(tsPaths).reduce((o, key) => {
+    if (typeof tsPaths[key] === "string") {
+      return {
+        ...o,
+        [`${key}`]: [
+          tsPaths[key]
+        ]
+      };
+    }
+    return {
+      ...o,
+      [`${key}`]: tsPaths[key]
+    };
+  }, {});
+  const resolvePathFn = (sourcePath, currentFile, opts) => {
+    if (sourcePath === "." || sourcePath === "./") {
+      return sourcePath;
+    }
+    const matchPath = (0, _tsconfigpaths.createMatchPath)(absoluteBaseUrl, tsPaths, [
+      "index"
+    ]);
+    const result = matchPath(sourcePath, void 0, void 0, [
+      ".js",
+      ".jsx",
+      ".ts",
+      ".tsx"
+    ]);
+    if (result) {
+      const relativePath = _path.default.relative(_path.default.dirname(currentFile), _path.default.dirname(result));
+      const fileName = _path.default.basename(result);
+      const filePath = _path.default.normalize(`${relativePath.length === 0 ? "." : relativePath}/${fileName}`).replace(/\\/, "/");
+      return filePath.startsWith(".") ? filePath : `./${filePath}`;
+    }
+    return resolvePath(sourcePath, currentFile, opts);
+  };
+  const typescriptExts = [
+    ".ts",
+    ".tsx",
+    ".js",
+    ".jsx",
+    ".es",
+    ".es6",
+    ".mjs"
+  ];
+  return [
+    "babel-plugin-module-resolver",
+    {
+      root: absoluteBaseUrl,
+      alias: mergedPaths,
+      resolvePath: isTsPath ? resolvePathFn : void 0,
+      extensions: isTsProject ? typescriptExts : void 0
+    }
+  ];
+};

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

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  getBabelChain: function() {
+    return getBabelChain;
+  },
+  applyUserBabelConfig: function() {
+    return _utils.applyUserBabelConfig;
+  }
+});
+const _export_star = require("@swc/helpers/_/_export_star");
+const _babelpresetbase = require("@modern-js/babel-preset-base");
+const _alias = require("./alias");
+_export_star._(require("./types"), exports);
+const _utils = require("@modern-js/utils");
+const getBabelChain = (libPresetOption, syntaxOption) => {
+  const { appDirectory, jsxTransformRuntime, enableReactPreset, enableTypescriptPreset, lodashOptions, styledComponentsOptions } = libPresetOption;
+  const { syntax, type } = syntaxOption;
+  const chain = (0, _babelpresetbase.getBaseBabelChain)({
+    appDirectory,
+    type,
+    syntax,
+    presets: {
+      envOptions: true,
+      reactOptions: enableReactPreset,
+      typescriptOptions: enableTypescriptPreset ? {
+        allowDeclareFields: true,
+        allExtensions: true
+      } : false
+    },
+    plugins: {
+      transformRuntime: {
+        corejs: false,
+        // for es5 code need helper functions
+        helpers: syntaxOption.syntax === "es5"
+      },
+      lodashOptions,
+      styledComponentsOptions
+    },
+    jsxTransformRuntime
+  });
+  if (libPresetOption.alias) {
+    const [name, opt] = (0, _alias.aliasPlugin)(libPresetOption.alias);
+    chain.plugin(name).use(require.resolve(name), [
+      opt
+    ]);
+  }
+  return chain;
+};

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -3,10 +3,10 @@ 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 { getBabelChain, applyUserBabelConfig } from "@modern-js/babel-preset-lib";
 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";
 export * from "@babel/core";
 export var readTsConfig = function(tsconfigPath) {
   var noExistReturn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
@@ -20,12 +20,6 @@ export var existTsConfigFile = function(tsconfigAbsolutePath) {
   var tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-export var getBabelConfig = function(libPresetOption, syntaxOption) {
-  var chain = getBabelChain(libPresetOption, syntaxOption);
-  return _object_spread({
-    sourceType: "unambiguous"
-  }, chain.toJSON());
-};
 export var resolveBabelConfig = function(appDirectory, config, option) {
   var alias = config.alias, babelConfig = config.babelConfig;
   var aliasConfig = getAliasConfig(alias, _object_spread({
@@ -35,8 +29,7 @@ export var resolveBabelConfig = function(appDirectory, config, option) {
     appDirectory: appDirectory,
     enableReactPreset: true,
     enableTypescriptPreset: true,
-    alias: aliasConfig,
-    envVars: []
+    alias: aliasConfig
   }, {
     type: option.type,
     syntax: option.syntax

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

@@ -0,0 +1,67 @@
+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";
+var resolvePath = require("babel-plugin-module-resolver").resolvePath;
+var defaultPaths = {
+  "@": [
+    "./src"
+  ]
+};
+export var aliasPlugin = function(alias) {
+  var absoluteBaseUrl = alias.absoluteBaseUrl, isTsPath = alias.isTsPath, _alias_isTsProject = alias.isTsProject, isTsProject = _alias_isTsProject === void 0 ? false : _alias_isTsProject;
+  var mergedPaths = isTsPath ? alias.paths || {} : _object_spread({}, defaultPaths, alias.paths || {});
+  var tsPaths = {};
+  if (isTsProject) {
+    tsPaths = getUserAlias(mergedPaths);
+  }
+  tsPaths = Object.keys(tsPaths).reduce(function(o, key) {
+    if (typeof tsPaths[key] === "string") {
+      return _object_spread_props(_object_spread({}, o), _define_property({}, "".concat(key), [
+        tsPaths[key]
+      ]));
+    }
+    return _object_spread_props(_object_spread({}, o), _define_property({}, "".concat(key), tsPaths[key]));
+  }, {});
+  var resolvePathFn = function(sourcePath, currentFile, opts) {
+    if (sourcePath === "." || sourcePath === "./") {
+      return sourcePath;
+    }
+    var matchPath = createMatchPath(absoluteBaseUrl, tsPaths, [
+      "index"
+    ]);
+    var result = matchPath(sourcePath, void 0, void 0, [
+      ".js",
+      ".jsx",
+      ".ts",
+      ".tsx"
+    ]);
+    if (result) {
+      var relativePath = path.relative(path.dirname(currentFile), path.dirname(result));
+      var fileName = path.basename(result);
+      var filePath = path.normalize("".concat(relativePath.length === 0 ? "." : relativePath, "/").concat(fileName)).replace(/\\/, "/");
+      return filePath.startsWith(".") ? filePath : "./".concat(filePath);
+    }
+    return resolvePath(sourcePath, currentFile, opts);
+  };
+  var typescriptExts = [
+    ".ts",
+    ".tsx",
+    ".js",
+    ".jsx",
+    ".es",
+    ".es6",
+    ".mjs"
+  ];
+  return [
+    "babel-plugin-module-resolver",
+    {
+      root: absoluteBaseUrl,
+      alias: mergedPaths,
+      resolvePath: isTsPath ? resolvePathFn : void 0,
+      extensions: isTsProject ? typescriptExts : void 0
+    }
+  ];
+};

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

@@ -0,0 +1,39 @@
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { getBaseBabelChain } from "@modern-js/babel-preset-base";
+import { aliasPlugin } from "./alias";
+export var getBabelChain = function(libPresetOption, syntaxOption) {
+  var appDirectory = libPresetOption.appDirectory, jsxTransformRuntime = libPresetOption.jsxTransformRuntime, enableReactPreset = libPresetOption.enableReactPreset, enableTypescriptPreset = libPresetOption.enableTypescriptPreset, lodashOptions = libPresetOption.lodashOptions, styledComponentsOptions = libPresetOption.styledComponentsOptions;
+  var syntax = syntaxOption.syntax, type = syntaxOption.type;
+  var chain = getBaseBabelChain({
+    appDirectory: appDirectory,
+    type: type,
+    syntax: syntax,
+    presets: {
+      envOptions: true,
+      reactOptions: enableReactPreset,
+      typescriptOptions: enableTypescriptPreset ? {
+        allowDeclareFields: true,
+        allExtensions: true
+      } : false
+    },
+    plugins: {
+      transformRuntime: {
+        corejs: false,
+        // for es5 code need helper functions
+        helpers: syntaxOption.syntax === "es5"
+      },
+      lodashOptions: lodashOptions,
+      styledComponentsOptions: styledComponentsOptions
+    },
+    jsxTransformRuntime: jsxTransformRuntime
+  });
+  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
+    ]);
+  }
+  return chain;
+};
+export * from "./types";
+export { applyUserBabelConfig } from "@modern-js/utils";

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

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

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

@@ -1,8 +1,8 @@
 import * as path from "path";
-import { getBabelChain, applyUserBabelConfig } from "@modern-js/babel-preset-lib";
 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";
 export * from "@babel/core";
 export const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   if (!fs.existsSync(tsconfigPath)) {
@@ -15,13 +15,6 @@ export const existTsConfigFile = (tsconfigAbsolutePath) => {
   const tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-export const getBabelConfig = (libPresetOption, syntaxOption) => {
-  const chain = getBabelChain(libPresetOption, syntaxOption);
-  return {
-    sourceType: "unambiguous",
-    ...chain.toJSON()
-  };
-};
 export const resolveBabelConfig = (appDirectory, config, option) => {
   const { alias, babelConfig } = config;
   const aliasConfig = getAliasConfig(alias, {
@@ -32,8 +25,7 @@ export const resolveBabelConfig = (appDirectory, config, option) => {
     appDirectory,
     enableReactPreset: true,
     enableTypescriptPreset: true,
-    alias: aliasConfig,
-    envVars: []
+    alias: aliasConfig
   }, {
     type: option.type,
     syntax: option.syntax

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

@@ -0,0 +1,73 @@
+import path from "path";
+import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
+import { getUserAlias } from "@modern-js/utils";
+const { resolvePath } = require("babel-plugin-module-resolver");
+const defaultPaths = {
+  "@": [
+    "./src"
+  ]
+};
+export const aliasPlugin = (alias) => {
+  const { absoluteBaseUrl, isTsPath, isTsProject = false } = alias;
+  const mergedPaths = isTsPath ? alias.paths || {} : {
+    ...defaultPaths,
+    ...alias.paths || {}
+  };
+  let tsPaths = {};
+  if (isTsProject) {
+    tsPaths = getUserAlias(mergedPaths);
+  }
+  tsPaths = Object.keys(tsPaths).reduce((o, key) => {
+    if (typeof tsPaths[key] === "string") {
+      return {
+        ...o,
+        [`${key}`]: [
+          tsPaths[key]
+        ]
+      };
+    }
+    return {
+      ...o,
+      [`${key}`]: tsPaths[key]
+    };
+  }, {});
+  const resolvePathFn = (sourcePath, currentFile, opts) => {
+    if (sourcePath === "." || sourcePath === "./") {
+      return sourcePath;
+    }
+    const matchPath = createMatchPath(absoluteBaseUrl, tsPaths, [
+      "index"
+    ]);
+    const result = matchPath(sourcePath, void 0, void 0, [
+      ".js",
+      ".jsx",
+      ".ts",
+      ".tsx"
+    ]);
+    if (result) {
+      const relativePath = path.relative(path.dirname(currentFile), path.dirname(result));
+      const fileName = path.basename(result);
+      const filePath = path.normalize(`${relativePath.length === 0 ? "." : relativePath}/${fileName}`).replace(/\\/, "/");
+      return filePath.startsWith(".") ? filePath : `./${filePath}`;
+    }
+    return resolvePath(sourcePath, currentFile, opts);
+  };
+  const typescriptExts = [
+    ".ts",
+    ".tsx",
+    ".js",
+    ".jsx",
+    ".es",
+    ".es6",
+    ".mjs"
+  ];
+  return [
+    "babel-plugin-module-resolver",
+    {
+      root: absoluteBaseUrl,
+      alias: mergedPaths,
+      resolvePath: isTsPath ? resolvePathFn : void 0,
+      extensions: isTsProject ? typescriptExts : void 0
+    }
+  ];
+};

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

@@ -0,0 +1,38 @@
+import { getBaseBabelChain } from "@modern-js/babel-preset-base";
+import { aliasPlugin } from "./alias";
+export const getBabelChain = (libPresetOption, syntaxOption) => {
+  const { appDirectory, jsxTransformRuntime, enableReactPreset, enableTypescriptPreset, lodashOptions, styledComponentsOptions } = libPresetOption;
+  const { syntax, type } = syntaxOption;
+  const chain = getBaseBabelChain({
+    appDirectory,
+    type,
+    syntax,
+    presets: {
+      envOptions: true,
+      reactOptions: enableReactPreset,
+      typescriptOptions: enableTypescriptPreset ? {
+        allowDeclareFields: true,
+        allExtensions: true
+      } : false
+    },
+    plugins: {
+      transformRuntime: {
+        corejs: false,
+        // for es5 code need helper functions
+        helpers: syntaxOption.syntax === "es5"
+      },
+      lodashOptions,
+      styledComponentsOptions
+    },
+    jsxTransformRuntime
+  });
+  if (libPresetOption.alias) {
+    const [name, opt] = aliasPlugin(libPresetOption.alias);
+    chain.plugin(name).use(require.resolve(name), [
+      opt
+    ]);
+  }
+  return chain;
+};
+export * from "./types";
+export { applyUserBabelConfig } from "@modern-js/utils";

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

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

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

@@ -1,5 +1,3 @@
-import { ILibPresetOption, ISyntaxOption } from '@modern-js/babel-preset-lib';
-import { TransformOptions } from '@babel/core';
 import { CompileFunc } from '../../common';
 export * from '@babel/core';
 export interface ITsconfig {
@@ -18,7 +16,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 declare const getBabelConfig: (libPresetOption: ILibPresetOption, syntaxOption: ISyntaxOption) => TransformOptions;
 export interface IPackageModeValue {
   type: 'module' | 'commonjs';
   syntax: 'es5' | 'es6+';

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

@@ -0,0 +1,3 @@
+import { 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

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

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

@@ -0,0 +1,21 @@
+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[]>;
+  isTsPath?: boolean;
+  isTsProject?: boolean;
+}
+export interface ILibPresetOption {
+  appDirectory: string;
+  enableTypescriptPreset?: boolean;
+  enableReactPreset?: boolean;
+  lodashOptions?: any;
+  alias?: AliasOption;
+  jsxTransformRuntime?: JsxTransformRuntimeType;
+  styledComponentsOptions?: IStyledComponentOptions;
+}
+export type JsxTransformRuntimeType = 'automatic' | 'classic';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.22.0",
+  "version": "2.22.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -39,9 +39,9 @@
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "@swc/helpers": "0.5.1",
-    "@modern-js/babel-compiler": "2.22.0",
-    "@modern-js/babel-preset-lib": "2.22.0",
-    "@modern-js/utils": "2.22.0"
+    "@modern-js/babel-compiler": "2.22.1",
+    "@modern-js/babel-preset-base": "2.22.1",
+    "@modern-js/utils": "2.22.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -50,9 +50,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/server-core": "2.22.0",
-    "@scripts/build": "2.22.0",
-    "@scripts/jest-config": "2.22.0"
+    "@modern-js/server-core": "2.22.1",
+    "@scripts/build": "2.22.1",
+    "@scripts/jest-config": "2.22.1"
   },
   "sideEffects": false,
   "publishConfig": {