From 00ac963470bd464f507d930ea0a4376c3f20099d Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:29:02 -0800 Subject: [PATCH 1/3] feat: allow SvelteKit 2 as peer dependency --- .changeset/hungry-kings-collect.md | 12 ++++++++++++ packages/adapter-auto/package.json | 2 +- packages/adapter-cloudflare-workers/package.json | 2 +- packages/adapter-cloudflare/package.json | 2 +- packages/adapter-netlify/package.json | 2 +- packages/adapter-node/package.json | 2 +- packages/adapter-static/package.json | 2 +- packages/adapter-vercel/package.json | 2 +- packages/amp/package.json | 2 +- 9 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 .changeset/hungry-kings-collect.md diff --git a/.changeset/hungry-kings-collect.md b/.changeset/hungry-kings-collect.md new file mode 100644 index 000000000000..7289023b7bc5 --- /dev/null +++ b/.changeset/hungry-kings-collect.md @@ -0,0 +1,12 @@ +--- +'@sveltejs/adapter-cloudflare-workers': minor +'@sveltejs/adapter-cloudflare': minor +'@sveltejs/adapter-netlify': minor +'@sveltejs/adapter-static': minor +'@sveltejs/adapter-vercel': minor +'@sveltejs/adapter-auto': minor +'@sveltejs/adapter-node': minor +'@sveltejs/amp': minor +--- + +feat: allow SvelteKit 2 as peer dependency diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json index 61c5c0878d73..67f831cfb5bc 100644 --- a/packages/adapter-auto/package.json +++ b/packages/adapter-auto/package.json @@ -39,6 +39,6 @@ "import-meta-resolve": "^4.0.0" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0" + "@sveltejs/kit": "^1.0.0 | ^2.0.0" } } diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json index 971a622c242d..8cb9d6fc0e1a 100644 --- a/packages/adapter-cloudflare-workers/package.json +++ b/packages/adapter-cloudflare-workers/package.json @@ -40,6 +40,6 @@ "typescript": "^5.3.2" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0" + "@sveltejs/kit": "^1.0.0 | ^2.0.0" } } diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json index 976c87ce2ebe..ec5f36ed6a17 100644 --- a/packages/adapter-cloudflare/package.json +++ b/packages/adapter-cloudflare/package.json @@ -42,7 +42,7 @@ "typescript": "^5.3.2" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0" + "@sveltejs/kit": "^1.0.0 | ^2.0.0" }, "publishConfig": { "access": "public" diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json index 8781e8565a3e..f08a83d88a2d 100644 --- a/packages/adapter-netlify/package.json +++ b/packages/adapter-netlify/package.json @@ -51,6 +51,6 @@ "vitest": "^1.0.0" }, "peerDependencies": { - "@sveltejs/kit": "^1.5.0" + "@sveltejs/kit": "^1.5.0 | ^2.0.0" } } diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json index b8328fd10397..2b8370388a2d 100644 --- a/packages/adapter-node/package.json +++ b/packages/adapter-node/package.json @@ -50,6 +50,6 @@ "rollup": "^4.2.0" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0" + "@sveltejs/kit": "^1.0.0 | ^2.0.0" } } diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json index d8bb191c1d1e..a68f4f5e76b7 100644 --- a/packages/adapter-static/package.json +++ b/packages/adapter-static/package.json @@ -40,6 +40,6 @@ "vite": "^5.0.4" }, "peerDependencies": { - "@sveltejs/kit": "^1.5.0" + "@sveltejs/kit": "^1.5.0 | ^2.0.0" } } diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json index f219497c2e15..8a55e250aa6b 100644 --- a/packages/adapter-vercel/package.json +++ b/packages/adapter-vercel/package.json @@ -42,6 +42,6 @@ "vitest": "^1.0.0" }, "peerDependencies": { - "@sveltejs/kit": "^1.5.0" + "@sveltejs/kit": "^1.5.0 | ^2.0.0" } } diff --git a/packages/amp/package.json b/packages/amp/package.json index d8740cc5aeb1..34c7b240f0bc 100644 --- a/packages/amp/package.json +++ b/packages/amp/package.json @@ -27,6 +27,6 @@ "format": "pnpm lint --write" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0" + "@sveltejs/kit": "^1.0.0 | ^2.0.0" } } From 88bd248c63a16a7f3ccedc2b30b725481aa52531 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 8 Dec 2023 11:42:28 -0800 Subject: [PATCH 2/3] fix --- packages/adapter-auto/package.json | 2 +- packages/adapter-cloudflare-workers/package.json | 2 +- packages/adapter-cloudflare/package.json | 2 +- packages/adapter-netlify/package.json | 2 +- packages/adapter-node/package.json | 2 +- packages/adapter-static/package.json | 2 +- packages/adapter-vercel/package.json | 2 +- packages/amp/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json index 67f831cfb5bc..9ada98dbab0e 100644 --- a/packages/adapter-auto/package.json +++ b/packages/adapter-auto/package.json @@ -39,6 +39,6 @@ "import-meta-resolve": "^4.0.0" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0 | ^2.0.0" + "@sveltejs/kit": "^1.0.0 || ^2.0.0" } } diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json index 8cb9d6fc0e1a..f8c97258de53 100644 --- a/packages/adapter-cloudflare-workers/package.json +++ b/packages/adapter-cloudflare-workers/package.json @@ -40,6 +40,6 @@ "typescript": "^5.3.2" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0 | ^2.0.0" + "@sveltejs/kit": "^1.0.0 || ^2.0.0" } } diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json index ec5f36ed6a17..aab5358562a8 100644 --- a/packages/adapter-cloudflare/package.json +++ b/packages/adapter-cloudflare/package.json @@ -42,7 +42,7 @@ "typescript": "^5.3.2" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0 | ^2.0.0" + "@sveltejs/kit": "^1.0.0 || ^2.0.0" }, "publishConfig": { "access": "public" diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json index f08a83d88a2d..b1b1c9b0d36e 100644 --- a/packages/adapter-netlify/package.json +++ b/packages/adapter-netlify/package.json @@ -51,6 +51,6 @@ "vitest": "^1.0.0" }, "peerDependencies": { - "@sveltejs/kit": "^1.5.0 | ^2.0.0" + "@sveltejs/kit": "^1.5.0 || ^2.0.0" } } diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json index 2b8370388a2d..0112a1ca8fd5 100644 --- a/packages/adapter-node/package.json +++ b/packages/adapter-node/package.json @@ -50,6 +50,6 @@ "rollup": "^4.2.0" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0 | ^2.0.0" + "@sveltejs/kit": "^1.0.0 || ^2.0.0" } } diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json index a68f4f5e76b7..af7a7f8b585f 100644 --- a/packages/adapter-static/package.json +++ b/packages/adapter-static/package.json @@ -40,6 +40,6 @@ "vite": "^5.0.4" }, "peerDependencies": { - "@sveltejs/kit": "^1.5.0 | ^2.0.0" + "@sveltejs/kit": "^1.5.0 || ^2.0.0" } } diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json index 8a55e250aa6b..95f8aaf1e412 100644 --- a/packages/adapter-vercel/package.json +++ b/packages/adapter-vercel/package.json @@ -42,6 +42,6 @@ "vitest": "^1.0.0" }, "peerDependencies": { - "@sveltejs/kit": "^1.5.0 | ^2.0.0" + "@sveltejs/kit": "^1.5.0 || ^2.0.0" } } diff --git a/packages/amp/package.json b/packages/amp/package.json index 34c7b240f0bc..b93383234560 100644 --- a/packages/amp/package.json +++ b/packages/amp/package.json @@ -27,6 +27,6 @@ "format": "pnpm lint --write" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0 | ^2.0.0" + "@sveltejs/kit": "^1.0.0 || ^2.0.0" } } From e4a803a0dbe0a75d84d8b71c02c0da6565b81973 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 8 Dec 2023 11:43:01 -0800 Subject: [PATCH 3/3] update lockfile --- pnpm-lock.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b4a51cf3840..df1810e3898f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -70,7 +70,7 @@ importers: specifier: ^4.20230404.0 version: 4.20230404.0 '@sveltejs/kit': - specifier: ^1.0.0 + specifier: ^1.0.0 || ^2.0.0 version: 1.27.7(svelte@4.2.7)(vite@4.5.1) esbuild: specifier: ^0.19.3 @@ -98,7 +98,7 @@ importers: specifier: ^2.2.5 version: 2.2.5 '@sveltejs/kit': - specifier: ^1.0.0 + specifier: ^1.0.0 || ^2.0.0 version: 1.27.7(svelte@4.2.7)(vite@4.5.1) esbuild: specifier: ^0.19.3 @@ -297,7 +297,7 @@ importers: packages/amp: dependencies: '@sveltejs/kit': - specifier: ^1.0.0 + specifier: ^1.0.0 || ^2.0.0 version: 1.27.7(svelte@4.2.7)(vite@4.5.1) packages/create-svelte: