From d08af376ae20c97da06b72495573499912e61153 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Tue, 24 Dec 2024 10:33:42 -0500 Subject: [PATCH 1/2] fix: use pnpx, not npx --- src/next/blocks/blockAllContributors.test.ts | 8 ++++---- src/next/blocks/blockAllContributors.ts | 4 ++-- src/shared/getGitHubUserAsAllContributor.test.ts | 4 ++-- src/shared/getGitHubUserAsAllContributor.ts | 2 +- src/steps/addToolAllContributors.test.ts | 2 +- src/steps/addToolAllContributors.ts | 2 +- src/steps/updateAllContributorsTable.ts | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/next/blocks/blockAllContributors.test.ts b/src/next/blocks/blockAllContributors.test.ts index cec47d65c..f1dba3da1 100644 --- a/src/next/blocks/blockAllContributors.test.ts +++ b/src/next/blocks/blockAllContributors.test.ts @@ -60,8 +60,8 @@ describe("blockAllContributors", () => { "scripts": [ { "commands": [ - "npx -y all-contributors-cli generate", - "npx -y all-contributors-cli add test-owner code,content,docs,ideas,infra,maintenance,projectManagement,tool", + "pnpx -y all-contributors-cli generate", + "pnpx -y all-contributors-cli add test-owner code,content,docs,ideas,infra,maintenance,projectManagement,tool", ], "phase": 3, }, @@ -138,8 +138,8 @@ describe("blockAllContributors", () => { "scripts": [ { "commands": [ - "npx -y all-contributors-cli generate", - "npx -y all-contributors-cli add test-owner code,content,docs,ideas,infra,maintenance,projectManagement,tool", + "pnpx -y all-contributors-cli generate", + "pnpx -y all-contributors-cli add test-owner code,content,docs,ideas,infra,maintenance,projectManagement,tool", ], "phase": 3, }, diff --git a/src/next/blocks/blockAllContributors.ts b/src/next/blocks/blockAllContributors.ts index 7b4867a6e..d62df3ee9 100644 --- a/src/next/blocks/blockAllContributors.ts +++ b/src/next/blocks/blockAllContributors.ts @@ -56,8 +56,8 @@ export const blockAllContributors = base.createBlock({ scripts: [ { commands: [ - `npx -y all-contributors-cli generate`, - `npx -y all-contributors-cli add ${options.owner} code,content,docs,ideas,infra,maintenance,projectManagement,tool`, + `pnpx -y all-contributors-cli generate`, + `pnpx -y all-contributors-cli add ${options.owner} code,content,docs,ideas,infra,maintenance,projectManagement,tool`, ], phase: CommandPhase.Process, }, diff --git a/src/shared/getGitHubUserAsAllContributor.test.ts b/src/shared/getGitHubUserAsAllContributor.test.ts index 2bad54375..846f44060 100644 --- a/src/shared/getGitHubUserAsAllContributor.test.ts +++ b/src/shared/getGitHubUserAsAllContributor.test.ts @@ -63,7 +63,7 @@ describe("getGitHubUserAsAllContributor", () => { [ [ [ - "npx -y all-contributors-cli@6.25 add ", + "pnpx -y all-contributors-cli@6.25 add ", " ", "", ], @@ -90,7 +90,7 @@ describe("getGitHubUserAsAllContributor", () => { [ [ [ - "npx -y all-contributors-cli@6.25 add ", + "pnpx -y all-contributors-cli@6.25 add ", " ", "", ], diff --git a/src/shared/getGitHubUserAsAllContributor.ts b/src/shared/getGitHubUserAsAllContributor.ts index 78e19c0d3..95530e903 100644 --- a/src/shared/getGitHubUserAsAllContributor.ts +++ b/src/shared/getGitHubUserAsAllContributor.ts @@ -44,7 +44,7 @@ export async function getGitHubUserAsAllContributor( "projectManagement", "tool", ].join(","); - await $`npx -y all-contributors-cli@6.25 add ${user} ${contributions}`; + await $`pnpx -y all-contributors-cli@6.25 add ${user} ${contributions}`; return user; } diff --git a/src/steps/addToolAllContributors.test.ts b/src/steps/addToolAllContributors.test.ts index 2aab64979..1f9d04344 100644 --- a/src/steps/addToolAllContributors.test.ts +++ b/src/steps/addToolAllContributors.test.ts @@ -33,7 +33,7 @@ describe("addToolAllContributors", () => { await addToolAllContributors(undefined, { owner: "owner" }); expect(mock$).toHaveBeenCalledWith([ - `npx -y all-contributors-cli add JoshuaKGoldberg tool`, + `pnpx -y all-contributors-cli add JoshuaKGoldberg tool`, ]); }); }); diff --git a/src/steps/addToolAllContributors.ts b/src/steps/addToolAllContributors.ts index dbf0daee7..bad390f00 100644 --- a/src/steps/addToolAllContributors.ts +++ b/src/steps/addToolAllContributors.ts @@ -11,6 +11,6 @@ export async function addToolAllContributors( const login = await getGitHubUserAsAllContributor(octokit, options); if (login !== "JoshuaKGoldberg") { - await $`npx -y all-contributors-cli add JoshuaKGoldberg tool`; + await $`pnpx -y all-contributors-cli add JoshuaKGoldberg tool`; } } diff --git a/src/steps/updateAllContributorsTable.ts b/src/steps/updateAllContributorsTable.ts index 47e51cdda..3a4cff481 100644 --- a/src/steps/updateAllContributorsTable.ts +++ b/src/steps/updateAllContributorsTable.ts @@ -20,5 +20,5 @@ export async function updateAllContributorsTable({ }), ); - await $`npx -y all-contributors-cli generate`; + await $`pnpx -y all-contributors-cli generate`; } From 90696887f1f0cf3a134e0b5b7d185ffe7ea9e352 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Tue, 24 Dec 2024 11:57:50 -0500 Subject: [PATCH 2/2] no -y --- src/next/blocks/blockAllContributors.test.ts | 8 ++++---- src/next/blocks/blockAllContributors.ts | 4 ++-- src/shared/getGitHubUserAsAllContributor.test.ts | 4 ++-- src/shared/getGitHubUserAsAllContributor.ts | 2 +- src/steps/addToolAllContributors.test.ts | 2 +- src/steps/addToolAllContributors.ts | 2 +- src/steps/updateAllContributorsTable.ts | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/next/blocks/blockAllContributors.test.ts b/src/next/blocks/blockAllContributors.test.ts index f1dba3da1..cd9265169 100644 --- a/src/next/blocks/blockAllContributors.test.ts +++ b/src/next/blocks/blockAllContributors.test.ts @@ -60,8 +60,8 @@ describe("blockAllContributors", () => { "scripts": [ { "commands": [ - "pnpx -y all-contributors-cli generate", - "pnpx -y all-contributors-cli add test-owner code,content,docs,ideas,infra,maintenance,projectManagement,tool", + "pnpx all-contributors-cli generate", + "pnpx all-contributors-cli add test-owner code,content,docs,ideas,infra,maintenance,projectManagement,tool", ], "phase": 3, }, @@ -138,8 +138,8 @@ describe("blockAllContributors", () => { "scripts": [ { "commands": [ - "pnpx -y all-contributors-cli generate", - "pnpx -y all-contributors-cli add test-owner code,content,docs,ideas,infra,maintenance,projectManagement,tool", + "pnpx all-contributors-cli generate", + "pnpx all-contributors-cli add test-owner code,content,docs,ideas,infra,maintenance,projectManagement,tool", ], "phase": 3, }, diff --git a/src/next/blocks/blockAllContributors.ts b/src/next/blocks/blockAllContributors.ts index d62df3ee9..da0c8c5a3 100644 --- a/src/next/blocks/blockAllContributors.ts +++ b/src/next/blocks/blockAllContributors.ts @@ -56,8 +56,8 @@ export const blockAllContributors = base.createBlock({ scripts: [ { commands: [ - `pnpx -y all-contributors-cli generate`, - `pnpx -y all-contributors-cli add ${options.owner} code,content,docs,ideas,infra,maintenance,projectManagement,tool`, + `pnpx all-contributors-cli generate`, + `pnpx all-contributors-cli add ${options.owner} code,content,docs,ideas,infra,maintenance,projectManagement,tool`, ], phase: CommandPhase.Process, }, diff --git a/src/shared/getGitHubUserAsAllContributor.test.ts b/src/shared/getGitHubUserAsAllContributor.test.ts index 846f44060..25fe80e68 100644 --- a/src/shared/getGitHubUserAsAllContributor.test.ts +++ b/src/shared/getGitHubUserAsAllContributor.test.ts @@ -63,7 +63,7 @@ describe("getGitHubUserAsAllContributor", () => { [ [ [ - "pnpx -y all-contributors-cli@6.25 add ", + "pnpx all-contributors-cli@6.25 add ", " ", "", ], @@ -90,7 +90,7 @@ describe("getGitHubUserAsAllContributor", () => { [ [ [ - "pnpx -y all-contributors-cli@6.25 add ", + "pnpx all-contributors-cli@6.25 add ", " ", "", ], diff --git a/src/shared/getGitHubUserAsAllContributor.ts b/src/shared/getGitHubUserAsAllContributor.ts index 95530e903..95948e26f 100644 --- a/src/shared/getGitHubUserAsAllContributor.ts +++ b/src/shared/getGitHubUserAsAllContributor.ts @@ -44,7 +44,7 @@ export async function getGitHubUserAsAllContributor( "projectManagement", "tool", ].join(","); - await $`pnpx -y all-contributors-cli@6.25 add ${user} ${contributions}`; + await $`pnpx all-contributors-cli@6.25 add ${user} ${contributions}`; return user; } diff --git a/src/steps/addToolAllContributors.test.ts b/src/steps/addToolAllContributors.test.ts index 1f9d04344..44684d902 100644 --- a/src/steps/addToolAllContributors.test.ts +++ b/src/steps/addToolAllContributors.test.ts @@ -33,7 +33,7 @@ describe("addToolAllContributors", () => { await addToolAllContributors(undefined, { owner: "owner" }); expect(mock$).toHaveBeenCalledWith([ - `pnpx -y all-contributors-cli add JoshuaKGoldberg tool`, + `pnpx all-contributors-cli add JoshuaKGoldberg tool`, ]); }); }); diff --git a/src/steps/addToolAllContributors.ts b/src/steps/addToolAllContributors.ts index bad390f00..2fa6cf571 100644 --- a/src/steps/addToolAllContributors.ts +++ b/src/steps/addToolAllContributors.ts @@ -11,6 +11,6 @@ export async function addToolAllContributors( const login = await getGitHubUserAsAllContributor(octokit, options); if (login !== "JoshuaKGoldberg") { - await $`pnpx -y all-contributors-cli add JoshuaKGoldberg tool`; + await $`pnpx all-contributors-cli add JoshuaKGoldberg tool`; } } diff --git a/src/steps/updateAllContributorsTable.ts b/src/steps/updateAllContributorsTable.ts index 3a4cff481..3c86dd1e8 100644 --- a/src/steps/updateAllContributorsTable.ts +++ b/src/steps/updateAllContributorsTable.ts @@ -20,5 +20,5 @@ export async function updateAllContributorsTable({ }), ); - await $`pnpx -y all-contributors-cli generate`; + await $`pnpx all-contributors-cli generate`; }