@modern-js/server-utils 2.26.1-alpha.1 → 2.27.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/server-utils
 
+## 2.27.0
+
+### Patch Changes
+
+- Updated dependencies [91d14b8]
+- Updated dependencies [8322a51]
+- Updated dependencies [6d7104d]
+  - @modern-js/utils@2.27.0
+  - @modern-js/babel-compiler@2.27.0
+  - @modern-js/babel-preset-base@2.27.0
+  - @modern-js/babel-plugin-module-resolver@2.27.0
+
 ## 2.26.0
 
 ### Patch Changes

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

@@ -12,7 +12,7 @@ const _interop_require_default = require("@swc/helpers/_/_interop_require_defaul
 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("../plugins/babel-plugin-module-resolver/src");
+const { resolvePath } = require("@modern-js/babel-plugin-module-resolver");
 const defaultPaths = {
   "@": [
     "./src"
@@ -73,7 +73,7 @@ const aliasPlugin = (alias) => {
     ".mjs"
   ];
   return [
-    "../plugins/babel-plugin-module-resolver/src",
+    "@modern-js/babel-plugin-module-resolver",
     {
       root: absoluteBaseUrl,
       alias: mergedPaths,

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

@@ -4,7 +4,7 @@ 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("../plugins/babel-plugin-module-resolver/src").resolvePath;
+var resolvePath = require("@modern-js/babel-plugin-module-resolver").resolvePath;
 var defaultPaths = {
   "@": [
     "./src"
@@ -56,7 +56,7 @@ export var aliasPlugin = function(alias) {
     ".mjs"
   ];
   return [
-    "../plugins/babel-plugin-module-resolver/src",
+    "@modern-js/babel-plugin-module-resolver",
     {
       root: absoluteBaseUrl,
       alias: mergedPaths,

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

@@ -1,7 +1,7 @@
 import path from "path";
 import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
 import { getUserAlias } from "@modern-js/utils";
-const { resolvePath } = require("../plugins/babel-plugin-module-resolver/src");
+const { resolvePath } = require("@modern-js/babel-plugin-module-resolver");
 const defaultPaths = {
   "@": [
     "./src"
@@ -62,7 +62,7 @@ export const aliasPlugin = (alias) => {
     ".mjs"
   ];
   return [
-    "../plugins/babel-plugin-module-resolver/src",
+    "@modern-js/babel-plugin-module-resolver",
     {
       root: absoluteBaseUrl,
       alias: mergedPaths,

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.26.1-alpha.1",
+  "version": "2.27.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -31,36 +31,28 @@
     }
   },
   "dependencies": {
+    "@babel/core": "^7.21.8",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@babel/preset-env": "^7.21.5",
     "@babel/preset-typescript": "^7.21.5",
-    "@swc/helpers": "0.5.1",
-    "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "glob": "7.2.0",
-    "pkg-up": "3.1.0",
-    "reselect": "^4.1.8",
-    "resolve": "^1.22.2",
-    "@modern-js/utils": "2.26.0",
-    "@modern-js/babel-preset-base": "2.26.0",
-    "@modern-js/babel-compiler": "2.26.0"
+    "@swc/helpers": "0.5.1",
+    "@modern-js/babel-compiler": "2.27.0",
+    "@modern-js/babel-preset-base": "2.27.0",
+    "@modern-js/utils": "2.27.0",
+    "@modern-js/babel-plugin-module-resolver": "2.27.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.8",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.17.7",
-    "@babel/preset-env": "^7.21.5",
     "@types/babel__core": "^7.20.0",
     "@types/jest": "^29",
     "@types/node": "^14",
-    "babel-core": "^6.26.3",
-    "common-tags": "^1.8.2",
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/server-core": "2.26.0",
-    "@scripts/jest-config": "2.26.0",
-    "@scripts/build": "2.26.0"
+    "@modern-js/server-core": "2.27.0",
+    "@scripts/build": "2.27.0",
+    "@scripts/jest-config": "2.27.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/index.js

@@ -1,56 +0,0 @@
-"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, {
-  resolvePath: function() {
-    return _resolvePath.default;
-  },
-  default: function() {
-    return _default;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _normalizeOptions = /* @__PURE__ */ _interop_require_default._(require("./normalizeOptions"));
-const _resolvePath = /* @__PURE__ */ _interop_require_default._(require("./resolvePath"));
-const _call = /* @__PURE__ */ _interop_require_default._(require("./transformers/call"));
-const _import = /* @__PURE__ */ _interop_require_default._(require("./transformers/import"));
-const importVisitors = {
-  CallExpression: _call.default,
-  "ImportDeclaration|ExportDeclaration": _import.default
-};
-const visitor = {
-  Program: {
-    enter(programPath, state) {
-      programPath.traverse(importVisitors, state);
-    },
-    exit(programPath, state) {
-      programPath.traverse(importVisitors, state);
-    }
-  }
-};
-const _default = ({ types }) => ({
-  name: "module-resolver",
-  manipulateOptions(opts) {
-    if (opts.filename === void 0) {
-      opts.filename = "unknown";
-    }
-  },
-  pre(file) {
-    this.types = types;
-    const currentFile = file.opts.filename;
-    this.normalizedOpts = (0, _normalizeOptions.default)(currentFile, this.opts);
-    this.moduleResolverVisited = /* @__PURE__ */ new Set();
-  },
-  visitor,
-  post() {
-    this.moduleResolverVisited.clear();
-  }
-});

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/log.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "warn", {
-  enumerable: true,
-  get: function() {
-    return warn;
-  }
-});
-function warn(...args) {
-  console.warn(...args);
-}

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/mapPath.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return mapPathString;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _resolvePath = /* @__PURE__ */ _interop_require_default._(require("./resolvePath"));
-function mapPathString(nodePath, state) {
-  if (!state.types.isStringLiteral(nodePath)) {
-    return;
-  }
-  const sourcePath = nodePath.node.value;
-  const currentFile = state.file.opts.filename;
-  const resolvePath = state.normalizedOpts.customResolvePath || _resolvePath.default;
-  const modulePath = resolvePath(sourcePath, currentFile, state.opts);
-  if (modulePath) {
-    if (nodePath.node.pathResolved) {
-      return;
-    }
-    nodePath.replaceWith(state.types.stringLiteral(modulePath));
-    nodePath.node.pathResolved = true;
-  }
-}

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/mapToRelative.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return mapToRelative;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _utils = require("./utils");
-function mapToRelative(cwd, currentFile, module) {
-  let from = _path.default.dirname(currentFile);
-  let to = _path.default.normalize(module);
-  from = _path.default.resolve(cwd, from);
-  to = _path.default.resolve(cwd, to);
-  const moduleMapped = _path.default.relative(from, to);
-  return (0, _utils.toPosixPath)(moduleMapped);
-}

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/normalizeOptions.js

@@ -1,157 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return _default;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _fs = /* @__PURE__ */ _interop_require_default._(require("fs"));
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _reselect = require("reselect");
-const _findbabelconfig = /* @__PURE__ */ _interop_require_default._(require("find-babel-config"));
-const _glob = /* @__PURE__ */ _interop_require_default._(require("glob"));
-const _pkgup = /* @__PURE__ */ _interop_require_default._(require("pkg-up"));
-const _utils = require("./utils");
-const defaultExtensions = [
-  ".js",
-  ".jsx",
-  ".es",
-  ".es6",
-  ".mjs"
-];
-const defaultTransformedFunctions = [
-  "require",
-  "require.resolve",
-  "System.import",
-  // Jest methods
-  "jest.genMockFromModule",
-  "jest.mock",
-  "jest.unmock",
-  "jest.doMock",
-  "jest.dontMock",
-  "jest.setMock",
-  "jest.requireActual",
-  "jest.requireMock",
-  // Older Jest methods
-  "require.requireActual",
-  "require.requireMock"
-];
-function isRegExp(string) {
-  return string.startsWith("^") || string.endsWith("$");
-}
-const specialCwd = {
-  babelrc: (startPath) => _findbabelconfig.default.sync(startPath).file,
-  packagejson: (startPath) => _pkgup.default.sync({
-    cwd: startPath
-  })
-};
-function normalizeCwd(optsCwd, currentFile) {
-  let cwd;
-  if (optsCwd in specialCwd) {
-    const startPath = currentFile === "unknown" ? "./" : currentFile;
-    const computedCwd = specialCwd[optsCwd](startPath);
-    cwd = computedCwd ? _path.default.dirname(computedCwd) : null;
-  } else {
-    cwd = optsCwd;
-  }
-  return cwd || process.cwd();
-}
-function normalizeRoot(optsRoot, cwd) {
-  if (!optsRoot) {
-    return [];
-  }
-  const rootArray = Array.isArray(optsRoot) ? optsRoot : [
-    optsRoot
-  ];
-  return rootArray.map((dirPath) => _path.default.resolve(cwd, dirPath)).reduce((resolvedDirs, absDirPath) => {
-    if (_glob.default.hasMagic(absDirPath)) {
-      const roots = _glob.default.sync(absDirPath).filter((resolvedPath) => _fs.default.lstatSync(resolvedPath).isDirectory());
-      return [
-        ...resolvedDirs,
-        ...roots
-      ];
-    }
-    return [
-      ...resolvedDirs,
-      absDirPath
-    ];
-  }, []);
-}
-function getAliasTarget(key, isKeyRegExp) {
-  const regExpPattern = isKeyRegExp ? key : `^${(0, _utils.escapeRegExp)(key)}(/.*|)$`;
-  return new RegExp(regExpPattern);
-}
-function getAliasSubstitute(value, isKeyRegExp) {
-  if (typeof value === "function") {
-    return value;
-  }
-  if (!isKeyRegExp) {
-    return ([, match]) => {
-      if (Array.isArray(value)) {
-        return value.map((v) => `${v}${match}`);
-      }
-      return `${value}${match}`;
-    };
-  }
-  const parts = value.split("\\\\");
-  return (execResult) => parts.map((part) => part.replace(/\\\d+/g, (number) => execResult[number.slice(1)] || "")).join("\\");
-}
-function normalizeAlias(optsAlias) {
-  if (!optsAlias) {
-    return [];
-  }
-  const aliasArray = Array.isArray(optsAlias) ? optsAlias : [
-    optsAlias
-  ];
-  return aliasArray.reduce((aliasPairs, alias) => {
-    const aliasKeys = Object.keys(alias);
-    aliasKeys.forEach((key) => {
-      const isKeyRegExp = isRegExp(key);
-      aliasPairs.push([
-        getAliasTarget(key, isKeyRegExp),
-        getAliasSubstitute(alias[key], isKeyRegExp)
-      ]);
-    });
-    return aliasPairs;
-  }, []);
-}
-function normalizeTransformedFunctions(optsTransformFunctions) {
-  if (!optsTransformFunctions) {
-    return defaultTransformedFunctions;
-  }
-  return [
-    ...defaultTransformedFunctions,
-    ...optsTransformFunctions
-  ];
-}
-function normalizeLoglevel(optsLoglevel) {
-  return optsLoglevel || "warn";
-}
-const _default = (0, _reselect.createSelector)(
-  // The currentFile should have an extension; otherwise it's considered a special value
-  (currentFile) => currentFile.includes(".") ? _path.default.dirname(currentFile) : currentFile,
-  (_, opts) => opts,
-  (currentFile, opts) => {
-    const cwd = normalizeCwd(opts.cwd, currentFile);
-    const root = normalizeRoot(opts.root, cwd);
-    const alias = normalizeAlias(opts.alias);
-    const loglevel = normalizeLoglevel(opts.loglevel);
-    const transformFunctions = normalizeTransformedFunctions(opts.transformFunctions);
-    const extensions = opts.extensions || defaultExtensions;
-    const stripExtensions = opts.stripExtensions || extensions;
-    return {
-      cwd,
-      root,
-      alias,
-      loglevel,
-      transformFunctions,
-      extensions,
-      stripExtensions,
-      customResolvePath: opts.resolvePath
-    };
-  }
-);

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/resolvePath.js

@@ -1,92 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return resolvePath;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _log = require("./log");
-const _mapToRelative = /* @__PURE__ */ _interop_require_default._(require("./mapToRelative"));
-const _normalizeOptions = /* @__PURE__ */ _interop_require_default._(require("./normalizeOptions"));
-const _utils = require("./utils");
-function getRelativePath(sourcePath, currentFile, absFileInRoot, opts) {
-  const realSourceFileExtension = _path.default.extname(absFileInRoot);
-  const sourceFileExtension = _path.default.extname(sourcePath);
-  let relativePath = (0, _mapToRelative.default)(opts.cwd, currentFile, absFileInRoot);
-  if (realSourceFileExtension !== sourceFileExtension) {
-    relativePath = (0, _utils.replaceExtension)(relativePath, opts);
-  }
-  return (0, _utils.toLocalPath)((0, _utils.toPosixPath)(relativePath));
-}
-function findPathInRoots(sourcePath, { extensions, root }) {
-  let resolvedSourceFile;
-  root.some((basedir) => {
-    resolvedSourceFile = (0, _utils.nodeResolvePath)(`./${sourcePath}`, basedir, extensions);
-    return resolvedSourceFile !== null;
-  });
-  return resolvedSourceFile;
-}
-function resolvePathFromRootConfig(sourcePath, currentFile, opts) {
-  const absFileInRoot = findPathInRoots(sourcePath, opts);
-  if (!absFileInRoot) {
-    return null;
-  }
-  return getRelativePath(sourcePath, currentFile, absFileInRoot, opts);
-}
-function checkIfPackageExists(modulePath, currentFile, extensions, loglevel) {
-  const resolvedPath = (0, _utils.nodeResolvePath)(modulePath, currentFile, extensions);
-  if (resolvedPath === null && loglevel !== "silent") {
-    (0, _log.warn)(`Could not resolve "${modulePath}" in file ${currentFile}.`);
-  }
-}
-function resolvePathFromAliasConfig(sourcePath, currentFile, opts) {
-  let aliasedSourceFile;
-  opts.alias.find(([regExp, substitute]) => {
-    const execResult = regExp.exec(sourcePath);
-    if (execResult === null) {
-      return false;
-    }
-    aliasedSourceFile = substitute(execResult);
-    return true;
-  });
-  if (!aliasedSourceFile) {
-    return null;
-  }
-  if (Array.isArray(aliasedSourceFile)) {
-    return aliasedSourceFile.map((asf) => {
-      if ((0, _utils.isRelativePath)(asf)) {
-        return (0, _utils.toLocalPath)((0, _utils.toPosixPath)((0, _mapToRelative.default)(opts.cwd, currentFile, asf)));
-      }
-      return asf;
-    }).find((src) => (0, _utils.nodeResolvePath)(src, _path.default.dirname(currentFile), opts.extensions));
-  }
-  if ((0, _utils.isRelativePath)(aliasedSourceFile)) {
-    return (0, _utils.toLocalPath)((0, _utils.toPosixPath)((0, _mapToRelative.default)(opts.cwd, currentFile, aliasedSourceFile)));
-  }
-  if (process.env.NODE_ENV !== "production") {
-    checkIfPackageExists(aliasedSourceFile, currentFile, opts.extensions, opts.loglevel);
-  }
-  return aliasedSourceFile;
-}
-const resolvers = [
-  resolvePathFromAliasConfig,
-  resolvePathFromRootConfig
-];
-function resolvePath(sourcePath, currentFile, opts) {
-  if ((0, _utils.isRelativePath)(sourcePath)) {
-    return sourcePath;
-  }
-  const normalizedOpts = (0, _normalizeOptions.default)(currentFile, opts);
-  const absoluteCurrentFile = _path.default.resolve(currentFile);
-  let resolvedPath = null;
-  resolvers.some((resolver) => {
-    resolvedPath = resolver(sourcePath, absoluteCurrentFile, normalizedOpts);
-    return resolvedPath !== null;
-  });
-  return resolvedPath;
-}

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/transformers/call.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return transformCall;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _utils = require("../utils");
-const _mapPath = /* @__PURE__ */ _interop_require_default._(require("../mapPath"));
-function transformCall(nodePath, state) {
-  if (state.moduleResolverVisited.has(nodePath)) {
-    return;
-  }
-  const calleePath = nodePath.get("callee");
-  const isNormalCall = state.normalizedOpts.transformFunctions.some((pattern) => (0, _utils.matchesPattern)(state.types, calleePath, pattern));
-  if (isNormalCall || (0, _utils.isImportCall)(state.types, nodePath)) {
-    state.moduleResolverVisited.add(nodePath);
-    (0, _mapPath.default)(nodePath.get("arguments.0"), state);
-  }
-}

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/transformers/import.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
-    return transformImport;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _mapPath = /* @__PURE__ */ _interop_require_default._(require("../mapPath"));
-function transformImport(nodePath, state) {
-  if (state.moduleResolverVisited.has(nodePath)) {
-    return;
-  }
-  state.moduleResolverVisited.add(nodePath);
-  (0, _mapPath.default)(nodePath.get("source"), state);
-}

package/dist/cjs/compilers/babel/plugins/babel-plugin-module-resolver/src/utils.js

@@ -1,98 +0,0 @@
-"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, {
-  nodeResolvePath: function() {
-    return nodeResolvePath;
-  },
-  isRelativePath: function() {
-    return isRelativePath;
-  },
-  toPosixPath: function() {
-    return toPosixPath;
-  },
-  toLocalPath: function() {
-    return toLocalPath;
-  },
-  stripExtension: function() {
-    return stripExtension;
-  },
-  replaceExtension: function() {
-    return replaceExtension;
-  },
-  matchesPattern: function() {
-    return matchesPattern;
-  },
-  isImportCall: function() {
-    return isImportCall;
-  },
-  escapeRegExp: function() {
-    return escapeRegExp;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _resolve = /* @__PURE__ */ _interop_require_default._(require("resolve"));
-function nodeResolvePath(modulePath, basedir, extensions) {
-  try {
-    return _resolve.default.sync(modulePath, {
-      basedir,
-      extensions
-    });
-  } catch (e) {
-    return null;
-  }
-}
-function isRelativePath(nodePath) {
-  return nodePath.match(/^\.?\.\//);
-}
-function toPosixPath(modulePath) {
-  return modulePath.replace(/\\/g, "/");
-}
-function toLocalPath(modulePath) {
-  let localPath = modulePath.replace(/\/index$/, "");
-  if (!isRelativePath(localPath)) {
-    localPath = `./${localPath}`;
-  }
-  return localPath;
-}
-function stripExtension(modulePath, stripExtensions) {
-  let name = _path.default.basename(modulePath);
-  stripExtensions.some((extension) => {
-    if (name.endsWith(extension)) {
-      name = name.slice(0, name.length - extension.length);
-      return true;
-    }
-    return false;
-  });
-  return name;
-}
-function replaceExtension(modulePath, opts) {
-  const filename = stripExtension(modulePath, opts.stripExtensions);
-  return _path.default.join(_path.default.dirname(modulePath), filename);
-}
-function matchesPattern(types, calleePath, pattern) {
-  const { node } = calleePath;
-  if (types.isMemberExpression(node)) {
-    return calleePath.matchesPattern(pattern);
-  }
-  if (!types.isIdentifier(node) || pattern.includes(".")) {
-    return false;
-  }
-  const name = pattern.split(".")[0];
-  return node.name === name;
-}
-function isImportCall(types, calleePath) {
-  return types.isImport(calleePath.node.callee);
-}
-function escapeRegExp(string) {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}