@modern-js/utils 2.5.0-alpha.0 → 2.5.1-alpha.0

package/dist/alias.d.ts

@@ -1,5 +1,5 @@
-export declare type Alias = Record<string, string | string[]>;
-export declare type AliasOption = Alias | ((aliases: Alias) => Alias | void);
+export type Alias = Record<string, string | string[]>;
+export type AliasOption = Alias | ((aliases: Alias) => Alias | void);
 interface NormalizedConfig {
   source: {
     alias?: AliasOption | Array<AliasOption>;

package/dist/chainId.d.ts

@@ -255,4 +255,4 @@ export declare const CHAIN_ID: {
     readonly TS_CONFIG_PATHS: "ts-config-paths";
   };
 };
-export declare type ChainIdentifier = typeof CHAIN_ID;
+export type ChainIdentifier = typeof CHAIN_ID;

package/dist/generateMetaTags.d.ts

@@ -7,7 +7,7 @@
  *
  * Modified from https://github.com/jantimon/html-webpack-plugin/blob/2f5de7ab9e8bca60e9e200f2e4b4cfab90db28d4/index.js#L800
  */
-export declare type MetaAttributes = {
+export type MetaAttributes = {
   [attributeName: string]: string | boolean;
 };
 export interface MetaOptions {

package/dist/index.d.ts

@@ -41,6 +41,4 @@ export * from './plugin';
 export * from './routes';
 export * from './test-utils';
 export * from './getCoreJsVersion';
-export * from './react';
-export * from './nestedRoutes';
-export * from './serialize';
+export * from './react';

package/dist/index.js

@@ -58,5 +58,3 @@ __reExport(src_exports, require("./routes"), module.exports);
 __reExport(src_exports, require("./test-utils"), module.exports);
 __reExport(src_exports, require("./getCoreJsVersion"), module.exports);
 __reExport(src_exports, require("./react"), module.exports);
-__reExport(src_exports, require("./nestedRoutes"), module.exports);
-__reExport(src_exports, require("./serialize"), module.exports);

package/dist/is/index.d.ts

@@ -40,6 +40,13 @@ export declare const isUseSSRBundle: (config: any) => boolean;
 
 export declare const isServiceWorker: (config: any) => boolean;
 export declare const isFastRefresh: () => boolean;
+export declare const isRouterV5: (config: {
+  runtime?: {
+    router?: {
+      mode?: string;
+    } | boolean;
+  };
+}) => boolean;
 export * from './node-env';
 export * from './platform';
 export * from './type';

package/dist/is/index.js

@@ -27,6 +27,7 @@ __export(is_exports, {
   isDepExists: () => isDepExists,
   isEmpty: () => isEmpty,
   isFastRefresh: () => isFastRefresh,
+  isRouterV5: () => isRouterV5,
   isSSR: () => isSSR,
   isServiceWorker: () => isServiceWorker,
   isTypescript: () => isTypescript,
@@ -82,11 +83,16 @@ const isServiceWorker = (config) => {
   return false;
 };
 const isFastRefresh = () => (0, import_node_env.isDev)() && process.env.FAST_REFRESH !== "false";
+const isRouterV5 = (config) => {
+  var _a, _b, _c;
+  return typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   isDepExists,
   isEmpty,
   isFastRefresh,
+  isRouterV5,
   isSSR,
   isServiceWorker,
   isTypescript,

package/dist/logger.d.ts

@@ -1,6 +1,6 @@
 import { Color } from '../compiled/chalk';
-declare type LogLevel = 'debug' | 'info' | 'warn' | 'error';
-declare type LogMsg = number | string | Error | null;
+type LogLevel = 'debug' | 'info' | 'warn' | 'error';
+type LogMsg = number | string | Error | null;
 interface LoggerConfiguration {
   color?: typeof Color;
   label?: string;
@@ -15,7 +15,7 @@ interface ConstructorOptions {
   level?: string;
   types?: Record<string, LoggerConfiguration>;
 }
-declare type LoggerFunction = (message?: LogMsg, ...args: any[]) => void;
+type LoggerFunction = (message?: LogMsg, ...args: any[]) => void;
 declare const LOG_TYPES: {
   error: {
     color: string;
@@ -58,7 +58,7 @@ declare class Logger {
   private getLongestLabel;
 }
 
-declare type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
+type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
 declare const logger: Logger & LoggerInterface;
 export { Logger };
 export { logger };

package/dist/pathSerializer.d.ts

@@ -1,5 +1,5 @@
 /** Different from  */
-export declare type PathMatchExpression = string | RegExp;
+export type PathMatchExpression = string | RegExp;
 export interface PathMatcher {
   match: PathMatchExpression;
   mark: string | ((substring: string, ...args: any[]) => string);

package/dist/types.d.ts

@@ -1 +1 @@
-export declare type Falsy = false | null | undefined | 0 | '';
+export type Falsy = false | null | undefined | 0 | '';

package/dist/watch.d.ts

@@ -1,6 +1,6 @@
-export declare type WatchChangeTypeValueT = 'add' | 'unlink' | 'change';
+export type WatchChangeTypeValueT = 'add' | 'unlink' | 'change';
 export declare const WatchChangeType: Record<'ADD' | 'UNLINK' | 'CHANGE', WatchChangeTypeValueT>;
-declare type RunTaskType = (option: {
+type RunTaskType = (option: {
   changedFilePath: string;
   changeType: WatchChangeTypeValueT;
 }) => void | Promise<void>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.0-alpha.0",
+  "version": "2.5.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -23,9 +23,6 @@
     "./format": "./dist/format.js",
     "./logger": "./dist/logger.js",
     "./constants": "./dist/constants.js",
-    "./serialize": "./dist/serialize.js",
-    "./nestedRoutes": "./dist/nestedRoutes.js",
-    "./remix-router": "./dist/remix-router.js",
     "./ajv": "./compiled/ajv/index.js",
     "./glob": "./compiled/glob/index.js",
     "./chalk": "./compiled/chalk/index.js",
@@ -64,12 +61,6 @@
       "constants": [
         "./dist/constants.d.ts"
       ],
-      "serialize": [
-        "./dist/serialize.d.ts"
-      ],
-      "nestedRoutes": [
-        "./dist/nestedRoutes.d.ts"
-      ],
       "ajv": [
         "./compiled/ajv/types/ajv.d.ts"
       ],
@@ -129,36 +120,22 @@
       ],
       "chain-id": [
         "./dist/chainId.d.ts"
-      ],
-      "remix-router": [
-        "./dist/remix-router.d.ts"
       ]
     }
   },
   "dependencies": {
     "caniuse-lite": "^1.0.30001451",
-    "lodash": "^4.17.21",
-    "serialize-javascript": "^6.0.0",
-    "@remix-run/router": "^1.3.2"
-  },
-  "peerDependencies": {
-    "react": ">=17.0.0",
-    "react-dom": ">=17.0.0",
-    "react-router-dom": "^6.8.1"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "react": ">=17.0.0",
-    "react-dom": ">=17.0.0",
-    "react-router-dom": "^6.8.1",
+    "@modern-js/types": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "webpack": "^5.75.0",
-    "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.5.0",
-    "@scripts/build": "2.5.0",
-    "@scripts/jest-config": "2.5.0"
+    "webpack": "^5.75.0"
   },
   "sideEffects": false,
   "scripts": {

package/dist/nestedRoutes.d.ts

@@ -1,9 +0,0 @@
-/**
- * runtime utils for nested routes generating
- */
-import type { NestedRoute } from '@modern-js/types';
-export declare const transformNestedRoutes: (routes: NestedRoute[]) => import("react-router-dom").RouteObject[];
-export declare const renderNestedRoute: (nestedRoute: NestedRoute, options?: {
-  parent?: NestedRoute;
-  DeferredDataComponent?: () => JSX.Element;
-}) => JSX.Element;

package/dist/nestedRoutes.js

@@ -1,144 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-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 nestedRoutes_exports = {};
-__export(nestedRoutes_exports, {
-  renderNestedRoute: () => renderNestedRoute,
-  transformNestedRoutes: () => transformNestedRoutes
-});
-module.exports = __toCommonJS(nestedRoutes_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_react_router_dom = require("react-router-dom");
-const transformNestedRoutes = (routes) => {
-  const routeElements = [];
-  for (const route of routes) {
-    const routeElement = renderNestedRoute(route);
-    routeElements.push(routeElement);
-  }
-  return (0, import_react_router_dom.createRoutesFromElements)(routeElements);
-};
-const renderNestedRoute = (nestedRoute, options = {}) => {
-  const { children, index, id, component, isRoot } = nestedRoute;
-  const Component = component;
-  const { parent, DeferredDataComponent } = options;
-  const routeProps = {
-    caseSensitive: nestedRoute.caseSensitive,
-    path: nestedRoute.path,
-    id: nestedRoute.id,
-    loader: createLoader(nestedRoute),
-    action: nestedRoute.action,
-    hasErrorBoundary: nestedRoute.hasErrorBoundary,
-    shouldRevalidate: nestedRoute.shouldRevalidate,
-    handle: nestedRoute.handle,
-    index: nestedRoute.index,
-    element: nestedRoute.element,
-    errorElement: nestedRoute.errorElement
-  };
-  if (nestedRoute.error) {
-    const errorElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(nestedRoute.error, {});
-    routeProps.errorElement = errorElement;
-  }
-  let element;
-  if (Component) {
-    if (parent == null ? void 0 : parent.loading) {
-      const Loading = parent.loading;
-      if (isLoadableComponent(Component)) {
-        element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
-          fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {})
-        });
-      } else {
-        element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
-          fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, {}),
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
-        });
-      }
-    } else if (isLoadableComponent(Component)) {
-      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {});
-    } else if (isRoot) {
-      element = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {}),
-          typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DeferredDataComponent, {})
-        ]
-      });
-    } else {
-      element = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, {
-        fallback: null,
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {})
-      });
-    }
-  } else {
-    nestedRoute.loading = parent == null ? void 0 : parent.loading;
-  }
-  if (element) {
-    routeProps.element = element;
-  }
-  const childElements = children == null ? void 0 : children.map((childRoute) => {
-    return renderNestedRoute(childRoute, { parent: nestedRoute });
-  });
-  const routeElement = index ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, __spreadProps(__spreadValues({}, routeProps), {
-    index: true
-  }), id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, __spreadProps(__spreadValues({}, routeProps), {
-    index: false,
-    children: childElements
-  }), id);
-  return routeElement;
-};
-function createLoader(route) {
-  const { loader } = route;
-  if (loader) {
-    return (args) => {
-      if (typeof route.lazyImport === "function") {
-        route.lazyImport();
-      }
-      return loader(args);
-    };
-  } 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";
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  renderNestedRoute,
-  transformNestedRoutes
-});

package/dist/remix-router.d.ts

@@ -1 +0,0 @@
-export * from '@remix-run/router';

package/dist/remix-router.js

@@ -1,17 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var remix_router_exports = {};
-module.exports = __toCommonJS(remix_router_exports);
-__reExport(remix_router_exports, require("@remix-run/router"), module.exports);

package/dist/serialize.d.ts

@@ -1 +0,0 @@
-export declare const serializeJson: (data: any) => string;

package/dist/serialize.js

@@ -1,36 +0,0 @@
-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)
-    __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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var serialize_exports = {};
-__export(serialize_exports, {
-  serializeJson: () => serializeJson
-});
-module.exports = __toCommonJS(serialize_exports);
-var import_serialize_javascript = __toESM(require("serialize-javascript"));
-const serializeJson = (data) => {
-  return (0, import_serialize_javascript.default)(data, { isJSON: true });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  serializeJson
-});