@modern-js/utils 2.58.2-alpha.0 → 2.58.2

package/dist/cjs/cli/index.js

@@ -37,6 +37,7 @@ __reExport(cli_exports, require("./watch"), module.exports);
 __reExport(cli_exports, require("./config"), module.exports);
 __reExport(cli_exports, require("./action"), module.exports);
 __reExport(cli_exports, require("./route"), module.exports);
+__reExport(cli_exports, require("./version"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./constants"),
@@ -60,5 +61,6 @@ __reExport(cli_exports, require("./route"), module.exports);
   ...require("./watch"),
   ...require("./config"),
   ...require("./action"),
-  ...require("./route")
+  ...require("./route"),
+  ...require("./version")
 });

package/dist/cjs/cli/monorepo.js

@@ -59,14 +59,15 @@ const isPnpmWorkspaces = (root) => import_fs.default.existsSync(import_path.defa
 const isMonorepo = (root) => isLerna(root) || isYarnWorkspaces(root) || isPnpmWorkspaces(root);
 const findMonorepoRoot = (appDirectory, maxDepth = PACKAGE_MAX_DEPTH) => {
   let inMonorepo = false;
+  let monorepoRoot = appDirectory;
   for (let depth = 0; depth < maxDepth; depth++) {
     if (isMonorepo(appDirectory)) {
       inMonorepo = true;
       break;
     }
-    appDirectory = import_path.default.dirname(appDirectory);
+    monorepoRoot = import_path.default.dirname(appDirectory);
   }
-  return inMonorepo ? appDirectory : void 0;
+  return inMonorepo ? monorepoRoot : void 0;
 };
 const getMonorepoPackages = (root) => {
   let packages = [];

package/dist/cjs/cli/port.js

@@ -34,7 +34,8 @@ module.exports = __toCommonJS(port_exports);
 var import_net = __toESM(require("net"));
 var import_compiled = require("../compiled");
 var import_logger = require("./logger");
-const getPort = async (port, { tryLimits = 20, strictPort = false, slient = false } = {}) => {
+const getPort = async (expectPort, { tryLimits = 20, strictPort = false, slient = false } = {}) => {
+  let port = expectPort;
   if (typeof port === "string") {
     port = parseInt(port, 10);
   }

package/dist/cjs/cli/require.js

@@ -26,7 +26,9 @@ __export(require_exports, {
   tryResolve: () => tryResolve
 });
 module.exports = __toCommonJS(require_exports);
+var import_node_path = require("node:path");
 var import_fs = require("./fs");
+var import_node_url = require("node:url");
 async function compatibleRequire(path, interop = true) {
   if (path.endsWith(".json")) {
     return require(path);
@@ -36,7 +38,8 @@ async function compatibleRequire(path, interop = true) {
     requiredModule = require(path);
   } catch (err) {
     if (err.code === "ERR_REQUIRE_ESM" || err instanceof SyntaxError) {
-      requiredModule = await import(path);
+      const modulePath = (0, import_node_path.isAbsolute)(path) ? (0, import_node_url.pathToFileURL)(path).href : path;
+      requiredModule = await import(modulePath);
       return interop ? requiredModule.default : requiredModule;
     } else {
       throw err;

package/dist/cjs/cli/runtimeExports.js

@@ -50,11 +50,11 @@ const memo = (fn) => {
 const createRuntimeExportsUtils = memo((pwd = "", namespace = "index") => {
   const entryExportFile = import_path.default.join(pwd, `.runtime-exports/${namespace}.js`);
   const addExport = (statement) => {
-    statement = (0, import_path2.normalizeOutputPath)(statement);
+    const statementStr = (0, import_path2.normalizeOutputPath)(statement);
     try {
       import_compiled.fs.ensureFileSync(entryExportFile);
-      if (!import_compiled.fs.readFileSync(entryExportFile, "utf8").includes(statement)) {
-        import_compiled.fs.appendFileSync(entryExportFile, `${statement}
+      if (!import_compiled.fs.readFileSync(entryExportFile, "utf8").includes(statementStr)) {
+        import_compiled.fs.appendFileSync(entryExportFile, `${statementStr}
 `);
       }
     } catch {

package/dist/cjs/cli/version.js

@@ -0,0 +1,32 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var version_exports = {};
+__export(version_exports, {
+  isVersionAtLeast1819: () => isVersionAtLeast1819
+});
+module.exports = __toCommonJS(version_exports);
+function isVersionAtLeast1819() {
+  const nodeVersion = process.versions.node;
+  const versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] > 18 || versionArr[0] === 18 && versionArr[1] >= 19;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isVersionAtLeast1819
+});

package/dist/esm/cli/index.js

@@ -20,3 +20,4 @@ export * from "./watch";
 export * from "./config";
 export * from "./action";
 export * from "./route";
+export * from "./version";

package/dist/esm/cli/monorepo.js

@@ -28,14 +28,15 @@ var isMonorepo = function(root) {
 var findMonorepoRoot = function(appDirectory) {
   var maxDepth = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : PACKAGE_MAX_DEPTH;
   var inMonorepo = false;
+  var monorepoRoot = appDirectory;
   for (var depth = 0; depth < maxDepth; depth++) {
     if (isMonorepo(appDirectory)) {
       inMonorepo = true;
       break;
     }
-    appDirectory = path.dirname(appDirectory);
+    monorepoRoot = path.dirname(appDirectory);
   }
-  return inMonorepo ? appDirectory : void 0;
+  return inMonorepo ? monorepoRoot : void 0;
 };
 var getMonorepoPackages = function(root) {
   var packages = [];

package/dist/esm/cli/port.js

@@ -4,13 +4,14 @@ import net from "net";
 import { chalk } from "../compiled";
 import { logger } from "./logger";
 var getPort = function() {
-  var _ref = _async_to_generator(function(port) {
-    var _ref2, _ref_tryLimits, tryLimits, _ref_strictPort, strictPort, _ref_slient, slient, original, found, attempts, e;
+  var _ref = _async_to_generator(function(expectPort) {
+    var _ref2, _ref_tryLimits, tryLimits, _ref_strictPort, strictPort, _ref_slient, slient, port, original, found, attempts, e;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           _ref2 = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {}, _ref_tryLimits = _ref2.tryLimits, tryLimits = _ref_tryLimits === void 0 ? 20 : _ref_tryLimits, _ref_strictPort = _ref2.strictPort, strictPort = _ref_strictPort === void 0 ? false : _ref_strictPort, _ref_slient = _ref2.slient, slient = _ref_slient === void 0 ? false : _ref_slient;
+          port = expectPort;
           if (typeof port === "string") {
             port = parseInt(port, 10);
           }
@@ -87,7 +88,7 @@ var getPort = function() {
       }
     });
   });
-  return function getPort2(port) {
+  return function getPort2(expectPort) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/cli/require.js

@@ -2,13 +2,15 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { isAbsolute } from "node:path";
 import { findExists } from "./fs";
+import { pathToFileURL } from "node:url";
 function compatibleRequire(path) {
   return _compatibleRequire.apply(this, arguments);
 }
 function _compatibleRequire() {
   _compatibleRequire = _async_to_generator(function(path) {
-    var interop, requiredModule, err;
+    var interop, requiredModule, err, modulePath;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -40,9 +42,10 @@ function _compatibleRequire() {
               3,
               4
             ];
+          modulePath = isAbsolute(path) ? pathToFileURL(path).href : path;
           return [
             4,
-            import(path)
+            import(modulePath)
           ];
         case 3:
           requiredModule = _state.sent();

package/dist/esm/cli/runtimeExports.js

@@ -22,11 +22,11 @@ var createRuntimeExportsUtils = memo(function() {
   var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", namespace = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "index";
   var entryExportFile = path.join(pwd, ".runtime-exports/".concat(namespace, ".js"));
   var addExport = function(statement) {
-    statement = normalizeOutputPath(statement);
+    var statementStr = normalizeOutputPath(statement);
     try {
       fs.ensureFileSync(entryExportFile);
-      if (!fs.readFileSync(entryExportFile, "utf8").includes(statement)) {
-        fs.appendFileSync(entryExportFile, "".concat(statement, "\n"));
+      if (!fs.readFileSync(entryExportFile, "utf8").includes(statementStr)) {
+        fs.appendFileSync(entryExportFile, "".concat(statementStr, "\n"));
       }
     } catch (e) {
     }

package/dist/esm/cli/version.js

@@ -0,0 +1,8 @@
+function isVersionAtLeast1819() {
+  var nodeVersion = process.versions.node;
+  var versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] > 18 || versionArr[0] === 18 && versionArr[1] >= 19;
+}
+export {
+  isVersionAtLeast1819
+};

package/dist/esm-node/cli/index.js

@@ -20,3 +20,4 @@ export * from "./watch";
 export * from "./config";
 export * from "./action";
 export * from "./route";
+export * from "./version";

package/dist/esm-node/cli/monorepo.js

@@ -21,14 +21,15 @@ const isPnpmWorkspaces = (root) => fs.existsSync(path.join(root, WORKSPACE_FILES
 const isMonorepo = (root) => isLerna(root) || isYarnWorkspaces(root) || isPnpmWorkspaces(root);
 const findMonorepoRoot = (appDirectory, maxDepth = PACKAGE_MAX_DEPTH) => {
   let inMonorepo = false;
+  let monorepoRoot = appDirectory;
   for (let depth = 0; depth < maxDepth; depth++) {
     if (isMonorepo(appDirectory)) {
       inMonorepo = true;
       break;
     }
-    appDirectory = path.dirname(appDirectory);
+    monorepoRoot = path.dirname(appDirectory);
   }
-  return inMonorepo ? appDirectory : void 0;
+  return inMonorepo ? monorepoRoot : void 0;
 };
 const getMonorepoPackages = (root) => {
   let packages = [];

package/dist/esm-node/cli/port.js

@@ -1,7 +1,8 @@
 import net from "net";
 import { chalk } from "../compiled";
 import { logger } from "./logger";
-const getPort = async (port, { tryLimits = 20, strictPort = false, slient = false } = {}) => {
+const getPort = async (expectPort, { tryLimits = 20, strictPort = false, slient = false } = {}) => {
+  let port = expectPort;
   if (typeof port === "string") {
     port = parseInt(port, 10);
   }

package/dist/esm-node/cli/require.js

@@ -1,4 +1,6 @@
+import { isAbsolute } from "node:path";
 import { findExists } from "./fs";
+import { pathToFileURL } from "node:url";
 async function compatibleRequire(path, interop = true) {
   if (path.endsWith(".json")) {
     return require(path);
@@ -8,7 +10,8 @@ async function compatibleRequire(path, interop = true) {
     requiredModule = require(path);
   } catch (err) {
     if (err.code === "ERR_REQUIRE_ESM" || err instanceof SyntaxError) {
-      requiredModule = await import(path);
+      const modulePath = isAbsolute(path) ? pathToFileURL(path).href : path;
+      requiredModule = await import(modulePath);
       return interop ? requiredModule.default : requiredModule;
     } else {
       throw err;

package/dist/esm-node/cli/runtimeExports.js

@@ -17,11 +17,11 @@ const memo = (fn) => {
 const createRuntimeExportsUtils = memo((pwd = "", namespace = "index") => {
   const entryExportFile = path.join(pwd, `.runtime-exports/${namespace}.js`);
   const addExport = (statement) => {
-    statement = normalizeOutputPath(statement);
+    const statementStr = normalizeOutputPath(statement);
     try {
       fs.ensureFileSync(entryExportFile);
-      if (!fs.readFileSync(entryExportFile, "utf8").includes(statement)) {
-        fs.appendFileSync(entryExportFile, `${statement}
+      if (!fs.readFileSync(entryExportFile, "utf8").includes(statementStr)) {
+        fs.appendFileSync(entryExportFile, `${statementStr}
 `);
       }
     } catch {

package/dist/esm-node/cli/version.js

@@ -0,0 +1,8 @@
+function isVersionAtLeast1819() {
+  const nodeVersion = process.versions.node;
+  const versionArr = nodeVersion.split(".").map(Number);
+  return versionArr[0] > 18 || versionArr[0] === 18 && versionArr[1] >= 19;
+}
+export {
+  isVersionAtLeast1819
+};

package/dist/types/cli/babel.d.ts

@@ -1,3 +1,3 @@
-import { BabelConfig, BabelConfigUtils, BabelTransformOptions } from '@modern-js/types';
+import type { BabelConfig, BabelConfigUtils, BabelTransformOptions } from '@modern-js/types';
 export declare const getBabelUtils: (config: BabelTransformOptions) => BabelConfigUtils;
 export declare const applyUserBabelConfig: (defaultOptions: BabelTransformOptions, userBabelConfig?: BabelConfig | BabelConfig[], extraBabelUtils?: Partial<BabelConfigUtils>) => BabelTransformOptions;

package/dist/types/cli/constants.d.ts

@@ -1,4 +1,4 @@
-import { InternalPlugins } from '@modern-js/types';
+import type { InternalPlugins } from '@modern-js/types';
 export { NESTED_ROUTE_SPEC_FILE, MAIN_ENTRY_NAME, ROUTE_SPEC_FILE, SERVER_BUNDLE_DIRECTORY, SERVER_RENDER_FUNCTION_NAME, SERVER_PLUGIN_BFF, SERVER_PLUGIN_EXPRESS, SERVER_PLUGIN_KOA, SERVER_PLUGIN_SERVER, SERVER_PLUGIN_POLYFILL, } from '../universal/constants';
 export declare const JS_EXTENSIONS: string[];
 /**

package/dist/types/cli/get/data.d.ts

@@ -1,4 +1,4 @@
-import { InternalPlugins } from '@modern-js/types';
+import type { InternalPlugins } from '@modern-js/types';
 export declare function getPackageManager(cwd?: string): Promise<"pnpm" | "npm" | "yarn">;
 export declare const getCoreJsVersion: (corejsPkgPath: string) => string;
 export declare const getAntdMajorVersion: (appDirectory: string) => number | null;

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

@@ -20,3 +20,4 @@ export * from './watch';
 export * from './config';
 export * from './action';
 export * from './route';
+export * from './version';

package/dist/types/cli/port.d.ts

@@ -5,7 +5,7 @@
  * @param strictPort - Whether to throw an error when the port is occupied.
  * @returns Available port number.
  */
-export declare const getPort: (port: string | number, { tryLimits, strictPort, slient, }?: {
+export declare const getPort: (expectPort: string | number, { tryLimits, strictPort, slient, }?: {
     tryLimits?: number | undefined;
     strictPort?: boolean | undefined;
     slient?: boolean | undefined;

package/dist/types/cli/version.d.ts

@@ -0,0 +1 @@
+export declare function isVersionAtLeast1819(): boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.2-alpha.0",
+  "version": "2.58.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -162,9 +162,9 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@scripts/build": "2.58.1",
-    "@modern-js/types": "2.58.1",
-    "@scripts/jest-config": "2.58.1"
+    "@scripts/build": "2.58.2",
+    "@scripts/jest-config": "2.58.2",
+    "@modern-js/types": "2.58.2"
   },
   "sideEffects": false,
   "scripts": {

package/dist/compiled/ajv/codegen.js

@@ -1 +0,0 @@
-module.exports = require('./').codegen;