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

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 { pathToFileURL } from "node:url";
 import { findExists } from "./fs";
 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/route.js

@@ -38,7 +38,27 @@ function filterRoutesLoader(routes) {
   });
   return newRoutes;
 }
+function markRoutes(routes, routeIds) {
+  return routes.map(function(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(function(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;
+  });
+}
 export {
   filterRoutesForServer,
-  filterRoutesLoader
+  filterRoutesLoader,
+  markRoutes
 };

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

@@ -1,7 +1,7 @@
 import fs from "fs";
 import path from "path";
-import { readTsConfigByFile } from "./get";
 import { applyOptionsChain } from "./applyOptionsChain";
+import { readTsConfigByFile } from "./get";
 const mergeAlias = (alias) => applyOptionsChain({}, alias);
 const getAliasConfig = (aliasOption, option) => {
   var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;

package/dist/esm-node/cli/get/data.js

@@ -1,6 +1,6 @@
 import os from "os";
 import path from "path";
-import { browserslist, fs, json5 } from "../../compiled";
+import { fs, browserslist, json5 } from "../../compiled";
 import { INTERNAL_CLI_PLUGINS } from "../constants";
 import { isDepExists } from "../is";
 import { canUsePnpm, canUseYarn } from "../package";

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

@@ -1,7 +1,7 @@
 import path from "path";
 import pkgUp from "../../../compiled/pkg-up";
-import { getArgv } from "../commands";
 import { fs, minimist, semver } from "../../compiled";
+import { getArgv } from "../commands";
 import { createDebugger } from "../common";
 import { ensureArray } from "../ensure";
 const debug = createDebugger("judge-depExists");

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

@@ -1,6 +1,6 @@
-import path from "path";
-import os from "os";
 import fs from "fs";
+import os from "os";
+import path from "path";
 import { nanoid, upath } from "../compiled";
 const isPathString = (test) => path.posix.basename(test) !== test || path.win32.basename(test) !== test;
 const isRelativePath = (test) => /^\.\.?($|[\\/])/.test(test);

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

@@ -1,8 +1,8 @@
-import os from "os";
 import { isIPv6 } from "net";
+import os from "os";
 import { chalk } from "../compiled";
-import { isDev, isSingleEntry } from "./is";
 import { DEFAULT_DEV_HOST } from "./constants";
+import { isDev, isSingleEntry } from "./is";
 const normalizeUrl = (url) => url.replace(/([^:]\/)\/+/g, "$1");
 const getIpv4Interfaces = () => {
   const interfaces = os.networkInterfaces();

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

@@ -1,3 +1,5 @@
+import { isAbsolute } from "node:path";
+import { pathToFileURL } from "node:url";
 import { findExists } from "./fs";
 async function compatibleRequire(path, interop = true) {
   if (path.endsWith(".json")) {
@@ -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/route.js

@@ -34,7 +34,27 @@ 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;
+  });
+}
 export {
   filterRoutesForServer,
-  filterRoutesLoader
+  filterRoutesLoader,
+  markRoutes
 };

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/route.d.ts

@@ -1,3 +1,4 @@
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
 export declare function filterRoutesForServer(routes: (NestedRouteForCli | PageRoute)[]): (NestedRouteForCli | PageRoute)[];
 export declare function filterRoutesLoader(routes: (NestedRouteForCli | PageRoute)[]): (NestedRouteForCli | PageRoute)[];
+export declare function markRoutes(routes: (NestedRouteForCli | PageRoute)[], routeIds: string[]): (NestedRouteForCli | PageRoute)[];

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.3-alpha.0",
   "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",
+    "@modern-js/types": "2.58.2",
+    "@scripts/jest-config": "2.58.2"
   },
   "sideEffects": false,
   "scripts": {