@umijs/core 4.0.51 → 4.0.53

package/dist/config/config.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/route/defineRoutes.js

@@ -33,6 +33,12 @@ function defineRoutes(callback) {
     const parentAbsPath = parentRoute == null ? void 0 : parentRoute.absPath;
     const absPath = [parentAbsPath, opts.path].join("/");
     const route = {
+      // 1. root index route path: '/'
+      // 2. nested children route path
+      //    - dir
+      //      - some.ts  -> 'some'
+      //      - index.ts -> ''
+      //    - dir.tsx    -> '/dir'
       path: absPath === "/" ? "/" : opts.path,
       id: (0, import_utils.createRouteId)(opts.file),
       parentId,

package/dist/route/routesConfig.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/service/hook.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/service/plugin.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -125,8 +129,15 @@ var Plugin = class {
     function get(type) {
       const types = `${type}s`;
       return [
+        // opts
         ...opts[types] || [],
+        // env
         ...(process.env[`${opts.prefix}_${types}`.toUpperCase()] || "").split(",").filter(Boolean),
+        // dependencies
+        // ...Object.keys(opts.pkg.devDependencies || {})
+        //   .concat(Object.keys(opts.pkg.dependencies || {}))
+        //   .filter(Plugin.isPluginOrPreset.bind(null, type)),
+        // user config
         ...opts.userConfig[types] || []
       ].map((path) => {
         (0, import_assert.default)(

package/dist/service/pluginAPI.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -135,7 +139,9 @@ var PluginAPI = class {
     );
     this.service.pluginMethods[opts.name] = {
       plugin: this.plugin,
-      fn: opts.fn || function(fn) {
+      fn: opts.fn || // 这里不能用 arrow function，this 需指向执行此方法的 PluginAPI
+      // 否则 pluginId 会不会，导致不能正确 skip plugin
+      function(fn) {
         this.register({
           key: opts.name,
           ...import_utils.lodash.isPlainObject(fn) ? fn : { fn }

package/dist/service/service.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -53,6 +57,7 @@ var Service = class {
     this.hooks = {};
     this.name = "";
     this.paths = {};
+    // preset is plugin with different type
     this.plugins = {};
     this.keyToPluginMap = {};
     this.pluginMethods = {};
@@ -257,16 +262,16 @@ var Service = class {
       throw Error(`Invalid command ${import_utils.chalk.red(name)}, it's not registered.`);
     }
     for (const id of Object.keys(this.plugins)) {
-      const { config: config2, key } = this.plugins[id];
-      if (config2.schema)
-        this.configSchemas[key] = config2.schema;
-      if (config2.default !== void 0) {
-        this.configDefaults[key] = config2.default;
+      const { config, key } = this.plugins[id];
+      if (config.schema)
+        this.configSchemas[key] = config.schema;
+      if (config.default !== void 0) {
+        this.configDefaults[key] = config.default;
       }
-      this.configOnChanges[key] = config2.onChange || import_types.ConfigChangeType.reload;
+      this.configOnChanges[key] = config.onChange || import_types.ConfigChangeType.reload;
     }
     this.stage = import_types.ServiceStage.resolveConfig;
-    const { config, defaultConfig } = await this.resolveConfig();
+    const { defaultConfig } = await this.resolveConfig();
     if (this.config.outputPath) {
       this.paths.absOutputPath = (0, import_path.isAbsolute)(this.config.outputPath) ? this.config.outputPath : (0, import_path.join)(this.cwd, this.config.outputPath);
     }
@@ -278,17 +283,30 @@ var Service = class {
     this.appData = await this.applyPlugins({
       key: "modifyAppData",
       initialValue: {
+        // base
         cwd: this.cwd,
         pkg,
         pkgPath,
-        plugins,
+        plugins: this.plugins,
         presets,
         name,
         args,
+        // config
         userConfig: this.userConfig,
         mainConfigFile: configManager.mainConfigFile,
-        config,
+        config: this.config,
         defaultConfig
+        // TODO
+        // moduleGraph,
+        // routes,
+        // npmClient,
+        // nodeVersion,
+        // gitInfo,
+        // gitBranch,
+        // debugger info,
+        // devPort,
+        // devHost,
+        // env
       }
     });
     this.stage = import_types.ServiceStage.onCheck;
@@ -320,6 +338,9 @@ var Service = class {
     const resolveMode = this.commands[this.name].configResolveMode;
     const config = await this.applyPlugins({
       key: "modifyConfig",
+      // why clone deep?
+      // user may change the config in modifyConfig
+      // e.g. memo.alias = xxx
       initialValue: import_utils.lodash.cloneDeep(
         resolveMode === "strict" ? this.configManager.getConfig({
           schemas: this.configSchemas
@@ -329,6 +350,7 @@ var Service = class {
     });
     const defaultConfig = await this.applyPlugins({
       key: "modifyDefaultConfig",
+      // 避免 modifyDefaultConfig 时修改 this.configDefaults
       initialValue: import_utils.lodash.cloneDeep(this.configDefaults)
     });
     this.config = import_utils.lodash.merge(defaultConfig, config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.51",
+  "version": "4.0.53",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
@@ -21,8 +21,8 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.51",
-    "@umijs/utils": "4.0.51"
+    "@umijs/bundler-utils": "4.0.53",
+    "@umijs/utils": "4.0.53"
   },
   "devDependencies": {
     "dotenv": "16.0.0",