@modern-js/utils 2.13.3 → 2.14.0

package/dist/esm/version.js

@@ -0,0 +1,25 @@
+import path from "path";
+import { fs, execa, semver } from "./compiled";
+async function getPnpmVersion() {
+  const { stdout } = await execa("pnpm", ["--version"]);
+  return stdout;
+}
+const isReact18 = (cwd) => {
+  const pkgPath = path.join(cwd, "package.json");
+  if (!fs.existsSync(pkgPath)) {
+    return false;
+  }
+  const pkgInfo = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+  const deps = {
+    ...pkgInfo.devDependencies,
+    ...pkgInfo.dependencies
+  };
+  if (typeof deps.react !== "string") {
+    return false;
+  }
+  return semver.satisfies(semver.minVersion(deps.react), ">=18.0.0");
+};
+export {
+  getPnpmVersion,
+  isReact18
+};

package/dist/esm/wait.js

@@ -0,0 +1,6 @@
+const wait = (time = 0) => new Promise((resolve) => {
+  setTimeout(resolve, time);
+});
+export {
+  wait
+};

package/dist/esm/watch.js

@@ -0,0 +1,36 @@
+import * as path from "path";
+import { chokidar } from "./compiled";
+const WatchChangeType = {
+  ADD: "add",
+  UNLINK: "unlink",
+  CHANGE: "change"
+};
+const watch = (watchDir, runTask, ignored = []) => {
+  let ready = false;
+  const watcher = chokidar.watch(watchDir, {
+    ignored
+  });
+  watcher.on("ready", () => ready = true);
+  watcher.on("change", async (filePath) => {
+    const changedFilePath = path.resolve(filePath);
+    await runTask({ changedFilePath, changeType: WatchChangeType.CHANGE });
+  });
+  watcher.on("add", async (filePath) => {
+    const changedFilePath = path.resolve(filePath);
+    if (ready) {
+      await runTask({ changedFilePath, changeType: WatchChangeType.ADD });
+    }
+  });
+  watcher.on("unlink", async (filePath) => {
+    const changedFilePath = path.resolve(filePath);
+    await runTask({ changedFilePath, changeType: WatchChangeType.UNLINK });
+  });
+  watcher.on("error", (err) => {
+    throw err;
+  });
+  return watcher;
+};
+export {
+  WatchChangeType,
+  watch
+};

package/dist/{constants.d.ts → types/constants.d.ts}

@@ -105,9 +105,7 @@ export declare const INTERNAL_DOC_TOOLS_PLUGINS: InternalPlugins;
 export declare const INTERNAL_CLI_PLUGINS: InternalPlugins;
 export declare const SERVER_PLUGIN_BFF = "@modern-js/plugin-bff";
 export declare const SERVER_PLUGIN_EXPRESS = "@modern-js/plugin-express";
-export declare const SERVER_PLUGIN_EGG = "@modern-js/plugin-egg";
 export declare const SERVER_PLUGIN_KOA = "@modern-js/plugin-koa";
-export declare const SERVER_PLUGIN_NEST = "@modern-js/plugin-nest";
 export declare const SERVER_PLUGIN_SERVER = "@modern-js/plugin-server";
 export declare const SERVER_PLUGIN_POLYFILL = "@modern-js/plugin-polyfill";
 export declare const INTERNAL_SERVER_PLUGINS: InternalPlugins;
@@ -226,6 +224,12 @@ export declare const PLUGIN_SCHEMAS: {
     };
   }[];
   '@modern-js/plugin-nocode': never[];
+  '@modern-js/plugin-worker': {
+    target: string;
+    schema: {
+      type: string[];
+    };
+  }[];
 };
 /**
  * The `@babel/preset-typescript` default options.

package/dist/{prettyInstructions.d.ts → types/prettyInstructions.d.ts}

@@ -5,5 +5,8 @@ export type AddressUrl = {
   label: string;
   url: string;
 };
-export declare const getAddressUrls: (protocol: string | undefined, port: number) => AddressUrl[];
+export declare const getAddressUrls: (protocol: string | undefined, port: number, host?: string) => {
+  label: string;
+  url: string;
+}[];
 export declare const prettyInstructions: (appContext: any, config: any) => string;

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

@@ -0,0 +1 @@
+export * from './parsed';

package/dist/types/runtime/parsed.d.ts

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

package/package.json

@@ -11,42 +11,91 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.13.3",
+  "version": "2.14.0",
   "jsnext:source": "./src/index.ts",
-  "types": "./dist/index.d.ts",
+  "types": "./dist/types/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": {
-    ".": "./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",
-    "./json5": "./compiled/json5/index.js",
-    "./semver": "./compiled/semver/index.js",
-    "./lodash": "./compiled/lodash/index.js",
-    "./globby": "./compiled/globby/index.js",
-    "./fs-extra": "./compiled/fs-extra/index.js",
-    "./fast-glob": "./compiled/fast-glob/index.js",
-    "./gzip-size": "./compiled/gzip-size/index.js",
-    "./mime-types": "./compiled/mime-types/index.js",
-    "./strip-ansi": "./compiled/strip-ansi/index.js",
-    "./ajv-keywords": "./compiled/ajv-keywords/index.js",
-    "./browserslist": "./compiled/browserslist/index.js",
-    "./webpack-chain": "./compiled/webpack-chain/index.js",
-    "./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",
-    "./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"
+    ".": {
+      "import": "./dist/esm/index.js",
+      "types": "./dist/types/index.d.ts",
+      "default": "./dist/cjs/index.js"
+    },
+    "./runtime": {
+      "import": "./dist/esm/runtime/index.js",
+      "types": "./dist/types/runtime/index.d.ts",
+      "default": "./dist/cjs/runtime/index.js"
+    },
+    "./ssr": {
+      "import": "./dist/esm/ssr.js",
+      "types": "./dist/types/ssr.d.ts",
+      "default": "./dist/cjs/ssr.js"
+    },
+    "./logger": {
+      "import": "./dist/esm/logger.js",
+      "types": "./dist/types/logger.d.ts",
+      "default": "./dist/cjs/logger.js"
+    },
+    "./constants": {
+      "import": "./dist/esm/constants.js",
+      "types": "./dist/types/constants.d.ts",
+      "default": "./dist/cjs/constants.js"
+    },
+    "./babel": {
+      "import": "./dist/esm/babel.js",
+      "types": "./dist/types/babel.d.ts",
+      "default": "./dist/cjs/babel.js"
+    },
+    "./ajv": "./dist/compiled/ajv/index.js",
+    "./glob": "./dist/compiled/glob/index.js",
+    "./chalk": "./dist/compiled/chalk/index.js",
+    "./execa": "./dist/compiled/execa/index.js",
+    "./json5": "./dist/compiled/json5/index.js",
+    "./semver": "./dist/compiled/semver/index.js",
+    "./lodash": "./dist/compiled/lodash/index.js",
+    "./globby": "./dist/compiled/globby/index.js",
+    "./fs-extra": "./dist/compiled/fs-extra/index.js",
+    "./fast-glob": "./dist/compiled/fast-glob/index.js",
+    "./gzip-size": "./dist/compiled/gzip-size/index.js",
+    "./mime-types": "./dist/compiled/mime-types/index.js",
+    "./strip-ansi": "./dist/compiled/strip-ansi/index.js",
+    "./ajv-keywords": "./dist/compiled/ajv-keywords/index.js",
+    "./browserslist": "./dist/compiled/browserslist/index.js",
+    "./webpack-chain": "./dist/compiled/webpack-chain/index.js",
+    "./tsconfig-paths": "./dist/compiled/tsconfig-paths/index.js",
+    "./better-ajv-errors": "./dist/compiled/better-ajv-errors/index.js",
+    "./webpack-dev-middleware": "./dist/compiled/webpack-dev-middleware/index.js",
+    "./chain-id": {
+      "types": "./dist/types/chainId.d.ts",
+      "default": "./dist/cjs/chainId.js"
+    },
+    "./universal/constants": {
+      "import": "./dist/esm/universal/constants.js",
+      "types": "./dist/types/universal/constants.d.ts",
+      "default": "./dist/cjs/universal/constants.js"
+    },
+    "./universal/serialize": {
+      "import": "./dist/esm/universal/serialize.js",
+      "types": "./dist/types/universal/serialize.d.ts",
+      "default": "./dist/cjs/universal/serialize.js"
+    },
+    "./universal/remix-router": {
+      "import": "./dist/esm/universal/remixRouter.js",
+      "types": "./dist/types/universal/remix-router.d.ts",
+      "default": "./dist/cjs/universal/remixRouter.js"
+    },
+    "./universal/format-webpack": {
+      "import": "./dist/esm/universal/formatWebpack.js",
+      "types": "./dist/types/universal/format-webpack.d.ts",
+      "default": "./dist/cjs/universal/formatWebpack.js"
+    },
+    "./universal/nestedRoutes": {
+      "import": "./dist/esm/universal/nestedRoutes.js",
+      "types": "./dist/types/universal/nestedRoutes.d.ts",
+      "default": "./dist/cjs/universal/nestedRoutes.js"
+    }
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -54,92 +103,98 @@
   },
   "typesVersions": {
     "*": {
+      "runtime": [
+        "./dist/types/runtime/index.d.ts"
+      ],
       "ssr": [
-        "./dist/ssr.d.ts"
+        "./dist/types/ssr.d.ts"
       ],
       "logger": [
-        "./dist/logger.d.ts"
+        "./dist/types/logger.d.ts"
       ],
       "constants": [
-        "./dist/constants.d.ts"
+        "./dist/types/constants.d.ts"
       ],
       "babel": [
-        "./dist/babel.d.ts"
+        "./dist/types/babel.d.ts"
       ],
       "ajv": [
-        "./compiled/ajv/types/ajv.d.ts"
+        "./dist/compiled/ajv/types/ajv.d.ts"
+      ],
+      "execa": [
+        "./dist/compiled/execa/index.d.ts"
       ],
       "ajv/json-schema": [
-        "./compiled/ajv/types/types/json-schema.d.ts"
+        "./dist/compiled/ajv/types/types/json-schema.d.ts"
       ],
       "glob": [
-        "./compiled/glob/index.d.ts"
+        "./dist/compiled/glob/index.d.ts"
       ],
       "chalk": [
-        "./compiled/chalk/index.d.ts"
+        "./dist/compiled/chalk/index.d.ts"
       ],
       "json5": [
-        "./compiled/json5/index.d.ts"
+        "./dist/compiled/json5/index.d.ts"
       ],
       "chain-id": [
-        "./dist/chainId.d.ts"
+        "./dist/types/chainId.d.ts"
       ],
       "semver": [
-        "./compiled/semver/index.d.ts"
+        "./dist/compiled/semver/index.d.ts"
       ],
       "lodash": [
-        "./compiled/lodash/index.d.ts"
+        "./dist/compiled/lodash/index.d.ts"
       ],
       "globby": [
-        "./compiled/globby/index.d.ts"
+        "./dist/compiled/globby/index.d.ts"
       ],
       "fs-extra": [
-        "./compiled/fs-extra/index.d.ts"
+        "./dist/compiled/fs-extra/index.d.ts"
       ],
       "fast-glob": [
-        "./compiled/fast-glob/index.d.ts"
+        "./dist/compiled/fast-glob/index.d.ts"
       ],
       "gzip-size": [
-        "./compiled/gzip-size/index.d.ts"
+        "./dist/compiled/gzip-size/index.d.ts"
       ],
       "mime-types": [
-        "./compiled/mime-types/index.d.ts"
+        "./dist/compiled/mime-types/index.d.ts"
       ],
       "strip-ansi": [
-        "./compiled/strip-ansi/index.d.ts"
+        "./dist/compiled/strip-ansi/index.d.ts"
       ],
       "ajv-keywords": [
-        "./compiled/ajv-keywords/index.d.ts"
+        "./dist/compiled/ajv-keywords/index.d.ts"
       ],
       "browserslist": [
-        "./compiled/browserslist/index.d.ts"
+        "./dist/compiled/browserslist/index.d.ts"
       ],
       "webpack-chain": [
-        "./compiled/webpack-chain/types/index.d.ts"
+        "./dist/compiled/webpack-chain/types/index.d.ts"
       ],
       "tsconfig-paths": [
-        "./compiled/tsconfig-paths/lib/index.d.ts"
+        "./dist/compiled/tsconfig-paths/lib/index.d.ts"
       ],
       "better-ajv-errors": [
-        "./compiled/better-ajv-errors/index.d.ts"
+        "./dist/compiled/better-ajv-errors/index.d.ts"
       ],
       "webpack-dev-middleware": [
-        "./compiled/webpack-dev-middleware/types/index.d.ts"
+        "./dist/compiled/webpack-dev-middleware/types/index.d.ts"
       ],
       "universal/constants": [
-        "./dist/universal/constants.d.ts"
+        "./dist/types/universal/constants.d.ts"
       ],
       "universal/serialize": [
-        "./dist/universal/serialize.d.ts"
+        "./dist/types/universal/serialize.d.ts"
       ],
       "universal/remix-router": [
-        "./dist/universal/remixRouter.d.ts"
+        "./dist/types/universal/remixRouter.d.ts"
       ],
       "universal/format-webpack": [
-        "./dist/universal/formatWebpack.d.ts"
+        "./dist/types/universal/formatWebpack.d.ts"
       ],
       "universal/nestedRoutes": [
-        "./dist/universal/nestedRoutes.d.ts"
+        "./dist/types/universal/nestedRoutes.d.ts"
       ]
     }
   },
@@ -175,9 +230,9 @@
     "typescript": "^4",
     "webpack": "^5.76.2",
     "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.13.3",
-    "@scripts/build": "2.13.3",
-    "@scripts/jest-config": "2.13.3"
+    "@modern-js/types": "2.14.0",
+    "@scripts/build": "2.14.0",
+    "@scripts/jest-config": "2.14.0"
   },
   "sideEffects": false,
   "scripts": {

package/dist/emptyDir.js

@@ -1,52 +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 __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 emptyDir_exports = {};
-__export(emptyDir_exports, {
-  emptyDir: () => emptyDir
-});
-module.exports = __toCommonJS(emptyDir_exports);
-var import_compiled = require("./compiled");
-const emptyDir = (dir) => __async(void 0, null, function* () {
-  if (yield import_compiled.fs.pathExists(dir)) {
-    yield import_compiled.fs.emptyDir(dir);
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  emptyDir
-});

package/dist/nodeEnv.js

@@ -1,81 +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 __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 nodeEnv_exports = {};
-__export(nodeEnv_exports, {
-  canUseNpm: () => canUseNpm,
-  canUsePnpm: () => canUsePnpm,
-  canUseYarn: () => canUseYarn
-});
-module.exports = __toCommonJS(nodeEnv_exports);
-var import_compiled = require("./compiled");
-function canUseNpm() {
-  return __async(this, null, function* () {
-    try {
-      yield (0, import_compiled.execa)("npm", ["--version"], { env: process.env });
-      return true;
-    } catch (e) {
-      return false;
-    }
-  });
-}
-function canUseYarn() {
-  return __async(this, null, function* () {
-    try {
-      yield (0, import_compiled.execa)("yarn", ["--version"], { env: process.env });
-      return true;
-    } catch (e) {
-      return false;
-    }
-  });
-}
-function canUsePnpm() {
-  return __async(this, null, function* () {
-    try {
-      yield (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/version.js

@@ -1,92 +0,0 @@
-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 });
-};
-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(
-  // 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 __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,
-  isReact18: () => isReact18
-});
-module.exports = __toCommonJS(version_exports);
-var import_path = __toESM(require("path"));
-var import_compiled = require("./compiled");
-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");
-  if (!import_compiled.fs.existsSync(pkgPath)) {
-    return false;
-  }
-  const pkgInfo = JSON.parse(import_compiled.fs.readFileSync(pkgPath, "utf8"));
-  const deps = __spreadValues(__spreadValues({}, pkgInfo.devDependencies), pkgInfo.dependencies);
-  if (typeof deps.react !== "string") {
-    return false;
-  }
-  return import_compiled.semver.satisfies(import_compiled.semver.minVersion(deps.react), ">=18.0.0");
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getPnpmVersion,
-  isReact18
-});