@umijs/core 4.0.0-rc.3 → 4.0.0-rc.6

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/path.d.ts

@@ -7,6 +7,7 @@ export declare function getPaths(opts: {
     cwd: string;
     absSrcPath: string;
     absPagesPath: string;
+    absApiRoutesPath: string;
     absTmpPath: string;
     absNodeModulesPath: string;
     absOutputPath: string;

package/dist/service/path.js

@@ -13,6 +13,7 @@ function getPaths(opts) {
     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}`;
@@ -23,6 +24,7 @@ function getPaths(opts) {
         cwd,
         absSrcPath,
         absPagesPath,
+        absApiRoutesPath,
         absTmpPath,
         absNodeModulesPath,
         absOutputPath,

package/dist/service/pluginAPI.d.ts

@@ -33,7 +33,7 @@ export declare class PluginAPI {
     }): void;
     registerPresets(source: Plugin[], presets: any[]): void;
     registerPlugins(source: Plugin[], plugins: any[]): void;
-    skipPlugins(ids: string[]): void;
+    skipPlugins(keys: string[]): void;
     static proxyPluginAPI(opts: {
         pluginAPI: PluginAPI;
         service: Service;

package/dist/service/pluginAPI.js

@@ -116,9 +116,11 @@ class PluginAPI {
             source.splice(0, 0, ...mappedPlugins);
         }
     }
-    skipPlugins(ids) {
-        ids.forEach((id) => {
-            this.service.skipPluginIds.add(id);
+    skipPlugins(keys) {
+        keys.forEach((key) => {
+            (0, assert_1.default)(!(this.plugin.key === key), `plugin ${key} can't skip itself!`);
+            (0, assert_1.default)(this.service.keyToPluginMap[key], `key: ${key} is not be registered by any plugin. You can't skip it!`);
+            this.service.skipPluginIds.add(this.service.keyToPluginMap[key].id);
         });
     }
     static proxyPluginAPI(opts) {

package/dist/service/service.d.ts

@@ -39,6 +39,7 @@ export declare class Service {
         cwd?: string;
         absSrcPath?: string;
         absPagesPath?: string;
+        absApiRoutesPath?: string;
         absTmpPath?: string;
         absNodeModulesPath?: string;
         absOutputPath?: string;
@@ -110,6 +111,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

@@ -81,7 +81,7 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tAdd.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage,
                             before: hook.before,
                         }, (memo) => __awaiter(this, void 0, void 0, function* () {
@@ -96,7 +96,7 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tModify.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage,
                             before: hook.before,
                         }, (memo) => __awaiter(this, void 0, void 0, function* () {
@@ -110,7 +110,7 @@ class Service {
                         if (!this.isPluginEnable(hook))
                             continue;
                         tEvent.tapPromise({
-                            name: hook.plugin.id,
+                            name: hook.plugin.key,
                             stage: hook.stage || 0,
                             before: hook.before,
                         }, () => __awaiter(this, void 0, void 0, function* () {
@@ -187,10 +187,6 @@ class Service {
             while (plugins.length) {
                 yield this.initPlugin({ plugin: plugins.shift(), plugins });
             }
-            // keyToPluginMap
-            for (const id of Object.keys(this.plugins)) {
-                this.keyToPluginMap[this.plugins[id].key] = this.plugins[id];
-            }
             // collect configSchemas and configDefaults
             for (const id of Object.keys(this.plugins)) {
                 const { config, key } = this.plugins[id];
@@ -291,7 +287,7 @@ class Service {
         });
     }
     initPlugin(opts) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             // register to this.plugins
             (0, assert_1.default)(!this.plugins[opts.plugin.id], `${opts.plugin.type} ${opts.plugin.id} is already registered by ${(_a = this.plugins[opts.plugin.id]) === null || _a === void 0 ? void 0 : _a.path}, ${opts.plugin.type} from ${opts.plugin.path} register failed.`);
@@ -335,6 +331,9 @@ class Service {
             if (opts.plugin.type === 'plugin') {
                 (0, assert_1.default)(!ret, `plugin should return nothing`);
             }
+            // key should be unique
+            (0, assert_1.default)(!this.keyToPluginMap[opts.plugin.key], `key ${opts.plugin.key} is already registered by ${(_b = this.keyToPluginMap[opts.plugin.key]) === null || _b === void 0 ? void 0 : _b.path}, ${opts.plugin.type} from ${opts.plugin.path} register failed.`);
+            this.keyToPluginMap[opts.plugin.key] = opts.plugin;
             if (ret === null || ret === void 0 ? void 0 : ret.presets) {
                 ret.presets = ret.presets.map((preset) => new plugin_1.Plugin({
                     path: preset,
@@ -369,7 +368,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.3",
+  "version": "4.0.0-rc.6",
   "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.3",
-    "@umijs/utils": "4.0.0-rc.3"
+    "@umijs/bundler-utils": "4.0.0-rc.6",
+    "@umijs/utils": "4.0.0-rc.6"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",