@modern-js/utils 2.60.1 → 2.60.3

package/dist/cjs/cli/index.js

@@ -36,8 +36,8 @@ __reExport(cli_exports, require("./runtimeExports"), module.exports);
 __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);
+__reExport(cli_exports, require("./route"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./constants"),
@@ -61,6 +61,6 @@ __reExport(cli_exports, require("./version"), module.exports);
   ...require("./watch"),
   ...require("./config"),
   ...require("./action"),
-  ...require("./route"),
-  ...require("./version")
+  ...require("./version"),
+  ...require("./route")
 });

package/dist/cjs/cli/require.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var require_exports = {};
 __export(require_exports, {
@@ -22,6 +32,7 @@ __export(require_exports, {
   compatibleRequire: () => compatibleRequire,
   deleteRequireCache: () => deleteRequireCache,
   dynamicImport: () => dynamicImport,
+  loadFromProject: () => loadFromProject,
   requireExistModule: () => requireExistModule,
   tryResolve: () => tryResolve
 });
@@ -29,6 +40,7 @@ module.exports = __toCommonJS(require_exports);
 var import_node_path = require("node:path");
 var import_node_url = require("node:url");
 var import_fs = require("./fs");
+const import_meta = {};
 async function compatibleRequire(path, interop = true) {
   if (path.endsWith(".json")) {
     return require(path);
@@ -47,6 +59,35 @@ async function compatibleRequire(path, interop = true) {
   }
   return interop && (requiredModule === null || requiredModule === void 0 ? void 0 : requiredModule.__esModule) ? requiredModule.default : requiredModule;
 }
+async function loadFromProject(moduleName, appDir) {
+  let requiredModule;
+  const paths = [
+    appDir,
+    process.cwd()
+  ];
+  try {
+    if (typeof require !== "undefined") {
+      const modulePath = require.resolve(moduleName, {
+        paths
+      });
+      requiredModule = require(modulePath);
+    } else {
+      const { createRequire } = await import("node:module");
+      const require1 = createRequire(import_meta.url);
+      const modulePath = require1.resolve(moduleName, {
+        paths
+      });
+      const moduleUrl = (0, import_node_url.pathToFileURL)(modulePath).href;
+      requiredModule = await import(moduleUrl);
+    }
+    return requiredModule.default || requiredModule;
+  } catch (error) {
+    if (error.code === "MODULE_NOT_FOUND") {
+      throw new Error(`Cannot find module ${moduleName}.`);
+    }
+    throw error;
+  }
+}
 const dynamicImport = new Function("modulePath", "return import(modulePath)");
 const requireExistModule = async (filename, opt) => {
   const final = {
@@ -99,6 +140,7 @@ const tryResolve = (name, resolvePath) => {
   compatibleRequire,
   deleteRequireCache,
   dynamicImport,
+  loadFromProject,
   requireExistModule,
   tryResolve
 });

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/esm/cli/index.js

@@ -19,5 +19,5 @@ export * from "./runtimeExports";
 export * from "./watch";
 export * from "./config";
 export * from "./action";
-export * from "./route";
 export * from "./version";
+export * from "./route";

package/dist/esm/cli/require.js

@@ -70,6 +70,79 @@ function _compatibleRequire() {
   });
   return _compatibleRequire.apply(this, arguments);
 }
+function loadFromProject(moduleName, appDir) {
+  return _loadFromProject.apply(this, arguments);
+}
+function _loadFromProject() {
+  _loadFromProject = _async_to_generator(function(moduleName, appDir) {
+    var requiredModule, paths, modulePath, createRequire, _$require, modulePath1, moduleUrl, error;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          paths = [
+            appDir,
+            process.cwd()
+          ];
+          _state.label = 1;
+        case 1:
+          _state.trys.push([
+            1,
+            6,
+            ,
+            7
+          ]);
+          if (!(typeof require !== "undefined"))
+            return [
+              3,
+              2
+            ];
+          modulePath = require.resolve(moduleName, {
+            paths
+          });
+          requiredModule = require(modulePath);
+          return [
+            3,
+            5
+          ];
+        case 2:
+          return [
+            4,
+            import("node:module")
+          ];
+        case 3:
+          createRequire = _state.sent().createRequire;
+          _$require = createRequire(import.meta.url);
+          modulePath1 = _$require.resolve(moduleName, {
+            paths
+          });
+          moduleUrl = pathToFileURL(modulePath1).href;
+          return [
+            4,
+            import(moduleUrl)
+          ];
+        case 4:
+          requiredModule = _state.sent();
+          _state.label = 5;
+        case 5:
+          return [
+            2,
+            requiredModule.default || requiredModule
+          ];
+        case 6:
+          error = _state.sent();
+          if (error.code === "MODULE_NOT_FOUND") {
+            throw new Error("Cannot find module ".concat(moduleName, "."));
+          }
+          throw error;
+        case 7:
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return _loadFromProject.apply(this, arguments);
+}
 var dynamicImport = new Function("modulePath", "return import(modulePath)");
 var requireExistModule = function() {
   var _ref = _async_to_generator(function(filename, opt) {
@@ -138,6 +211,7 @@ export {
   compatibleRequire,
   deleteRequireCache,
   dynamicImport,
+  loadFromProject,
   requireExistModule,
   tryResolve
 };

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-node/cli/index.js

@@ -19,5 +19,5 @@ export * from "./runtimeExports";
 export * from "./watch";
 export * from "./config";
 export * from "./action";
-export * from "./route";
 export * from "./version";
+export * from "./route";

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

@@ -1,3 +1,4 @@
+const import_meta = {};
 import { isAbsolute } from "node:path";
 import { pathToFileURL } from "node:url";
 import { findExists } from "./fs";
@@ -19,6 +20,35 @@ async function compatibleRequire(path, interop = true) {
   }
   return interop && (requiredModule === null || requiredModule === void 0 ? void 0 : requiredModule.__esModule) ? requiredModule.default : requiredModule;
 }
+async function loadFromProject(moduleName, appDir) {
+  let requiredModule;
+  const paths = [
+    appDir,
+    process.cwd()
+  ];
+  try {
+    if (typeof require !== "undefined") {
+      const modulePath = require.resolve(moduleName, {
+        paths
+      });
+      requiredModule = require(modulePath);
+    } else {
+      const { createRequire } = await import("node:module");
+      const require1 = createRequire(import_meta.url);
+      const modulePath = require1.resolve(moduleName, {
+        paths
+      });
+      const moduleUrl = pathToFileURL(modulePath).href;
+      requiredModule = await import(moduleUrl);
+    }
+    return requiredModule.default || requiredModule;
+  } catch (error) {
+    if (error.code === "MODULE_NOT_FOUND") {
+      throw new Error(`Cannot find module ${moduleName}.`);
+    }
+    throw error;
+  }
+}
 const dynamicImport = new Function("modulePath", "return import(modulePath)");
 const requireExistModule = async (filename, opt) => {
   const final = {
@@ -70,6 +100,7 @@ export {
   compatibleRequire,
   deleteRequireCache,
   dynamicImport,
+  loadFromProject,
   requireExistModule,
   tryResolve
 };

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/types/cli/index.d.ts

@@ -19,5 +19,5 @@ export * from './runtimeExports';
 export * from './watch';
 export * from './config';
 export * from './action';
-export * from './route';
 export * from './version';
+export * from './route';

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

@@ -4,6 +4,7 @@
  * @returns module export object.
  */
 export declare function compatibleRequire(path: string, interop?: boolean): Promise<any>;
+export declare function loadFromProject(moduleName: string, appDir: string): Promise<any>;
 export declare const dynamicImport: Function;
 export declare const requireExistModule: (filename: string, opt?: {
     extensions?: string[];

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/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.1",
+  "version": "2.60.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -161,10 +161,10 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.94.0",
-    "@modern-js/types": "2.60.1",
-    "@scripts/build": "2.60.1",
-    "@scripts/jest-config": "2.60.1"
+    "webpack": "^5.95.0",
+    "@modern-js/types": "2.60.3",
+    "@scripts/jest-config": "2.60.3",
+    "@scripts/build": "2.60.3"
   },
   "sideEffects": false,
   "scripts": {