umi 4.0.5 → 4.0.8

package/dist/service/requireHook.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/service/requireHook.js

@@ -0,0 +1,14 @@
+// requireHook.ts
+var import_path = require("path");
+var hookPropertyMap = /* @__PURE__ */ new Map([
+  ["umi", (0, import_path.join)(__dirname, "../index.js")],
+  ["umi/plugin-utils", (0, import_path.join)(__dirname, "../../plugin-utils.js")]
+]);
+var mod = require("module");
+var resolveFilename = mod._resolveFilename;
+mod._resolveFilename = function(request, parent, isMain, options) {
+  const hookResolved = hookPropertyMap.get(request);
+  if (hookResolved)
+    request = hookResolved;
+  return resolveFilename.call(mod, request, parent, isMain, options);
+};

package/dist/service/service.js

@@ -1,39 +1,80 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Service = void 0;
-const core_1 = require("@umijs/core");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const constants_1 = require("../constants");
-const cwd_1 = require("./cwd");
-class Service extends core_1.Service {
-    constructor(opts) {
-        process.env.UMI_DIR = (0, path_1.dirname)(require.resolve('../../package'));
-        const cwd = (0, cwd_1.getCwd)();
-        super({
-            ...opts,
-            env: process.env.NODE_ENV,
-            cwd,
-            defaultConfigFiles: constants_1.DEFAULT_CONFIG_FILES,
-            frameworkName: constants_1.FRAMEWORK_NAME,
-            presets: [require.resolve('@umijs/preset-umi'), ...((opts === null || opts === void 0 ? void 0 : opts.presets) || [])],
-            plugins: [
-                (0, fs_1.existsSync)((0, path_1.join)(cwd, 'plugin.ts')) && (0, path_1.join)(cwd, 'plugin.ts'),
-                (0, fs_1.existsSync)((0, path_1.join)(cwd, 'plugin.js')) && (0, path_1.join)(cwd, 'plugin.js'),
-            ].filter(Boolean),
-        });
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
     }
-    async run2(opts) {
-        let name = opts.name;
-        if ((opts === null || opts === void 0 ? void 0 : opts.args.version) || name === 'v') {
-            name = 'version';
-        }
-        else if ((opts === null || opts === void 0 ? void 0 : opts.args.help) || !name || name === 'h') {
-            name = 'help';
-        }
-        // TODO
-        // initWebpack
-        return await this.run({ ...opts, name });
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// service.ts
+var service_exports = {};
+__export(service_exports, {
+  Service: () => Service
+});
+module.exports = __toCommonJS(service_exports);
+var import_core = require("@umijs/core");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_constants = require("../constants");
+var import_cwd = require("./cwd");
+var Service = class extends import_core.Service {
+  constructor(opts) {
+    process.env.UMI_DIR = (0, import_path.dirname)(require.resolve("../../package"));
+    const cwd = (0, import_cwd.getCwd)();
+    require("./requireHook");
+    super(__spreadProps(__spreadValues({}, opts), {
+      env: process.env.NODE_ENV,
+      cwd,
+      defaultConfigFiles: import_constants.DEFAULT_CONFIG_FILES,
+      frameworkName: import_constants.FRAMEWORK_NAME,
+      presets: [require.resolve("@umijs/preset-umi"), ...(opts == null ? void 0 : opts.presets) || []],
+      plugins: [
+        (0, import_fs.existsSync)((0, import_path.join)(cwd, "plugin.ts")) && (0, import_path.join)(cwd, "plugin.ts"),
+        (0, import_fs.existsSync)((0, import_path.join)(cwd, "plugin.js")) && (0, import_path.join)(cwd, "plugin.js")
+      ].filter(Boolean)
+    }));
+  }
+  async run2(opts) {
+    let name = opts.name;
+    if ((opts == null ? void 0 : opts.args.version) || name === "v") {
+      name = "version";
+    } else if ((opts == null ? void 0 : opts.args.help) || !name || name === "h") {
+      name = "help";
     }
-}
-exports.Service = Service;
+    return await this.run(__spreadProps(__spreadValues({}, opts), { name }));
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Service
+});

package/dist/test.js

@@ -1,67 +1,77 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configUmiAlias = exports.getUmiAlias = exports.getAliasPathWithKey = void 0;
-const fs_1 = require("fs");
-const service_1 = require("./service/service");
-__exportStar(require("@umijs/test"), exports);
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// test.ts
+var test_exports = {};
+__export(test_exports, {
+  configUmiAlias: () => configUmiAlias,
+  getAliasPathWithKey: () => getAliasPathWithKey,
+  getUmiAlias: () => getUmiAlias
+});
+module.exports = __toCommonJS(test_exports);
+var import_fs = require("fs");
+var import_service = require("./service/service");
+__reExport(test_exports, require("@umijs/test"), module.exports);
 function getAliasPathWithKey(alias, key) {
-    if (alias[key]) {
-        return getAliasPathWithKey(alias, alias[key]);
-    }
-    const aliasKeys = Object.keys(alias);
-    const keyStartedWith = aliasKeys.find((k) => !k.endsWith('$') && key.startsWith(`${k}/`));
-    if (keyStartedWith) {
-        const realPath = alias[keyStartedWith];
-        const newKey = realPath + key.slice(keyStartedWith.length);
-        return getAliasPathWithKey(alias, newKey);
-    }
-    else {
-        return key;
-    }
+  if (alias[key]) {
+    return getAliasPathWithKey(alias, alias[key]);
+  }
+  const aliasKeys = Object.keys(alias);
+  const keyStartedWith = aliasKeys.find((k) => !k.endsWith("$") && key.startsWith(`${k}/`));
+  if (keyStartedWith) {
+    const realPath = alias[keyStartedWith];
+    const newKey = realPath + key.slice(keyStartedWith.length);
+    return getAliasPathWithKey(alias, newKey);
+  } else {
+    return key;
+  }
 }
-exports.getAliasPathWithKey = getAliasPathWithKey;
-let service;
+var service;
 async function getUmiAlias() {
-    if (!service) {
-        service = new service_1.Service();
-        await service.run2({
-            name: 'setup',
-            args: { quiet: true },
-        });
-    }
-    return service.config.alias;
+  if (!service) {
+    service = new import_service.Service();
+    await service.run2({
+      name: "setup",
+      args: { quiet: true }
+    });
+  }
+  return service.config.alias;
 }
-exports.getUmiAlias = getUmiAlias;
 async function configUmiAlias(config) {
-    config.moduleNameMapper || (config.moduleNameMapper = {});
-    const alias = await getUmiAlias();
-    for (const key of Object.keys(alias)) {
-        const aliasPath = getAliasPathWithKey(alias, key);
-        if (key.endsWith('$')) {
-            config.moduleNameMapper[`^${key}`] = aliasPath;
-        }
-        else if ((0, fs_1.existsSync)(aliasPath) && (0, fs_1.statSync)(aliasPath).isDirectory()) {
-            config.moduleNameMapper[`^${key}/(.*)$`] = `${aliasPath}/$1`;
-            config.moduleNameMapper[`^${key}$`] = aliasPath;
-        }
-        else {
-            config.moduleNameMapper[`^${key}$`] = aliasPath;
-        }
+  config.moduleNameMapper || (config.moduleNameMapper = {});
+  const alias = await getUmiAlias();
+  for (const key of Object.keys(alias)) {
+    const aliasPath = getAliasPathWithKey(alias, key);
+    if (key.endsWith("$")) {
+      config.moduleNameMapper[`^${key}`] = aliasPath;
+    } else if ((0, import_fs.existsSync)(aliasPath) && (0, import_fs.statSync)(aliasPath).isDirectory()) {
+      config.moduleNameMapper[`^${key}/(.*)$`] = `${aliasPath}/$1`;
+      config.moduleNameMapper[`^${key}$`] = aliasPath;
+    } else {
+      config.moduleNameMapper[`^${key}$`] = aliasPath;
     }
-    return config;
+  }
+  return config;
 }
-exports.configUmiAlias = configUmiAlias;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  configUmiAlias,
+  getAliasPathWithKey,
+  getUmiAlias
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "4.0.5",
+  "version": "4.0.8",
   "description": "umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -30,23 +30,22 @@
     "stylelint.js"
   ],
   "scripts": {
-    "build": "pnpm tsc",
-    "build:client": "pnpm tsc --project ./tsconfig.client.json",
+    "build": "pnpm father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build --watch",
-    "dev:client": "pnpm build:client -- --watch",
+    "dev": "pnpm father dev",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.5",
-    "@umijs/bundler-webpack": "4.0.5",
-    "@umijs/core": "4.0.5",
-    "@umijs/lint": "4.0.5",
-    "@umijs/preset-umi": "4.0.5",
-    "@umijs/renderer-react": "4.0.5",
-    "@umijs/server": "4.0.5",
-    "@umijs/test": "4.0.5",
-    "@umijs/utils": "4.0.5",
+    "@babel/runtime": "7.17.9",
+    "@umijs/bundler-utils": "4.0.8",
+    "@umijs/bundler-webpack": "4.0.8",
+    "@umijs/core": "4.0.8",
+    "@umijs/lint": "4.0.8",
+    "@umijs/preset-umi": "4.0.8",
+    "@umijs/renderer-react": "4.0.8",
+    "@umijs/server": "4.0.8",
+    "@umijs/test": "4.0.8",
+    "@umijs/utils": "4.0.8",
     "prettier-plugin-organize-imports": "^2.3.4",
     "prettier-plugin-packagejson": "^2.2.17"
   },

package/dist/cli/printHelp.d.ts

@@ -1 +0,0 @@
-export declare function printHelp(): void;

package/dist/cli/printHelp.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.printHelp = void 0;
-const utils_1 = require("@umijs/utils");
-function printHelp() {
-    utils_1.logger.fatal('A complete log of this run can be found in:');
-    utils_1.logger.fatal(utils_1.logger.getLatestLogFilePath());
-    utils_1.logger.fatal('Consider reporting a GitHub issue on https://github.com/umijs/umi/issues');
-}
-exports.printHelp = printHelp;

package/dist/client/plugin.d.ts

@@ -1,34 +0,0 @@
-export declare enum ApplyPluginsType {
-    compose = "compose",
-    modify = "modify",
-    event = "event"
-}
-interface IPlugin {
-    path?: string;
-    apply: Record<string, any>;
-}
-export declare class PluginManager {
-    opts: {
-        validKeys: string[];
-    };
-    hooks: {
-        [key: string]: any;
-    };
-    constructor(opts: {
-        validKeys: string[];
-    });
-    register(plugin: IPlugin): void;
-    getHooks(keyWithDot: string): any;
-    applyPlugins({ key, type, initialValue, args, async, }: {
-        key: string;
-        type: ApplyPluginsType;
-        initialValue?: any;
-        args?: object;
-        async?: boolean;
-    }): any;
-    static create(opts: {
-        validKeys: string[];
-        plugins: IPlugin[];
-    }): PluginManager;
-}
-export {};

package/dist/client/plugin.js

@@ -1,124 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginManager = exports.ApplyPluginsType = void 0;
-const utils_1 = require("./utils");
-var ApplyPluginsType;
-(function (ApplyPluginsType) {
-    ApplyPluginsType["compose"] = "compose";
-    ApplyPluginsType["modify"] = "modify";
-    ApplyPluginsType["event"] = "event";
-})(ApplyPluginsType = exports.ApplyPluginsType || (exports.ApplyPluginsType = {}));
-class PluginManager {
-    constructor(opts) {
-        this.hooks = {};
-        this.opts = opts;
-    }
-    register(plugin) {
-        (0, utils_1.assert)(plugin.apply, `plugin register failed, apply must supplied`);
-        Object.keys(plugin.apply).forEach((key) => {
-            (0, utils_1.assert)(this.opts.validKeys.indexOf(key) > -1, `register failed, invalid key ${key} ${plugin.path ? `from plugin ${plugin.path}` : ''}.`);
-            this.hooks[key] = (this.hooks[key] || []).concat(plugin.apply[key]);
-        });
-    }
-    getHooks(keyWithDot) {
-        const [key, ...memberKeys] = keyWithDot.split('.');
-        let hooks = this.hooks[key] || [];
-        if (memberKeys.length) {
-            hooks = hooks
-                .map((hook) => {
-                try {
-                    let ret = hook;
-                    for (const memberKey of memberKeys) {
-                        ret = ret[memberKey];
-                    }
-                    return ret;
-                }
-                catch (e) {
-                    return null;
-                }
-            })
-                .filter(Boolean);
-        }
-        return hooks;
-    }
-    applyPlugins({ key, type, initialValue, args, async, }) {
-        const hooks = this.getHooks(key) || [];
-        if (args) {
-            (0, utils_1.assert)(typeof args === 'object', `applyPlugins failed, args must be plain object.`);
-        }
-        if (async) {
-            (0, utils_1.assert)(type === ApplyPluginsType.modify || type === ApplyPluginsType.event, `async only works with modify and event type.`);
-        }
-        switch (type) {
-            case ApplyPluginsType.modify:
-                if (async) {
-                    return hooks.reduce(async (memo, hook) => {
-                        (0, utils_1.assert)(typeof hook === 'function' ||
-                            typeof hook === 'object' ||
-                            (0, utils_1.isPromiseLike)(hook), `applyPlugins failed, all hooks for key ${key} must be function, plain object or Promise.`);
-                        if ((0, utils_1.isPromiseLike)(memo)) {
-                            memo = await memo;
-                        }
-                        if (typeof hook === 'function') {
-                            const ret = hook(memo, args);
-                            if ((0, utils_1.isPromiseLike)(ret)) {
-                                return await ret;
-                            }
-                            else {
-                                return ret;
-                            }
-                        }
-                        else {
-                            if ((0, utils_1.isPromiseLike)(hook)) {
-                                hook = await hook;
-                            }
-                            return { ...memo, ...hook };
-                        }
-                    }, (0, utils_1.isPromiseLike)(initialValue)
-                        ? initialValue
-                        : Promise.resolve(initialValue));
-                }
-                else {
-                    return hooks.reduce((memo, hook) => {
-                        (0, utils_1.assert)(typeof hook === 'function' || typeof hook === 'object', `applyPlugins failed, all hooks for key ${key} must be function or plain object.`);
-                        if (typeof hook === 'function') {
-                            return hook(memo, args);
-                        }
-                        else {
-                            // TODO: deepmerge?
-                            return { ...memo, ...hook };
-                        }
-                    }, initialValue);
-                }
-            case ApplyPluginsType.event:
-                return (async () => {
-                    for (const hook of hooks) {
-                        (0, utils_1.assert)(typeof hook === 'function', `applyPlugins failed, all hooks for key ${key} must be function.`);
-                        const ret = hook(args);
-                        if (async && (0, utils_1.isPromiseLike)(ret)) {
-                            await ret;
-                        }
-                    }
-                })();
-            case ApplyPluginsType.compose:
-                return () => {
-                    return (0, utils_1.compose)({
-                        fns: hooks.concat(initialValue),
-                        args,
-                    })();
-                };
-        }
-    }
-    static create(opts) {
-        const pluginManager = new PluginManager({
-            validKeys: opts.validKeys,
-        });
-        opts.plugins.forEach((plugin) => {
-            pluginManager.register(plugin);
-        });
-        return pluginManager;
-    }
-}
-exports.PluginManager = PluginManager;
-// plugins meta info (in tmp file)
-// hooks api: usePlugin

package/dist/client/utils.d.ts

@@ -1,6 +0,0 @@
-export declare function assert(value: unknown, message: string): void;
-export declare function compose({ fns, args, }: {
-    fns: (Function | any)[];
-    args?: object;
-}): any;
-export declare function isPromiseLike(obj: any): boolean;

package/dist/client/utils.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPromiseLike = exports.compose = exports.assert = void 0;
-function assert(value, message) {
-    if (!value)
-        throw new Error(message);
-}
-exports.assert = assert;
-function compose({ fns, args, }) {
-    if (fns.length === 1) {
-        return fns[0];
-    }
-    const last = fns.pop();
-    return fns.reduce((a, b) => () => b(a, args), last);
-}
-exports.compose = compose;
-function isPromiseLike(obj) {
-    return !!obj && typeof obj === 'object' && typeof obj.then === 'function';
-}
-exports.isPromiseLike = isPromiseLike;