Skip to content

Commit 1554f01

Browse files
committedNov 13, 2023
fix(create): fix yarn2+ registry command
1 parent 88ce9ef commit 1554f01

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed
 

‎packages/create/src/registry.ts

+17-4
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,35 @@ export interface RegistryAnswer {
1010

1111
const NPM_MIRROR_REGISTRY = "https://registry.npmmirror.com/";
1212

13-
const getUserRegistry = (packageManager: PackageManager): string =>
14-
execaCommandSync(`${packageManager} config get registry`).stdout;
13+
const getUserRegistry = (
14+
packageManager: PackageManager,
15+
isYarnModern: boolean,
16+
): string =>
17+
execaCommandSync(
18+
`${packageManager} config get ${
19+
isYarnModern ? "npmRegistryServer" : "registry"
20+
}}`,
21+
).stdout;
1522

1623
export const getRegistry = async (
1724
packageManager: PackageManager,
1825
lang: Lang,
1926
): Promise<string> => {
20-
const userRegistry = getUserRegistry(packageManager);
27+
const isYarnModern =
28+
packageManager === "yarn" &&
29+
!execaCommandSync("yarn --version").stdout.startsWith("1");
30+
31+
const userRegistry = getUserRegistry(packageManager, isYarnModern);
2132

2233
if (/https:\/\/registry\.npm\.taobao\.org\/?/.test(userRegistry)) {
2334
console.error(
2435
"npm.taobao.org is no longer available, resetting it to npmmirror.com",
2536
);
2637

2738
execaCommandSync(
28-
`${packageManager} config set registry ${NPM_MIRROR_REGISTRY}`,
39+
`${packageManager} config set ${
40+
isYarnModern ? "npmRegistryServer" : "registry"
41+
}} ${NPM_MIRROR_REGISTRY}`,
2942
);
3043
}
3144

0 commit comments

Comments
 (0)
Please sign in to comment.