From cb71558ab4ec0f424bcc0152d8957a74d9f59836 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sat, 16 Nov 2024 07:54:32 -0800 Subject: [PATCH 1/9] chore: upgrade package-manager-detector to add Deno support --- packages/cli/package.json | 2 +- pnpm-lock.yaml | 46 +++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index b736009c..7384941d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,7 +40,7 @@ "commander": "^12.1.0", "degit": "^2.8.4", "empathic": "^1.0.0", - "package-manager-detector": "^0.2.2", + "package-manager-detector": "^0.2.4", "picocolors": "^1.1.0", "ps-tree": "^1.2.0", "tar-fs": "^3.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e476e989..2ed40ffd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -128,7 +128,7 @@ importers: version: 9.1.0 postcss: specifier: ^8.4.38 - version: 8.4.47 + version: 8.4.49 recast: specifier: ^0.23.7 version: 0.23.9 @@ -199,8 +199,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 package-manager-detector: - specifier: ^0.2.2 - version: 0.2.2 + specifier: ^0.2.4 + version: 0.2.4 picocolors: specifier: ^1.1.0 version: 1.1.1 @@ -1236,7 +1236,7 @@ packages: resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} cross-spawn@5.1.0: resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} @@ -1902,8 +1902,8 @@ packages: package-json-from-dist@1.0.0: resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==} - package-manager-detector@0.2.2: - resolution: {integrity: sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==} + package-manager-detector@0.2.4: + resolution: {integrity: sha512-H/OUu9/zUfP89z1APcBf2X8Us0tt8dUK4lUmKqz12QNXif3DxAs1/YqjGtcutZi1zQqeNQRWr9C+EbQnnvSSFA==} parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} @@ -2001,8 +2001,8 @@ packages: resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==} engines: {node: '>=4'} - postcss@8.4.47: - resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==} + postcss@8.4.49: + resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==} engines: {node: ^10 || ^12 || >=14} prelude-ls@1.2.1: @@ -2611,7 +2611,7 @@ snapshots: fs-extra: 7.0.1 mri: 1.2.0 p-limit: 2.3.0 - package-manager-detector: 0.2.2 + package-manager-detector: 0.2.4 picocolors: 1.1.1 resolve-from: 5.0.0 semver: 7.6.3 @@ -3601,9 +3601,9 @@ snapshots: eslint-compat-utils: 0.5.1(eslint@9.10.0) esutils: 2.0.3 known-css-properties: 0.35.0 - postcss: 8.4.47 - postcss-load-config: 3.1.4(postcss@8.4.47) - postcss-safe-parser: 6.0.0(postcss@8.4.47) + postcss: 8.4.49 + postcss-load-config: 3.1.4(postcss@8.4.49) + postcss-safe-parser: 6.0.0(postcss@8.4.49) postcss-selector-parser: 6.1.2 semver: 7.6.3 svelte-eslint-parser: 0.43.0(svelte@5.0.0) @@ -4102,7 +4102,7 @@ snapshots: package-json-from-dist@1.0.0: {} - package-manager-detector@0.2.2: {} + package-manager-detector@0.2.4: {} parent-module@1.0.1: dependencies: @@ -4155,27 +4155,27 @@ snapshots: optionalDependencies: fsevents: 2.3.2 - postcss-load-config@3.1.4(postcss@8.4.47): + postcss-load-config@3.1.4(postcss@8.4.49): dependencies: lilconfig: 2.1.0 yaml: 1.10.2 optionalDependencies: - postcss: 8.4.47 + postcss: 8.4.49 - postcss-safe-parser@6.0.0(postcss@8.4.47): + postcss-safe-parser@6.0.0(postcss@8.4.49): dependencies: - postcss: 8.4.47 + postcss: 8.4.49 - postcss-scss@4.0.9(postcss@8.4.47): + postcss-scss@4.0.9(postcss@8.4.49): dependencies: - postcss: 8.4.47 + postcss: 8.4.49 postcss-selector-parser@6.1.2: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss@8.4.47: + postcss@8.4.49: dependencies: nanoid: 3.3.7 picocolors: 1.1.1 @@ -4421,8 +4421,8 @@ snapshots: eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 - postcss: 8.4.47 - postcss-scss: 4.0.9(postcss@8.4.47) + postcss: 8.4.49 + postcss-scss: 4.0.9(postcss@8.4.49) optionalDependencies: svelte: 5.0.0 @@ -4619,7 +4619,7 @@ snapshots: vite@5.4.10(@types/node@22.9.0): dependencies: esbuild: 0.21.5 - postcss: 8.4.47 + postcss: 8.4.49 rollup: 4.22.4 optionalDependencies: '@types/node': 22.9.0 From e8b8a66bc0a9a7f54c98c4f7921a4ecb8fca459c Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sat, 16 Nov 2024 08:01:38 -0800 Subject: [PATCH 2/9] Create olive-tips-worry.md --- .changeset/olive-tips-worry.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/olive-tips-worry.md diff --git a/.changeset/olive-tips-worry.md b/.changeset/olive-tips-worry.md new file mode 100644 index 00000000..34cce5f2 --- /dev/null +++ b/.changeset/olive-tips-worry.md @@ -0,0 +1,5 @@ +--- +"sv": patch +--- + +chore: upgrade `package-manager-detector` to add Deno support From c492dd014691791eab93ebee82a084bf295a8574 Mon Sep 17 00:00:00 2001 From: AdrianGonz97 <31664583+AdrianGonz97@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:14:39 -0500 Subject: [PATCH 3/9] update type --- packages/core/addon/workspace.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/addon/workspace.ts b/packages/core/addon/workspace.ts index 85bb4fcd..a6525d44 100644 --- a/packages/core/addon/workspace.ts +++ b/packages/core/addon/workspace.ts @@ -17,4 +17,4 @@ export type Workspace = { packageManager: PackageManager; }; -export type PackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun'; +export type PackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun' | 'deno'; From 83887b390d9f5775a0b31be874731073dafde12e Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sun, 24 Nov 2024 09:15:51 -0800 Subject: [PATCH 4/9] upgrade to 0.2.5 --- packages/cli/package.json | 2 +- pnpm-lock.yaml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 7384941d..dfb548cd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,7 +40,7 @@ "commander": "^12.1.0", "degit": "^2.8.4", "empathic": "^1.0.0", - "package-manager-detector": "^0.2.4", + "package-manager-detector": "^0.2.5", "picocolors": "^1.1.0", "ps-tree": "^1.2.0", "tar-fs": "^3.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ed40ffd..2449f932 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -199,8 +199,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 package-manager-detector: - specifier: ^0.2.4 - version: 0.2.4 + specifier: ^0.2.5 + version: 0.2.5 picocolors: specifier: ^1.1.0 version: 1.1.1 @@ -1905,6 +1905,9 @@ packages: package-manager-detector@0.2.4: resolution: {integrity: sha512-H/OUu9/zUfP89z1APcBf2X8Us0tt8dUK4lUmKqz12QNXif3DxAs1/YqjGtcutZi1zQqeNQRWr9C+EbQnnvSSFA==} + package-manager-detector@0.2.5: + resolution: {integrity: sha512-3dS7y28uua+UDbRCLBqltMBrbI+A5U2mI9YuxHRxIWYmLj3DwntEBmERYzIAQ4DMeuCUOBSak7dBHHoXKpOTYQ==} + parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -4104,6 +4107,8 @@ snapshots: package-manager-detector@0.2.4: {} + package-manager-detector@0.2.5: {} + parent-module@1.0.1: dependencies: callsites: 3.1.0 From 8183d57394a6345fae393f1c67bb966c62d7a7a2 Mon Sep 17 00:00:00 2001 From: AdrianGonz97 <31664583+AdrianGonz97@users.noreply.github.com> Date: Sun, 24 Nov 2024 12:49:51 -0500 Subject: [PATCH 5/9] add `npm:` protocol to deno runs --- packages/cli/lib/install.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/cli/lib/install.ts b/packages/cli/lib/install.ts index 72d5173c..cb66042e 100644 --- a/packages/cli/lib/install.ts +++ b/packages/cli/lib/install.ts @@ -122,6 +122,9 @@ async function runAddon({ addon, multiple, workspace }: RunAddon): Promise { + // Deno requires the package to be prepended with the `npm:` protocol + if (workspace.packageManager === 'deno') commandArgs[0] = `npm:${commandArgs[0]}`; + const { command, args } = resolveCommand(workspace.packageManager, 'execute', commandArgs)!; const addonPrefix = multiple ? `${addon.id}: ` : ''; From de84ed62441dbe25d68746a0cb7fa2b45fdf9dfa Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:38:36 -0800 Subject: [PATCH 6/9] bump package-manager-detector --- packages/cli/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index dfb548cd..c3d7562a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,7 +40,7 @@ "commander": "^12.1.0", "degit": "^2.8.4", "empathic": "^1.0.0", - "package-manager-detector": "^0.2.5", + "package-manager-detector": "^0.2.6", "picocolors": "^1.1.0", "ps-tree": "^1.2.0", "tar-fs": "^3.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2449f932..d3e688d9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -199,8 +199,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 package-manager-detector: - specifier: ^0.2.5 - version: 0.2.5 + specifier: ^0.2.6 + version: 0.2.6 picocolors: specifier: ^1.1.0 version: 1.1.1 @@ -1905,8 +1905,8 @@ packages: package-manager-detector@0.2.4: resolution: {integrity: sha512-H/OUu9/zUfP89z1APcBf2X8Us0tt8dUK4lUmKqz12QNXif3DxAs1/YqjGtcutZi1zQqeNQRWr9C+EbQnnvSSFA==} - package-manager-detector@0.2.5: - resolution: {integrity: sha512-3dS7y28uua+UDbRCLBqltMBrbI+A5U2mI9YuxHRxIWYmLj3DwntEBmERYzIAQ4DMeuCUOBSak7dBHHoXKpOTYQ==} + package-manager-detector@0.2.6: + resolution: {integrity: sha512-9vPH3qooBlYRJdmdYP00nvjZOulm40r5dhtal8st18ctf+6S1k7pi5yIHLvI4w5D70x0Y+xdVD9qITH0QO/A8A==} parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} @@ -4107,7 +4107,7 @@ snapshots: package-manager-detector@0.2.4: {} - package-manager-detector@0.2.5: {} + package-manager-detector@0.2.6: {} parent-module@1.0.1: dependencies: From 11473adbf9b108784c04559327d90bac30d0dfaa Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:39:02 -0800 Subject: [PATCH 7/9] Revert "add `npm:` protocol to deno runs" This reverts commit 8183d57394a6345fae393f1c67bb966c62d7a7a2. --- packages/cli/lib/install.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/cli/lib/install.ts b/packages/cli/lib/install.ts index cb66042e..72d5173c 100644 --- a/packages/cli/lib/install.ts +++ b/packages/cli/lib/install.ts @@ -122,9 +122,6 @@ async function runAddon({ addon, multiple, workspace }: RunAddon): Promise { - // Deno requires the package to be prepended with the `npm:` protocol - if (workspace.packageManager === 'deno') commandArgs[0] = `npm:${commandArgs[0]}`; - const { command, args } = resolveCommand(workspace.packageManager, 'execute', commandArgs)!; const addonPrefix = multiple ? `${addon.id}: ` : ''; From 6bd78f16890d3fc97bd3de90bcc5929c7587fb2a Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:40:34 -0800 Subject: [PATCH 8/9] dedupe --- pnpm-lock.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d3e688d9..b2559aa6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1902,9 +1902,6 @@ packages: package-json-from-dist@1.0.0: resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==} - package-manager-detector@0.2.4: - resolution: {integrity: sha512-H/OUu9/zUfP89z1APcBf2X8Us0tt8dUK4lUmKqz12QNXif3DxAs1/YqjGtcutZi1zQqeNQRWr9C+EbQnnvSSFA==} - package-manager-detector@0.2.6: resolution: {integrity: sha512-9vPH3qooBlYRJdmdYP00nvjZOulm40r5dhtal8st18ctf+6S1k7pi5yIHLvI4w5D70x0Y+xdVD9qITH0QO/A8A==} @@ -2614,7 +2611,7 @@ snapshots: fs-extra: 7.0.1 mri: 1.2.0 p-limit: 2.3.0 - package-manager-detector: 0.2.4 + package-manager-detector: 0.2.6 picocolors: 1.1.1 resolve-from: 5.0.0 semver: 7.6.3 @@ -4105,8 +4102,6 @@ snapshots: package-json-from-dist@1.0.0: {} - package-manager-detector@0.2.4: {} - package-manager-detector@0.2.6: {} parent-module@1.0.1: From b736d8b627b493c999f32c7d4e7b09958bc70064 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:10:59 -0800 Subject: [PATCH 9/9] bump again --- packages/cli/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index c3d7562a..69a0eaf6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,7 +40,7 @@ "commander": "^12.1.0", "degit": "^2.8.4", "empathic": "^1.0.0", - "package-manager-detector": "^0.2.6", + "package-manager-detector": "^0.2.7", "picocolors": "^1.1.0", "ps-tree": "^1.2.0", "tar-fs": "^3.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2559aa6..1d1f6c68 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -199,8 +199,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 package-manager-detector: - specifier: ^0.2.6 - version: 0.2.6 + specifier: ^0.2.7 + version: 0.2.7 picocolors: specifier: ^1.1.0 version: 1.1.1 @@ -1902,8 +1902,8 @@ packages: package-json-from-dist@1.0.0: resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==} - package-manager-detector@0.2.6: - resolution: {integrity: sha512-9vPH3qooBlYRJdmdYP00nvjZOulm40r5dhtal8st18ctf+6S1k7pi5yIHLvI4w5D70x0Y+xdVD9qITH0QO/A8A==} + package-manager-detector@0.2.7: + resolution: {integrity: sha512-g4+387DXDKlZzHkP+9FLt8yKj8+/3tOkPv7DVTJGGRm00RkEWgqbFstX1mXJ4M0VDYhUqsTOiISqNOJnhAu3PQ==} parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} @@ -2611,7 +2611,7 @@ snapshots: fs-extra: 7.0.1 mri: 1.2.0 p-limit: 2.3.0 - package-manager-detector: 0.2.6 + package-manager-detector: 0.2.7 picocolors: 1.1.1 resolve-from: 5.0.0 semver: 7.6.3 @@ -4102,7 +4102,7 @@ snapshots: package-json-from-dist@1.0.0: {} - package-manager-detector@0.2.6: {} + package-manager-detector@0.2.7: {} parent-module@1.0.1: dependencies: