@modern-js/utils 2.12.1-alpha.3 → 2.13.1

package/dist/{cjs/react.js → react.js}

@@ -2,8 +2,22 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,10 +52,7 @@ const isBeyondReact17 = (cwd) => {
     return false;
   }
   const pkgInfo = JSON.parse(import__.fs.readFileSync(pkgPath, "utf8"));
-  const deps = {
-    ...pkgInfo.devDependencies,
-    ...pkgInfo.dependencies
-  };
+  const deps = __spreadValues(__spreadValues({}, pkgInfo.devDependencies), pkgInfo.dependencies);
   if (typeof deps.react !== "string") {
     return false;
   }

package/dist/{cjs/runtimeExports.js → runtimeExports.js}

@@ -57,7 +57,7 @@ const createRuntimeExportsUtils = memo(
           import_compiled.fs.appendFileSync(entryExportFile, `${statement}
 `);
         }
-      } catch {
+      } catch (e) {
       }
     };
     const getPath = () => entryExportFile;

package/dist/{cjs/universal → universal}/nestedRoutes.js

@@ -1,7 +1,24 @@
 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 });
@@ -66,7 +83,7 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
       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, { ...props }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, __spreadValues({}, props)),
         typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DeferredDataComponent, {})
       ] });
     } else if (lazyImport) {
@@ -83,7 +100,7 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
   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, { ...routeProps, index: true }, id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Route, { ...routeProps, index: false, children: childElements }, id);
+  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) {

package/dist/{cjs/version.js → version.js}

@@ -2,8 +2,22 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -25,6 +39,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 var version_exports = {};
 __export(version_exports, {
   getPnpmVersion: () => getPnpmVersion,
@@ -33,9 +67,11 @@ __export(version_exports, {
 module.exports = __toCommonJS(version_exports);
 var import_path = __toESM(require("path"));
 var import_compiled = require("./compiled");
-async function getPnpmVersion() {
-  const { stdout } = await (0, import_compiled.execa)("pnpm", ["--version"]);
-  return stdout;
+function getPnpmVersion() {
+  return __async(this, null, function* () {
+    const { stdout } = yield (0, import_compiled.execa)("pnpm", ["--version"]);
+    return stdout;
+  });
 }
 const isReact18 = (cwd) => {
   const pkgPath = import_path.default.join(cwd, "package.json");
@@ -43,10 +79,7 @@ const isReact18 = (cwd) => {
     return false;
   }
   const pkgInfo = JSON.parse(import_compiled.fs.readFileSync(pkgPath, "utf8"));
-  const deps = {
-    ...pkgInfo.devDependencies,
-    ...pkgInfo.dependencies
-  };
+  const deps = __spreadValues(__spreadValues({}, pkgInfo.devDependencies), pkgInfo.dependencies);
   if (typeof deps.react !== "string") {
     return false;
   }

package/dist/{cjs/watch.js → watch.js}

@@ -25,6 +25,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 var watch_exports = {};
 __export(watch_exports, {
   WatchChangeType: () => WatchChangeType,
@@ -44,20 +64,20 @@ const watch = (watchDir, runTask, ignored = []) => {
     ignored
   });
   watcher.on("ready", () => ready = true);
-  watcher.on("change", async (filePath) => {
+  watcher.on("change", (filePath) => __async(void 0, null, function* () {
     const changedFilePath = path.resolve(filePath);
-    await runTask({ changedFilePath, changeType: WatchChangeType.CHANGE });
-  });
-  watcher.on("add", async (filePath) => {
+    yield runTask({ changedFilePath, changeType: WatchChangeType.CHANGE });
+  }));
+  watcher.on("add", (filePath) => __async(void 0, null, function* () {
     const changedFilePath = path.resolve(filePath);
     if (ready) {
-      await runTask({ changedFilePath, changeType: WatchChangeType.ADD });
+      yield runTask({ changedFilePath, changeType: WatchChangeType.ADD });
     }
-  });
-  watcher.on("unlink", async (filePath) => {
+  }));
+  watcher.on("unlink", (filePath) => __async(void 0, null, function* () {
     const changedFilePath = path.resolve(filePath);
-    await runTask({ changedFilePath, changeType: WatchChangeType.UNLINK });
-  });
+    yield runTask({ changedFilePath, changeType: WatchChangeType.UNLINK });
+  }));
   watcher.on("error", (err) => {
     throw err;
   });

package/package.json

@@ -11,33 +11,19 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.12.1-alpha.3",
+  "version": "2.13.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "_comment": "Provide ESM and CJS exports, ESM is used by runtime package, for treeshaking",
   "exports": {
-    ".": {
-      "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
-    },
-    "./ssr": {
-      "import": "./dist/esm/ssr.js",
-      "default": "./dist/cjs/ssr.js"
-    },
-    "./logger": {
-      "import": "./dist/esm/logger.js",
-      "default": "./dist/cjs/logger.js"
-    },
-    "./constants": {
-      "import": "./dist/esm/constants.js",
-      "default": "./dist/cjs/constants.js"
-    },
-    "./babel": {
-      "import": "./dist/esm/babel.js",
-      "default": "./dist/cjs/babel.js"
-    },
+    ".": "./dist/index.js",
+    "./ssr": "./dist/ssr.js",
+    "./babel": "./dist/babel.js",
+    "./logger": "./dist/logger.js",
+    "./chain-id": "./dist/chainId.js",
+    "./constants": "./dist/constants.js",
     "./ajv": "./compiled/ajv/index.js",
     "./glob": "./compiled/glob/index.js",
     "./chalk": "./compiled/chalk/index.js",
@@ -56,29 +42,11 @@
     "./tsconfig-paths": "./compiled/tsconfig-paths/index.js",
     "./better-ajv-errors": "./compiled/better-ajv-errors/index.js",
     "./webpack-dev-middleware": "./compiled/webpack-dev-middleware/index.js",
-    "./chain-id": {
-      "default": "./dist/cjs/chainId.js"
-    },
-    "./universal/constants": {
-      "import": "./dist/esm/universal/constants.js",
-      "default": "./dist/cjs/universal/constants.js"
-    },
-    "./universal/serialize": {
-      "import": "./dist/esm/universal/serialize.js",
-      "default": "./dist/cjs/universal/serialize.js"
-    },
-    "./universal/remix-router": {
-      "import": "./dist/esm/universal/remixRouter.js",
-      "default": "./dist/cjs/universal/remixRouter.js"
-    },
-    "./universal/format-webpack": {
-      "import": "./dist/esm/universal/formatWebpack.js",
-      "default": "./dist/cjs/universal/formatWebpack.js"
-    },
-    "./universal/nestedRoutes": {
-      "import": "./dist/esm/universal/nestedRoutes.js",
-      "default": "./dist/cjs/universal/nestedRoutes.js"
-    }
+    "./universal/constants": "./dist/universal/constants.js",
+    "./universal/serialize": "./dist/universal/serialize.js",
+    "./universal/remix-router": "./dist/universal/remixRouter.js",
+    "./universal/format-webpack": "./dist/universal/formatWebpack.js",
+    "./universal/nestedRoutes": "./dist/universal/nestedRoutes.js"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -176,10 +144,10 @@
     }
   },
   "dependencies": {
-    "@remix-run/router": "^1.3.2",
     "caniuse-lite": "^1.0.30001451",
     "lodash": "^4.17.21",
-    "serialize-javascript": "^6.0.0"
+    "serialize-javascript": "^6.0.0",
+    "@remix-run/router": "^1.3.2"
   },
   "peerDependencies": {
     "react": ">=17.0.0",
@@ -198,24 +166,24 @@
     }
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.12.0",
-    "@types/jest": "^29",
-    "@types/node": "^14",
-    "@types/serialize-javascript": "^5.0.1",
-    "jest": "^29",
     "react": ">=17.0.0",
     "react-dom": ">=17.0.0",
     "react-router-dom": "^6.8.1",
+    "@types/jest": "^29",
+    "@types/node": "^14",
+    "jest": "^29",
     "typescript": "^4",
     "webpack": "^5.76.2",
-    "@modern-js/types": "2.12.0",
-    "@scripts/jest-config": "2.12.0"
+    "@types/serialize-javascript": "^5.0.1",
+    "@modern-js/types": "2.13.1",
+    "@scripts/build": "2.13.1",
+    "@scripts/jest-config": "2.13.1"
   },
   "sideEffects": false,
   "scripts": {
     "new": "modern-lib new",
-    "dev": "modern build --watch",
-    "build": "modern build",
+    "dev": "modern-lib build --watch",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }

package/dist/cjs/nodeEnv.js

@@ -1,55 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var nodeEnv_exports = {};
-__export(nodeEnv_exports, {
-  canUseNpm: () => canUseNpm,
-  canUsePnpm: () => canUsePnpm,
-  canUseYarn: () => canUseYarn
-});
-module.exports = __toCommonJS(nodeEnv_exports);
-var import_compiled = require("./compiled");
-async function canUseNpm() {
-  try {
-    await (0, import_compiled.execa)("npm", ["--version"], { env: process.env });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-async function canUseYarn() {
-  try {
-    await (0, import_compiled.execa)("yarn", ["--version"], { env: process.env });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-async function canUsePnpm() {
-  try {
-    await (0, import_compiled.execa)("pnpm", ["--version"], { env: process.env });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  canUseNpm,
-  canUsePnpm,
-  canUseYarn
-});

package/dist/compiled/address/index.js

@@ -1 +0,0 @@
-(()=>{"use strict";var e={198:(e,r,a)=>{var n=a(37);var i=a(147);var t=a(81);var f="/etc/resolv.conf";function getInterfaceName(){var e="eth";var r=n.platform();if(r==="darwin"){e="en"}else if(r==="win32"){e=null}return e}function getIfconfigCMD(){if(n.platform()==="win32"){return"ipconfig/all"}return"/sbin/ifconfig"}function address(e,r){if(typeof e==="function"){r=e;e=null}var a={ip:address.ip(e),ipv6:address.ipv6(e),mac:null};address.mac(e,(function(e,n){if(n){a.mac=n}r(e,a)}))}address.interface=function(e,r){var a=n.networkInterfaces();var i=!r;r=r||getInterfaceName();e=e||"IPv4";for(var t=-1;t<8;t++){var f=r+(t>=0?t:"");var s=a[f];if(s){for(var d=0;d<s.length;d++){var c=s[d];if(c.family===e){return c}}}}if(i){for(var u in a){var s=a[u];for(var t=0;t<s.length;t++){var c=s[t];if(c.family===e&&c.address!=="127.0.0.1"){return c}}}}return};address.ip=function(e){var r=address.interface("IPv4",e);return r&&r.address};address.ipv6=function(e){var r=address.interface("IPv6",e);return r&&r.address};var s=/^(\w+)\:\s+flags=/;var d=/^(\w+)\s{2,}link encap:\w+/i;var c=address.MAC_RE=/(?:ether|HWaddr)\s+((?:[a-z0-9]{2}\:){5}[a-z0-9]{2})/i;var u=address.MAC_IP_RE=/inet\s(?:addr\:)?(\d+\.\d+\.\d+\.\d+)/;function getMAC(e,r,a){var n=e.split("\n");for(var i=0;i<n.length;i++){var t=n[i].trimRight();var f=s.exec(t)||d.exec(t);if(!f){continue}var v=f[1];if(v.indexOf(r)!==0){continue}var o=null;var l=null;var p=c.exec(t);if(p){l=p[1]}i++;while(true){t=n[i];if(!t||s.exec(t)||d.exec(t)){i--;break}if(!l){p=c.exec(t);if(p){l=p[1]}}if(!o){p=u.exec(t);if(p){o=p[1]}}i++}if(o===a){return l}}}address.mac=function(e,r){if(typeof e==="function"){r=e;e=null}e=e||getInterfaceName();var a=address.interface("IPv4",e);if(!a){return r()}if(!process.env.CI&&(a.mac==="ff:00:00:00:00:00"||a.mac==="00:00:00:00:00:00")){a.mac=""}if(a.mac){return r(null,a.mac)}t.exec(getIfconfigCMD(),{timeout:5e3},(function(n,i,t){if(n||!i){return r(n)}var f=getMAC(i||"",e,a.address);r(null,f)}))};var v=/^nameserver\s+(\d+\.\d+\.\d+\.\d+)$/i;address.dns=function(e,r){if(typeof e==="function"){r=e;e=null}e=e||f;i.readFile(e,"utf8",(function(e,a){if(e){return r(e)}var n=[];a=a||"";var i=a.split("\n");for(var t=0;t<i.length;t++){var f=i[t].trim();var s=v.exec(f);if(s){n.push(s[1])}}r(null,n)}))};e.exports=address},81:e=>{e.exports=require("child_process")},147:e=>{e.exports=require("fs")},37:e=>{e.exports=require("os")}};var r={};function __nccwpck_require__(a){var n=r[a];if(n!==undefined){return n.exports}var i=r[a]={exports:{}};var t=true;try{e[a](i,i.exports,__nccwpck_require__);t=false}finally{if(t)delete r[a]}return i.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var a=__nccwpck_require__(198);module.exports=a})();

package/dist/compiled/address/lib/address.d.ts

@@ -1,28 +0,0 @@
-export = address;
-
-declare interface Address {
-  ip: string;
-  ipv6: string;
-  mac: string;
-}
-
-declare type AddressCallback = (err: Error, addr: Address) => void;
-declare type MacCallback = (err: Error, addr: string) => void;
-declare type DnsCallback = (err: Error, servers: string[]) => void;
-
-declare function address(interfaceName: string, callback: AddressCallback): void;
-declare function address(callback: AddressCallback): void;
-
-declare namespace address {
-  const MAC_IP_RE: RegExp;
-  const MAC_RE: RegExp;
-
-  function dns(filepath: string, callback: DnsCallback): void;
-  function dns(callback: DnsCallback): void;
-
-  function ip(interfaceName?: string): any;
-  function ipv6(interfaceName?: string): any;
-
-  function mac(interfaceName: string, callback: MacCallback): void;
-  function mac(callback: MacCallback): void;
-}

package/dist/compiled/address/package.json

@@ -1 +0,0 @@
-{"name":"address","author":"fengmk2 <fengmk2@gmail.com>","version":"1.1.2","license":"MIT","types":"lib/address.d.ts"}

package/dist/compiled/ajv/codegen.js

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