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

package/dist/cjs/cli/alias.js

@@ -35,8 +35,8 @@ __export(alias_exports, {
 module.exports = __toCommonJS(alias_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
-var import_get = require("./get");
 var import_applyOptionsChain = require("./applyOptionsChain");
+var import_get = require("./get");
 const mergeAlias = (alias) => (0, import_applyOptionsChain.applyOptionsChain)({}, alias);
 const getAliasConfig = (aliasOption, option) => {
   var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;

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/is/project.js

@@ -39,8 +39,8 @@ __export(project_exports, {
 module.exports = __toCommonJS(project_exports);
 var import_path = __toESM(require("path"));
 var import_pkg_up = __toESM(require("../../../compiled/pkg-up"));
-var import_commands = require("../commands");
 var import_compiled = require("../../compiled");
+var import_commands = require("../commands");
 var import_common = require("../common");
 var import_ensure = require("../ensure");
 const debug = (0, import_common.createDebugger)("judge-depExists");

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/path.js

@@ -41,9 +41,9 @@ __export(path_exports, {
   splitPathString: () => splitPathString
 });
 module.exports = __toCommonJS(path_exports);
-var import_path = __toESM(require("path"));
-var import_os = __toESM(require("os"));
 var import_fs = __toESM(require("fs"));
+var import_os = __toESM(require("os"));
+var import_path = __toESM(require("path"));
 var import_compiled = require("../compiled");
 const isPathString = (test) => import_path.default.posix.basename(test) !== test || import_path.default.win32.basename(test) !== test;
 const isRelativePath = (test) => /^\.\.?($|[\\/])/.test(test);

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/prettyInstructions.js

@@ -32,11 +32,11 @@ __export(prettyInstructions_exports, {
   prettyInstructions: () => prettyInstructions
 });
 module.exports = __toCommonJS(prettyInstructions_exports);
-var import_os = __toESM(require("os"));
 var import_net = require("net");
+var import_os = __toESM(require("os"));
 var import_compiled = require("../compiled");
-var import_is = require("./is");
 var import_constants = require("./constants");
+var import_is = require("./is");
 const normalizeUrl = (url) => url.replace(/([^:]\/)\/+/g, "$1");
 const getIpv4Interfaces = () => {
   const interfaces = import_os.default.networkInterfaces();

package/dist/cjs/cli/require.js

@@ -26,6 +26,8 @@ __export(require_exports, {
   tryResolve: () => tryResolve
 });
 module.exports = __toCommonJS(require_exports);
+var import_node_path = require("node:path");
+var import_node_url = require("node:url");
 var import_fs = require("./fs");
 async function compatibleRequire(path, interop = true) {
   if (path.endsWith(".json")) {
@@ -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/route.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var route_exports = {};
 __export(route_exports, {
   filterRoutesForServer: () => filterRoutesForServer,
-  filterRoutesLoader: () => filterRoutesLoader
+  filterRoutesLoader: () => filterRoutesLoader,
+  markRoutes: () => markRoutes
 });
 module.exports = __toCommonJS(route_exports);
 var import_compiled = require("../compiled");
@@ -58,8 +59,28 @@ function filterRoutesLoader(routes) {
   }).filter((route) => route !== null);
   return newRoutes;
 }
+function markRoutes(routes, routeIds) {
+  return routes.map((route) => {
+    if (route.type !== "nested") {
+      return route;
+    }
+    if (route.children && route.children.length > 0) {
+      route.children = markRoutes(route.children, routeIds);
+    }
+    if (route.children && route.children.length > 0) {
+      route.inValidSSRRoute = route.children.every((child) => {
+        var _child_inValidSSRRoute;
+        return (_child_inValidSSRRoute = child.inValidSSRRoute) !== null && _child_inValidSSRRoute !== void 0 ? _child_inValidSSRRoute : false;
+      });
+    } else if (route.id) {
+      route.inValidSSRRoute = !routeIds.includes(route.id);
+    }
+    return route;
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   filterRoutesForServer,
-  filterRoutesLoader
+  filterRoutesLoader,
+  markRoutes
 });

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
+});