Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Mar 21, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be7ec21
fix: 修复 npmClient 配置为 tnpm，但 tnpm mode 为 npm 时 layout 插件注入绝对路径 types 问题
Mar 14, 2024
ec5353b
fix: 仅考虑 npm、yarn 两种模式
Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion packages/plugins/src/layout.ts
View file
Open in desktop
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
Loading