From 1309cb4acdab16daea3d46118625692aa60acf52 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Tue, 20 Jun 2023 15:15:18 -0400 Subject: [PATCH 1/4] fix: use which-pm-runs instead of preferred-pm --- packages/create-astro/src/messages.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-astro/src/messages.ts b/packages/create-astro/src/messages.ts index cea1f0bdc406..2f8ca960bb94 100644 --- a/packages/create-astro/src/messages.ts +++ b/packages/create-astro/src/messages.ts @@ -4,15 +4,15 @@ import { align, sleep } from '@astrojs/cli-kit/utils'; import { execa } from 'execa'; import { exec } from 'node:child_process'; import { get } from 'node:https'; -import preferredPM from 'preferred-pm'; import stripAnsi from 'strip-ansi'; +import detectPackageManager from 'which-pm-runs'; // Users might lack access to the global npm registry, this function // checks the user's project type and will return the proper npm registry // // A copy of this function also exists in the astro package async function getRegistry(): Promise { - const packageManager = (await preferredPM(process.cwd()))?.name || 'npm'; + const packageManager = detectPackageManager()?.name || 'npm'; const { stdout } = await execa(packageManager, ['config', 'get', 'registry']); return stdout || 'https://registry.npmjs.org'; } From fc223715c413dba02a46131cf795d57827669f8e Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Tue, 20 Jun 2023 15:20:56 -0400 Subject: [PATCH 2/4] deps: remove preferred-pm --- packages/create-astro/package.json | 3 +-- pnpm-lock.yaml | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index fd975ef49cc0..105d1cf735d3 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -35,8 +35,7 @@ "chai": "^4.3.7", "execa": "^6.1.0", "giget": "1.0.0", - "mocha": "^9.2.2", - "preferred-pm": "^3.0.3" + "mocha": "^9.2.2" }, "devDependencies": { "@types/which-pm-runs": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 739cf8997969..48a0def1cbf5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3577,9 +3577,6 @@ importers: mocha: specifier: ^9.2.2 version: 9.2.2 - preferred-pm: - specifier: ^3.0.3 - version: 3.0.3 devDependencies: '@types/which-pm-runs': specifier: ^1.0.0 From 3f18c409026071978637b25005de56877a9cde16 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Tue, 20 Jun 2023 15:21:47 -0400 Subject: [PATCH 3/4] chore: move which-pm-runs to regular deps --- packages/create-astro/package.json | 6 +++--- pnpm-lock.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index 105d1cf735d3..8737baeec712 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -35,15 +35,15 @@ "chai": "^4.3.7", "execa": "^6.1.0", "giget": "1.0.0", - "mocha": "^9.2.2" + "mocha": "^9.2.2", + "which-pm-runs": "^1.1.0" }, "devDependencies": { "@types/which-pm-runs": "^1.0.0", "arg": "^5.0.2", "astro-scripts": "workspace:*", "strip-ansi": "^7.1.0", - "strip-json-comments": "^5.0.0", - "which-pm-runs": "^1.1.0" + "strip-json-comments": "^5.0.0" }, "engines": { "node": ">=16.12.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48a0def1cbf5..3e3539ef7a2f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3577,6 +3577,9 @@ importers: mocha: specifier: ^9.2.2 version: 9.2.2 + which-pm-runs: + specifier: ^1.1.0 + version: 1.1.0 devDependencies: '@types/which-pm-runs': specifier: ^1.0.0 @@ -3593,9 +3596,6 @@ importers: strip-json-comments: specifier: ^5.0.0 version: 5.0.0 - which-pm-runs: - specifier: ^1.1.0 - version: 1.1.0 packages/create-astro/test/fixtures/not-empty: {} From 75eedd0e6d5a445c0e1b48d3316aafa0aad0ad5e Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Tue, 20 Jun 2023 15:27:25 -0400 Subject: [PATCH 4/4] chore: changeset --- .changeset/clever-rings-draw.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/clever-rings-draw.md diff --git a/.changeset/clever-rings-draw.md b/.changeset/clever-rings-draw.md new file mode 100644 index 000000000000..e6a474f917f3 --- /dev/null +++ b/.changeset/clever-rings-draw.md @@ -0,0 +1,5 @@ +--- +'create-astro': patch +--- + +Fix registry failures using unexpected package managers when running create-astro