@umijs/core 4.0.5 → 4.0.8

package/dist/route/utils.js

@@ -1,34 +1,59 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRouteModuleFile = exports.findParentRouteId = exports.byLongestFirst = exports.stripFileExtension = exports.createRouteId = void 0;
-const utils_1 = require("@umijs/utils");
-const path_1 = require("path");
+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);
+
+// utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  byLongestFirst: () => byLongestFirst,
+  createRouteId: () => createRouteId,
+  findParentRouteId: () => findParentRouteId,
+  isRouteModuleFile: () => isRouteModuleFile,
+  stripFileExtension: () => stripFileExtension
+});
+module.exports = __toCommonJS(utils_exports);
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
 function createRouteId(file) {
-    return (0, utils_1.winPath)(stripFileExtension(file));
+  return (0, import_utils.winPath)(stripFileExtension(file));
 }
-exports.createRouteId = createRouteId;
 function stripFileExtension(file) {
-    return file.replace(/\.[a-z0-9]+$/i, '');
+  return file.replace(/\.[a-z0-9]+$/i, "");
 }
-exports.stripFileExtension = stripFileExtension;
 function byLongestFirst(a, b) {
-    return b.length - a.length;
+  return b.length - a.length;
 }
-exports.byLongestFirst = byLongestFirst;
 function findParentRouteId(routeIds, childRouteId) {
-    return routeIds.find((id) => childRouteId.startsWith(`${id}/`));
+  return routeIds.find((id) => childRouteId.startsWith(`${id}/`));
 }
-exports.findParentRouteId = findParentRouteId;
-const routeModuleExts = ['.js', '.jsx', '.ts', '.tsx', '.md', '.mdx', '.vue'];
+var routeModuleExts = [".js", ".jsx", ".ts", ".tsx", ".md", ".mdx", ".vue"];
 function isRouteModuleFile(opts) {
-    // TODO: add cache strategy
-    for (const excludeRegExp of opts.exclude || []) {
-        if (opts.file &&
-            excludeRegExp instanceof RegExp &&
-            excludeRegExp.test(opts.file)) {
-            return false;
-        }
+  for (const excludeRegExp of opts.exclude || []) {
+    if (opts.file && excludeRegExp instanceof RegExp && excludeRegExp.test(opts.file)) {
+      return false;
     }
-    return routeModuleExts.includes((0, path_1.extname)(opts.file));
+  }
+  return routeModuleExts.includes((0, import_path.extname)(opts.file));
 }
-exports.isRouteModuleFile = isRouteModuleFile;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  byLongestFirst,
+  createRouteId,
+  findParentRouteId,
+  isRouteModuleFile,
+  stripFileExtension
+});

package/dist/service/command.js

@@ -1,15 +1,39 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Command = void 0;
-class Command {
-    constructor(opts) {
-        this.name = opts.name;
-        this.description = opts.description;
-        this.options = opts.options;
-        this.details = opts.details;
-        this.fn = opts.fn;
-        this.plugin = opts.plugin;
-        this.configResolveMode = opts.configResolveMode || 'strict';
-    }
-}
-exports.Command = Command;
+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);
+
+// command.ts
+var command_exports = {};
+__export(command_exports, {
+  Command: () => Command
+});
+module.exports = __toCommonJS(command_exports);
+var Command = class {
+  constructor(opts) {
+    this.name = opts.name;
+    this.description = opts.description;
+    this.options = opts.options;
+    this.details = opts.details;
+    this.fn = opts.fn;
+    this.plugin = opts.plugin;
+    this.configResolveMode = opts.configResolveMode || "strict";
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Command
+});

package/dist/service/env.js

@@ -1,21 +1,47 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadEnv = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const dotenv_1 = require("../../compiled/dotenv");
+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);
+
+// env.ts
+var env_exports = {};
+__export(env_exports, {
+  loadEnv: () => loadEnv
+});
+module.exports = __toCommonJS(env_exports);
+var import_fs = require("fs");
+var import_path = require("path");
+var import_dotenv = require("../../compiled/dotenv");
+var import_dotenv_expand = require("../../compiled/dotenv-expand");
 function loadEnv(opts) {
-    const files = [
-        (0, path_1.join)(opts.cwd, opts.envFile),
-        (0, path_1.join)(opts.cwd, `${opts.envFile}.local`),
-    ];
-    for (const file of files) {
-        if (!(0, fs_1.existsSync)(file))
-            continue;
-        const parsed = (0, dotenv_1.parse)((0, fs_1.readFileSync)(file)) || {};
-        for (const key of Object.keys(parsed)) {
-            process.env[key] = parsed[key];
-        }
+  const files = [
+    (0, import_path.join)(opts.cwd, opts.envFile),
+    (0, import_path.join)(opts.cwd, `${opts.envFile}.local`)
+  ];
+  for (const file of files) {
+    if (!(0, import_fs.existsSync)(file))
+      continue;
+    const parsed = (0, import_dotenv.parse)((0, import_fs.readFileSync)(file)) || {};
+    (0, import_dotenv_expand.expand)({ parsed, ignoreProcessEnv: true });
+    for (const key of Object.keys(parsed)) {
+      process.env[key] = parsed[key];
     }
+  }
 }
-exports.loadEnv = loadEnv;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  loadEnv
+});

package/dist/service/generatePlugin.js

@@ -1,83 +1,104 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@umijs/utils");
-const generator_1 = require("./generator");
-exports.default = (api) => {
-    api.registerCommand({
-        name: 'generate',
-        alias: 'g',
-        details: `
+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);
+
+// generatePlugin.ts
+var generatePlugin_exports = {};
+__export(generatePlugin_exports, {
+  default: () => generatePlugin_default
+});
+module.exports = __toCommonJS(generatePlugin_exports);
+var import_utils = require("@umijs/utils");
+var import_generator = require("./generator");
+var generatePlugin_default = (api) => {
+  api.registerCommand({
+    name: "generate",
+    alias: "g",
+    details: `
 umi generate
 `,
-        description: 'generate code snippets quickly',
-        configResolveMode: 'loose',
-        async fn({ args }) {
-            var _a;
-            const [type] = args._;
-            const runGenerator = async (generator) => {
-                await (generator === null || generator === void 0 ? void 0 : generator.fn({
-                    args,
-                    generateFile: utils_1.generateFile,
-                    installDeps: utils_1.installDeps,
-                    updatePackageJSON: utils_1.updatePackageJSON,
-                }));
-            };
-            if (type) {
-                const generator = api.service.generators[type];
-                if (!generator) {
-                    throw new Error(`Generator ${type} not found.`);
-                }
-                if (generator.type === generator_1.GeneratorType.enable) {
-                    const enable = await ((_a = generator.checkEnable) === null || _a === void 0 ? void 0 : _a.call(generator, {
-                        args,
-                    }));
-                    if (!enable) {
-                        if (typeof generator.disabledDescription === 'function') {
-                            utils_1.logger.warn(generator.disabledDescription());
-                        }
-                        else {
-                            utils_1.logger.warn(generator.disabledDescription);
-                        }
-                        return;
-                    }
-                }
-                await runGenerator(generator);
+    description: "generate code snippets quickly",
+    configResolveMode: "loose",
+    async fn({ args }) {
+      var _a;
+      const [type] = args._;
+      const runGenerator = async (generator) => {
+        await (generator == null ? void 0 : generator.fn({
+          args,
+          generateFile: import_utils.generateFile,
+          installDeps: import_utils.installDeps,
+          updatePackageJSON: import_utils.updatePackageJSON
+        }));
+      };
+      if (type) {
+        const generator = api.service.generators[type];
+        if (!generator) {
+          throw new Error(`Generator ${type} not found.`);
+        }
+        if (generator.type === import_generator.GeneratorType.enable) {
+          const enable = await ((_a = generator.checkEnable) == null ? void 0 : _a.call(generator, {
+            args
+          }));
+          if (!enable) {
+            if (typeof generator.disabledDescription === "function") {
+              import_utils.logger.warn(generator.disabledDescription());
+            } else {
+              import_utils.logger.warn(generator.disabledDescription);
             }
-            else {
-                const getEnableGenerators = async (generators) => {
-                    var _a;
-                    const questions = [];
-                    for (const key of Object.keys(generators)) {
-                        const g = generators[key];
-                        if (g.type === generator_1.GeneratorType.generate) {
-                            questions.push({
-                                title: `${g.name} -- ${g.description}` || '',
-                                value: g.key,
-                            });
-                        }
-                        else {
-                            const enable = await ((_a = g === null || g === void 0 ? void 0 : g.checkEnable) === null || _a === void 0 ? void 0 : _a.call(g, {
-                                args,
-                            }));
-                            if (enable) {
-                                questions.push({
-                                    title: `${g.name} -- ${g.description}` || '',
-                                    value: g.key,
-                                });
-                            }
-                        }
-                    }
-                    return questions;
-                };
-                const questions = await getEnableGenerators(api.service.generators);
-                const { gType } = await (0, utils_1.prompts)({
-                    type: 'select',
-                    name: 'gType',
-                    message: 'Pick generator type',
-                    choices: questions,
+            return;
+          }
+        }
+        await runGenerator(generator);
+      } else {
+        const getEnableGenerators = async (generators) => {
+          var _a2;
+          const questions2 = [];
+          for (const key of Object.keys(generators)) {
+            const g = generators[key];
+            if (g.type === import_generator.GeneratorType.generate) {
+              questions2.push({
+                title: `${g.name} -- ${g.description}` || "",
+                value: g.key
+              });
+            } else {
+              const enable = await ((_a2 = g == null ? void 0 : g.checkEnable) == null ? void 0 : _a2.call(g, {
+                args
+              }));
+              if (enable) {
+                questions2.push({
+                  title: `${g.name} -- ${g.description}` || "",
+                  value: g.key
                 });
-                await runGenerator(api.service.generators[gType]);
+              }
             }
-        },
-    });
+          }
+          return questions2;
+        };
+        const questions = await getEnableGenerators(api.service.generators);
+        const { gType } = await (0, import_utils.prompts)({
+          type: "select",
+          name: "gType",
+          message: "Pick generator type",
+          choices: questions
+        });
+        await runGenerator(api.service.generators[gType]);
+      }
+    }
+  });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/service/generator.js

@@ -1,14 +1,52 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeGenerator = exports.GeneratorType = void 0;
-var GeneratorType;
-(function (GeneratorType) {
-    GeneratorType["generate"] = "generate";
-    GeneratorType["enable"] = "enable";
-})(GeneratorType = exports.GeneratorType || (exports.GeneratorType = {}));
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+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 __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);
+
+// generator.ts
+var generator_exports = {};
+__export(generator_exports, {
+  GeneratorType: () => GeneratorType,
+  makeGenerator: () => makeGenerator
+});
+module.exports = __toCommonJS(generator_exports);
+var GeneratorType = /* @__PURE__ */ ((GeneratorType2) => {
+  GeneratorType2["generate"] = "generate";
+  GeneratorType2["enable"] = "enable";
+  return GeneratorType2;
+})(GeneratorType || {});
 function makeGenerator(opts) {
-    return {
-        ...opts,
-    };
+  return __spreadValues({}, opts);
 }
-exports.makeGenerator = makeGenerator;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  GeneratorType,
+  makeGenerator
+});

package/dist/service/hook.js

@@ -1,18 +1,42 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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 });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Hook = void 0;
-const assert_1 = __importDefault(require("assert"));
-class Hook {
-    constructor(opts) {
-        (0, assert_1.default)(opts.key && opts.fn, `Invalid hook ${opts}, key and fn must supplied.`);
-        this.plugin = opts.plugin;
-        this.key = opts.key;
-        this.fn = opts.fn;
-        this.before = opts.before;
-        this.stage = opts.stage || 0;
-    }
-}
-exports.Hook = Hook;
+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);
+
+// hook.ts
+var hook_exports = {};
+__export(hook_exports, {
+  Hook: () => Hook
+});
+module.exports = __toCommonJS(hook_exports);
+var import_assert = __toESM(require("assert"));
+var Hook = class {
+  constructor(opts) {
+    (0, import_assert.default)(opts.key && opts.fn, `Invalid hook ${opts}, key and fn must supplied.`);
+    this.plugin = opts.plugin;
+    this.key = opts.key;
+    this.fn = opts.fn;
+    this.before = opts.before;
+    this.stage = opts.stage || 0;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Hook
+});

package/dist/service/path.js

@@ -1,33 +1,55 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPaths = void 0;
-const utils_1 = require("@umijs/utils");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const types_1 = require("../types");
+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);
+
+// path.ts
+var path_exports = {};
+__export(path_exports, {
+  getPaths: () => getPaths
+});
+module.exports = __toCommonJS(path_exports);
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_types = require("../types");
 function winJoin(...args) {
-    return (0, utils_1.winPath)((0, path_1.join)(...args));
+  return (0, import_utils.winPath)((0, import_path.join)(...args));
 }
 function getPaths(opts) {
-    const cwd = opts.cwd;
-    const src = winJoin(cwd, 'src');
-    const absSrcPath = (0, fs_1.existsSync)(src) && (0, fs_1.statSync)(src).isDirectory() ? src : cwd;
-    const absPagesPath = winJoin(absSrcPath, 'pages');
-    const absApiRoutesPath = winJoin(absSrcPath, 'api');
-    const tmp = opts.env === types_1.Env.development
-        ? `.${opts.prefix}`
-        : `.${opts.prefix}-${opts.env}`;
-    const absTmpPath = winJoin(absSrcPath, tmp);
-    const absNodeModulesPath = winJoin(cwd, 'node_modules');
-    const absOutputPath = winJoin(cwd, 'dist');
-    return {
-        cwd,
-        absSrcPath,
-        absPagesPath,
-        absApiRoutesPath,
-        absTmpPath,
-        absNodeModulesPath,
-        absOutputPath,
-    };
+  const cwd = opts.cwd;
+  const src = winJoin(cwd, "src");
+  const absSrcPath = (0, import_fs.existsSync)(src) && (0, import_fs.statSync)(src).isDirectory() ? src : cwd;
+  const absPagesPath = winJoin(absSrcPath, "pages");
+  const absApiRoutesPath = winJoin(absSrcPath, "api");
+  const tmp = opts.env === import_types.Env.development ? `.${opts.prefix}` : `.${opts.prefix}-${opts.env}`;
+  const absTmpPath = winJoin(absSrcPath, tmp);
+  const absNodeModulesPath = winJoin(cwd, "node_modules");
+  const absOutputPath = winJoin(cwd, "dist");
+  return {
+    cwd,
+    absSrcPath,
+    absPagesPath,
+    absApiRoutesPath,
+    absTmpPath,
+    absNodeModulesPath,
+    absOutputPath
+  };
 }
-exports.getPaths = getPaths;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPaths
+});