@modern-js/utils 2.58.4-alpha.2 → 2.60.0

package/dist/cjs/cli/index.js

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

package/dist/cjs/{universal/route.server.js → cli/route.js}

@@ -16,13 +16,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var route_server_exports = {};
-__export(route_server_exports, {
+var route_exports = {};
+__export(route_exports, {
   filterRoutesForServer: () => filterRoutesForServer,
-  filterRoutesLoader: () => filterRoutesLoader,
-  markRoutes: () => markRoutes
+  filterRoutesLoader: () => filterRoutesLoader
 });
-module.exports = __toCommonJS(route_server_exports);
+module.exports = __toCommonJS(route_exports);
 var import_compiled = require("../compiled");
 const { cloneDeep } = import_compiled.lodash;
 function filterRoutesForServer(routes) {
@@ -59,28 +58,8 @@ 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,
-  markRoutes
+  filterRoutesLoader
 });

package/dist/esm/cli/index.js

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

package/dist/esm/cli/is/type.js

@@ -1,3 +1,4 @@
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 function isString(str) {
   return typeof str === "string";
 }
@@ -11,13 +12,13 @@ function isFunction(func) {
   return typeof func === "function";
 }
 function isObject(obj) {
-  return obj !== null && typeof obj === "object";
+  return obj !== null && (typeof obj === "undefined" ? "undefined" : _type_of(obj)) === "object";
 }
 function isPlainObject(obj) {
   return isObject(obj) && Object.prototype.toString.call(obj) === "[object Object]";
 }
 function isPromise(obj) {
-  return Boolean(obj) && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
+  return Boolean(obj) && ((typeof obj === "undefined" ? "undefined" : _type_of(obj)) === "object" || typeof obj === "function") && typeof obj.then === "function";
 }
 function isRegExp(obj) {
   return Object.prototype.toString.call(obj) === "[object RegExp]";

package/dist/esm/{universal/route.server.js → cli/route.js}

@@ -38,27 +38,7 @@ 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,
-  markRoutes
+  filterRoutesLoader
 };

package/dist/esm/universal/formatWebpack.js

@@ -1,4 +1,5 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 var friendlySyntaxErrorLabel = "SyntaxError:";
 function isLikelyASyntaxError(message) {
   return message.includes(friendlySyntaxErrorLabel);
@@ -6,7 +7,7 @@ function isLikelyASyntaxError(message) {
 function formatMessage(stats) {
   var lines = [];
   var message;
-  if (typeof stats === "object") {
+  if ((typeof stats === "undefined" ? "undefined" : _type_of(stats)) === "object") {
     var fileName = stats.moduleName ? "File: ".concat(stats.moduleName, "\n") : "";
     var mainMessage = typeof stats.formatted === "string" ? stats.formatted : stats.message;
     var details = stats.details ? "\nDetails: ".concat(stats.details, "\n") : "";

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

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

package/dist/esm-node/{universal/route.server.js → cli/route.js}

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

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

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

package/dist/types/{universal/route.server.d.ts → cli/route.d.ts}

@@ -1,4 +1,3 @@
 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.58.4-alpha.2",
+  "version": "2.60.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -54,11 +54,6 @@
       "import": "./dist/esm/universal/pluginDagSort.js",
       "default": "./dist/cjs/universal/pluginDagSort.js"
     },
-    "./universal/route": {
-      "types": "./dist/types/universal/route.server.d.ts",
-      "import": "./dist/esm/universal/route.js",
-      "default": "./dist/cjs/universal/route.server.js"
-    },
     "./commander": "./dist/compiled/commander/index.js",
     "./ora": "./dist/compiled/ora/index.js",
     "./glob": "./dist/compiled/glob/index.js",
@@ -102,9 +97,6 @@
       "universal/plugin-dag-sort": [
         "./dist/types/universal/pluginDagSort.d.ts"
       ],
-      "universal/route": [
-        "./dist/types/universal/route.server.d.ts"
-      ],
       "execa": [
         "./dist/compiled/execa/index.d.ts"
       ],
@@ -159,7 +151,7 @@
     }
   },
   "dependencies": {
-    "@swc/helpers": "0.5.3",
+    "@swc/helpers": "0.5.13",
     "caniuse-lite": "^1.0.30001520",
     "lodash": "^4.17.21",
     "rslog": "^1.1.0"
@@ -169,10 +161,10 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.93.0",
-    "@modern-js/types": "2.58.3",
-    "@scripts/jest-config": "2.58.3",
-    "@scripts/build": "2.58.3"
+    "webpack": "^5.94.0",
+    "@modern-js/types": "2.60.0",
+    "@scripts/build": "2.60.0",
+    "@scripts/jest-config": "2.60.0"
   },
   "sideEffects": false,
   "scripts": {

package/dist/cjs/universal/route.js

@@ -1 +0,0 @@
-"use strict";

package/dist/compiled/ajv/codegen.js

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