Skip to content

Commit

Permalink
fix: 修复 npmClient 配置为 tnpm,但 tnpm mode 为 npm 时 layout 插件注入绝对路径 types …
Browse files Browse the repository at this point in the history
…问题 (#12198)

* fix: 修复 npmClient 配置为 tnpm,但 tnpm mode 为 npm 时 layout 插件注入绝对路径 types 问题

* fix: 仅考虑 npm、yarn 两种模式

---------

Co-authored-by: hanzebang.hzb <hanzebang.hzb@alibaba-inc.com>
  • Loading branch information
hanzebang and hanzebang.hzb authored Mar 21, 2024
1 parent ef3b1e1 commit 894ac3f
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion packages/plugins/src/layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,20 @@ export default (api: IApi) => {
});

api.onGenerateFiles(() => {
let realNpmClient = api.appData.npmClient;
// tnpm 作为 npmClient 时,可能使用不同的安装模式
if (
api.appData.npmClient === NpmClientEnum.tnpm &&
api.pkg.tnpm?.mode &&
[NpmClientEnum.npm, NpmClientEnum.yarn].includes(api.pkg.tnpm.mode)
) {
realNpmClient = api.pkg.tnpm.mode;
}
// use absolute path to types references in `npm/yarn` will cause case problems.
// https://github.com/umijs/umi/discussions/10947
// https://github.com/umijs/umi/discussions/11570
const isFlattedDepsDir = [NpmClientEnum.npm, NpmClientEnum.yarn].includes(
api.appData.npmClient,
realNpmClient,
);
const PKG_TYPE_REFERENCE = `
/// <reference types="${
Expand Down

0 comments on commit 894ac3f

Please sign in to comment.