From 5e7d4dbbea8eeee76d4f5a9d0d7c6eed83dcdaff Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Thu, 14 Dec 2023 17:16:14 +0100 Subject: [PATCH 1/5] breaking: require SvelteKit 2 for adapter-auto We bump Vercel to version 4, which requires SvelteKit 2, and as such we need to bump this one as a major, too --- .changeset/silly-frogs-love.md | 5 +++++ packages/adapter-auto/adapters.js | 2 +- packages/adapter-auto/package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/silly-frogs-love.md diff --git a/.changeset/silly-frogs-love.md b/.changeset/silly-frogs-love.md new file mode 100644 index 000000000000..b50674e802e0 --- /dev/null +++ b/.changeset/silly-frogs-love.md @@ -0,0 +1,5 @@ +--- +"@sveltejs/adapter-auto": major +--- + +breaking: require SvelteKit 2 diff --git a/packages/adapter-auto/adapters.js b/packages/adapter-auto/adapters.js index 13ec6d189b97..8c69b5d3ad5f 100644 --- a/packages/adapter-auto/adapters.js +++ b/packages/adapter-auto/adapters.js @@ -5,7 +5,7 @@ export const adapters = [ name: 'Vercel', test: () => !!process.env.VERCEL, module: '@sveltejs/adapter-vercel', - version: '2' + version: '4' }, { name: 'Cloudflare Pages', diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json index ba1ff78660e7..64272599b75c 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": "^2.0.0" } } From f519eb82418508a545d767f986e0c533fc7c4fd7 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Thu, 14 Dec 2023 17:20:29 +0100 Subject: [PATCH 2/5] bump other adapters, too --- .changeset/hip-spoons-crash.md | 7 +++++++ packages/adapter-auto/adapters.js | 4 ++-- packages/adapter-cloudflare-workers/package.json | 2 +- packages/adapter-cloudflare/package.json | 2 +- packages/adapter-netlify/package.json | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 .changeset/hip-spoons-crash.md diff --git a/.changeset/hip-spoons-crash.md b/.changeset/hip-spoons-crash.md new file mode 100644 index 000000000000..e11e0b5ae9bd --- /dev/null +++ b/.changeset/hip-spoons-crash.md @@ -0,0 +1,7 @@ +--- +"@sveltejs/adapter-cloudflare-workers": major +"@sveltejs/adapter-cloudflare": major +"@sveltejs/adapter-netlify": major +--- + +breaking: require SvelteKit 2 diff --git a/packages/adapter-auto/adapters.js b/packages/adapter-auto/adapters.js index 8c69b5d3ad5f..fa682638d539 100644 --- a/packages/adapter-auto/adapters.js +++ b/packages/adapter-auto/adapters.js @@ -11,13 +11,13 @@ export const adapters = [ name: 'Cloudflare Pages', test: () => !!process.env.CF_PAGES, module: '@sveltejs/adapter-cloudflare', - version: '2' + version: '3' }, { name: 'Netlify', test: () => !!process.env.NETLIFY, module: '@sveltejs/adapter-netlify', - version: '2' + version: '3' }, { name: 'Azure Static Web Apps', diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json index 86a31cd1270a..ed71784800a2 100644 --- a/packages/adapter-cloudflare-workers/package.json +++ b/packages/adapter-cloudflare-workers/package.json @@ -40,6 +40,6 @@ "typescript": "^5.3.3" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0 || ^2.0.0" + "@sveltejs/kit": "^2.0.0" } } diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json index 19c6f42cad95..063b4ee889ed 100644 --- a/packages/adapter-cloudflare/package.json +++ b/packages/adapter-cloudflare/package.json @@ -42,7 +42,7 @@ "typescript": "^5.3.3" }, "peerDependencies": { - "@sveltejs/kit": "^1.0.0 || ^2.0.0" + "@sveltejs/kit": "^2.0.0" }, "publishConfig": { "access": "public" diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json index 2a921d2529b1..2909bf1ac7b1 100644 --- a/packages/adapter-netlify/package.json +++ b/packages/adapter-netlify/package.json @@ -51,6 +51,6 @@ "vitest": "^1.0.4" }, "peerDependencies": { - "@sveltejs/kit": "^1.5.0 || ^2.0.0" + "@sveltejs/kit": "^2.0.0" } } From 936e130b80f1ba9d170b6ed90f5868e513ac0829 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Thu, 14 Dec 2023 17:23:02 +0100 Subject: [PATCH 3/5] adjust migration script --- packages/migrate/migrations/sveltekit-2/migrate.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/migrate/migrations/sveltekit-2/migrate.js b/packages/migrate/migrations/sveltekit-2/migrate.js index c1e6892527ad..4d8c63b0e223 100644 --- a/packages/migrate/migrations/sveltekit-2/migrate.js +++ b/packages/migrate/migrations/sveltekit-2/migrate.js @@ -18,6 +18,12 @@ export function update_pkg_json_content(content) { // All other bumps are done as part of the Svelte 4 migration ['@sveltejs/kit', '^2.0.0'], ['@sveltejs/adapter-static', '^3.0.0'], + ['@sveltejs/adapter-node', '^2.0.0'], + ['@sveltejs/adapter-vercel', '^4.0.0'], + ['@sveltejs/adapter-netlify', '^3.0.0'], + ['@sveltejs/adapter-cloudflare', '^3.0.0'], + ['@sveltejs/adapter-cloudflare-workers', '^2.0.0'], + ['@sveltejs/adapter-auto', '^3.0.0'], ['vite', '^5.0.0'], ['vitest', '^1.0.0'], ['typescript', '^5.0.0'], // should already be done by Svelte 4 migration, but who knows From d300fb0ceb06074f491f42fa2fb7c62038d12c97 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Thu, 14 Dec 2023 17:28:32 +0100 Subject: [PATCH 4/5] add SvelteKit to devdeps to move it out of deps for pnpm --- packages/adapter-cloudflare-workers/package.json | 1 + packages/adapter-cloudflare/package.json | 1 + pnpm-lock.yaml | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json index ed71784800a2..5adfcb74c7e0 100644 --- a/packages/adapter-cloudflare-workers/package.json +++ b/packages/adapter-cloudflare-workers/package.json @@ -35,6 +35,7 @@ "esbuild": "^0.19.9" }, "devDependencies": { + "@sveltejs/kit": "workspace:^", "@cloudflare/kv-asset-handler": "^0.3.0", "@types/node": "^18.19.3", "typescript": "^5.3.3" diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json index 063b4ee889ed..7d8556407db3 100644 --- a/packages/adapter-cloudflare/package.json +++ b/packages/adapter-cloudflare/package.json @@ -37,6 +37,7 @@ "worktop": "0.8.0-next.15" }, "devDependencies": { + "@sveltejs/kit": "workspace:^", "@types/node": "^18.19.3", "@types/ws": "^8.5.10", "typescript": "^5.3.3" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a360ffccac8..3ad5ec644d82 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,9 +72,6 @@ importers: '@cloudflare/workers-types': specifier: ^4.20231121.0 version: 4.20231121.0 - '@sveltejs/kit': - specifier: ^1.0.0 || ^2.0.0 - version: link:../kit esbuild: specifier: ^0.19.9 version: 0.19.9 @@ -82,6 +79,9 @@ importers: specifier: 0.8.0-next.15 version: 0.8.0-next.15 devDependencies: + '@sveltejs/kit': + specifier: workspace:^ + version: link:../kit '@types/node': specifier: ^18.19.3 version: 18.19.3 @@ -100,9 +100,6 @@ importers: '@iarna/toml': specifier: ^2.2.5 version: 2.2.5 - '@sveltejs/kit': - specifier: ^1.0.0 || ^2.0.0 - version: link:../kit esbuild: specifier: ^0.19.9 version: 0.19.9 @@ -110,6 +107,9 @@ importers: '@cloudflare/kv-asset-handler': specifier: ^0.3.0 version: 0.3.0 + '@sveltejs/kit': + specifier: workspace:^ + version: link:../kit '@types/node': specifier: ^18.19.3 version: 18.19.3 From a4795d810ac38d1236c876b241ee899bc7aca5ec Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Thu, 14 Dec 2023 17:32:57 +0100 Subject: [PATCH 5/5] bump --- packages/create-svelte/templates/default/package.template.json | 2 +- packages/create-svelte/templates/skeleton/package.template.json | 2 +- .../create-svelte/templates/skeletonlib/package.template.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create-svelte/templates/default/package.template.json b/packages/create-svelte/templates/default/package.template.json index 586d0f7e863b..b48d793cdcc0 100644 --- a/packages/create-svelte/templates/default/package.template.json +++ b/packages/create-svelte/templates/default/package.template.json @@ -9,7 +9,7 @@ "devDependencies": { "@fontsource/fira-mono": "^4.5.10", "@neoconfetti/svelte": "^1.0.0", - "@sveltejs/adapter-auto": "^2.0.0", + "@sveltejs/adapter-auto": "^3.0.0", "@sveltejs/kit": "^2.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0", "svelte": "^4.2.7", diff --git a/packages/create-svelte/templates/skeleton/package.template.json b/packages/create-svelte/templates/skeleton/package.template.json index fada20157b4a..f3c535af23da 100644 --- a/packages/create-svelte/templates/skeleton/package.template.json +++ b/packages/create-svelte/templates/skeleton/package.template.json @@ -8,7 +8,7 @@ "preview": "vite preview" }, "devDependencies": { - "@sveltejs/adapter-auto": "^2.0.0", + "@sveltejs/adapter-auto": "^3.0.0", "@sveltejs/kit": "^2.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0", "svelte": "^4.2.7", diff --git a/packages/create-svelte/templates/skeletonlib/package.template.json b/packages/create-svelte/templates/skeletonlib/package.template.json index b5af7d05f186..77558fb5c6df 100644 --- a/packages/create-svelte/templates/skeletonlib/package.template.json +++ b/packages/create-svelte/templates/skeletonlib/package.template.json @@ -19,7 +19,7 @@ "svelte": "^4.0.0" }, "devDependencies": { - "@sveltejs/adapter-auto": "^2.0.0", + "@sveltejs/adapter-auto": "^3.0.0", "@sveltejs/kit": "^2.0.0", "@sveltejs/package": "^2.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0",