@umijs/core 4.0.0-rc.2 → 4.0.0-rc.5

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/route/route.js

@@ -5,7 +5,11 @@
 // programming route
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/service/service.d.ts

@@ -110,6 +110,7 @@ export interface IServicePluginAPI {
     ConfigChangeType: typeof ConfigChangeType;
     EnableBy: typeof EnableBy;
     ServiceStage: typeof ServiceStage;
+    registerPresets: (presets: any[]) => void;
     registerPlugins: (plugins: (Plugin | {})[]) => void;
 }
 export {};

package/dist/service/service.js

@@ -369,7 +369,15 @@ class Service {
             return false;
         if (enableBy === types_1.EnableBy.config) {
             // TODO: 提供单独的命令用于启用插件
-            return key in this.userConfig;
+            // this.userConfig 中如果存在，启用
+            // this.config 好了之后如果存在，启用
+            // this.config 在 modifyConfig 和 modifyDefaultConfig 之后才会 ready
+            // 这意味着 modifyConfig 和 modifyDefaultConfig 只能判断 api.userConfig
+            // 举个具体场景:
+            //   - p1 enableBy config, p2 modifyDefaultConfig p1 = {}
+            //   - p1 里 modifyConfig 和 modifyDefaultConfig 仅 userConfig 里有 p1 有效，其他 p2 开启时即有效
+            //   - p2 里因为用了 modifyDefaultConfig，如果 p2 是 enableBy config，需要 userConfig 里配 p2，p2 和 p1 才有效
+            return key in this.userConfig || (this.config && key in this.config);
         }
         if (typeof enableBy === 'function')
             return enableBy({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.5",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -20,8 +20,8 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.2",
-    "@umijs/utils": "4.0.0-rc.2"
+    "@umijs/bundler-utils": "4.0.0-rc.5",
+    "@umijs/utils": "4.0.0-rc.5"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",