@modern-js/utils 2.34.0 → 2.35.1

package/dist/esm-node/universal/formatWebpack.js

@@ -79,9 +79,9 @@ export default {
   });
 }
 function formatWebpackMessages(json, color = defaultColor) {
-  var _json_errors, _json, _json_warnings, _json1, _result_errors;
-  const formattedErrors = (_json = json) === null || _json === void 0 ? void 0 : (_json_errors = _json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
-  const formattedWarnings = (_json1 = json) === null || _json1 === void 0 ? void 0 : (_json_warnings = _json1.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
+  var _json_errors, _json_warnings, _result_errors;
+  const formattedErrors = json === null || json === void 0 ? void 0 : (_json_errors = json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
+  const formattedWarnings = json === null || json === void 0 ? void 0 : (_json_warnings = json.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
   const result = {
     errors: formattedErrors || [],
     warnings: formattedWarnings || [],

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

@@ -89,8 +89,6 @@ export declare const CHAIN_ID: {
     readonly STYLE: "style-loader";
     /** postcss-loader */
     readonly POSTCSS: "postcss";
-    /** markdown-loader */
-    readonly MARKDOWN: "markdown";
     /** ignore-css-loader */
     readonly IGNORE_CSS: "ignore-css";
     /** css-modules-typescript-loader */
@@ -172,6 +170,8 @@ export declare const CHAIN_ID: {
     readonly HTML_ASYNC_CHUNK: "html-async-chunk";
     /** SWC_POLYFILL_CHECKER */
     readonly SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin";
+    /** RouterPlugin */
+    readonly ROUTER_MANIFEST: "route-plugin";
   };
   /** Predefined minimizers */
   readonly MINIMIZER: {

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

@@ -27,6 +27,11 @@ declare const LOG_TYPES: {
     label: string;
     level: string;
   };
+  ready: {
+    color: string;
+    label: string;
+    level: string;
+  };
   success: {
     color: string;
     label: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.34.0",
+  "version": "2.35.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -34,33 +34,6 @@
       "types": "./dist/types/cli/constants/chainId.d.ts",
       "default": "./dist/cjs/cli/constants/chainId.js"
     },
-    "./runtime/router": {
-      "types": "./dist/types/runtime/router.d.ts",
-      "default": "./dist/esm/runtime/router.js"
-    },
-    "./runtime/remix-router": {
-      "types": "./dist/types/runtime/remixRouter.d.ts",
-      "require": "./dist/cjs/runtime/remixRouter.js",
-      "default": "./dist/esm/runtime/remixRouter.js"
-    },
-    "./runtime/nested-routes": {
-      "types": "./dist/types/runtime/nestedRoutes.d.ts",
-      "default": "./dist/esm/runtime/nestedRoutes.js"
-    },
-    "./runtime-browser": {
-      "jsnext:source": "./src/runtime-browser/index.d.ts",
-      "default": "./dist/esm/runtime-browser/index.js"
-    },
-    "./runtime-node": {
-      "types": "./dist/types/runtime-node/index.d.ts",
-      "require": "./dist/cjs/runtime-node/index.js",
-      "default": "./dist/esm/runtime-node/index.js"
-    },
-    "./runtime-node/router": {
-      "types": "./dist/types/runtime-node/router.d.ts",
-      "require": "./dist/cjs/runtime-node/router.js",
-      "default": "./dist/esm/runtime-node/router.js"
-    },
     "./universal/constants": {
       "types": "./dist/types/universal/constants.d.ts",
       "import": "./dist/esm/universal/constants.js",
@@ -76,11 +49,6 @@
       "import": "./dist/esm/universal/pluginDagSort.js",
       "default": "./dist/cjs/universal/pluginDagSort.js"
     },
-    "./universal/time": {
-      "types": "./dist/types/universal/time.d.ts",
-      "import": "./dist/esm/universal/time.js",
-      "default": "./dist/cjs/universal/time.js"
-    },
     "./ajv": "./dist/compiled/ajv/index.js",
     "./commander": "./dist/compiled/commander/index.js",
     "./ora": "./dist/compiled/ora/index.js",
@@ -100,6 +68,7 @@
     "./browserslist": "./dist/compiled/browserslist/index.js",
     "./webpack-chain": "./dist/compiled/webpack-chain/index.js",
     "./tsconfig-paths": "./dist/compiled/tsconfig-paths/index.js",
+    "./gradient-string": "./dist/compiled/gradient-string/index.js",
     "./better-ajv-errors": "./dist/compiled/better-ajv-errors/index.js",
     "./webpack-dev-middleware": "./dist/compiled/webpack-dev-middleware/index.js"
   },
@@ -116,24 +85,6 @@
       "chain-id": [
         "./dist/types/cli/constants/chainId.d.ts"
       ],
-      "runtime/router": [
-        "./dist/types/runtime/router.d.ts"
-      ],
-      "runtime/remix-router": [
-        "./dist/types/runtime/remixRouter.d.ts"
-      ],
-      "runtime/nested-routes": [
-        "./dist/types/runtime/nestedRoutes.d.ts"
-      ],
-      "runtime-browser": [
-        "./dist/types/runtime-browser/index.d.ts"
-      ],
-      "runtime-node": [
-        "./dist/types/runtime-node/index.d.ts"
-      ],
-      "runtime-node/router": [
-        "./dist/types/runtime-node/router.d.ts"
-      ],
       "universal/constants": [
         "./dist/types/universal/constants.d.ts"
       ],
@@ -143,9 +94,6 @@
       "universal/plugin-dag-sort": [
         "./dist/types/universal/pluginDagSort.d.ts"
       ],
-      "universal/time": [
-        "./dist/types/universal/time.d.ts"
-      ],
       "ajv": [
         "./dist/compiled/ajv/types/ajv.d.ts"
       ],
@@ -200,6 +148,9 @@
       "tsconfig-paths": [
         "./dist/compiled/tsconfig-paths/lib/index.d.ts"
       ],
+      "gradient-string": [
+        "./dist/compiled/gradient-string/index.d.ts"
+      ],
       "better-ajv-errors": [
         "./dist/compiled/better-ajv-errors/index.d.ts"
       ],
@@ -217,35 +168,17 @@
   "dependencies": {
     "caniuse-lite": "^1.0.30001520",
     "lodash": "^4.17.21",
-    "serialize-javascript": "^6.0.0",
-    "react-router-dom": "6.15.0",
-    "@remix-run/router": "1.8.0",
     "@swc/helpers": "0.5.1"
   },
-  "peerDependencies": {
-    "react": ">=17.0.0",
-    "react-dom": ">=17.0.0"
-  },
-  "peerDependenciesMeta": {
-    "react": {
-      "optional": true
-    },
-    "react-dom": {
-      "optional": true
-    }
-  },
   "devDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.34.0",
-    "@scripts/jest-config": "2.34.0",
-    "@scripts/build": "2.34.0"
+    "@modern-js/types": "2.35.1",
+    "@scripts/build": "2.35.1",
+    "@scripts/jest-config": "2.35.1"
   },
   "sideEffects": false,
   "scripts": {

package/dist/cjs/runtime/nestedRoutes.js

@@ -1,149 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  transformNestedRoutes: function() {
-    return transformNestedRoutes;
-  },
-  renderNestedRoute: function() {
-    return renderNestedRoute;
-  }
-});
-const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-const _jsxruntime = require("react/jsx-runtime");
-const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
-const _reactrouterdom = require("react-router-dom");
-const _constants = require("../universal/constants");
-const _time = require("../universal/time");
-const transformNestedRoutes = (routes, reporter) => {
-  const routeElements = [];
-  for (const route of routes) {
-    const routeElement = renderNestedRoute(route, {
-      reporter
-    });
-    routeElements.push(routeElement);
-  }
-  return (0, _reactrouterdom.createRoutesFromElements)(routeElements);
-};
-const renderNestedRoute = (nestedRoute, options = {}) => {
-  var _config, _children;
-  const { children, index, id, component, isRoot, lazyImport, config, handle } = nestedRoute;
-  const Component = component;
-  const { parent, DeferredDataComponent, props = {}, reporter } = options;
-  const routeProps = {
-    caseSensitive: nestedRoute.caseSensitive,
-    path: nestedRoute.path,
-    id: nestedRoute.id,
-    loader: createLoader(nestedRoute, reporter),
-    action: nestedRoute.action,
-    hasErrorBoundary: nestedRoute.hasErrorBoundary,
-    shouldRevalidate: nestedRoute.shouldRevalidate,
-    handle: {
-      ...handle,
-      ...typeof config === "object" ? (_config = config) === null || _config === void 0 ? void 0 : _config.handle : {}
-    },
-    index: nestedRoute.index,
-    element: nestedRoute.element,
-    errorElement: nestedRoute.errorElement
-  };
-  if (nestedRoute.error) {
-    const errorElement = /* @__PURE__ */ (0, _jsxruntime.jsx)(nestedRoute.error, {});
-    routeProps.errorElement = errorElement;
-  }
-  let element;
-  if (Component) {
-    var _parent;
-    if (((_parent = parent) === null || _parent === void 0 ? void 0 : _parent.loading) && lazyImport) {
-      const Loading = parent.loading;
-      if (isLoadableComponent(Component)) {
-        element = /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
-          fallback: /* @__PURE__ */ (0, _jsxruntime.jsx)(Loading, {})
-        });
-      } else {
-        element = /* @__PURE__ */ (0, _jsxruntime.jsx)(_react.Suspense, {
-          fallback: /* @__PURE__ */ (0, _jsxruntime.jsx)(Loading, {}),
-          children: /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {})
-        });
-      }
-    } else if (isLoadableComponent(Component) && lazyImport) {
-      element = /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {});
-    } else if (isRoot) {
-      var _props;
-      element = /* @__PURE__ */ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
-        children: [
-          /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
-            ...props
-          }),
-          typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ (0, _jsxruntime.jsx)(DeferredDataComponent, {
-            nonce: (_props = props) === null || _props === void 0 ? void 0 : _props.nonce
-          })
-        ]
-      });
-    } else if (lazyImport) {
-      element = /* @__PURE__ */ (0, _jsxruntime.jsx)(_react.Suspense, {
-        fallback: null,
-        children: /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {})
-      });
-    } else {
-      element = /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {});
-    }
-  } else {
-    var _parent1;
-    nestedRoute.loading = (_parent1 = parent) === null || _parent1 === void 0 ? void 0 : _parent1.loading;
-    routeProps.element = /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Outlet, {});
-  }
-  if (element) {
-    routeProps.element = element;
-  }
-  const childElements = (_children = children) === null || _children === void 0 ? void 0 : _children.map((childRoute) => {
-    return renderNestedRoute(childRoute, {
-      parent: nestedRoute,
-      reporter
-    });
-  });
-  const routeElement = index ? /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
-    ...routeProps,
-    index: true
-  }, id) : /* @__PURE__ */ (0, _jsxruntime.jsx)(_reactrouterdom.Route, {
-    ...routeProps,
-    index: false,
-    children: childElements
-  }, id);
-  return routeElement;
-};
-function createLoader(route, reporter) {
-  const { loader } = route;
-  if (loader) {
-    return async (args) => {
-      if (typeof route.lazyImport === "function") {
-        route.lazyImport();
-      }
-      const end = (0, _time.time)();
-      const res = await loader(args);
-      const cost = end();
-      if (typeof document === "undefined" && reporter) {
-        var _reporter;
-        (_reporter = reporter) === null || _reporter === void 0 ? void 0 : _reporter.reportTiming(`${_constants.LOADER_REPORTER_NAME}-${route.id}`, cost);
-      }
-      return res;
-    };
-  } else {
-    return () => {
-      if (typeof route.lazyImport === "function") {
-        route.lazyImport();
-      }
-      return null;
-    };
-  }
-}
-function isLoadableComponent(component) {
-  return component && component.displayName === "Loadable" && component.preload && typeof component.preload === "function";
-}

package/dist/cjs/runtime/remixRouter.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const _export_star = require("@swc/helpers/_/_export_star");
-_export_star._(require("@remix-run/router"), exports);

package/dist/cjs/runtime/router.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const _export_star = require("@swc/helpers/_/_export_star");
-_export_star._(require("react-router-dom"), exports);

package/dist/cjs/runtime-browser/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const _export_star = require("@swc/helpers/_/_export_star");
-_export_star._(require("./parsed"), exports);

package/dist/cjs/runtime-browser/parsed.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "parsedJSONFromElement", {
-  enumerable: true,
-  get: function() {
-    return parsedJSONFromElement;
-  }
-});
-const parsedJSONFromElement = (id) => {
-  const elements = document.querySelectorAll(`#${id}`);
-  if (elements.length === 0) {
-    return void 0;
-  }
-  const element = elements[elements.length - 1];
-  if (element) {
-    try {
-      var _element;
-      const parsed = JSON.parse(((_element = element) === null || _element === void 0 ? void 0 : _element.textContent) || "");
-      return parsed;
-    } catch (e) {
-      console.error(`parse ${id} error`, e);
-      return void 0;
-    }
-  }
-  return void 0;
-};

package/dist/cjs/runtime-node/index.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  run: function() {
-    return run;
-  },
-  useHeaders: function() {
-    return useHeaders;
-  },
-  serializeJson: function() {
-    return _serialize.serializeJson;
-  }
-});
-const _export_star = require("@swc/helpers/_/_export_star");
-const _storage = require("./storage");
-const _serialize = require("./serialize");
-_export_star._(require("./nestedRoutes"), exports);
-_export_star._(require("./loaderContext"), exports);
-const { run, useContext: useHeaders } = (0, _storage.createStorage)();

package/dist/cjs/runtime-node/loaderContext/createLoaderCtx.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  LoaderContext: function() {
-    return LoaderContext;
-  },
-  createLoaderContext: function() {
-    return createLoaderContext;
-  }
-});
-class LoaderContext {
-  getDefaultValue() {
-    if (!this.defaultValue) {
-      throw new Error("Can't get defaultValue before initialed");
-    }
-    return this.defaultValue;
-  }
-  constructor(defaultValue) {
-    this.defaultValue = defaultValue;
-    this.symbol = Symbol("loaderContext");
-  }
-}
-function createLoaderContext(defaultValue) {
-  return new LoaderContext(defaultValue);
-}

package/dist/cjs/runtime-node/loaderContext/createRequestCtx.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  RequestContext: function() {
-    return RequestContext;
-  },
-  createRequestContext: function() {
-    return createRequestContext;
-  }
-});
-class RequestContext {
-  get(loaderCtx) {
-    const { symbol } = loaderCtx;
-    if (this.store.get(symbol)) {
-      return this.store.get(symbol);
-    }
-    return loaderCtx.getDefaultValue();
-  }
-  set(loaderCtx, value) {
-    const { symbol } = loaderCtx;
-    this.store.set(symbol, value);
-  }
-  constructor() {
-    this.store = /* @__PURE__ */ new Map();
-  }
-}
-function createRequestContext() {
-  return new RequestContext();
-}

package/dist/cjs/runtime-node/loaderContext/index.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  createRequestContext: function() {
-    return _createRequestCtx.createRequestContext;
-  },
-  reporterCtx: function() {
-    return reporterCtx;
-  }
-});
-const _createLoaderCtx = require("./createLoaderCtx");
-const _createRequestCtx = require("./createRequestCtx");
-const reporterCtx = (0, _createLoaderCtx.createLoaderContext)();

package/dist/cjs/runtime-node/nestedRoutes.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "matchEntry", {
-  enumerable: true,
-  get: function() {
-    return matchEntry;
-  }
-});
-function sortByUrlPath(entries) {
-  entries.sort(function(a, b) {
-    const length1 = a.urlPath.length;
-    const length2 = b.urlPath.length;
-    if (length1 < length2) {
-      return 1;
-    }
-    if (length1 > length2) {
-      return -1;
-    }
-    return 0;
-  });
-  return entries;
-}
-const matchEntry = (pathname, entries) => {
-  sortByUrlPath(entries);
-  return entries.find((entry) => pathname.startsWith(entry.urlPath));
-};

package/dist/cjs/runtime-node/router.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const _export_star = require("@swc/helpers/_/_export_star");
-_export_star._(require("react-router-dom/server"), exports);

package/dist/cjs/runtime-node/serialize.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "serializeJson", {
-  enumerable: true,
-  get: function() {
-    return serializeJson;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _serializejavascript = /* @__PURE__ */ _interop_require_default._(require("serialize-javascript"));
-const serializeJson = (data) => {
-  return (0, _serializejavascript.default)(data, {
-    isJSON: true
-  });
-};

package/dist/cjs/runtime-node/storage.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "createStorage", {
-  enumerable: true,
-  get: function() {
-    return createStorage;
-  }
-});
-const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-const _async_hooks = /* @__PURE__ */ _interop_require_wildcard._(require("async_hooks"));
-const createStorage = () => {
-  let storage;
-  if (typeof _async_hooks.AsyncLocalStorage !== "undefined") {
-    storage = new _async_hooks.AsyncLocalStorage();
-  }
-  const run = (context, cb) => {
-    if (!storage) {
-      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
-        `);
-    }
-    return new Promise((resolve, reject) => {
-      storage.run(context, () => {
-        try {
-          return resolve(cb());
-        } catch (error) {
-          return reject(error);
-        }
-      });
-    });
-  };
-  const useContext = () => {
-    if (!storage) {
-      throw new Error(`Unable to use async_hook, please confirm the node version >= 12.17
-        `);
-    }
-    const context = storage.getStore();
-    if (!context) {
-      throw new Error(`Can't call useContext out of scope, make sure @modern-js/utils is a single version in node_modules`);
-    }
-    return context;
-  };
-  return {
-    run,
-    useContext
-  };
-};

package/dist/cjs/universal/time.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "time", {
-  enumerable: true,
-  get: function() {
-    return time;
-  }
-});
-function processHrtime(previousTimestamp) {
-  const now = (/* @__PURE__ */ new Date()).getTime();
-  const clocktime = now * 1e-3;
-  let seconds = Math.floor(clocktime);
-  let nanoseconds = Math.floor(clocktime % 1 * 1e9);
-  if (previousTimestamp) {
-    seconds -= previousTimestamp[0];
-    nanoseconds -= previousTimestamp[1];
-    if (nanoseconds < 0) {
-      seconds--;
-      nanoseconds += 1e9;
-    }
-  }
-  return [
-    seconds,
-    nanoseconds
-  ];
-}
-const getLatency = (hrtime) => {
-  const [s, ns] = processHrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-const time = () => {
-  const hrtime = processHrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};