@umijs/core 4.0.0-canary.20220718.2 → 4.0.0-canary.20220720.1

package/dist/config/config.d.ts

@@ -61,4 +61,3 @@ export declare class Config {
     };
 }
 export {};
-//# sourceMappingURL=config.d.ts.map

package/dist/config/config.js

@@ -1,197 +1,207 @@
-"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.Config = void 0;
-const esbuild_1 = __importDefault(require("@umijs/bundler-utils/compiled/esbuild"));
-const utils_1 = require("@umijs/utils");
-const joi_1 = __importDefault(require("@umijs/utils/compiled/@hapi/joi"));
-const assert_1 = __importDefault(require("assert"));
-const fs_1 = require("fs");
-const path_1 = require("path");
-const just_diff_1 = require("../../compiled/just-diff");
-const constants_1 = require("../constants");
-const types_1 = require("../types");
-const utils_2 = require("./utils");
-class Config {
-    constructor(opts) {
-        this.files = [];
-        this.opts = opts;
-        this.mainConfigFile = Config.getMainConfigFile(this.opts);
-        this.prevConfig = null;
-    }
-    getUserConfig() {
-        const configFiles = Config.getConfigFiles({
-            mainConfigFile: this.mainConfigFile,
-            env: this.opts.env,
-            specifiedEnv: this.opts.specifiedEnv,
-        });
-        return Config.getUserConfig({
-            configFiles: (0, utils_2.getAbsFiles)({
-                files: configFiles,
-                cwd: this.opts.cwd,
-            }),
-        });
+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);
+
+// config.ts
+var config_exports = {};
+__export(config_exports, {
+  Config: () => Config
+});
+module.exports = __toCommonJS(config_exports);
+var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
+var import_utils = require("@umijs/utils");
+var import_joi = __toESM(require("@umijs/utils/compiled/@hapi/joi"));
+var import_assert = __toESM(require("assert"));
+var import_fs = require("fs");
+var import_path = require("path");
+var import_just_diff = require("../../compiled/just-diff");
+var import_constants = require("../constants");
+var import_types = require("../types");
+var import_utils2 = require("./utils");
+var Config = class {
+  constructor(opts) {
+    this.files = [];
+    this.opts = opts;
+    this.mainConfigFile = Config.getMainConfigFile(this.opts);
+    this.prevConfig = null;
+  }
+  getUserConfig() {
+    const configFiles = Config.getConfigFiles({
+      mainConfigFile: this.mainConfigFile,
+      env: this.opts.env,
+      specifiedEnv: this.opts.specifiedEnv
+    });
+    return Config.getUserConfig({
+      configFiles: (0, import_utils2.getAbsFiles)({
+        files: configFiles,
+        cwd: this.opts.cwd
+      })
+    });
+  }
+  getConfig(opts) {
+    const { config, files } = this.getUserConfig();
+    Config.validateConfig({ config, schemas: opts.schemas });
+    this.files = files;
+    return this.prevConfig = {
+      config,
+      files
+    };
+  }
+  watch(opts) {
+    const watcher = import_utils.chokidar.watch([
+      ...this.files,
+      ...this.mainConfigFile ? [] : (0, import_utils2.getAbsFiles)({
+        files: this.opts.defaultConfigFiles || import_constants.DEFAULT_CONFIG_FILES,
+        cwd: this.opts.cwd
+      })
+    ], {
+      ignoreInitial: true,
+      cwd: this.opts.cwd
+    });
+    watcher.on("all", import_utils.lodash.debounce((event, path) => {
+      const { config: origin } = this.prevConfig;
+      const { config: updated, files } = this.getConfig({
+        schemas: opts.schemas
+      });
+      watcher.add(files);
+      const data = Config.diffConfigs({
+        origin,
+        updated,
+        onChangeTypes: opts.onChangeTypes
+      });
+      opts.onChange({
+        data,
+        event,
+        path
+      }).catch((e) => {
+        throw new Error(e);
+      });
+    }, import_constants.WATCH_DEBOUNCE_STEP));
+    return () => watcher.close();
+  }
+  static getMainConfigFile(opts) {
+    let mainConfigFile = null;
+    for (const configFile of opts.defaultConfigFiles || import_constants.DEFAULT_CONFIG_FILES) {
+      const absConfigFile = (0, import_path.join)(opts.cwd, configFile);
+      if ((0, import_fs.existsSync)(absConfigFile)) {
+        mainConfigFile = absConfigFile;
+        break;
+      }
     }
-    getConfig(opts) {
-        const { config, files } = this.getUserConfig();
-        Config.validateConfig({ config, schemas: opts.schemas });
-        this.files = files;
-        return (this.prevConfig = {
-            config: config,
-            files,
-        });
+    return mainConfigFile;
+  }
+  static getConfigFiles(opts) {
+    const ret = [];
+    const { mainConfigFile } = opts;
+    const specifiedEnv = opts.specifiedEnv || "";
+    if (mainConfigFile) {
+      const env = import_constants.SHORT_ENV[opts.env] || opts.env;
+      ret.push(...[
+        mainConfigFile,
+        specifiedEnv && (0, import_utils2.addExt)({ file: mainConfigFile, ext: `.${specifiedEnv}` }),
+        (0, import_utils2.addExt)({ file: mainConfigFile, ext: `.${env}` }),
+        specifiedEnv && (0, import_utils2.addExt)({
+          file: mainConfigFile,
+          ext: `.${env}.${specifiedEnv}`
+        })
+      ].filter(Boolean));
+      if (opts.env === import_types.Env.development) {
+        ret.push((0, import_utils2.addExt)({ file: mainConfigFile, ext: import_constants.LOCAL_EXT }));
+      }
     }
-    watch(opts) {
-        const watcher = utils_1.chokidar.watch([
-            ...this.files,
-            ...(this.mainConfigFile
-                ? []
-                : (0, utils_2.getAbsFiles)({
-                    files: this.opts.defaultConfigFiles || constants_1.DEFAULT_CONFIG_FILES,
-                    cwd: this.opts.cwd,
-                })),
-        ], {
-            ignoreInitial: true,
-            cwd: this.opts.cwd,
+    return ret;
+  }
+  static getUserConfig(opts) {
+    let config = {};
+    let files = [];
+    for (const configFile of opts.configFiles) {
+      if ((0, import_fs.existsSync)(configFile)) {
+        import_utils.register.register({
+          implementor: import_esbuild.default
         });
-        watcher.on('all', utils_1.lodash.debounce((event, path) => {
-            const { config: origin } = this.prevConfig;
-            const { config: updated, files } = this.getConfig({
-                schemas: opts.schemas,
-            });
-            watcher.add(files);
-            const data = Config.diffConfigs({
-                origin,
-                updated,
-                onChangeTypes: opts.onChangeTypes,
-            });
-            opts
-                .onChange({
-                data,
-                event,
-                path,
-            })
-                .catch((e) => {
-                throw new Error(e);
-            });
-        }, constants_1.WATCH_DEBOUNCE_STEP));
-        return () => watcher.close();
-    }
-    static getMainConfigFile(opts) {
-        let mainConfigFile = null;
-        for (const configFile of opts.defaultConfigFiles || constants_1.DEFAULT_CONFIG_FILES) {
-            const absConfigFile = (0, path_1.join)(opts.cwd, configFile);
-            if ((0, fs_1.existsSync)(absConfigFile)) {
-                mainConfigFile = absConfigFile;
-                break;
-            }
+        import_utils.register.clearFiles();
+        try {
+          config = import_utils.lodash.merge(config, require(configFile).default);
+        } catch (e) {
+          throw new Error(`Parse config file failed: [${configFile}]`, {
+            cause: e
+          });
         }
-        return mainConfigFile;
-    }
-    static getConfigFiles(opts) {
-        const ret = [];
-        const { mainConfigFile } = opts;
-        const specifiedEnv = opts.specifiedEnv || '';
-        if (mainConfigFile) {
-            const env = constants_1.SHORT_ENV[opts.env] || opts.env;
-            ret.push(...[
-                mainConfigFile,
-                specifiedEnv &&
-                    (0, utils_2.addExt)({ file: mainConfigFile, ext: `.${specifiedEnv}` }),
-                (0, utils_2.addExt)({ file: mainConfigFile, ext: `.${env}` }),
-                specifiedEnv &&
-                    (0, utils_2.addExt)({
-                        file: mainConfigFile,
-                        ext: `.${env}.${specifiedEnv}`,
-                    }),
-            ].filter(Boolean));
-            if (opts.env === types_1.Env.development) {
-                ret.push((0, utils_2.addExt)({ file: mainConfigFile, ext: constants_1.LOCAL_EXT }));
-            }
+        for (const file of import_utils.register.getFiles()) {
+          delete require.cache[file];
         }
-        return ret;
+        files.push(...import_utils.register.getFiles());
+        import_utils.register.restore();
+      } else {
+        files.push(configFile);
+      }
     }
-    static getUserConfig(opts) {
-        let config = {};
-        let files = [];
-        for (const configFile of opts.configFiles) {
-            if ((0, fs_1.existsSync)(configFile)) {
-                utils_1.register.register({
-                    implementor: esbuild_1.default,
-                });
-                utils_1.register.clearFiles();
-                try {
-                    config = utils_1.lodash.merge(config, require(configFile).default);
-                }
-                catch (e) {
-                    // @ts-ignore
-                    throw new Error(`Parse config file failed: [${configFile}]`, {
-                        cause: e,
-                    });
-                }
-                for (const file of utils_1.register.getFiles()) {
-                    delete require.cache[file];
-                }
-                // includes the config File
-                files.push(...utils_1.register.getFiles());
-                utils_1.register.restore();
-            }
-            else {
-                files.push(configFile);
-            }
-        }
-        return {
-            config,
-            files,
-        };
+    return {
+      config,
+      files
+    };
+  }
+  static validateConfig(opts) {
+    const errors = /* @__PURE__ */ new Map();
+    const configKeys = new Set(Object.keys(opts.config));
+    for (const key of Object.keys(opts.schemas)) {
+      configKeys.delete(key);
+      if (!opts.config[key])
+        continue;
+      const schema = opts.schemas[key](import_joi.default);
+      (0, import_assert.default)(import_joi.default.isSchema(schema), `schema for config ${key} is not valid.`);
+      const { error } = schema.validate(opts.config[key]);
+      if (error)
+        errors.set(key, error);
     }
-    static validateConfig(opts) {
-        const errors = new Map();
-        const configKeys = new Set(Object.keys(opts.config));
-        for (const key of Object.keys(opts.schemas)) {
-            configKeys.delete(key);
-            if (!opts.config[key])
-                continue;
-            const schema = opts.schemas[key](joi_1.default);
-            // invalid schema
-            (0, assert_1.default)(joi_1.default.isSchema(schema), `schema for config ${key} is not valid.`);
-            const { error } = schema.validate(opts.config[key]);
-            if (error)
-                errors.set(key, error);
-        }
-        // invalid config values
-        (0, assert_1.default)(errors.size === 0, `Invalid config values: ${Array.from(errors.keys()).join(', ')}
+    (0, import_assert.default)(errors.size === 0, `Invalid config values: ${Array.from(errors.keys()).join(", ")}
 ${Array.from(errors.keys()).map((key) => {
-            return `Invalid value for ${key}:\n${errors.get(key).message}`;
-        })}`);
-        // invalid config keys
-        (0, assert_1.default)(configKeys.size === 0, `Invalid config keys: ${Array.from(configKeys).join(', ')}`);
+      return `Invalid value for ${key}:
+${errors.get(key).message}`;
+    })}`);
+    (0, import_assert.default)(configKeys.size === 0, `Invalid config keys: ${Array.from(configKeys).join(", ")}`);
+  }
+  static diffConfigs(opts) {
+    const patch = (0, import_just_diff.diff)(opts.origin, opts.updated);
+    const changes = {};
+    const fns = [];
+    for (const item of patch) {
+      const key = item.path[0];
+      const onChange = opts.onChangeTypes[key];
+      (0, import_assert.default)(onChange, `Invalid onChange config for key ${key}`);
+      if (typeof onChange === "string") {
+        changes[onChange] || (changes[onChange] = []);
+        changes[onChange].push(String(key));
+      } else if (typeof onChange === "function") {
+        fns.push(onChange);
+      } else {
+        throw new Error(`Invalid onChange value for key ${key}`);
+      }
     }
-    static diffConfigs(opts) {
-        const patch = (0, just_diff_1.diff)(opts.origin, opts.updated);
-        const changes = {};
-        const fns = [];
-        for (const item of patch) {
-            const key = item.path[0];
-            const onChange = opts.onChangeTypes[key];
-            (0, assert_1.default)(onChange, `Invalid onChange config for key ${key}`);
-            if (typeof onChange === 'string') {
-                changes[onChange] || (changes[onChange] = []);
-                changes[onChange].push(String(key));
-            }
-            else if (typeof onChange === 'function') {
-                fns.push(onChange);
-            }
-            else {
-                throw new Error(`Invalid onChange value for key ${key}`);
-            }
-        }
-        return {
-            changes,
-            fns,
-        };
-    }
-}
-exports.Config = Config;
+    return {
+      changes,
+      fns
+    };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Config
+});

package/dist/config/utils.d.ts

@@ -6,4 +6,3 @@ export declare function getAbsFiles(opts: {
     files: string[];
     cwd: string;
 }): string[];
-//# sourceMappingURL=utils.d.ts.map

package/dist/config/utils.js

@@ -1,15 +1,40 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAbsFiles = exports.addExt = void 0;
-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, {
+  addExt: () => addExt,
+  getAbsFiles: () => getAbsFiles
+});
+module.exports = __toCommonJS(utils_exports);
+var import_path = require("path");
 function addExt(opts) {
-    const index = opts.file.lastIndexOf('.');
-    return `${opts.file.slice(0, index)}${opts.ext}${opts.file.slice(index)}`;
+  const index = opts.file.lastIndexOf(".");
+  return `${opts.file.slice(0, index)}${opts.ext}${opts.file.slice(index)}`;
 }
-exports.addExt = addExt;
 function getAbsFiles(opts) {
-    return opts.files.map((file) => {
-        return (0, path_1.isAbsolute)(file) ? file : (0, path_1.join)(opts.cwd, file);
-    });
+  return opts.files.map((file) => {
+    return (0, import_path.isAbsolute)(file) ? file : (0, import_path.join)(opts.cwd, file);
+  });
 }
-exports.getAbsFiles = getAbsFiles;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  addExt,
+  getAbsFiles
+});

package/dist/constants.d.ts

@@ -7,4 +7,3 @@ export declare const SHORT_ENV: {
 export declare const LOCAL_EXT = ".local";
 export declare const WATCH_DEBOUNCE_STEP = 300;
 export declare const DEFAULT_FRAMEWORK_NAME = "umi";
-//# sourceMappingURL=constants.d.ts.map

package/dist/constants.js

@@ -1,12 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_FRAMEWORK_NAME = exports.WATCH_DEBOUNCE_STEP = exports.LOCAL_EXT = exports.SHORT_ENV = exports.DEFAULT_CONFIG_FILES = void 0;
-exports.DEFAULT_CONFIG_FILES = ['config.ts', 'config.js'];
-exports.SHORT_ENV = {
-    development: 'dev',
-    production: 'prod',
-    test: 'test',
+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 });
 };
-exports.LOCAL_EXT = '.local';
-exports.WATCH_DEBOUNCE_STEP = 300;
-exports.DEFAULT_FRAMEWORK_NAME = 'umi';
+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);
+
+// constants.ts
+var constants_exports = {};
+__export(constants_exports, {
+  DEFAULT_CONFIG_FILES: () => DEFAULT_CONFIG_FILES,
+  DEFAULT_FRAMEWORK_NAME: () => DEFAULT_FRAMEWORK_NAME,
+  LOCAL_EXT: () => LOCAL_EXT,
+  SHORT_ENV: () => SHORT_ENV,
+  WATCH_DEBOUNCE_STEP: () => WATCH_DEBOUNCE_STEP
+});
+module.exports = __toCommonJS(constants_exports);
+var DEFAULT_CONFIG_FILES = ["config.ts", "config.js"];
+var SHORT_ENV = {
+  development: "dev",
+  production: "prod",
+  test: "test"
+};
+var LOCAL_EXT = ".local";
+var WATCH_DEBOUNCE_STEP = 300;
+var DEFAULT_FRAMEWORK_NAME = "umi";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DEFAULT_CONFIG_FILES,
+  DEFAULT_FRAMEWORK_NAME,
+  LOCAL_EXT,
+  SHORT_ENV,
+  WATCH_DEBOUNCE_STEP
+});

package/dist/index.d.ts

@@ -4,4 +4,3 @@ export { Generator, GeneratorType } from './service/generator';
 export * from './service/pluginAPI';
 export * from './service/service';
 export { Env, IAdd, IEvent, IModify, IRoute } from './types';
-//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,25 +1,47 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+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 });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Env = exports.GeneratorType = void 0;
-__exportStar(require("./config/config"), exports);
-__exportStar(require("./route/route"), exports);
-var generator_1 = require("./service/generator");
-Object.defineProperty(exports, "GeneratorType", { enumerable: true, get: function () { return generator_1.GeneratorType; } });
-__exportStar(require("./service/pluginAPI"), exports);
-__exportStar(require("./service/service"), exports);
-var types_1 = require("./types");
-Object.defineProperty(exports, "Env", { enumerable: true, get: function () { return types_1.Env; } });
+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);
+
+// index.ts
+var src_exports = {};
+__export(src_exports, {
+  Env: () => import_types.Env,
+  Generator: () => import_generator.Generator,
+  GeneratorType: () => import_generator.GeneratorType,
+  IAdd: () => import_types.IAdd,
+  IEvent: () => import_types.IEvent,
+  IModify: () => import_types.IModify,
+  IRoute: () => import_types.IRoute
+});
+module.exports = __toCommonJS(src_exports);
+__reExport(src_exports, require("./config/config"), module.exports);
+__reExport(src_exports, require("./route/route"), module.exports);
+var import_generator = require("./service/generator");
+__reExport(src_exports, require("./service/pluginAPI"), module.exports);
+__reExport(src_exports, require("./service/service"), module.exports);
+var import_types = require("./types");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Env,
+  Generator,
+  GeneratorType,
+  IAdd,
+  IEvent,
+  IModify,
+  IRoute
+});

package/dist/route/defineRoutes.d.ts

@@ -1,2 +1 @@
 export declare function defineRoutes(callback: (defineRoute: Function) => void): any;
-//# sourceMappingURL=defineRoutes.d.ts.map