@umijs/core 4.0.0-rc.12 → 4.0.0-rc.15

package/dist/route/routesConfig.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,18 +19,39 @@ function transformRoutes(opts) {
 function transformRoute(opts) {
     (0, assert_1.default)(!opts.route.children, 'children is not allowed in route props, use routes instead.');
     const id = String(opts.memo.id++);
-    const _a = opts.route, { routes, component } = _a, routeProps = __rest(_a, ["routes", "component"]);
+    const { routes, component, wrappers, ...routeProps } = opts.route;
     let absPath = opts.route.path;
     if ((absPath === null || absPath === void 0 ? void 0 : absPath.charAt(0)) !== '/') {
         const parentAbsPath = opts.parentId
-            ? opts.memo.ret[opts.parentId].absPath.replace(/\/*$/, '/') // to remove '/'s on the tail
+            ? opts.memo.ret[opts.parentId].absPath.replace(/\/+$/, '/') // to remove '/'s on the tail
             : '/';
         absPath = parentAbsPath + absPath;
     }
-    opts.memo.ret[id] = Object.assign(Object.assign(Object.assign(Object.assign({}, routeProps), { path: opts.route.path }), (component ? { file: component } : {})), { parentId: opts.parentId, id });
+    opts.memo.ret[id] = {
+        ...routeProps,
+        path: opts.route.path,
+        ...(component ? { file: component } : {}),
+        parentId: opts.parentId,
+        id,
+    };
     if (absPath) {
         opts.memo.ret[id].absPath = absPath;
     }
+    if (wrappers === null || wrappers === void 0 ? void 0 : wrappers.length) {
+        let parentId = opts.parentId;
+        let path = opts.route.path;
+        wrappers.forEach((wrapper) => {
+            const { id } = transformRoute({
+                route: { path, component: wrapper },
+                parentId,
+                memo: opts.memo,
+            });
+            parentId = id;
+            path = '';
+        });
+        opts.memo.ret[id].parentId = parentId;
+        opts.memo.ret[id].path = path;
+    }
     if (opts.route.routes) {
         transformRoutes({
             routes: opts.route.routes,
@@ -49,4 +59,5 @@ function transformRoute(opts) {
             memo: opts.memo,
         });
     }
+    return { id };
 }

package/dist/route/routesConvention.js

@@ -44,10 +44,10 @@ function visitFiles(opts) {
         let file = (0, path_1.resolve)(opts.dir, filename);
         let stat = (0, fs_1.lstatSync)(file);
         if (stat.isDirectory()) {
-            visitFiles(Object.assign(Object.assign({}, opts), { dir: file }));
+            visitFiles({ ...opts, dir: file });
         }
         else if (stat.isFile() &&
-            ['.tsx', '.ts', '.js', '.jsx', '.md', '.mdx'].includes((0, path_1.extname)(file))) {
+            ['.tsx', '.ts', '.js', '.jsx', '.md', '.mdx', '.vue'].includes((0, path_1.extname)(file))) {
             opts.visitor((0, path_1.relative)(opts.baseDir, file));
         }
     }

package/dist/route/utils.js

@@ -19,7 +19,7 @@ function findParentRouteId(routeIds, childRouteId) {
     return routeIds.find((id) => childRouteId.startsWith(`${id}/`));
 }
 exports.findParentRouteId = findParentRouteId;
-const routeModuleExts = ['.js', '.jsx', '.ts', '.tsx', '.md', '.mdx'];
+const routeModuleExts = ['.js', '.jsx', '.ts', '.tsx', '.md', '.mdx', '.vue'];
 function isRouteModuleFile(opts) {
     // TODO: add cache strategy
     for (const excludeRegExp of opts.exclude || []) {

package/dist/service/generatePlugin.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@umijs/utils");
 const generator_1 = require("./generator");
@@ -19,70 +10,68 @@ exports.default = (api) => {
 umi generate
 `,
         description: 'generate code snippets quickly',
-        fn({ args }) {
+        async fn({ args }) {
             var _a;
-            return __awaiter(this, void 0, void 0, function* () {
-                const [type] = args._;
-                const runGenerator = (generator) => __awaiter(this, void 0, void 0, function* () {
-                    yield (generator === null || generator === void 0 ? void 0 : generator.fn({
+            const [type] = args._;
+            const runGenerator = async (generator) => {
+                await (generator === null || generator === void 0 ? void 0 : generator.fn({
+                    args,
+                    generateFile: utils_1.generateFile,
+                    installDeps: utils_1.installDeps,
+                    updatePackageJSON: utils_1.updatePackageJSON,
+                }));
+            };
+            if (type) {
+                const generator = api.service.generators[type];
+                if (!generator) {
+                    throw new Error(`Generator ${type} not found.`);
+                }
+                if (generator.type === generator_1.GeneratorType.enable) {
+                    const enable = await ((_a = generator.checkEnable) === null || _a === void 0 ? void 0 : _a.call(generator, {
                         args,
-                        generateFile: utils_1.generateFile,
-                        installDeps: utils_1.installDeps,
-                        updatePackageJSON: utils_1.updatePackageJSON,
                     }));
-                });
-                if (type) {
-                    const generator = api.service.generators[type];
-                    if (!generator) {
-                        throw new Error(`Generator ${type} not found.`);
-                    }
-                    if (generator.type === generator_1.GeneratorType.enable) {
-                        const enable = yield ((_a = generator.checkEnable) === null || _a === void 0 ? void 0 : _a.call(generator, {
-                            args,
-                        }));
-                        if (!enable) {
-                            throw new Error(`Generator ${type} is unable.The corresponding function has been turned on or is not available.`);
-                        }
+                    if (!enable) {
+                        throw new Error(`Generator ${type} is unable.The corresponding function has been turned on or is not available.`);
                     }
-                    yield runGenerator(generator);
                 }
-                else {
-                    const getEnableGenerators = (generators) => __awaiter(this, void 0, void 0, function* () {
-                        var _b, _c;
-                        const questions = [];
-                        for (const key of Object.keys(generators)) {
-                            if (generators[key].type === generator_1.GeneratorType.generate) {
+                await runGenerator(generator);
+            }
+            else {
+                const getEnableGenerators = async (generators) => {
+                    var _a, _b;
+                    const questions = [];
+                    for (const key of Object.keys(generators)) {
+                        if (generators[key].type === generator_1.GeneratorType.generate) {
+                            questions.push({
+                                title: `${generators[key].name} -- ${generators[key].description}` ||
+                                    '',
+                                value: generators[key].key,
+                            });
+                        }
+                        else {
+                            const enable = await ((_b = (_a = generators[key]) === null || _a === void 0 ? void 0 : _a.checkEnable) === null || _b === void 0 ? void 0 : _b.call(_a, {
+                                args,
+                            }));
+                            if (enable) {
                                 questions.push({
                                     title: `${generators[key].name} -- ${generators[key].description}` ||
                                         '',
                                     value: generators[key].key,
                                 });
                             }
-                            else {
-                                const enable = yield ((_c = (_b = generators[key]) === null || _b === void 0 ? void 0 : _b.checkEnable) === null || _c === void 0 ? void 0 : _c.call(_b, {
-                                    args,
-                                }));
-                                if (enable) {
-                                    questions.push({
-                                        title: `${generators[key].name} -- ${generators[key].description}` ||
-                                            '',
-                                        value: generators[key].key,
-                                    });
-                                }
-                            }
                         }
-                        return questions;
-                    });
-                    const questions = yield getEnableGenerators(api.service.generators);
-                    const { gType } = yield (0, utils_1.prompts)({
-                        type: 'select',
-                        name: 'gType',
-                        message: 'Pick generator type',
-                        choices: questions,
-                    });
-                    yield runGenerator(api.service.generators[gType]);
-                }
-            });
+                    }
+                    return questions;
+                };
+                const questions = await getEnableGenerators(api.service.generators);
+                const { gType } = await (0, utils_1.prompts)({
+                    type: 'select',
+                    name: 'gType',
+                    message: 'Pick generator type',
+                    choices: questions,
+                });
+                await runGenerator(api.service.generators[gType]);
+            }
         },
     });
 };

package/dist/service/pluginAPI.js

@@ -50,13 +50,16 @@ class PluginAPI {
             var _a;
             const { name } = commandOpts;
             (0, assert_1.default)(!this.service.commands[name], `api.registerCommand() failed, the command ${name} is exists from ${(_a = this.service.commands[name]) === null || _a === void 0 ? void 0 : _a.plugin.id}.`);
-            this.service.commands[name] = new command_1.Command(Object.assign(Object.assign({}, commandOpts), { plugin: this.plugin }));
+            this.service.commands[name] = new command_1.Command({
+                ...commandOpts,
+                plugin: this.plugin,
+            });
         };
         registerCommand(opts);
         if (alias) {
             const aliases = (0, utils_2.makeArray)(alias);
             aliases.forEach((alias) => {
-                registerCommand(Object.assign(Object.assign({}, opts), { name: alias }));
+                registerCommand({ ...opts, name: alias });
             });
         }
     }
@@ -64,13 +67,16 @@ class PluginAPI {
         var _a;
         const { key } = opts;
         (0, assert_1.default)(!this.service.generators[key], `api.registerGenerator() failed, the generator ${key} is exists from ${(_a = this.service.generators[key]) === null || _a === void 0 ? void 0 : _a.plugin.id}.`);
-        this.service.generators[key] = new generator_1.Generator(Object.assign(Object.assign({}, opts), { plugin: this.plugin }));
+        this.service.generators[key] = new generator_1.Generator({
+            ...opts,
+            plugin: this.plugin,
+        });
     }
     register(opts) {
         var _a, _b;
         (0, assert_1.default)(this.service.stage <= types_1.ServiceStage.initPlugins, 'api.register() should not be called after plugin register stage.');
         (_a = this.service.hooks)[_b = opts.key] || (_a[_b] = []);
-        this.service.hooks[opts.key].push(new hook_1.Hook(Object.assign(Object.assign({}, opts), { plugin: this.plugin })));
+        this.service.hooks[opts.key].push(new hook_1.Hook({ ...opts, plugin: this.plugin }));
     }
     registerMethod(opts) {
         (0, assert_1.default)(!this.service.pluginMethods[opts.name], `api.registerMethod() failed, method ${opts.name} is already exist.`);
@@ -81,7 +87,10 @@ class PluginAPI {
                 // 否则 pluginId 会不会，导致不能正确 skip plugin
                 function (fn) {
                     // @ts-ignore
-                    this.register(Object.assign({ key: opts.name }, (utils_1.lodash.isPlainObject(fn) ? fn : { fn })));
+                    this.register({
+                        key: opts.name,
+                        ...(utils_1.lodash.isPlainObject(fn) ? fn : { fn }),
+                    });
                 },
         };
     }

package/dist/service/service.d.ts

@@ -63,6 +63,13 @@ export declare class Service {
     };
     pkgPath: string;
     constructor(opts: IOpts);
+    applyPlugins<T>(opts: {
+        key: string;
+        type?: ApplyPluginsType.event;
+        initialValue?: any;
+        args?: any;
+        sync: true;
+    }): typeof opts.initialValue | T;
     applyPlugins<T>(opts: {
         key: string;
         type?: ApplyPluginsType;
@@ -73,6 +80,11 @@ export declare class Service {
         name: string;
         args?: any;
     }): Promise<void>;
+    generateFinalConfig(): Promise<{
+        config: any;
+        defaultConfig: any;
+        finalConfig: Record<string, any>;
+    }>;
     _baconPlugins(): void;
     initPreset(opts: {
         preset: Plugin;

package/dist/service/service.js

@@ -1,23 +1,14 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Service = void 0;
+const tapable_1 = require("@umijs/bundler-utils/compiled/tapable");
 const utils_1 = require("@umijs/utils");
 const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
-const tapable_1 = require("../../compiled/tapable");
 const config_1 = require("../config/config");
 const constants_1 = require("../constants");
 const types_1 = require("../types");
@@ -54,242 +45,271 @@ class Service {
         (0, assert_1.default)((0, fs_1.existsSync)(this.cwd), `Invalid cwd ${this.cwd}, it's not found.`);
     }
     applyPlugins(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const hooks = this.hooks[opts.key] || [];
-            let type = opts.type;
-            // guess type from key
-            if (!type) {
-                if (opts.key.startsWith('on')) {
-                    type = types_1.ApplyPluginsType.event;
+        const hooks = this.hooks[opts.key] || [];
+        let type = opts.type;
+        // guess type from key
+        if (!type) {
+            if (opts.key.startsWith('on')) {
+                type = types_1.ApplyPluginsType.event;
+            }
+            else if (opts.key.startsWith('modify')) {
+                type = types_1.ApplyPluginsType.modify;
+            }
+            else if (opts.key.startsWith('add')) {
+                type = types_1.ApplyPluginsType.add;
+            }
+            else {
+                throw new Error(`Invalid applyPlugins arguments, type must be supplied for key ${opts.key}.`);
+            }
+        }
+        switch (type) {
+            case types_1.ApplyPluginsType.add:
+                (0, assert_1.default)(!('initialValue' in opts) || Array.isArray(opts.initialValue), `applyPlugins failed, opts.initialValue must be Array if opts.type is add.`);
+                const tAdd = new tapable_1.AsyncSeriesWaterfallHook(['memo']);
+                for (const hook of hooks) {
+                    if (!this.isPluginEnable(hook))
+                        continue;
+                    tAdd.tapPromise({
+                        name: hook.plugin.key,
+                        stage: hook.stage,
+                        before: hook.before,
+                    }, async (memo) => {
+                        var _a, _b;
+                        const dateStart = new Date();
+                        const items = await hook.fn(opts.args);
+                        (_a = hook.plugin.time.hooks)[_b = opts.key] || (_a[_b] = []);
+                        hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
+                        return memo.concat(items);
+                    });
                 }
-                else if (opts.key.startsWith('modify')) {
-                    type = types_1.ApplyPluginsType.modify;
+                return tAdd.promise(opts.initialValue || []);
+            case types_1.ApplyPluginsType.modify:
+                const tModify = new tapable_1.AsyncSeriesWaterfallHook(['memo']);
+                for (const hook of hooks) {
+                    if (!this.isPluginEnable(hook))
+                        continue;
+                    tModify.tapPromise({
+                        name: hook.plugin.key,
+                        stage: hook.stage,
+                        before: hook.before,
+                    }, async (memo) => {
+                        var _a, _b;
+                        const dateStart = new Date();
+                        const ret = await hook.fn(memo, opts.args);
+                        (_a = hook.plugin.time.hooks)[_b = opts.key] || (_a[_b] = []);
+                        hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
+                        return ret;
+                    });
                 }
-                else if (opts.key.startsWith('add')) {
-                    type = types_1.ApplyPluginsType.add;
+                return tModify.promise(opts.initialValue);
+            case types_1.ApplyPluginsType.event:
+                if (opts.sync) {
+                    const tEvent = new tapable_1.SyncWaterfallHook(['_']);
+                    hooks.forEach((hook) => {
+                        if (this.isPluginEnable(hook)) {
+                            tEvent.tap({
+                                name: hook.plugin.key,
+                                stage: hook.stage || 0,
+                                before: hook.before,
+                            }, () => {
+                                var _a, _b;
+                                const dateStart = new Date();
+                                hook.fn(opts.args);
+                                (_a = hook.plugin.time.hooks)[_b = opts.key] || (_a[_b] = []);
+                                hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
+                            });
+                        }
+                    });
+                    return tEvent.call(1);
                 }
-                else {
-                    throw new Error(`Invalid applyPlugins arguments, type must be supplied for key ${opts.key}.`);
+                const tEvent = new tapable_1.AsyncSeriesWaterfallHook(['_']);
+                for (const hook of hooks) {
+                    if (!this.isPluginEnable(hook))
+                        continue;
+                    tEvent.tapPromise({
+                        name: hook.plugin.key,
+                        stage: hook.stage || 0,
+                        before: hook.before,
+                    }, async () => {
+                        var _a, _b;
+                        const dateStart = new Date();
+                        await hook.fn(opts.args);
+                        (_a = hook.plugin.time.hooks)[_b = opts.key] || (_a[_b] = []);
+                        hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
+                    });
                 }
-            }
-            switch (type) {
-                case types_1.ApplyPluginsType.add:
-                    (0, assert_1.default)(!('initialValue' in opts) || Array.isArray(opts.initialValue), `applyPlugins failed, opts.initialValue must be Array if opts.type is add.`);
-                    const tAdd = new tapable_1.AsyncSeriesWaterfallHook(['memo']);
-                    for (const hook of hooks) {
-                        if (!this.isPluginEnable(hook))
-                            continue;
-                        tAdd.tapPromise({
-                            name: hook.plugin.key,
-                            stage: hook.stage,
-                            before: hook.before,
-                        }, (memo) => __awaiter(this, void 0, void 0, function* () {
-                            var _a, _b;
-                            const dateStart = new Date();
-                            const items = yield hook.fn(opts.args);
-                            (_a = hook.plugin.time.hooks)[_b = opts.key] || (_a[_b] = []);
-                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
-                            return memo.concat(items);
-                        }));
-                    }
-                    return (yield tAdd.promise(opts.initialValue || []));
-                case types_1.ApplyPluginsType.modify:
-                    const tModify = new tapable_1.AsyncSeriesWaterfallHook(['memo']);
-                    for (const hook of hooks) {
-                        if (!this.isPluginEnable(hook))
-                            continue;
-                        tModify.tapPromise({
-                            name: hook.plugin.key,
-                            stage: hook.stage,
-                            before: hook.before,
-                        }, (memo) => __awaiter(this, void 0, void 0, function* () {
-                            var _c, _d;
-                            const dateStart = new Date();
-                            const ret = yield hook.fn(memo, opts.args);
-                            (_c = hook.plugin.time.hooks)[_d = opts.key] || (_c[_d] = []);
-                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
-                            return ret;
-                        }));
-                    }
-                    return (yield tModify.promise(opts.initialValue));
-                case types_1.ApplyPluginsType.event:
-                    const tEvent = new tapable_1.AsyncSeriesWaterfallHook(['_']);
-                    for (const hook of hooks) {
-                        if (!this.isPluginEnable(hook))
-                            continue;
-                        tEvent.tapPromise({
-                            name: hook.plugin.key,
-                            stage: hook.stage || 0,
-                            before: hook.before,
-                        }, () => __awaiter(this, void 0, void 0, function* () {
-                            var _f, _g;
-                            const dateStart = new Date();
-                            yield hook.fn(opts.args);
-                            (_f = hook.plugin.time.hooks)[_g = opts.key] || (_f[_g] = []);
-                            hook.plugin.time.hooks[opts.key].push(new Date().getTime() - dateStart.getTime());
-                        }));
-                    }
-                    return (yield tEvent.promise(1));
-                default:
-                    throw new Error(`applyPlugins failed, type is not defined or is not matched, got ${opts.type}.`);
-            }
-        });
+                return tEvent.promise(1);
+            default:
+                throw new Error(`applyPlugins failed, type is not defined or is not matched, got ${opts.type}.`);
+        }
     }
-    run(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { name, args = {} } = opts;
-            args._ = args._ || [];
-            // shift the command itself
-            if (args._[0] === name)
-                args._.shift();
-            this.args = args;
-            this.name = name;
-            // loadEnv
-            this.stage = types_1.ServiceStage.init;
-            (0, env_1.loadEnv)({ cwd: this.cwd, envFile: '.env' });
-            // get pkg from package.json
-            let pkg = {};
-            let pkgPath = '';
-            try {
-                pkg = require((0, path_1.join)(this.cwd, 'package.json'));
-                pkgPath = (0, path_1.join)(this.cwd, 'package.json');
-            }
-            catch (_e) {
-                // APP_ROOT
-                if (this.cwd !== process.cwd()) {
-                    try {
-                        pkg = require((0, path_1.join)(process.cwd(), 'package.json'));
-                        pkgPath = (0, path_1.join)(process.cwd(), 'package.json');
-                    }
-                    catch (_e) { }
+    async run(opts) {
+        const { name, args = {} } = opts;
+        args._ = args._ || [];
+        // shift the command itself
+        if (args._[0] === name)
+            args._.shift();
+        this.args = args;
+        this.name = name;
+        // loadEnv
+        this.stage = types_1.ServiceStage.init;
+        (0, env_1.loadEnv)({ cwd: this.cwd, envFile: '.env' });
+        // get pkg from package.json
+        let pkg = {};
+        let pkgPath = '';
+        try {
+            pkg = require((0, path_1.join)(this.cwd, 'package.json'));
+            pkgPath = (0, path_1.join)(this.cwd, 'package.json');
+        }
+        catch (_e) {
+            // APP_ROOT
+            if (this.cwd !== process.cwd()) {
+                try {
+                    pkg = require((0, path_1.join)(process.cwd(), 'package.json'));
+                    pkgPath = (0, path_1.join)(process.cwd(), 'package.json');
                 }
+                catch (_e) { }
             }
-            this.pkg = pkg;
-            this.pkgPath = pkgPath || (0, path_1.join)(this.cwd, 'package.json');
-            const prefix = this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME;
-            // get user config
-            const configManager = new config_1.Config({
-                cwd: this.cwd,
-                env: this.env,
-                defaultConfigFiles: this.opts.defaultConfigFiles,
-                specifiedEnv: process.env[`${prefix}_ENV`.toUpperCase()],
+        }
+        this.pkg = pkg;
+        this.pkgPath = pkgPath || (0, path_1.join)(this.cwd, 'package.json');
+        const prefix = this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME;
+        // get user config
+        const configManager = new config_1.Config({
+            cwd: this.cwd,
+            env: this.env,
+            defaultConfigFiles: this.opts.defaultConfigFiles,
+            specifiedEnv: process.env[`${prefix}_ENV`.toUpperCase()],
+        });
+        this.configManager = configManager;
+        this.userConfig = configManager.getUserConfig().config;
+        // get paths
+        const paths = (0, path_2.getPaths)({
+            cwd: this.cwd,
+            env: this.env,
+            prefix: this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME,
+        });
+        // temporary paths for use by function generateFinalConfig.
+        // the value of paths may be updated by plugins later
+        this.paths = paths;
+        // resolve initial presets and plugins
+        const { plugins, presets } = plugin_1.Plugin.getPluginsAndPresets({
+            cwd: this.cwd,
+            pkg,
+            plugins: [require.resolve('./generatePlugin')].concat(this.opts.plugins || []),
+            presets: [require.resolve('./servicePlugin')].concat(this.opts.presets || []),
+            userConfig: this.userConfig,
+            prefix,
+        });
+        // register presets and plugins
+        this.stage = types_1.ServiceStage.initPresets;
+        const presetPlugins = [];
+        while (presets.length) {
+            await this.initPreset({
+                preset: presets.shift(),
+                presets,
+                plugins: presetPlugins,
             });
-            this.configManager = configManager;
-            this.userConfig = configManager.getUserConfig().config;
-            // get paths (move after?)
-            // resolve initial presets and plugins
-            const { plugins, presets } = plugin_1.Plugin.getPluginsAndPresets({
+        }
+        plugins.unshift(...presetPlugins);
+        this.stage = types_1.ServiceStage.initPlugins;
+        while (plugins.length) {
+            await this.initPlugin({ plugin: plugins.shift(), plugins });
+        }
+        // collect configSchemas and configDefaults
+        for (const id of Object.keys(this.plugins)) {
+            const { config, key } = this.plugins[id];
+            if (config.schema)
+                this.configSchemas[key] = config.schema;
+            if (config.default !== undefined) {
+                this.configDefaults[key] = config.default;
+            }
+            this.configOnChanges[key] = config.onChange || types_1.ConfigChangeType.reload;
+        }
+        // setup api.config from modifyConfig and modifyDefaultConfig
+        this.stage = types_1.ServiceStage.resolveConfig;
+        const { config, defaultConfig } = await this.generateFinalConfig();
+        if (this.config.outputPath) {
+            paths.absOutputPath = (0, path_1.isAbsolute)(this.config.outputPath)
+                ? this.config.outputPath
+                : (0, path_1.join)(this.cwd, this.config.outputPath);
+        }
+        this.paths = await this.applyPlugins({
+            key: 'modifyPaths',
+            initialValue: paths,
+        });
+        // applyPlugin collect app data
+        // TODO: some data is mutable
+        this.stage = types_1.ServiceStage.collectAppData;
+        this.appData = await this.applyPlugins({
+            key: 'modifyAppData',
+            initialValue: {
+                // base
                 cwd: this.cwd,
                 pkg,
-                plugins: [require.resolve('./generatePlugin')].concat(this.opts.plugins || []),
-                presets: [require.resolve('./servicePlugin')].concat(this.opts.presets || []),
+                pkgPath,
+                plugins,
+                presets,
+                name,
+                args,
+                // config
                 userConfig: this.userConfig,
-                prefix,
-            });
-            // register presets and plugins
-            this.stage = types_1.ServiceStage.initPresets;
-            const presetPlugins = [];
-            while (presets.length) {
-                yield this.initPreset({
-                    preset: presets.shift(),
-                    presets,
-                    plugins: presetPlugins,
-                });
-            }
-            plugins.unshift(...presetPlugins);
-            this.stage = types_1.ServiceStage.initPlugins;
-            while (plugins.length) {
-                yield this.initPlugin({ plugin: plugins.shift(), plugins });
-            }
-            // collect configSchemas and configDefaults
-            for (const id of Object.keys(this.plugins)) {
-                const { config, key } = this.plugins[id];
-                if (config.schema)
-                    this.configSchemas[key] = config.schema;
-                if (config.default !== undefined) {
-                    this.configDefaults[key] = config.default;
-                }
-                this.configOnChanges[key] = config.onChange || types_1.ConfigChangeType.reload;
-            }
-            // setup api.config from modifyConfig and modifyDefaultConfig
-            const paths = (0, path_2.getPaths)({
-                cwd: this.cwd,
-                env: this.env,
-                prefix: this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME,
-            });
-            this.stage = types_1.ServiceStage.resolveConfig;
-            const config = yield this.applyPlugins({
-                key: 'modifyConfig',
-                // why clone deep?
-                // user may change the config in modifyConfig
-                // e.g. memo.alias = xxx
-                initialValue: utils_1.lodash.cloneDeep(configManager.getConfig({
-                    schemas: this.configSchemas,
-                }).config),
-                args: { paths },
-            });
-            const defaultConfig = yield this.applyPlugins({
-                key: 'modifyDefaultConfig',
-                initialValue: this.configDefaults,
-            });
-            this.config = utils_1.lodash.merge(defaultConfig, config);
-            if (this.config.outputPath) {
-                paths.absOutputPath = (0, path_1.join)(this.cwd, this.config.outputPath);
-            }
-            this.paths = yield this.applyPlugins({
-                key: 'modifyPaths',
-                initialValue: paths,
-            });
-            // applyPlugin collect app data
-            // TODO: some data is mutable
-            this.stage = types_1.ServiceStage.collectAppData;
-            this.appData = yield this.applyPlugins({
-                key: 'modifyAppData',
-                initialValue: {
-                    // base
-                    cwd: this.cwd,
-                    pkg,
-                    pkgPath,
-                    plugins,
-                    presets,
-                    name,
-                    args,
-                    // config
-                    userConfig: this.userConfig,
-                    mainConfigFile: configManager.mainConfigFile,
-                    config,
-                    defaultConfig: defaultConfig,
-                    // TODO
-                    // moduleGraph,
-                    // routes,
-                    // npmClient,
-                    // nodeVersion,
-                    // gitInfo,
-                    // gitBranch,
-                    // debugger info,
-                    // devPort,
-                    // devHost,
-                    // env
-                },
-            });
-            // applyPlugin onCheck
-            this.stage = types_1.ServiceStage.onCheck;
-            yield this.applyPlugins({
-                key: 'onCheck',
-            });
-            // applyPlugin onStart
-            this.stage = types_1.ServiceStage.onStart;
-            yield this.applyPlugins({
-                key: 'onStart',
-            });
-            // run command
-            this.stage = types_1.ServiceStage.runCommand;
-            const command = this.commands[name];
-            (0, assert_1.default)(command, `Invalid command ${name}, it's not registered.`);
-            let ret = yield command.fn({ args });
-            this._baconPlugins();
-            return ret;
+                mainConfigFile: configManager.mainConfigFile,
+                config,
+                defaultConfig: defaultConfig,
+                // TODO
+                // moduleGraph,
+                // routes,
+                // npmClient,
+                // nodeVersion,
+                // gitInfo,
+                // gitBranch,
+                // debugger info,
+                // devPort,
+                // devHost,
+                // env
+            },
+        });
+        // applyPlugin onCheck
+        this.stage = types_1.ServiceStage.onCheck;
+        await this.applyPlugins({
+            key: 'onCheck',
         });
+        // applyPlugin onStart
+        this.stage = types_1.ServiceStage.onStart;
+        await this.applyPlugins({
+            key: 'onStart',
+        });
+        // run command
+        this.stage = types_1.ServiceStage.runCommand;
+        const command = this.commands[name];
+        (0, assert_1.default)(command, `Invalid command ${name}, it's not registered.`);
+        let ret = await command.fn({ args });
+        this._baconPlugins();
+        return ret;
+    }
+    // generate config and defaultConfig, and assign values to this.config
+    async generateFinalConfig() {
+        var _a;
+        // configManager and paths are not available until the init stage
+        (0, assert_1.default)(this.stage > types_1.ServiceStage.init, `Can't generate final config before init stage`);
+        const config = await this.applyPlugins({
+            key: 'modifyConfig',
+            // why clone deep?
+            // user may change the config in modifyConfig
+            // e.g. memo.alias = xxx
+            initialValue: utils_1.lodash.cloneDeep((_a = this.configManager) === null || _a === void 0 ? void 0 : _a.getConfig({
+                schemas: this.configSchemas,
+            }).config),
+            args: { paths: this.paths },
+        });
+        const defaultConfig = await this.applyPlugins({
+            key: 'modifyDefaultConfig',
+            initialValue: this.configDefaults,
+        });
+        const finalConfig = utils_1.lodash.merge(defaultConfig, config);
+        this.config = finalConfig;
+        return { config, defaultConfig, finalConfig };
     }
     _baconPlugins() {
         // TODO: prettier
@@ -301,80 +321,76 @@ class Service {
             }
         }
     }
-    initPreset(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { presets, plugins } = yield this.initPlugin({
-                plugin: opts.preset,
-                presets: opts.presets,
-                plugins: opts.plugins,
-            });
-            opts.presets.unshift(...(presets || []));
-            opts.plugins.push(...(plugins || []));
+    async initPreset(opts) {
+        const { presets, plugins } = await this.initPlugin({
+            plugin: opts.preset,
+            presets: opts.presets,
+            plugins: opts.plugins,
         });
+        opts.presets.unshift(...(presets || []));
+        opts.plugins.push(...(plugins || []));
     }
-    initPlugin(opts) {
+    async initPlugin(opts) {
         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.`);
-            this.plugins[opts.plugin.id] = opts.plugin;
-            // apply with PluginAPI
-            const pluginAPI = new pluginAPI_1.PluginAPI({
-                plugin: opts.plugin,
-                service: this,
-            });
-            pluginAPI.registerPresets = pluginAPI.registerPresets.bind(pluginAPI, opts.presets || []);
-            pluginAPI.registerPlugins = pluginAPI.registerPlugins.bind(pluginAPI, opts.plugins);
-            const proxyPluginAPI = pluginAPI_1.PluginAPI.proxyPluginAPI({
+        // 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.`);
+        this.plugins[opts.plugin.id] = opts.plugin;
+        // apply with PluginAPI
+        const pluginAPI = new pluginAPI_1.PluginAPI({
+            plugin: opts.plugin,
+            service: this,
+        });
+        pluginAPI.registerPresets = pluginAPI.registerPresets.bind(pluginAPI, opts.presets || []);
+        pluginAPI.registerPlugins = pluginAPI.registerPlugins.bind(pluginAPI, opts.plugins);
+        const proxyPluginAPI = pluginAPI_1.PluginAPI.proxyPluginAPI({
+            service: this,
+            pluginAPI,
+            serviceProps: [
+                'appData',
+                'applyPlugins',
+                'args',
+                'config',
+                'cwd',
+                'pkg',
+                'pkgPath',
+                'name',
+                'paths',
+                'userConfig',
+                'env',
+                'isPluginEnable',
+            ],
+            staticProps: {
+                ApplyPluginsType: types_1.ApplyPluginsType,
+                ConfigChangeType: types_1.ConfigChangeType,
+                EnableBy: types_1.EnableBy,
+                ServiceStage: types_1.ServiceStage,
                 service: this,
-                pluginAPI,
-                serviceProps: [
-                    'appData',
-                    'applyPlugins',
-                    'args',
-                    'config',
-                    'cwd',
-                    'pkg',
-                    'pkgPath',
-                    'name',
-                    'paths',
-                    'userConfig',
-                    'env',
-                    'isPluginEnable',
-                ],
-                staticProps: {
-                    ApplyPluginsType: types_1.ApplyPluginsType,
-                    ConfigChangeType: types_1.ConfigChangeType,
-                    EnableBy: types_1.EnableBy,
-                    ServiceStage: types_1.ServiceStage,
-                    service: this,
-                },
-            });
-            let dateStart = new Date();
-            let ret = yield opts.plugin.apply()(proxyPluginAPI);
-            opts.plugin.time.register = new Date().getTime() - dateStart.getTime();
-            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,
-                    type: types_1.PluginType.preset,
-                    cwd: this.cwd,
-                }));
-            }
-            if (ret === null || ret === void 0 ? void 0 : ret.plugins) {
-                ret.plugins = ret.plugins.map((plugin) => new plugin_1.Plugin({
-                    path: plugin,
-                    type: types_1.PluginType.plugin,
-                    cwd: this.cwd,
-                }));
-            }
-            return ret || {};
+            },
         });
+        let dateStart = new Date();
+        let ret = await opts.plugin.apply()(proxyPluginAPI);
+        opts.plugin.time.register = new Date().getTime() - dateStart.getTime();
+        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,
+                type: types_1.PluginType.preset,
+                cwd: this.cwd,
+            }));
+        }
+        if (ret === null || ret === void 0 ? void 0 : ret.plugins) {
+            ret.plugins = ret.plugins.map((plugin) => new plugin_1.Plugin({
+                path: plugin,
+                type: types_1.PluginType.plugin,
+                cwd: this.cwd,
+            }));
+        }
+        return ret || {};
     }
     isPluginEnable(hook) {
         let plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-rc.12",
+  "version": "4.0.0-rc.15",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -16,20 +16,19 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.12",
-    "@umijs/utils": "4.0.0-rc.12"
+    "@umijs/bundler-utils": "4.0.0-rc.15",
+    "@umijs/utils": "4.0.0-rc.15"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",
     "@types/hapi__joi": "17.1.8",
     "dotenv": "16.0.0",
-    "just-diff": "5.0.1",
-    "tapable": "2.2.1"
+    "just-diff": "5.0.1"
   },
   "publishConfig": {
     "access": "public"
@@ -41,14 +40,13 @@
     "deps": [
       "@hapi/joi",
       "dotenv",
-      "just-diff",
-      "tapable"
+      "just-diff"
     ],
     "externals": {
       "@hapi/joi": "$$LOCAL",
       "dotenv": "$$LOCAL",
       "just-diff": "$$LOCAL",
-      "tapable": "$$LOCAL"
+      "tapable": "@umijs/bundler-utils/compiled/tapable"
     }
   }
 }

package/compiled/tapable/LICENSE

@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright JS Foundation and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package/compiled/tapable/index.js

@@ -1 +0,0 @@
-(function(){"use strict";var e={131:function(e,t,n){const o=n(246);const r=n(431);class AsyncParallelBailHookCodeFactory extends r{content({onError:e,onResult:t,onDone:n}){let o="";o+=`var _results = new Array(${this.options.taps.length});\n`;o+="var _checkDone = function() {\n";o+="for(var i = 0; i < _results.length; i++) {\n";o+="var item = _results[i];\n";o+="if(item === undefined) return false;\n";o+="if(item.result !== undefined) {\n";o+=t("item.result");o+="return true;\n";o+="}\n";o+="if(item.error) {\n";o+=e("item.error");o+="return true;\n";o+="}\n";o+="}\n";o+="return false;\n";o+="}\n";o+=this.callTapsParallel({onError:(e,t,n,o)=>{let r="";r+=`if(${e} < _results.length && ((_results.length = ${e+1}), (_results[${e}] = { error: ${t} }), _checkDone())) {\n`;r+=o(true);r+="} else {\n";r+=n();r+="}\n";return r},onResult:(e,t,n,o)=>{let r="";r+=`if(${e} < _results.length && (${t} !== undefined && (_results.length = ${e+1}), (_results[${e}] = { result: ${t} }), _checkDone())) {\n`;r+=o(true);r+="} else {\n";r+=n();r+="}\n";return r},onTap:(e,t,n,o)=>{let r="";if(e>0){r+=`if(${e} >= _results.length) {\n`;r+=n();r+="} else {\n"}r+=t();if(e>0)r+="}\n";return r},onDone:n});return o}}const s=new AsyncParallelBailHookCodeFactory;const COMPILE=function(e){s.setup(this,e);return s.create(e)};function AsyncParallelBailHook(e=[],t=undefined){const n=new o(e,t);n.constructor=AsyncParallelBailHook;n.compile=COMPILE;n._call=undefined;n.call=undefined;return n}AsyncParallelBailHook.prototype=null;e.exports=AsyncParallelBailHook},834:function(e,t,n){const o=n(246);const r=n(431);class AsyncParallelHookCodeFactory extends r{content({onError:e,onDone:t}){return this.callTapsParallel({onError:(t,n,o,r)=>e(n)+r(true),onDone:t})}}const s=new AsyncParallelHookCodeFactory;const COMPILE=function(e){s.setup(this,e);return s.create(e)};function AsyncParallelHook(e=[],t=undefined){const n=new o(e,t);n.constructor=AsyncParallelHook;n.compile=COMPILE;n._call=undefined;n.call=undefined;return n}AsyncParallelHook.prototype=null;e.exports=AsyncParallelHook},179:function(e,t,n){const o=n(246);const r=n(431);class AsyncSeriesBailHookCodeFactory extends r{content({onError:e,onResult:t,resultReturns:n,onDone:o}){return this.callTapsSeries({onError:(t,n,o,r)=>e(n)+r(true),onResult:(e,n,o)=>`if(${n} !== undefined) {\n${t(n)}\n} else {\n${o()}}\n`,resultReturns:n,onDone:o})}}const s=new AsyncSeriesBailHookCodeFactory;const COMPILE=function(e){s.setup(this,e);return s.create(e)};function AsyncSeriesBailHook(e=[],t=undefined){const n=new o(e,t);n.constructor=AsyncSeriesBailHook;n.compile=COMPILE;n._call=undefined;n.call=undefined;return n}AsyncSeriesBailHook.prototype=null;e.exports=AsyncSeriesBailHook},1:function(e,t,n){const o=n(246);const r=n(431);class AsyncSeriesHookCodeFactory extends r{content({onError:e,onDone:t}){return this.callTapsSeries({onError:(t,n,o,r)=>e(n)+r(true),onDone:t})}}const s=new AsyncSeriesHookCodeFactory;const COMPILE=function(e){s.setup(this,e);return s.create(e)};function AsyncSeriesHook(e=[],t=undefined){const n=new o(e,t);n.constructor=AsyncSeriesHook;n.compile=COMPILE;n._call=undefined;n.call=undefined;return n}AsyncSeriesHook.prototype=null;e.exports=AsyncSeriesHook},843:function(e,t,n){const o=n(246);const r=n(431);class AsyncSeriesLoopHookCodeFactory extends r{content({onError:e,onDone:t}){return this.callTapsLooping({onError:(t,n,o,r)=>e(n)+r(true),onDone:t})}}const s=new AsyncSeriesLoopHookCodeFactory;const COMPILE=function(e){s.setup(this,e);return s.create(e)};function AsyncSeriesLoopHook(e=[],t=undefined){const n=new o(e,t);n.constructor=AsyncSeriesLoopHook;n.compile=COMPILE;n._call=undefined;n.call=undefined;return n}AsyncSeriesLoopHook.prototype=null;e.exports=AsyncSeriesLoopHook},371:function(e,t,n){const o=n(246);const r=n(431);class AsyncSeriesWaterfallHookCodeFactory extends r{content({onError:e,onResult:t,onDone:n}){return this.callTapsSeries({onError:(t,n,o,r)=>e(n)+r(true),onResult:(e,t,n)=>{let o="";o+=`if(${t} !== undefined) {\n`;o+=`${this._args[0]} = ${t};\n`;o+=`}\n`;o+=n();return o},onDone:()=>t(this._args[0])})}}const s=new AsyncSeriesWaterfallHookCodeFactory;const COMPILE=function(e){s.setup(this,e);return s.create(e)};function AsyncSeriesWaterfallHook(e=[],t=undefined){if(e.length<1)throw new Error("Waterfall hooks must have at least one argument");const n=new o(e,t);n.constructor=AsyncSeriesWaterfallHook;n.compile=COMPILE;n._call=undefined;n.call=undefined;return n}AsyncSeriesWaterfallHook.prototype=null;e.exports=AsyncSeriesWaterfallHook},246:function(e,t,n){const o=n(669);const r=o.deprecate((()=>{}),"Hook.context is deprecated and will be removed");const CALL_DELEGATE=function(...e){this.call=this._createCall("sync");return this.call(...e)};const CALL_ASYNC_DELEGATE=function(...e){this.callAsync=this._createCall("async");return this.callAsync(...e)};const PROMISE_DELEGATE=function(...e){this.promise=this._createCall("promise");return this.promise(...e)};class Hook{constructor(e=[],t=undefined){this._args=e;this.name=t;this.taps=[];this.interceptors=[];this._call=CALL_DELEGATE;this.call=CALL_DELEGATE;this._callAsync=CALL_ASYNC_DELEGATE;this.callAsync=CALL_ASYNC_DELEGATE;this._promise=PROMISE_DELEGATE;this.promise=PROMISE_DELEGATE;this._x=undefined;this.compile=this.compile;this.tap=this.tap;this.tapAsync=this.tapAsync;this.tapPromise=this.tapPromise}compile(e){throw new Error("Abstract: should be overridden")}_createCall(e){return this.compile({taps:this.taps,interceptors:this.interceptors,args:this._args,type:e})}_tap(e,t,n){if(typeof t==="string"){t={name:t.trim()}}else if(typeof t!=="object"||t===null){throw new Error("Invalid tap options")}if(typeof t.name!=="string"||t.name===""){throw new Error("Missing name for tap")}if(typeof t.context!=="undefined"){r()}t=Object.assign({type:e,fn:n},t);t=this._runRegisterInterceptors(t);this._insert(t)}tap(e,t){this._tap("sync",e,t)}tapAsync(e,t){this._tap("async",e,t)}tapPromise(e,t){this._tap("promise",e,t)}_runRegisterInterceptors(e){for(const t of this.interceptors){if(t.register){const n=t.register(e);if(n!==undefined){e=n}}}return e}withOptions(e){const mergeOptions=t=>Object.assign({},e,typeof t==="string"?{name:t}:t);return{name:this.name,tap:(e,t)=>this.tap(mergeOptions(e),t),tapAsync:(e,t)=>this.tapAsync(mergeOptions(e),t),tapPromise:(e,t)=>this.tapPromise(mergeOptions(e),t),intercept:e=>this.intercept(e),isUsed:()=>this.isUsed(),withOptions:e=>this.withOptions(mergeOptions(e))}}isUsed(){return this.taps.length>0||this.interceptors.length>0}intercept(e){this._resetCompilation();this.interceptors.push(Object.assign({},e));if(e.register){for(let t=0;t<this.taps.length;t++){this.taps[t]=e.register(this.taps[t])}}}_resetCompilation(){this.call=this._call;this.callAsync=this._callAsync;this.promise=this._promise}_insert(e){this._resetCompilation();let t;if(typeof e.before==="string"){t=new Set([e.before])}else if(Array.isArray(e.before)){t=new Set(e.before)}let n=0;if(typeof e.stage==="number"){n=e.stage}let o=this.taps.length;while(o>0){o--;const e=this.taps[o];this.taps[o+1]=e;const r=e.stage||0;if(t){if(t.has(e.name)){t.delete(e.name);continue}if(t.size>0){continue}}if(r>n){continue}o++;break}this.taps[o]=e}}Object.setPrototypeOf(Hook.prototype,null);e.exports=Hook},431:function(e){class HookCodeFactory{constructor(e){this.config=e;this.options=undefined;this._args=undefined}create(e){this.init(e);let t;switch(this.options.type){case"sync":t=new Function(this.args(),'"use strict";\n'+this.header()+this.contentWithInterceptors({onError:e=>`throw ${e};\n`,onResult:e=>`return ${e};\n`,resultReturns:true,onDone:()=>"",rethrowIfPossible:true}));break;case"async":t=new Function(this.args({after:"_callback"}),'"use strict";\n'+this.header()+this.contentWithInterceptors({onError:e=>`_callback(${e});\n`,onResult:e=>`_callback(null, ${e});\n`,onDone:()=>"_callback();\n"}));break;case"promise":let e=false;const n=this.contentWithInterceptors({onError:t=>{e=true;return`_error(${t});\n`},onResult:e=>`_resolve(${e});\n`,onDone:()=>"_resolve();\n"});let o="";o+='"use strict";\n';o+=this.header();o+="return new Promise((function(_resolve, _reject) {\n";if(e){o+="var _sync = true;\n";o+="function _error(_err) {\n";o+="if(_sync)\n";o+="_resolve(Promise.resolve().then((function() { throw _err; })));\n";o+="else\n";o+="_reject(_err);\n";o+="};\n"}o+=n;if(e){o+="_sync = false;\n"}o+="}));\n";t=new Function(this.args(),o);break}this.deinit();return t}setup(e,t){e._x=t.taps.map((e=>e.fn))}init(e){this.options=e;this._args=e.args.slice()}deinit(){this.options=undefined;this._args=undefined}contentWithInterceptors(e){if(this.options.interceptors.length>0){const t=e.onError;const n=e.onResult;const o=e.onDone;let r="";for(let e=0;e<this.options.interceptors.length;e++){const t=this.options.interceptors[e];if(t.call){r+=`${this.getInterceptor(e)}.call(${this.args({before:t.context?"_context":undefined})});\n`}}r+=this.content(Object.assign(e,{onError:t&&(e=>{let n="";for(let t=0;t<this.options.interceptors.length;t++){const o=this.options.interceptors[t];if(o.error){n+=`${this.getInterceptor(t)}.error(${e});\n`}}n+=t(e);return n}),onResult:n&&(e=>{let t="";for(let n=0;n<this.options.interceptors.length;n++){const o=this.options.interceptors[n];if(o.result){t+=`${this.getInterceptor(n)}.result(${e});\n`}}t+=n(e);return t}),onDone:o&&(()=>{let e="";for(let t=0;t<this.options.interceptors.length;t++){const n=this.options.interceptors[t];if(n.done){e+=`${this.getInterceptor(t)}.done();\n`}}e+=o();return e})}));return r}else{return this.content(e)}}header(){let e="";if(this.needContext()){e+="var _context = {};\n"}else{e+="var _context;\n"}e+="var _x = this._x;\n";if(this.options.interceptors.length>0){e+="var _taps = this.taps;\n";e+="var _interceptors = this.interceptors;\n"}return e}needContext(){for(const e of this.options.taps)if(e.context)return true;return false}callTap(e,{onError:t,onResult:n,onDone:o,rethrowIfPossible:r}){let s="";let i=false;for(let t=0;t<this.options.interceptors.length;t++){const n=this.options.interceptors[t];if(n.tap){if(!i){s+=`var _tap${e} = ${this.getTap(e)};\n`;i=true}s+=`${this.getInterceptor(t)}.tap(${n.context?"_context, ":""}_tap${e});\n`}}s+=`var _fn${e} = ${this.getTapFn(e)};\n`;const c=this.options.taps[e];switch(c.type){case"sync":if(!r){s+=`var _hasError${e} = false;\n`;s+="try {\n"}if(n){s+=`var _result${e} = _fn${e}(${this.args({before:c.context?"_context":undefined})});\n`}else{s+=`_fn${e}(${this.args({before:c.context?"_context":undefined})});\n`}if(!r){s+="} catch(_err) {\n";s+=`_hasError${e} = true;\n`;s+=t("_err");s+="}\n";s+=`if(!_hasError${e}) {\n`}if(n){s+=n(`_result${e}`)}if(o){s+=o()}if(!r){s+="}\n"}break;case"async":let i="";if(n)i+=`(function(_err${e}, _result${e}) {\n`;else i+=`(function(_err${e}) {\n`;i+=`if(_err${e}) {\n`;i+=t(`_err${e}`);i+="} else {\n";if(n){i+=n(`_result${e}`)}if(o){i+=o()}i+="}\n";i+="})";s+=`_fn${e}(${this.args({before:c.context?"_context":undefined,after:i})});\n`;break;case"promise":s+=`var _hasResult${e} = false;\n`;s+=`var _promise${e} = _fn${e}(${this.args({before:c.context?"_context":undefined})});\n`;s+=`if (!_promise${e} || !_promise${e}.then)\n`;s+=`  throw new Error('Tap function (tapPromise) did not return promise (returned ' + _promise${e} + ')');\n`;s+=`_promise${e}.then((function(_result${e}) {\n`;s+=`_hasResult${e} = true;\n`;if(n){s+=n(`_result${e}`)}if(o){s+=o()}s+=`}), function(_err${e}) {\n`;s+=`if(_hasResult${e}) throw _err${e};\n`;s+=t(`_err${e}`);s+="});\n";break}return s}callTapsSeries({onError:e,onResult:t,resultReturns:n,onDone:o,doneReturns:r,rethrowIfPossible:s}){if(this.options.taps.length===0)return o();const i=this.options.taps.findIndex((e=>e.type!=="sync"));const c=n||r;let a="";let l=o;let p=0;for(let n=this.options.taps.length-1;n>=0;n--){const r=n;const u=l!==o&&(this.options.taps[r].type!=="sync"||p++>20);if(u){p=0;a+=`function _next${r}() {\n`;a+=l();a+=`}\n`;l=()=>`${c?"return ":""}_next${r}();\n`}const f=l;const doneBreak=e=>{if(e)return"";return o()};const h=this.callTap(r,{onError:t=>e(r,t,f,doneBreak),onResult:t&&(e=>t(r,e,f,doneBreak)),onDone:!t&&f,rethrowIfPossible:s&&(i<0||r<i)});l=()=>h}a+=l();return a}callTapsLooping({onError:e,onDone:t,rethrowIfPossible:n}){if(this.options.taps.length===0)return t();const o=this.options.taps.every((e=>e.type==="sync"));let r="";if(!o){r+="var _looper = (function() {\n";r+="var _loopAsync = false;\n"}r+="var _loop;\n";r+="do {\n";r+="_loop = false;\n";for(let e=0;e<this.options.interceptors.length;e++){const t=this.options.interceptors[e];if(t.loop){r+=`${this.getInterceptor(e)}.loop(${this.args({before:t.context?"_context":undefined})});\n`}}r+=this.callTapsSeries({onError:e,onResult:(e,t,n,r)=>{let s="";s+=`if(${t} !== undefined) {\n`;s+="_loop = true;\n";if(!o)s+="if(_loopAsync) _looper();\n";s+=r(true);s+=`} else {\n`;s+=n();s+=`}\n`;return s},onDone:t&&(()=>{let e="";e+="if(!_loop) {\n";e+=t();e+="}\n";return e}),rethrowIfPossible:n&&o});r+="} while(_loop);\n";if(!o){r+="_loopAsync = true;\n";r+="});\n";r+="_looper();\n"}return r}callTapsParallel({onError:e,onResult:t,onDone:n,rethrowIfPossible:o,onTap:r=((e,t)=>t())}){if(this.options.taps.length<=1){return this.callTapsSeries({onError:e,onResult:t,onDone:n,rethrowIfPossible:o})}let s="";s+="do {\n";s+=`var _counter = ${this.options.taps.length};\n`;if(n){s+="var _done = (function() {\n";s+=n();s+="});\n"}for(let i=0;i<this.options.taps.length;i++){const done=()=>{if(n)return"if(--_counter === 0) _done();\n";else return"--_counter;"};const doneBreak=e=>{if(e||!n)return"_counter = 0;\n";else return"_counter = 0;\n_done();\n"};s+="if(_counter <= 0) break;\n";s+=r(i,(()=>this.callTap(i,{onError:t=>{let n="";n+="if(_counter > 0) {\n";n+=e(i,t,done,doneBreak);n+="}\n";return n},onResult:t&&(e=>{let n="";n+="if(_counter > 0) {\n";n+=t(i,e,done,doneBreak);n+="}\n";return n}),onDone:!t&&(()=>done()),rethrowIfPossible:o})),done,doneBreak)}s+="} while(false);\n";return s}args({before:e,after:t}={}){let n=this._args;if(e)n=[e].concat(n);if(t)n=n.concat(t);if(n.length===0){return""}else{return n.join(", ")}}getTapFn(e){return`_x[${e}]`}getTap(e){return`_taps[${e}]`}getInterceptor(e){return`_interceptors[${e}]`}}e.exports=HookCodeFactory},278:function(e,t,n){const o=n(669);const defaultFactory=(e,t)=>t;class HookMap{constructor(e,t=undefined){this._map=new Map;this.name=t;this._factory=e;this._interceptors=[]}get(e){return this._map.get(e)}for(e){const t=this.get(e);if(t!==undefined){return t}let n=this._factory(e);const o=this._interceptors;for(let t=0;t<o.length;t++){n=o[t].factory(e,n)}this._map.set(e,n);return n}intercept(e){this._interceptors.push(Object.assign({factory:defaultFactory},e))}}HookMap.prototype.tap=o.deprecate((function(e,t,n){return this.for(e).tap(t,n)}),"HookMap#tap(key,…) is deprecated. Use HookMap#for(key).tap(…) instead.");HookMap.prototype.tapAsync=o.deprecate((function(e,t,n){return this.for(e).tapAsync(t,n)}),"HookMap#tapAsync(key,…) is deprecated. Use HookMap#for(key).tapAsync(…) instead.");HookMap.prototype.tapPromise=o.deprecate((function(e,t,n){return this.for(e).tapPromise(t,n)}),"HookMap#tapPromise(key,…) is deprecated. Use HookMap#for(key).tapPromise(…) instead.");e.exports=HookMap},310:function(e,t,n){const o=n(246);class MultiHook{constructor(e,t=undefined){this.hooks=e;this.name=t}tap(e,t){for(const n of this.hooks){n.tap(e,t)}}tapAsync(e,t){for(const n of this.hooks){n.tapAsync(e,t)}}tapPromise(e,t){for(const n of this.hooks){n.tapPromise(e,t)}}isUsed(){for(const e of this.hooks){if(e.isUsed())return true}return false}intercept(e){for(const t of this.hooks){t.intercept(e)}}withOptions(e){return new MultiHook(this.hooks.map((t=>t.withOptions(e))),this.name)}}e.exports=MultiHook},487:function(e,t,n){const o=n(246);const r=n(431);class SyncBailHookCodeFactory extends r{content({onError:e,onResult:t,resultReturns:n,onDone:o,rethrowIfPossible:r}){return this.callTapsSeries({onError:(t,n)=>e(n),onResult:(e,n,o)=>`if(${n} !== undefined) {\n${t(n)};\n} else {\n${o()}}\n`,resultReturns:n,onDone:o,rethrowIfPossible:r})}}const s=new SyncBailHookCodeFactory;const TAP_ASYNC=()=>{throw new Error("tapAsync is not supported on a SyncBailHook")};const TAP_PROMISE=()=>{throw new Error("tapPromise is not supported on a SyncBailHook")};const COMPILE=function(e){s.setup(this,e);return s.create(e)};function SyncBailHook(e=[],t=undefined){const n=new o(e,t);n.constructor=SyncBailHook;n.tapAsync=TAP_ASYNC;n.tapPromise=TAP_PROMISE;n.compile=COMPILE;return n}SyncBailHook.prototype=null;e.exports=SyncBailHook},75:function(e,t,n){const o=n(246);const r=n(431);class SyncHookCodeFactory extends r{content({onError:e,onDone:t,rethrowIfPossible:n}){return this.callTapsSeries({onError:(t,n)=>e(n),onDone:t,rethrowIfPossible:n})}}const s=new SyncHookCodeFactory;const TAP_ASYNC=()=>{throw new Error("tapAsync is not supported on a SyncHook")};const TAP_PROMISE=()=>{throw new Error("tapPromise is not supported on a SyncHook")};const COMPILE=function(e){s.setup(this,e);return s.create(e)};function SyncHook(e=[],t=undefined){const n=new o(e,t);n.constructor=SyncHook;n.tapAsync=TAP_ASYNC;n.tapPromise=TAP_PROMISE;n.compile=COMPILE;return n}SyncHook.prototype=null;e.exports=SyncHook},667:function(e,t,n){const o=n(246);const r=n(431);class SyncLoopHookCodeFactory extends r{content({onError:e,onDone:t,rethrowIfPossible:n}){return this.callTapsLooping({onError:(t,n)=>e(n),onDone:t,rethrowIfPossible:n})}}const s=new SyncLoopHookCodeFactory;const TAP_ASYNC=()=>{throw new Error("tapAsync is not supported on a SyncLoopHook")};const TAP_PROMISE=()=>{throw new Error("tapPromise is not supported on a SyncLoopHook")};const COMPILE=function(e){s.setup(this,e);return s.create(e)};function SyncLoopHook(e=[],t=undefined){const n=new o(e,t);n.constructor=SyncLoopHook;n.tapAsync=TAP_ASYNC;n.tapPromise=TAP_PROMISE;n.compile=COMPILE;return n}SyncLoopHook.prototype=null;e.exports=SyncLoopHook},303:function(e,t,n){const o=n(246);const r=n(431);class SyncWaterfallHookCodeFactory extends r{content({onError:e,onResult:t,resultReturns:n,rethrowIfPossible:o}){return this.callTapsSeries({onError:(t,n)=>e(n),onResult:(e,t,n)=>{let o="";o+=`if(${t} !== undefined) {\n`;o+=`${this._args[0]} = ${t};\n`;o+=`}\n`;o+=n();return o},onDone:()=>t(this._args[0]),doneReturns:n,rethrowIfPossible:o})}}const s=new SyncWaterfallHookCodeFactory;const TAP_ASYNC=()=>{throw new Error("tapAsync is not supported on a SyncWaterfallHook")};const TAP_PROMISE=()=>{throw new Error("tapPromise is not supported on a SyncWaterfallHook")};const COMPILE=function(e){s.setup(this,e);return s.create(e)};function SyncWaterfallHook(e=[],t=undefined){if(e.length<1)throw new Error("Waterfall hooks must have at least one argument");const n=new o(e,t);n.constructor=SyncWaterfallHook;n.tapAsync=TAP_ASYNC;n.tapPromise=TAP_PROMISE;n.compile=COMPILE;return n}SyncWaterfallHook.prototype=null;e.exports=SyncWaterfallHook},669:function(e){e.exports=require("util")}};var t={};function __nccwpck_require__(n){var o=t[n];if(o!==undefined){return o.exports}var r=t[n]={exports:{}};var s=true;try{e[n](r,r.exports,__nccwpck_require__);s=false}finally{if(s)delete t[n]}return r.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var n={};!function(){var e=n;e.__esModule=true;e.SyncHook=__nccwpck_require__(75);e.SyncBailHook=__nccwpck_require__(487);e.SyncWaterfallHook=__nccwpck_require__(303);e.SyncLoopHook=__nccwpck_require__(667);e.AsyncParallelHook=__nccwpck_require__(834);e.AsyncParallelBailHook=__nccwpck_require__(131);e.AsyncSeriesHook=__nccwpck_require__(1);e.AsyncSeriesBailHook=__nccwpck_require__(179);e.AsyncSeriesLoopHook=__nccwpck_require__(843);e.AsyncSeriesWaterfallHook=__nccwpck_require__(371);e.HookMap=__nccwpck_require__(278);e.MultiHook=__nccwpck_require__(310)}();module.exports=n})();

package/compiled/tapable/package.json

@@ -1 +0,0 @@
-{"name":"tapable","author":"Tobias Koppers @sokra","license":"MIT","types":"./tapable.d.ts"}

package/compiled/tapable/tapable.d.ts

@@ -1,116 +0,0 @@
-type FixedSizeArray<T extends number, U> = T extends 0
-	? void[]
-	: ReadonlyArray<U> & {
-			0: U;
-			length: T;
-	  };
-type Measure<T extends number> = T extends 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8
-	? T
-	: never;
-type Append<T extends any[], U> = {
-	0: [U];
-	1: [T[0], U];
-	2: [T[0], T[1], U];
-	3: [T[0], T[1], T[2], U];
-	4: [T[0], T[1], T[2], T[3], U];
-	5: [T[0], T[1], T[2], T[3], T[4], U];
-	6: [T[0], T[1], T[2], T[3], T[4], T[5], U];
-	7: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], U];
-	8: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7], U];
-}[Measure<T["length"]>];
-type AsArray<T> = T extends any[] ? T : [T];
-
-declare class UnsetAdditionalOptions {
-	_UnsetAdditionalOptions: true
-}
-type IfSet<X> = X extends UnsetAdditionalOptions ? {} : X;
-
-type Callback<E, T> = (error: E | null, result?: T) => void;
-type InnerCallback<E, T> = (error?: E | null | false, result?: T) => void;
-
-type FullTap = Tap & {
-	type: "sync" | "async" | "promise",
-	fn: Function
-}
-
-type Tap = TapOptions & {
-	name: string;
-};
-
-type TapOptions = {
-	before?: string;
-	stage?: number;
-};
-
-interface HookInterceptor<T, R, AdditionalOptions = UnsetAdditionalOptions> {
-	name?: string;
-	tap?: (tap: FullTap & IfSet<AdditionalOptions>) => void;
-	call?: (...args: any[]) => void;
-	loop?: (...args: any[]) => void;
-	error?: (err: Error) => void;
-	result?: (result: R) => void;
-	done?: () => void;
-	register?: (tap: FullTap & IfSet<AdditionalOptions>) => FullTap & IfSet<AdditionalOptions>;
-}
-
-type ArgumentNames<T extends any[]> = FixedSizeArray<T["length"], string>;
-
-declare class Hook<T, R, AdditionalOptions = UnsetAdditionalOptions> {
-	constructor(args?: ArgumentNames<AsArray<T>>, name?: string);
-	name: string | undefined;
-	taps: FullTap[];
-	intercept(interceptor: HookInterceptor<T, R, AdditionalOptions>): void;
-	isUsed(): boolean;
-	callAsync(...args: Append<AsArray<T>, Callback<Error, R>>): void;
-	promise(...args: AsArray<T>): Promise<R>;
-	tap(options: string | Tap & IfSet<AdditionalOptions>, fn: (...args: AsArray<T>) => R): void;
-	withOptions(options: TapOptions & IfSet<AdditionalOptions>): Omit<this, "call" | "callAsync" | "promise">;
-}
-
-export class SyncHook<T, R = void, AdditionalOptions = UnsetAdditionalOptions> extends Hook<T, R, AdditionalOptions> {
-	call(...args: AsArray<T>): R;
-}
-
-export class SyncBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<T, R, AdditionalOptions> {}
-export class SyncLoopHook<T, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<T, void, AdditionalOptions> {}
-export class SyncWaterfallHook<T, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<T, AsArray<T>[0], AdditionalOptions> {}
-
-declare class AsyncHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends Hook<T, R, AdditionalOptions> {
-	tapAsync(
-		options: string | Tap & IfSet<AdditionalOptions>,
-		fn: (...args: Append<AsArray<T>, InnerCallback<Error, R>>) => void
-	): void;
-	tapPromise(
-		options: string | Tap & IfSet<AdditionalOptions>,
-		fn: (...args: AsArray<T>) => Promise<R>
-	): void;
-}
-
-export class AsyncParallelHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<T, void, AdditionalOptions> {}
-export class AsyncParallelBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<T, R, AdditionalOptions> {}
-export class AsyncSeriesHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<T, void, AdditionalOptions> {}
-export class AsyncSeriesBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<T, R, AdditionalOptions> {}
-export class AsyncSeriesLoopHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<T, void, AdditionalOptions> {}
-export class AsyncSeriesWaterfallHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<T, AsArray<T>[0], AdditionalOptions> {}
-
-type HookFactory<H> = (key: any, hook?: H) => H;
-
-interface HookMapInterceptor<H> {
-	factory?: HookFactory<H>;
-}
-
-export class HookMap<H> {
-	constructor(factory: HookFactory<H>, name?: string);
-	name: string | undefined;
-	get(key: any): H | undefined;
-	for(key: any): H;
-	intercept(interceptor: HookMapInterceptor<H>): void;
-}
-
-export class MultiHook<H> {
-	constructor(hooks: H[], name?: string);
-	name: string | undefined;
-	tap(options: string | Tap, fn?: Function): void;
-	tapAsync(options: string | Tap, fn?: Function): void;
-	tapPromise(options: string | Tap, fn?: Function): void;
-}