From 2c0949bb5e05cc1472ab54cf5e866fbc07b4104f Mon Sep 17 00:00:00 2001 From: Eldar Kasmamytov Date: Wed, 20 Nov 2024 11:10:31 +0100 Subject: [PATCH 1/9] Resolve peer dependency problem in the SolidJS integration package --- packages/integrations/solid/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index d786893628d1..e41bca6f64c7 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -35,13 +35,13 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "vite-plugin-solid": "^2.10.2" + "vite-plugin-solid": "^2.10.2", + "vite": "^5.4.10" }, "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "solid-js": "^1.9.3", - "vite": "^5.4.10" + "solid-js": "^1.9.3" }, "peerDependencies": { "solid-devtools": "^0.30.1", From cfa9384d458ed5aa97c7b57cdfa488807ed59da2 Mon Sep 17 00:00:00 2001 From: Eldar Kasmamytov Date: Wed, 20 Nov 2024 11:42:02 +0100 Subject: [PATCH 2/9] Update pnpm lock file --- pnpm-lock.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3066c199614d..03401b414368 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5147,6 +5147,9 @@ importers: packages/integrations/solid: dependencies: + vite: + specifier: ^5.4.10 + version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) vite-plugin-solid: specifier: ^2.10.2 version: 2.10.2(solid-js@1.9.3)(vite@5.4.10(@types/node@18.19.50)(sass@1.80.6)) @@ -5160,9 +5163,6 @@ importers: solid-js: specifier: ^1.9.3 version: 1.9.3 - vite: - specifier: ^5.4.10 - version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) packages/integrations/svelte: dependencies: From b6973b62828874661979dd9ad3e08fbe444cca9c Mon Sep 17 00:00:00 2001 From: Eldar Kasmamytov Date: Wed, 20 Nov 2024 11:44:54 +0100 Subject: [PATCH 3/9] Add a changeset --- .changeset/strong-stingrays-provide.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/strong-stingrays-provide.md diff --git a/.changeset/strong-stingrays-provide.md b/.changeset/strong-stingrays-provide.md new file mode 100644 index 000000000000..e9e9249a1c48 --- /dev/null +++ b/.changeset/strong-stingrays-provide.md @@ -0,0 +1,5 @@ +--- +'@astrojs/solid-js': major +--- + +Resolve peer dependency problem in the SolidJS integration package From bec746c89fbb24ffab0405fc619fc98bf75d435c Mon Sep 17 00:00:00 2001 From: Eldar Kasmamytov Date: Wed, 20 Nov 2024 14:07:12 +0100 Subject: [PATCH 4/9] Resolve peer dependency problem in the Svelte integration package --- .changeset/cuddly-meals-turn.md | 5 +++++ packages/integrations/svelte/package.json | 6 +++--- pnpm-lock.yaml | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .changeset/cuddly-meals-turn.md diff --git a/.changeset/cuddly-meals-turn.md b/.changeset/cuddly-meals-turn.md new file mode 100644 index 000000000000..c734b6844f84 --- /dev/null +++ b/.changeset/cuddly-meals-turn.md @@ -0,0 +1,5 @@ +--- +'@astrojs/svelte': major +--- + +Resolve peer dependency problem in the Svelte integration package diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 2a25510b2fe8..3a212a87c54b 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -40,13 +40,13 @@ }, "dependencies": { "@sveltejs/vite-plugin-svelte": "^4.0.0", - "svelte2tsx": "^0.7.22" + "svelte2tsx": "^0.7.22", + "vite": "^5.4.10" }, "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "svelte": "^5.1.16", - "vite": "^5.4.10" + "svelte": "^5.1.16" }, "peerDependencies": { "astro": "^4.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 03401b414368..b64173fe383f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5172,6 +5172,9 @@ importers: svelte2tsx: specifier: ^0.7.22 version: 0.7.22(svelte@5.1.16)(typescript@5.6.3) + vite: + specifier: ^5.4.10 + version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) devDependencies: astro: specifier: workspace:* @@ -5182,9 +5185,6 @@ importers: svelte: specifier: ^5.1.16 version: 5.1.16 - vite: - specifier: ^5.4.10 - version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) packages/integrations/tailwind: dependencies: From e163ad08141403e649b27716f8c1aaed7fcd1be9 Mon Sep 17 00:00:00 2001 From: Eldar Kasmamytov Date: Wed, 20 Nov 2024 14:09:25 +0100 Subject: [PATCH 5/9] Resolve peer dependency problem in the Vue integration package --- .changeset/smooth-onions-protect.md | 5 +++++ packages/integrations/vue/package.json | 4 ++-- pnpm-lock.yaml | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .changeset/smooth-onions-protect.md diff --git a/.changeset/smooth-onions-protect.md b/.changeset/smooth-onions-protect.md new file mode 100644 index 000000000000..f2374020372f --- /dev/null +++ b/.changeset/smooth-onions-protect.md @@ -0,0 +1,5 @@ +--- +'@astrojs/vue': major +--- + +Resolve peer dependency problem in the Vue integration package diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 325d8781f45f..ce658b6a8cbe 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -45,14 +45,14 @@ "@vitejs/plugin-vue": "^5.1.4", "@vitejs/plugin-vue-jsx": "^4.0.1", "@vue/compiler-sfc": "^3.5.12", - "vite-plugin-vue-devtools": "^7.6.3" + "vite-plugin-vue-devtools": "^7.6.3", + "vite": "^5.4.10" }, "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", "cheerio": "1.0.0", "linkedom": "^0.18.5", - "vite": "^5.4.10", "vue": "^3.5.12" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b64173fe383f..73a2ac4f4f7b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5233,6 +5233,9 @@ importers: '@vue/compiler-sfc': specifier: ^3.5.12 version: 3.5.12 + vite: + specifier: ^5.4.10 + version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) vite-plugin-vue-devtools: specifier: ^7.6.3 version: 7.6.3(rollup@4.24.4)(vite@5.4.10(@types/node@18.19.50)(sass@1.80.6))(vue@3.5.12(typescript@5.6.3)) @@ -5249,9 +5252,6 @@ importers: linkedom: specifier: ^0.18.5 version: 0.18.5 - vite: - specifier: ^5.4.10 - version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) vue: specifier: ^3.5.12 version: 3.5.12(typescript@5.6.3) From da6a6c20d683e2cd82b01d7720d97678499b0079 Mon Sep 17 00:00:00 2001 From: Eldar Kasmamytov Date: Wed, 20 Nov 2024 14:10:53 +0100 Subject: [PATCH 6/9] Resolve peer dependency problem in the React integration package --- .changeset/angry-parrots-push.md | 5 +++++ packages/integrations/react/package.json | 6 +++--- pnpm-lock.yaml | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .changeset/angry-parrots-push.md diff --git a/.changeset/angry-parrots-push.md b/.changeset/angry-parrots-push.md new file mode 100644 index 000000000000..c46c28b5eea5 --- /dev/null +++ b/.changeset/angry-parrots-push.md @@ -0,0 +1,5 @@ +--- +'@astrojs/react': major +--- + +Resolve peer dependency problem in the React integration package diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json index 9bb7a4e19332..40749c76df49 100644 --- a/packages/integrations/react/package.json +++ b/packages/integrations/react/package.json @@ -50,7 +50,8 @@ }, "dependencies": { "@vitejs/plugin-react": "^4.3.3", - "ultrahtml": "^1.5.3" + "ultrahtml": "^1.5.3", + "vite": "^5.4.10" }, "devDependencies": { "@types/react": "^18.3.12", @@ -59,8 +60,7 @@ "astro-scripts": "workspace:*", "cheerio": "1.0.0", "react": "^18.3.1", - "react-dom": "^18.3.1", - "vite": "^5.4.10" + "react-dom": "^18.3.1" }, "peerDependencies": { "@types/react": "^17.0.50 || ^18.0.21", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 73a2ac4f4f7b..1e4b37cdcc69 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5037,6 +5037,9 @@ importers: ultrahtml: specifier: ^1.5.3 version: 1.5.3 + vite: + specifier: ^5.4.10 + version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) devDependencies: '@types/react': specifier: ^18.3.12 @@ -5059,9 +5062,6 @@ importers: react-dom: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) - vite: - specifier: ^5.4.10 - version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) packages/integrations/react/test/fixtures/react-component: dependencies: From ac77b2b5334b8212bab6b594a4d57ce6f682e31c Mon Sep 17 00:00:00 2001 From: marbrex Date: Wed, 20 Nov 2024 15:07:25 +0100 Subject: [PATCH 7/9] Add vite to the dependencies of the Preact integration --- packages/integrations/preact/package.json | 3 ++- pnpm-lock.yaml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json index c23925956143..b441bca21a84 100644 --- a/packages/integrations/preact/package.json +++ b/packages/integrations/preact/package.json @@ -40,7 +40,8 @@ "@preact/preset-vite": "2.8.2", "@preact/signals": "^1.3.0", "babel-plugin-transform-hook-names": "^1.0.2", - "preact-render-to-string": "^6.5.11" + "preact-render-to-string": "^6.5.11", + "vite": "^5.4.10" }, "devDependencies": { "astro": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1e4b37cdcc69..f7ae0646d8a7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5018,6 +5018,9 @@ importers: preact-render-to-string: specifier: ^6.5.11 version: 6.5.11(preact@10.24.3) + vite: + specifier: ^5.4.10 + version: 5.4.10(@types/node@18.19.50)(sass@1.80.6) devDependencies: astro: specifier: workspace:* From d8a7f5de046a379b17aadcdc3a4671269cb2ca64 Mon Sep 17 00:00:00 2001 From: marbrex Date: Wed, 20 Nov 2024 15:09:03 +0100 Subject: [PATCH 8/9] Merge changesets --- .changeset/angry-parrots-push.md | 5 ----- .changeset/cuddly-meals-turn.md | 5 ----- .changeset/smooth-onions-protect.md | 5 ----- .changeset/strong-stingrays-provide.md | 8 ++++++-- 4 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 .changeset/angry-parrots-push.md delete mode 100644 .changeset/cuddly-meals-turn.md delete mode 100644 .changeset/smooth-onions-protect.md diff --git a/.changeset/angry-parrots-push.md b/.changeset/angry-parrots-push.md deleted file mode 100644 index c46c28b5eea5..000000000000 --- a/.changeset/angry-parrots-push.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/react': major ---- - -Resolve peer dependency problem in the React integration package diff --git a/.changeset/cuddly-meals-turn.md b/.changeset/cuddly-meals-turn.md deleted file mode 100644 index c734b6844f84..000000000000 --- a/.changeset/cuddly-meals-turn.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/svelte': major ---- - -Resolve peer dependency problem in the Svelte integration package diff --git a/.changeset/smooth-onions-protect.md b/.changeset/smooth-onions-protect.md deleted file mode 100644 index f2374020372f..000000000000 --- a/.changeset/smooth-onions-protect.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/vue': major ---- - -Resolve peer dependency problem in the Vue integration package diff --git a/.changeset/strong-stingrays-provide.md b/.changeset/strong-stingrays-provide.md index e9e9249a1c48..912668c29de6 100644 --- a/.changeset/strong-stingrays-provide.md +++ b/.changeset/strong-stingrays-provide.md @@ -1,5 +1,9 @@ --- -'@astrojs/solid-js': major +'@astrojs/solid-js': patch +'@astrojs/vue': patch +'@astrojs/svelte': patch +'@astrojs/react': patch +'@astrojs/preact': patch --- -Resolve peer dependency problem in the SolidJS integration package +Resolve `vite` peer dependency problem in the integration packages for strict package managers like **Yarn in PnP mode**. From 381dcc5da8b7679f998579eef2612d59cbfc3581 Mon Sep 17 00:00:00 2001 From: Eldar Kasmamytov <42811701+marbrex@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:00:25 +0100 Subject: [PATCH 9/9] Update .changeset/strong-stingrays-provide.md Co-authored-by: Bjorn Lu --- .changeset/strong-stingrays-provide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/strong-stingrays-provide.md b/.changeset/strong-stingrays-provide.md index 912668c29de6..a98fea0f8df3 100644 --- a/.changeset/strong-stingrays-provide.md +++ b/.changeset/strong-stingrays-provide.md @@ -6,4 +6,4 @@ '@astrojs/preact': patch --- -Resolve `vite` peer dependency problem in the integration packages for strict package managers like **Yarn in PnP mode**. +Resolve `vite` peer dependency problem for strict package managers like **Yarn in PnP mode**.