umi 4.0.2 → 4.0.3

package/dist/cli/printHelp.js

@@ -5,6 +5,6 @@ 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-next/issues');
+    utils_1.logger.fatal('Consider reporting a GitHub issue on https://github.com/umijs/umi/issues');
 }
 exports.printHelp = printHelp;

package/dist/test.d.ts

@@ -1,5 +1,7 @@
 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;
     bail: number | boolean;

package/dist/test.js

@@ -14,19 +14,28 @@ 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 = 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 configUmiAlias(config) {
+async function getUmiAlias() {
     if (!service) {
         service = new service_1.Service();
         await service.run2({
@@ -34,11 +43,18 @@ async function configUmiAlias(config) {
             args: { quiet: true },
         });
     }
+    return service.config.alias;
+}
+exports.getUmiAlias = getUmiAlias;
+async function configUmiAlias(config) {
     config.moduleNameMapper || (config.moduleNameMapper = {});
-    const { alias } = service.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,12 +1,12 @@
 {
   "name": "umi",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "umi",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/umi#readme",
-  "bugs": "https://github.com/umijs/umi-next/issues",
+  "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
+  "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+    "url": "https://github.com/umijs/umi"
   },
   "license": "MIT",
   "main": "dist/index.js",
@@ -38,15 +38,15 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.2",
-    "@umijs/bundler-webpack": "4.0.2",
-    "@umijs/core": "4.0.2",
-    "@umijs/lint": "4.0.2",
-    "@umijs/preset-umi": "4.0.2",
-    "@umijs/renderer-react": "4.0.2",
-    "@umijs/server": "4.0.2",
-    "@umijs/test": "4.0.2",
-    "@umijs/utils": "4.0.2",
+    "@umijs/bundler-utils": "4.0.3",
+    "@umijs/bundler-webpack": "4.0.3",
+    "@umijs/core": "4.0.3",
+    "@umijs/lint": "4.0.3",
+    "@umijs/preset-umi": "4.0.3",
+    "@umijs/renderer-react": "4.0.3",
+    "@umijs/server": "4.0.3",
+    "@umijs/test": "4.0.3",
+    "@umijs/utils": "4.0.3",
     "prettier-plugin-organize-imports": "^2.3.4",
     "prettier-plugin-packagejson": "^2.2.17"
   },

package/prettier.js

@@ -9,4 +9,5 @@ module.exports = {
     require.resolve('prettier-plugin-packagejson'),
     require.resolve('prettier-plugin-organize-imports'),
   ],
+  pluginSearchDirs: false,
 };