umi 4.0.0-canary.20220628.2 → 4.0.0-canary.20220707.1

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;

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.20220707.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.20220707.1",
+    "@umijs/bundler-webpack": "4.0.0-canary.20220707.1",
+    "@umijs/core": "4.0.0-canary.20220707.1",
+    "@umijs/lint": "4.0.0-canary.20220707.1",
+    "@umijs/preset-umi": "4.0.0-canary.20220707.1",
+    "@umijs/renderer-react": "4.0.0-canary.20220707.1",
+    "@umijs/server": "4.0.0-canary.20220707.1",
+    "@umijs/test": "4.0.0-canary.20220707.1",
+    "@umijs/utils": "4.0.0-canary.20220707.1",
     "prettier-plugin-organize-imports": "^2.3.4",
     "prettier-plugin-packagejson": "^2.2.17"
   },