@umijs/core 4.5.2 → 4.6.0

package/dist/config/config.js

@@ -42,20 +42,23 @@ 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 {
+var Config = class _Config {
+  opts;
+  mainConfigFile;
+  prevConfig;
+  files = [];
   constructor(opts) {
-    this.files = [];
     this.opts = opts;
-    this.mainConfigFile = Config.getMainConfigFile(this.opts);
+    this.mainConfigFile = _Config.getMainConfigFile(this.opts);
     this.prevConfig = null;
   }
   getUserConfig() {
-    const configFiles = Config.getConfigFiles({
+    const configFiles = _Config.getConfigFiles({
       mainConfigFile: this.mainConfigFile,
       env: this.opts.env,
       specifiedEnv: this.opts.specifiedEnv
     });
-    return Config.getUserConfig({
+    return _Config.getUserConfig({
       configFiles: (0, import_utils2.getAbsFiles)({
         files: configFiles,
         cwd: this.opts.cwd
@@ -64,7 +67,7 @@ var Config = class {
   }
   getConfig(opts) {
     const { config, files } = this.getUserConfig();
-    Config.validateConfig({ config, schemas: opts.schemas });
+    _Config.validateConfig({ config, schemas: opts.schemas });
     this.files = files;
     return this.prevConfig = {
       config,
@@ -93,7 +96,7 @@ var Config = class {
           schemas: opts.schemas
         });
         watcher.add(files);
-        const data = Config.diffConfigs({
+        const data = _Config.diffConfigs({
           origin,
           updated,
           onChangeTypes: opts.onChangeTypes
@@ -181,21 +184,18 @@ var Config = class {
     const configKeys = new Set(Object.keys(opts.config));
     for (const key of Object.keys(opts.schemas)) {
       configKeys.delete(key);
-      if (!opts.config[key])
-        continue;
+      if (!opts.config[key]) continue;
       const schema = opts.schemas[key]({ ...import_joi.default, zod: import_utils.zod });
       if (import_joi.default.isSchema(schema)) {
         const { error } = schema.validate(opts.config[key]);
-        if (error)
-          errors.set(key, error);
+        if (error) errors.set(key, error);
       } else {
         (0, import_assert.default)(
           (0, import_utils.isZodSchema)(schema),
           `schema for config ${key} is not valid, neither joi nor zod.`
         );
         const { error } = schema.safeParse(opts.config[key]);
-        if (error)
-          errors.set(key, error);
+        if (error) errors.set(key, error);
       }
     }
     (0, import_assert.default)(

package/dist/service/command.js

@@ -23,6 +23,13 @@ __export(command_exports, {
 });
 module.exports = __toCommonJS(command_exports);
 var Command = class {
+  name;
+  description;
+  options;
+  details;
+  configResolveMode;
+  fn;
+  plugin;
   constructor(opts) {
     this.name = opts.name;
     this.description = opts.description;

package/dist/service/env.js

@@ -32,8 +32,7 @@ function loadEnv(opts) {
     (0, import_path.join)(opts.cwd, `${opts.envFile}.local`)
   ];
   for (const file of files) {
-    if (!(0, import_fs.existsSync)(file))
-      continue;
+    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)) {

package/dist/service/hook.js

@@ -34,6 +34,11 @@ __export(hook_exports, {
 module.exports = __toCommonJS(hook_exports);
 var import_assert = __toESM(require("assert"));
 var Hook = class {
+  plugin;
+  key;
+  fn;
+  before;
+  stage;
   constructor(opts) {
     (0, import_assert.default)(
       opts.key && opts.fn,

package/dist/service/plugin.js

@@ -42,11 +42,17 @@ var RE = {
   plugin: /^(@umijs\/|umi-)plugin-/,
   preset: /^(@umijs\/|umi-)preset-/
 };
-var Plugin = class {
+var Plugin = class _Plugin {
+  cwd;
+  type;
+  path;
+  id;
+  key;
+  apply;
+  config = {};
+  time = { hooks: {} };
+  enableBy = import_types.EnableBy.register;
   constructor(opts) {
-    this.config = {};
-    this.time = { hooks: {} };
-    this.enableBy = import_types.EnableBy.register;
     this.type = opts.type;
     this.path = (0, import_utils.winPath)(opts.path);
     this.cwd = opts.cwd;
@@ -84,12 +90,9 @@ var Plugin = class {
     };
   }
   merge(opts) {
-    if (opts.key)
-      this.key = opts.key;
-    if (opts.config)
-      this.config = opts.config;
-    if (opts.enableBy)
-      this.enableBy = opts.enableBy;
+    if (opts.key) this.key = opts.key;
+    if (opts.config) this.config = opts.config;
+    if (opts.enableBy) this.enableBy = opts.enableBy;
   }
   getId(opts) {
     let id;
@@ -113,11 +116,11 @@ var Plugin = class {
       return name.split(".").map((part) => import_utils.lodash.camelCase(part)).join(".");
     }
     return nameToKey(
-      opts.isPkgEntry ? Plugin.stripNoneUmiScope(opts.pkg.name).replace(RE[this.type], "") : (0, import_path.basename)(this.path, (0, import_path.extname)(this.path))
+      opts.isPkgEntry ? _Plugin.stripNoneUmiScope(opts.pkg.name).replace(RE[this.type], "") : (0, import_path.basename)(this.path, (0, import_path.extname)(this.path))
     );
   }
   static isPluginOrPreset(type, name) {
-    return RE[type].test(Plugin.stripNoneUmiScope(name));
+    return RE[type].test(_Plugin.stripNoneUmiScope(name));
   }
   static stripNoneUmiScope(name) {
     if (name.charAt(0) === "@" && !name.startsWith("@umijs/")) {
@@ -155,7 +158,7 @@ var Plugin = class {
             cause: _e
           });
         }
-        return new Plugin({
+        return new _Plugin({
           path: resolved,
           type,
           cwd: opts.cwd

package/dist/service/pluginAPI.js

@@ -42,6 +42,10 @@ var import_plugin = require("./plugin");
 var import_utils2 = require("./utils");
 var resolveConfigModes = ["strict", "loose"];
 var PluginAPI = class {
+  service;
+  plugin;
+  logger;
+  telemetry;
   constructor(opts) {
     this.service = opts.service;
     this.plugin = opts.plugin;

package/dist/service/service.js

@@ -46,29 +46,32 @@ var import_plugin = require("./plugin");
 var import_pluginAPI = require("./pluginAPI");
 var import_telemetry = require("./telemetry");
 var Service = class {
+  opts;
+  appData = {};
+  args = { _: [], $0: "" };
+  commands = {};
+  generators = {};
+  config = {};
+  configSchemas = {};
+  configDefaults = {};
+  configOnChanges = {};
+  cwd;
+  env;
+  hooks = {};
+  name = "";
+  paths = {};
+  // preset is plugin with different type
+  plugins = {};
+  keyToPluginMap = {};
+  pluginMethods = {};
+  skipPluginIds = /* @__PURE__ */ new Set();
+  stage = import_types.ServiceStage.uninitialized;
+  userConfig = {};
+  configManager = null;
+  pkg = {};
+  pkgPath = "";
+  telemetry = new import_telemetry.Telemetry();
   constructor(opts) {
-    this.appData = {};
-    this.args = { _: [], $0: "" };
-    this.commands = {};
-    this.generators = {};
-    this.config = {};
-    this.configSchemas = {};
-    this.configDefaults = {};
-    this.configOnChanges = {};
-    this.hooks = {};
-    this.name = "";
-    this.paths = {};
-    // preset is plugin with different type
-    this.plugins = {};
-    this.keyToPluginMap = {};
-    this.pluginMethods = {};
-    this.skipPluginIds = /* @__PURE__ */ new Set();
-    this.stage = import_types.ServiceStage.uninitialized;
-    this.userConfig = {};
-    this.configManager = null;
-    this.pkg = {};
-    this.pkgPath = "";
-    this.telemetry = new import_telemetry.Telemetry();
     this.cwd = opts.cwd;
     this.env = opts.env;
     this.opts = opts;
@@ -98,8 +101,7 @@ var Service = class {
         );
         const tAdd = new import_tapable.AsyncSeriesWaterfallHook(["memo"]);
         for (const hook of hooks) {
-          if (!this.isPluginEnable(hook))
-            continue;
+          if (!this.isPluginEnable(hook)) continue;
           tAdd.tapPromise(
             {
               name: hook.plugin.key,
@@ -122,8 +124,7 @@ var Service = class {
       case import_types.ApplyPluginsType.modify:
         const tModify = new import_tapable.AsyncSeriesWaterfallHook(["memo"]);
         for (const hook of hooks) {
-          if (!this.isPluginEnable(hook))
-            continue;
+          if (!this.isPluginEnable(hook)) continue;
           tModify.tapPromise(
             {
               name: hook.plugin.key,
@@ -170,8 +171,7 @@ var Service = class {
         }
         const tEvent = new import_tapable.AsyncSeriesWaterfallHook(["_"]);
         for (const hook of hooks) {
-          if (!this.isPluginEnable(hook))
-            continue;
+          if (!this.isPluginEnable(hook)) continue;
           tEvent.tapPromise(
             {
               name: hook.plugin.key,
@@ -199,8 +199,7 @@ var Service = class {
   async run(opts) {
     const { name, args = {} } = opts;
     args._ = args._ || [];
-    if (args._[0] === name)
-      args._.shift();
+    if (args._[0] === name) args._.shift();
     this.args = args;
     this.name = name;
     this.stage = import_types.ServiceStage.init;
@@ -265,8 +264,7 @@ var Service = class {
     }
     for (const id of Object.keys(this.plugins)) {
       const { config, key } = this.plugins[id];
-      if (config.schema)
-        this.configSchemas[key] = config.schema;
+      if (config.schema) this.configSchemas[key] = config.schema;
       if (config.default !== void 0) {
         this.configDefaults[key] = config.default;
       }
@@ -496,16 +494,12 @@ var Service = class {
       plugin = hook.plugin;
     } else {
       plugin = this.keyToPluginMap[hook];
-      if (!plugin)
-        return false;
+      if (!plugin) return false;
     }
     const { id, key, enableBy } = plugin;
-    if (this.skipPluginIds.has(id))
-      return false;
-    if (this.userConfig[key] === false)
-      return false;
-    if (this.config[key] === false)
-      return false;
+    if (this.skipPluginIds.has(id)) return false;
+    if (this.userConfig[key] === false) return false;
+    if (this.config[key] === false) return false;
     if (enableBy === import_types.EnableBy.config) {
       return key in this.userConfig || this.config && key in this.config;
     }

package/dist/service/telemetry.js

@@ -24,17 +24,9 @@ __export(telemetry_exports, {
 });
 module.exports = __toCommonJS(telemetry_exports);
 var Telemetry = class {
+  queuedEvents = [];
+  storage = new NoopStorage();
   constructor() {
-    this.queuedEvents = [];
-    this.storage = new NoopStorage();
-    this.afterFlush = () => {
-      const un = this.unFinishedEvents();
-      if (un.length) {
-        this.scheduleFlush();
-      } else {
-        this.queuedEvents = [];
-      }
-    };
   }
   prefixWith(prefix) {
     const upStream = this;
@@ -99,6 +91,14 @@ var Telemetry = class {
       this.flush().then(this.afterFlush, this.afterFlush);
     }, 5e3);
   }
+  afterFlush = () => {
+    const un = this.unFinishedEvents();
+    if (un.length) {
+      this.scheduleFlush();
+    } else {
+      this.queuedEvents = [];
+    }
+  };
   unFinishedEvents() {
     return this.queuedEvents.filter((e) => {
       if (e.status === "sent") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.5.2",
+  "version": "4.6.0",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
@@ -15,8 +15,8 @@
     "compiled"
   ],
   "dependencies": {
-    "@umijs/bundler-utils": "4.5.2",
-    "@umijs/utils": "4.5.2"
+    "@umijs/bundler-utils": "4.6.0",
+    "@umijs/utils": "4.6.0"
   },
   "devDependencies": {
     "dotenv": "16.0.0",