umi 4.0.0-canary.20220628.2 → 4.0.0-canary.20220718.1

package/dist/cli/cli.d.ts

@@ -3,3 +3,4 @@ interface IOpts {
 }
 export declare function run(opts?: IOpts): Promise<void>;
 export {};
+//# sourceMappingURL=cli.d.ts.map

package/dist/cli/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAWA,UAAU,KAAK;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAsB,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,iBAoCrC"}

package/dist/cli/cli.js

@@ -6,7 +6,6 @@ const constants_1 = require("../constants");
 const service_1 = require("../service/service");
 const dev_1 = require("./dev");
 const node_1 = require("./node");
-const printHelp_1 = require("./printHelp");
 async function run(opts) {
     (0, node_1.checkVersion)();
     (0, node_1.checkLocal)();
@@ -41,7 +40,7 @@ async function run(opts) {
         }
         catch (e) {
             utils_1.logger.fatal(e);
-            (0, printHelp_1.printHelp)();
+            utils_1.printHelp.exit();
             process.exit(1);
         }
     }

package/dist/cli/dev.d.ts

@@ -1 +1,2 @@
 export declare function dev(): void;
+//# sourceMappingURL=dev.d.ts.map

package/dist/cli/dev.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AAEA,wBAAgB,GAAG,SAiBlB"}

package/dist/cli/fork.d.ts

@@ -4,3 +4,4 @@ interface IOpts {
 }
 export default function start({ scriptPath }: IOpts): import("child_process").ChildProcess;
 export {};
+//# sourceMappingURL=fork.d.ts.map

package/dist/cli/fork.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fork.d.ts","sourceRoot":"","sources":["../../src/cli/fork.ts"],"names":[],"mappings":";AAIA,UAAU,KAAK;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAAE,UAAU,EAAE,EAAE,KAAK,wCA0ClD"}

package/dist/cli/forkedDev.d.ts

@@ -1 +1,2 @@
 export {};
+//# sourceMappingURL=forkedDev.d.ts.map

package/dist/cli/forkedDev.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"forkedDev.d.ts","sourceRoot":"","sources":["../../src/cli/forkedDev.ts"],"names":[],"mappings":""}

package/dist/cli/forkedDev.js

@@ -4,7 +4,6 @@ const utils_1 = require("@umijs/utils");
 const constants_1 = require("../constants");
 const service_1 = require("../service/service");
 const node_1 = require("./node");
-const printHelp_1 = require("./printHelp");
 (0, node_1.setNodeTitle)(`${constants_1.FRAMEWORK_NAME}-dev`);
 (0, node_1.setNoDeprecation)();
 (async () => {
@@ -38,7 +37,7 @@ const printHelp_1 = require("./printHelp");
     }
     catch (e) {
         utils_1.logger.fatal(e);
-        (0, printHelp_1.printHelp)();
+        utils_1.printHelp.exit();
         process.exit(1);
     }
 })();

package/dist/cli/node.d.ts

@@ -2,3 +2,4 @@ export declare function checkVersion(): void;
 export declare function checkLocal(): void;
 export declare function setNodeTitle(name?: string): void;
 export declare function setNoDeprecation(): void;
+//# sourceMappingURL=node.d.ts.map

package/dist/cli/node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,SAQ3B;AAED,wBAAgB,UAAU,SAIzB;AAED,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,QAIzC;AAED,wBAAgB,gBAAgB,SAK/B"}

package/dist/client/plugin.d.ts

@@ -32,3 +32,4 @@ export declare class PluginManager {
     }): PluginManager;
 }
 export {};
+//# sourceMappingURL=plugin.d.ts.map

package/dist/client/plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/client/plugin.ts"],"names":[],"mappings":"AAEA,oBAAY,gBAAgB;IAC1B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,UAAU,OAAO;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B;AAED,qBAAa,aAAa;IACxB,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC9B,KAAK,EAAE;QACL,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAM;gBACK,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE;IAIzC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAaxB,QAAQ,CAAC,UAAU,EAAE,MAAM;IAqB3B,YAAY,CAAC,EACX,GAAG,EACH,IAAI,EACJ,YAAY,EACZ,IAAI,EACJ,KAAK,GACN,EAAE;QACD,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,gBAAgB,CAAC;QACvB,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;IAuFD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,OAAO,EAAE,CAAA;KAAE;CAShE"}

package/dist/client/utils.d.ts

@@ -4,3 +4,4 @@ export declare function compose({ fns, args, }: {
     args?: object;
 }): any;
 export declare function isPromiseLike(obj: any): boolean;
+//# sourceMappingURL=utils.d.ts.map

package/dist/client/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/client/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAErD;AAED,wBAAgB,OAAO,CAAC,EACtB,GAAG,EACH,IAAI,GACL,EAAE;IACD,GAAG,EAAE,CAAC,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,OAMA;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC"}

package/dist/constants.d.ts

@@ -2,3 +2,4 @@ export declare const MIN_NODE_VERSION = 14;
 export declare const DEV_COMMAND = "dev";
 export declare const DEFAULT_CONFIG_FILES: string[];
 export declare const FRAMEWORK_NAME = "umi";
+//# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,WAAW,QAAQ,CAAC;AACjC,eAAO,MAAM,oBAAoB,UAKhC,CAAC;AACF,eAAO,MAAM,cAAc,QAAQ,CAAC"}

package/dist/defineConfig.d.ts

@@ -3,3 +3,4 @@ import type { IConfig } from '@umijs/preset-umi';
 declare type ConfigType = IConfigFromPlugins & IConfig;
 export declare function defineConfig(config: ConfigType): ConfigType;
 export {};
+//# sourceMappingURL=defineConfig.d.ts.map

package/dist/defineConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineConfig.d.ts","sourceRoot":"","sources":["../src/defineConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,aAAK,UAAU,GAAG,kBAAkB,GAAG,OAAO,CAAC;AAE/C,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAE3D"}

package/dist/defineMock.d.ts

@@ -6,3 +6,4 @@ export declare function defineMock(mockData: {
     [key: string]: MockDeclare;
 };
 export {};
+//# sourceMappingURL=defineMock.d.ts.map

package/dist/defineMock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineMock.d.ts","sourceRoot":"","sources":["../src/defineMock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAE9E,aAAK,WAAW,GACZ,MAAM,GACN,MAAM,GACN,IAAI,GACJ,SAAS,GACT,OAAO,GACP,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACnB,cAAc,CAAC;AAEnB,wBAAgB,UAAU,CAAC,QAAQ,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE;;EAElE"}

package/dist/index.d.ts

@@ -4,3 +4,4 @@ export { defineConfig } from './defineConfig';
 export { defineMock } from './defineMock';
 export * from './service/service';
 export declare type IApi = PluginAPI & IServicePluginAPI;
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,oBAAY,IAAI,GAAG,SAAS,GAAG,iBAAiB,CAAC"}

package/dist/pluginUtils.d.ts

@@ -3,3 +3,4 @@ import * as httpProxyMiddleware from '@umijs/bundler-webpack/compiled/http-proxy
 export { createServerRoutes } from '@umijs/server';
 export * from '@umijs/utils';
 export { httpProxyMiddleware, express };
+//# sourceMappingURL=pluginUtils.d.ts.map

package/dist/pluginUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginUtils.d.ts","sourceRoot":"","sources":["../src/pluginUtils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,uCAAuC,CAAC;AAC5D,OAAO,KAAK,mBAAmB,MAAM,uDAAuD,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,CAAC"}

package/dist/service/cwd.d.ts

@@ -1 +1,2 @@
 export declare function getCwd(): string;
+//# sourceMappingURL=cwd.d.ts.map

package/dist/service/cwd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cwd.d.ts","sourceRoot":"","sources":["../../src/service/cwd.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,WAOrB"}

package/dist/service/requireHook.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=requireHook.d.ts.map

package/dist/service/requireHook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"requireHook.d.ts","sourceRoot":"","sources":["../../src/service/requireHook.ts"],"names":[],"mappings":""}

package/dist/service/requireHook.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const hookPropertyMap = new Map([
+    ['umi', (0, path_1.join)(__dirname, '../index.js')],
+    ['umi/plugin-utils', (0, path_1.join)(__dirname, '../../plugin-utils.js')],
+]);
+const mod = require('module');
+const 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.d.ts

@@ -6,3 +6,4 @@ export declare class Service extends CoreService {
         args?: any;
     }): Promise<void>;
 }
+//# sourceMappingURL=service.d.ts.map

package/dist/service/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AAMrD,qBAAa,OAAQ,SAAQ,WAAW;gBAC1B,IAAI,CAAC,EAAE,GAAG;IAsBhB,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE;CAa9C"}

package/dist/service/service.js

@@ -10,6 +10,11 @@ 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)();
+        // Why?
+        // plugin import from umi but don't explicitly depend on it
+        // and we may also have old umi installed
+        // ref: https://github.com/umijs/umi/issues/8342#issuecomment-1182654076
+        require('./requireHook');
         super({
             ...opts,
             env: process.env.NODE_ENV,

package/dist/test.d.ts

@@ -1,5 +1,6 @@
 import { Config } from '@umijs/test';
 export * from '@umijs/test';
+export declare function getAliasPathWithKey(alias: Record<string, string>, key: string): string;
 export declare function getUmiAlias(): Promise<any>;
 export declare function configUmiAlias(config: Config.InitialOptions): Promise<Partial<{
     automock: boolean;
@@ -116,3 +117,4 @@ export declare function configUmiAlias(config: Config.InitialOptions): Promise<P
     watchman: boolean;
     watchPlugins: (string | [string, Record<string, unknown>])[];
 }>>;
+//# sourceMappingURL=test.d.ts.map

package/dist/test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,cAAc,aAAa,CAAC;AAE5B,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,GAAG,EAAE,MAAM,GACV,MAAM,CAkBR;AAID,wBAAsB,WAAW,iBAShC;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAejE"}

package/dist/test.js

@@ -14,17 +14,26 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configUmiAlias = exports.getUmiAlias = void 0;
+exports.configUmiAlias = exports.getUmiAlias = exports.getAliasPathWithKey = void 0;
 const fs_1 = require("fs");
 const service_1 = require("./service/service");
 __exportStar(require("@umijs/test"), exports);
 function getAliasPathWithKey(alias, key) {
-    const thePath = alias[key];
-    if (alias[thePath]) {
-        return getAliasPathWithKey(alias, thePath);
+    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;
     }
-    return thePath;
 }
+exports.getAliasPathWithKey = getAliasPathWithKey;
 let service;
 async function getUmiAlias() {
     if (!service) {
@@ -42,7 +51,10 @@ async function configUmiAlias(config) {
     const alias = await getUmiAlias();
     for (const key of Object.keys(alias)) {
         const aliasPath = getAliasPathWithKey(alias, key);
-        if ((0, fs_1.existsSync)(aliasPath) && (0, fs_1.statSync)(aliasPath).isDirectory()) {
+        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;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "4.0.0-canary.20220628.2",
+  "version": "4.0.0-canary.20220718.1",
   "description": "umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -38,15 +38,15 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-canary.20220628.2",
-    "@umijs/bundler-webpack": "4.0.0-canary.20220628.2",
-    "@umijs/core": "4.0.0-canary.20220628.2",
-    "@umijs/lint": "4.0.0-canary.20220628.2",
-    "@umijs/preset-umi": "4.0.0-canary.20220628.2",
-    "@umijs/renderer-react": "4.0.0-canary.20220628.2",
-    "@umijs/server": "4.0.0-canary.20220628.2",
-    "@umijs/test": "4.0.0-canary.20220628.2",
-    "@umijs/utils": "4.0.0-canary.20220628.2",
+    "@umijs/bundler-utils": "4.0.0-canary.20220718.1",
+    "@umijs/bundler-webpack": "4.0.0-canary.20220718.1",
+    "@umijs/core": "4.0.0-canary.20220718.1",
+    "@umijs/lint": "4.0.0-canary.20220718.1",
+    "@umijs/preset-umi": "4.0.0-canary.20220718.1",
+    "@umijs/renderer-react": "4.0.0-canary.20220718.1",
+    "@umijs/server": "4.0.0-canary.20220718.1",
+    "@umijs/test": "4.0.0-canary.20220718.1",
+    "@umijs/utils": "4.0.0-canary.20220718.1",
     "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;