@umijs/utils 4.0.58 → 4.0.60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
16
16
  }
17
17
  return to;
18
18
  };
19
- 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));
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
+ mod
22
+ ));
20
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
24
 
22
25
  // src/BaseGenerator/generateFile.ts
@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
16
16
  }
17
17
  return to;
18
18
  };
19
- 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));
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
+ mod
22
+ ));
20
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
24
 
22
25
  // src/getDevBanner.ts
@@ -29,26 +32,34 @@ var import_address = __toESM(require("../compiled/address"));
29
32
  var import_chalk = __toESM(require("../compiled/chalk"));
30
33
  var import_strip_ansi = __toESM(require("../compiled/strip-ansi"));
31
34
  var BORDERS = {
32
- TL: import_chalk.default.gray.dim("\u2554"),
33
- TR: import_chalk.default.gray.dim("\u2557"),
34
- BL: import_chalk.default.gray.dim("\u255A"),
35
- BR: import_chalk.default.gray.dim("\u255D"),
36
- V: import_chalk.default.gray.dim("\u2551"),
37
- H_PURE: "\u2550"
35
+ TL: import_chalk.default.gray.dim(""),
36
+ TR: import_chalk.default.gray.dim(""),
37
+ BL: import_chalk.default.gray.dim(""),
38
+ BR: import_chalk.default.gray.dim(""),
39
+ V: import_chalk.default.gray.dim(""),
40
+ H_PURE: ""
38
41
  };
39
42
  function getDevBanner(protocol, host = "0.0.0.0", port, offset = 8) {
40
43
  const header = " App listening at:";
41
- const footer = import_chalk.default.bold(" Now you can open browser with the above addresses\u2191 ");
42
- const local = ` ${import_chalk.default.gray(">")} Local: ${import_chalk.default.green(`${protocol}//${host === "0.0.0.0" ? "localhost" : host}:${port}`)} `;
44
+ const footer = import_chalk.default.bold(
45
+ " Now you can open browser with the above addresses↑ "
46
+ );
47
+ const local = ` ${import_chalk.default.gray(">")} Local: ${import_chalk.default.green(
48
+ `${protocol}//${host === "0.0.0.0" ? "localhost" : host}:${port}`
49
+ )} `;
43
50
  const ip = import_address.default.ip();
44
51
  const network = ` ${import_chalk.default.gray(">")} Network: ${ip ? import_chalk.default.green(`${protocol}//${ip}:${port}`) : import_chalk.default.gray("Not available")} `;
45
- const maxLen = Math.max(...[header, footer, local, network].map((x) => (0, import_strip_ansi.default)(x).length));
52
+ const maxLen = Math.max(
53
+ ...[header, footer, local, network].map((x) => (0, import_strip_ansi.default)(x).length)
54
+ );
46
55
  const beforeLines = [
47
56
  `${BORDERS.TL}${import_chalk.default.gray.dim("".padStart(maxLen, BORDERS.H_PURE))}${BORDERS.TR}`,
48
57
  `${BORDERS.V}${header}${"".padStart(maxLen - header.length)}${BORDERS.V}`,
49
58
  `${BORDERS.V}${local}${"".padStart(maxLen - (0, import_strip_ansi.default)(local).length)}${BORDERS.V}`
50
59
  ];
51
- const mainLine = `${BORDERS.V}${network}${"".padStart(maxLen - (0, import_strip_ansi.default)(network).length)}${BORDERS.V}`;
60
+ const mainLine = `${BORDERS.V}${network}${"".padStart(
61
+ maxLen - (0, import_strip_ansi.default)(network).length
62
+ )}${BORDERS.V}`;
52
63
  const afterLines = [
53
64
  `${BORDERS.V}${"".padStart(maxLen)}${BORDERS.V}`,
54
65
  `${BORDERS.V}${footer}${"".padStart(maxLen - (0, import_strip_ansi.default)(footer).length)}${BORDERS.V}`,
@@ -34,7 +34,7 @@ __export(getFileGitIno_exports, {
34
34
  isGitRepo: () => isGitRepo
35
35
  });
36
36
  module.exports = __toCommonJS(getFileGitIno_exports);
37
- var import_cross_spawn = __toESM(require("cross-spawn"));
37
+ var import_cross_spawn = __toESM(require("../compiled/cross-spawn"));
38
38
  var import_execa = require("../compiled/execa");
39
39
  var promisifySpawn = (cmd, args, {
40
40
  onlyOnce,
@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
16
16
  }
17
17
  return to;
18
18
  };
19
- 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));
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
+ mod
22
+ ));
20
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
24
 
22
25
  // src/getGitInfo.ts
@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
16
16
  }
17
17
  return to;
18
18
  };
19
- 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));
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
+ mod
22
+ ));
20
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
24
 
22
25
  // src/importLazy.ts
@@ -27,7 +30,9 @@ __export(importLazy_exports, {
27
30
  module.exports = __toCommonJS(importLazy_exports);
28
31
  var import_import_lazy = __toESM(require("../compiled/import-lazy"));
29
32
  function importLazy(moduleName, requireFn) {
30
- const importLazyLocal = (0, import_import_lazy.default)(requireFn || require);
33
+ const importLazyLocal = (0, import_import_lazy.default)(
34
+ requireFn || require
35
+ );
31
36
  return importLazyLocal(moduleName);
32
37
  }
33
38
  // Annotate the CommonJS export names for ESM import in node:
package/dist/index.d.ts CHANGED
@@ -51,5 +51,4 @@ export * from './setNoDeprecation';
51
51
  export * from './tryPaths';
52
52
  export * from './winPath';
53
53
  export * from './zod/isZodSchema';
54
- export * from './zod/zod2string';
55
54
  export { address, axios, chalk, cheerio, chokidar, crossSpawn, debug, deepmerge, execa, fsExtra, glob, Generator, BaseGenerator, generateFile, installDeps, lodash, logger, Mustache, pkgUp, portfinder, prompts, resolve, rimraf, semver, stripAnsi, updatePackageJSON, yParser, getGitInfo, printHelp, filesize, gzipSize, fastestLevenshtein, clackPrompts, MagicString, remapping, tsconfigPaths, z as zod, };
package/dist/index.js CHANGED
@@ -125,7 +125,6 @@ __reExport(src_exports, require("./setNoDeprecation"), module.exports);
125
125
  __reExport(src_exports, require("./tryPaths"), module.exports);
126
126
  __reExport(src_exports, require("./winPath"), module.exports);
127
127
  __reExport(src_exports, require("./zod/isZodSchema"), module.exports);
128
- __reExport(src_exports, require("./zod/zod2string"), module.exports);
129
128
  // Annotate the CommonJS export names for ESM import in node:
130
129
  0 && (module.exports = {
131
130
  BaseGenerator,
@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
16
16
  }
17
17
  return to;
18
18
  };
19
- 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));
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
+ mod
22
+ ));
20
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
24
 
22
25
  // src/installDeps.ts
@@ -40,15 +43,18 @@ function installDeps({
40
43
  const devTag = useYarn || usePnpm ? "--D" : "--save-dev";
41
44
  const installDependencies = (deps, npmStr, insStr, devStr) => {
42
45
  console.log(`${npmStr} install dependencies packages:${deps.join(" ")}`);
43
- execa.execaCommandSync([npmStr, insStr, devStr].concat(deps).filter((n) => n).join(" "), {
44
- encoding: "utf8",
45
- cwd,
46
- env: {
47
- ...process.env
48
- },
49
- stderr: "pipe",
50
- stdout: "pipe"
51
- });
46
+ execa.execaCommandSync(
47
+ [npmStr, insStr, devStr].concat(deps).filter((n) => n).join(" "),
48
+ {
49
+ encoding: "utf8",
50
+ cwd,
51
+ env: {
52
+ ...process.env
53
+ },
54
+ stderr: "pipe",
55
+ stdout: "pipe"
56
+ }
57
+ );
52
58
  console.log(`install dependencies packages success`);
53
59
  };
54
60
  if (dependencies) {
package/dist/printHelp.js CHANGED
@@ -16,7 +16,14 @@ var __copyProps = (to, from, except, desc) => {
16
16
  }
17
17
  return to;
18
18
  };
19
- 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));
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ // If the importer is in node compatibility mode or this is not an ESM
21
+ // file that has been converted to a CommonJS file using a Babel-
22
+ // compatible transform (i.e. "__esModule" has not been set), then set
23
+ // "default" to the CommonJS "module.exports" for node compatibility.
24
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
+ mod
26
+ ));
20
27
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
28
 
22
29
  // src/printHelp.ts
@@ -27,13 +34,25 @@ __export(printHelp_exports, {
27
34
  });
28
35
  module.exports = __toCommonJS(printHelp_exports);
29
36
  var logger = __toESM(require("./logger"));
37
+ var FEEDBACK_MESSAGE = "如果你需要进交流群,请访问 https://fb.umijs.org 。";
30
38
  function exit() {
31
39
  const loggerPath = logger.getLatestLogFilePath();
32
40
  if (loggerPath) {
33
41
  logger.fatal("A complete log of this run can be found in:");
34
42
  logger.fatal(loggerPath);
35
43
  }
36
- logger.fatal("Consider reporting a GitHub issue on https://github.com/umijs/umi/issues");
44
+ logger.fatal(
45
+ "Consider reporting a GitHub issue on https://github.com/umijs/umi/issues"
46
+ );
47
+ const binFile = process.argv[1];
48
+ const isUmi = binFile.endsWith("bin/umi.js");
49
+ const isMax = binFile.endsWith("bin/max.js");
50
+ if (process.env.FATAL_GUIDE_MESSAGE !== "none" && (isUmi || isMax)) {
51
+ logger.fatal(FEEDBACK_MESSAGE);
52
+ }
53
+ if (process.env.FATAL_GUIDE_MESSAGE && process.env.FATAL_GUIDE_MESSAGE !== "none") {
54
+ logger.fatal(process.env.FATAL_GUIDE_MESSAGE);
55
+ }
37
56
  }
38
57
  function runtime(e) {
39
58
  logger.error(e);
@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
16
16
  }
17
17
  return to;
18
18
  };
19
- 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));
19
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
+ mod
22
+ ));
20
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
24
 
22
25
  // src/randomColor/randomColor.ts
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@umijs/utils",
3
- "version": "4.0.58",
3
+ "version": "4.0.60",
4
4
  "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme",
5
5
  "bugs": "https://github.com/umijs/umi/issues",
6
6
  "repository": {
@@ -1,2 +0,0 @@
1
- import { z } from '../../compiled/zod';
2
- export declare function zod2string<T extends z.ZodType<any>>(schema: T): string;
@@ -1,49 +0,0 @@
1
- var __defProp = Object.defineProperty;
2
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
- var __getOwnPropNames = Object.getOwnPropertyNames;
4
- var __hasOwnProp = Object.prototype.hasOwnProperty;
5
- var __export = (target, all) => {
6
- for (var name in all)
7
- __defProp(target, name, { get: all[name], enumerable: true });
8
- };
9
- var __copyProps = (to, from, except, desc) => {
10
- if (from && typeof from === "object" || typeof from === "function") {
11
- for (let key of __getOwnPropNames(from))
12
- if (!__hasOwnProp.call(to, key) && key !== except)
13
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
14
- }
15
- return to;
16
- };
17
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
-
19
- // src/zod/zod2string.ts
20
- var zod2string_exports = {};
21
- __export(zod2string_exports, {
22
- zod2string: () => zod2string
23
- });
24
- module.exports = __toCommonJS(zod2string_exports);
25
- var import_zod = require("../../compiled/zod");
26
- function zod2string(schema) {
27
- if (schema instanceof import_zod.z.ZodObject) {
28
- const keys = Object.keys(schema.shape);
29
- const properties = keys.map((key) => `${key}: ${zod2string(schema.shape[key])}`).join(", ");
30
- return `z.object({${properties}})`;
31
- } else if (schema instanceof import_zod.z.ZodArray) {
32
- return `z.array(${zod2string(schema._def.type)})`;
33
- } else if (schema instanceof import_zod.z.ZodOptional) {
34
- return `z.optional(${zod2string(schema._def.innerType)})`;
35
- } else {
36
- const { typeName, checks } = schema._def;
37
- let str = `z.${typeName.replace("Zod", "").toLowerCase()}()`;
38
- if (checks && checks.length > 0) {
39
- checks.forEach((i) => {
40
- str += `.${i.kind}(${(i == null ? void 0 : i.value) || ""})`;
41
- });
42
- }
43
- return str;
44
- }
45
- }
46
- // Annotate the CommonJS export names for ESM import in node:
47
- 0 && (module.exports = {
48
- zod2string
49
- });