breaking: require SvelteKit 2 for all adapters (#11316)

dummdidumm · web-flow · commit 74b9a855a188 · 2023-12-14T17:34:49.000+01:00
Bumping all the adapters to require SvelteKit 2, because a) esbuild changes and we want to be careful b) easier to do minors using new capabilities c) adapter-auto is more robust in installing correct versions then
diff --git a/.changeset/hip-spoons-crash.md 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/.changeset/silly-frogs-love.md 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
@@ -5,19 +5,19 @@ export const adapters = [
 		name: 'Vercel',
 		test: () => !!process.env.VERCEL,
 		module: '@sveltejs/adapter-vercel',
-		version: '2'
+		version: '4'
 	},
 	{
 		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-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"
 	}
 }
diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -35,11 +35,12 @@
 		"esbuild": "^0.19.9"
 	},
 	"devDependencies": {
+		"@sveltejs/kit": "workspace:^",
 		"@cloudflare/kv-asset-handler": "^0.3.0",
 		"@types/node": "^18.19.3",
 		"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
@@ -37,12 +37,13 @@
 		"worktop": "0.8.0-next.15"
 	},
 	"devDependencies": {
+		"@sveltejs/kit": "workspace:^",
 		"@types/node": "^18.19.3",
 		"@types/ws": "^8.5.10",
 		"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
@@ -51,6 +51,6 @@
 		"vitest": "^1.0.4"
 	},
 	"peerDependencies": {
-		"@sveltejs/kit": "^1.5.0 || ^2.0.0"
+		"@sveltejs/kit": "^2.0.0"
 	}
 }
diff --git 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
@@ -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
@@ -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",
diff --git 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
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@sveltejs/adapter-auto": major
 +---
++
 +breaking: require SvelteKit 2
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@`
`39`	`39`	`"import-meta-resolve": "^4.0.0"`
`40`	`40`	`},`
`41`	`41`	`"peerDependencies": {`
`42`		`- "@sveltejs/kit": "^1.0.0 \|\| ^2.0.0"`
	`42`	`+ "@sveltejs/kit": "^2.0.0"`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,12 @@`
`35`	`35`	`"esbuild": "^0.19.9"`
`36`	`36`	`},`
`37`	`37`	`"devDependencies": {`
	`38`	`+ "@sveltejs/kit": "workspace:^",`
`38`	`39`	`"@cloudflare/kv-asset-handler": "^0.3.0",`
`39`	`40`	`"@types/node": "^18.19.3",`
`40`	`41`	`"typescript": "^5.3.3"`
`41`	`42`	`},`
`42`	`43`	`"peerDependencies": {`
`43`		`- "@sveltejs/kit": "^1.0.0 \|\| ^2.0.0"`
	`44`	`+ "@sveltejs/kit": "^2.0.0"`
`44`	`45`	`}`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@`
`51`	`51`	`"vitest": "^1.0.4"`
`52`	`52`	`},`
`53`	`53`	`"peerDependencies": {`
`54`		`- "@sveltejs/kit": "^1.5.0 \|\| ^2.0.0"`
	`54`	`+ "@sveltejs/kit": "^2.0.0"`
`55`	`55`	`}`
`56`	`56`	`}`