feat: use @cloudflare/vite-plugin to bundle worker

.changeset/early-eggs-crash.md

@@ -0,0 +1,9 @@
+---
+"@sveltejs/kit": minor
+"@sveltejs/adapter-vercel": minor
+"@sveltejs/adapter-node": minor
+"@sveltejs/adapter-cloudflare": minor
+---
+
+feat: move `basePath` and `prerenderedRoutes` to the public SSRManifest api
+

.changeset/flat-cases-see.md

@@ -0,0 +1,6 @@
+---
+"@sveltejs/kit": major
+---
+
+breaking: remove `SSRManifest` from public types
+

.changeset/fuzzy-kings-sit.md

@@ -0,0 +1,6 @@
+---
+"@sveltejs/adapter-cloudflare": major
+---
+
+breaking: remove cloudflare `platform`, emulate the `cloudflare:workers` module instead
+

.changeset/rare-schools-itch.md

@@ -0,0 +1,6 @@
+---
+"@sveltejs/kit": minor
+---
+
+feat: allow adapters to override getRequest and setResponse
+

.changeset/shy-apes-prove.md

@@ -0,0 +1,6 @@
+---
+"@sveltejs/kit": minor
+---
+
+feat: skip SSR build if a server is not required
+

.changeset/smooth-flies-begin.md

@@ -0,0 +1,10 @@
+---
+"@sveltejs/adapter-cloudflare": major
+"@sveltejs/adapter-netlify": major
+"@sveltejs/adapter-node": major
+"@sveltejs/adapter-vercel": major
+"@sveltejs/kit": major
+---
+
+breaking: replace the `generateManifest` adapter api with `writeServerEntrypoint` and `builder.manifest`
+

documentation/docs/25-build-and-deploy/60-adapter-cloudflare.md

@@ -4,7 +4,7 @@ title: Cloudflare
 
 To deploy to [Cloudflare Workers](https://workers.cloudflare.com/) or [Cloudflare Pages](https://pages.cloudflare.com/), use [`adapter-cloudflare`](https://github.com/sveltejs/kit/tree/main/packages/adapter-cloudflare).
 
-This adapter will be installed by default when you use [`adapter-auto`](adapter-auto). If you plan on staying with Cloudflare, you can switch from [`adapter-auto`](adapter-auto) to using this adapter directly so that `event.platform` is emulated during local development, type declarations are automatically applied, and the ability to set Cloudflare-specific options is provided.
+This adapter will be installed by default when you use [`adapter-auto`](adapter-auto). If you plan on staying with Cloudflare, you can switch from [`adapter-auto`](adapter-auto) to using this adapter directly so that `cloudflare:workers` is emulated during local development, type declarations are automatically applied, and the ability to set Cloudflare-specific options is provided.
 
 ## Comparisons
 
@@ -53,7 +53,7 @@ Path to your [Wrangler configuration file](https://developers.cloudflare.com/wor
 
 ### platformProxy
 
-Preferences for the emulated `platform.env` local bindings. See the [getPlatformProxy](https://developers.cloudflare.com/workers/wrangler/api/#parameters-1) Wrangler API documentation for a full list of options.
+Preferences for the emulated `env` local bindings. See the [getPlatformProxy](https://developers.cloudflare.com/workers/wrangler/api/#parameters-1) Wrangler API documentation for a full list of options.
 
 ### fallback
 
@@ -130,62 +130,34 @@ Functions contained in the [`/functions` directory](https://developers.cloudflar
 
 ## Runtime APIs
 
-The [`env`](https://developers.cloudflare.com/workers/runtime-apis/fetch-event#parameters) object contains your project's [bindings](https://developers.cloudflare.com/workers/runtime-apis/bindings/), which consist of KV/DO namespaces, etc. It is passed to SvelteKit via the `platform` property, along with [`ctx`](https://developers.cloudflare.com/workers/runtime-apis/context/), [`caches`](https://developers.cloudflare.com/workers/runtime-apis/cache/), and [`cf`](https://developers.cloudflare.com/workers/runtime-apis/request/#incomingrequestcfproperties), meaning that you can access it in hooks and endpoints:
+The [`env`](https://developers.cloudflare.com/workers/runtime-apis/fetch-event#parameters) object contains your project's [bindings](https://developers.cloudflare.com/workers/runtime-apis/bindings/), which consist of KV/DO namespaces, etc. It is available on the [`cloudflare:workers`](https://developers.cloudflare.com/workers/runtime-apis/bindings/#importing-env-as-a-global) module.
 
 ```js
+/// file: +server.js
 // @filename: ambient.d.ts
-import { DurableObjectNamespace } from '@cloudflare/workers-types';
-
-declare global {
-	namespace App {
-		interface Platform {
-			env: {
-				YOUR_DURABLE_OBJECT_NAMESPACE: DurableObjectNamespace;
-			};
-		}
-	}
+declare module 'cloudflare:workers' {
+	export const env: {
+		YOUR_DURABLE_OBJECT_NAMESPACE: import('@cloudflare/workers-types').DurableObjectNamespace;
+	};
 }
 // @filename: +server.js
 // ---cut---
 // @errors: 2355 2322
-/// file: +server.js
+import { env } from 'cloudflare:workers';
+
 /** @type {import('./$types').RequestHandler} */
-export async function POST({ request, platform }) {
-	const x = platform?.env.YOUR_DURABLE_OBJECT_NAMESPACE.idFromName('x');
+export async function POST() {
+	const x = env.YOUR_DURABLE_OBJECT_NAMESPACE.idFromName('x');
 }
 ```
 
 > [!NOTE] SvelteKit's built-in [`$app/env/*` modules](environment-variables) should be preferred for environment variables.
 
-To make these types available to your app, install [`wrangler`](https://www.npmjs.com/package/wrangler), run [`wrangler types`](https://developers.cloudflare.com/workers/languages/typescript/), and reference them in your `src/app.d.ts`:
-
-```ts
-// @filename: ambient.d.ts
-import { KVNamespace, DurableObjectNamespace } from '@cloudflare/workers-types';
-
-namespace Cloudflare {
-	export interface Env {
-		YOUR_KV_NAMESPACE: KVNamespace;
-		YOUR_DURABLE_OBJECT_NAMESPACE: DurableObjectNamespace;
-	}
-}
-/// file: src/app.d.ts
-// ---cut---
-
-declare global {
-	namespace App {
-		interface Platform {
-+++			env: Cloudflare.Env;+++
-		}
-	}
-}
-
-export {};
-```
+To make these types available to your app, install [`wrangler`](https://www.npmjs.com/package/wrangler) and run [`wrangler types`](https://developers.cloudflare.com/workers/languages/typescript/).
 
 ### Testing locally
 
-Cloudflare specific values in the `platform` property are emulated during dev and preview modes. Local [bindings](https://developers.cloudflare.com/workers/wrangler/configuration/#bindings) are created based on your [Wrangler configuration file](https://developers.cloudflare.com/workers/wrangler/) and are used to populate `platform.env` during development and preview. Use the adapter config [`platformProxy` option](#Options-platformProxy) to change your preferences for the bindings.
+Cloudflare specific values are emulated during dev and preview modes. Local [bindings](https://developers.cloudflare.com/workers/wrangler/configuration/#bindings) are created based on your [Wrangler configuration file](https://developers.cloudflare.com/workers/wrangler/) and are used to populate `env` during development and preview. Use the adapter config [`platformProxy` option](#Options-platformProxy) to change your preferences for the bindings.
 
 > [!NOTE] [Durable Objects](https://developers.cloudflare.com/durable-objects/) and [Workflows](https://developers.cloudflare.com/workflows/), which require custom classes to be exported from your worker, are not currently supported. 
 

documentation/docs/25-build-and-deploy/99-writing-adapters.md

@@ -13,6 +13,8 @@ type AdapterSpecificOptions = any;
 
 // @filename: index.js
 // ---cut---
+import { getRequest, setResponse } from '@sveltejs/kit/node';
+
 /** @param {AdapterSpecificOptions} options */
 export default function (options) {
 	/** @type {import('@sveltejs/kit').Adapter} */
@@ -40,6 +42,15 @@ export default function (options) {
 				// Return `false if it can't, or throw a descriptive error.
 			}
 		},
+		getRequest(options) {
+			const request = getRequest(options);
+			// modify the Request object here if needed
+			return request;
+		},
+		setResponse(res, response) {
+			// handle WebSockets here, for example
+			setResponse(res, response);
+		},
 		vite: {
 			plugins: {
 				// add plugins here to integrate with Vite
@@ -53,15 +64,15 @@ export default function (options) {
 }
 ```
 
-Of these, `name` and `adapt` are required. `emulate`, `vite`, and `supports` are optional.
+Of these, `name` and `adapt` are required. `emulate`, `vite`, `getRequest`, `setResponse`, and `supports` are optional.
 
 Within the `adapt` method, there are a number of things that an adapter should do:
 
 - Clear out the build directory
 - Write SvelteKit output with `builder.writeClient`, `builder.writeServer`, and `builder.writePrerendered`
 - Output code that:
-	- Imports `Server` from `${builder.getServerDirectory()}/index.js`
-	- Instantiates the app with a manifest generated with `builder.generateManifest({ relativePath })`
+	- Imports a `server` instance generated by `${builder.writeServerEntrypoint()}`
+	- Runs `await server.init({ env, read })`
 	- Listens for requests from the platform, converts them to a standard [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request) if necessary, calls the `server.respond(request, { getClientAddress })` function to generate a [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response) and responds with it
 	- expose any platform-specific information to SvelteKit via the `platform` option passed to `server.respond`
 - Bundle the output to avoid needing to install dependencies on the target platform, if necessary

documentation/docs/60-appendix/35-migrating-to-sveltekit-3.md

@@ -453,9 +453,45 @@ All first-party adapters now require SvelteKit 3, alongside these adapter-specif
 
 ### `adapter-cloudflare`
 
+Cloudflare-specific APIs are no longer available on `platform`. Instead, find them where you would expect on a Cloudflare worker:
+
+- `env`, `ctx.waitUntil`, and other `ctx` properties should be imported from `cloudflare:workers`:
+```js
+// @filename: ambient.d.ts
+declare module 'cloudflare:workers' {
+	export const env: { KV: { get(): Promise<unknown> } };
+	export function waitUntil(promise: Promise<any>): void;
+}
+// ---cut---
+import { env, waitUntil } from 'cloudflare:workers';
+
+const value = await env.KV.get('key');
+```
+- `cf` is now a property of the `Request` object:
+```js
+/// file: src/routes/cf/+server.js
+// @filename: ambient.d.ts
+interface Request {
+  cf: import('@cloudflare/workers-types').IncomingRequestCfProperties;
+}
+// @filename: index.js
+// @errors: 7031
+// ---cut---
+export async function GET({ request }) {
+	const { country } = request.cf;
+}
+```
+- `caches` is now a global variable:
+```js
+/// file: src/routes/cache/+server.js
+let request = new Request('');
+// ---cut---
+const myCache = await caches.open('foo');
+await myCache.match(request);
+```
+
 - minimum `wrangler` is now `^4.67.0`
 - `@cloudflare/workers-types` upgraded
-- `platform.context` removed in favour of `platform.ctx`
 
 ### `adapter-node`
 

packages/adapter-bun/index.js

@@ -136,9 +136,13 @@ export default function (opts = {}) {
 			const manifest_file = path.resolve(server, 'manifest.js');
 			const server_options_file = path.resolve(src_dir, 'options.js');
 
+			const tmp = builder.getBuildDirectory('bun-tmp');
+			fs.mkdirSync(tmp, { recursive: true });
+			builder.writeServerEntrypoint(`${tmp}/server.js`);
+
 			const virtual_files = {
 				[manifest_file]:
-					`export const manifest = ${builder.generateManifest({ relativePath: './' })};\n` +
+					`export const app_dir = ${JSON.stringify(builder.config.appDir)};\n` +
 					`export const base = ${JSON.stringify(builder.config.paths.base || '/')};\n` +
 					`export const embed = ${JSON.stringify(!!buildOptions.compile)};\n` +
 					`export const env_prefix = ${JSON.stringify(envPrefix)};\n` +
@@ -198,7 +202,7 @@ export default function (opts = {}) {
 				name: 'adapter-bun',
 				setup(build) {
 					build.onResolve({ filter: /^(SERVER|MANIFEST|ROUTES|SERVER_OPTIONS)$/ }, ({ path }) => {
-						if (path === 'SERVER') return { path: `${server}/index.js` };
+						if (path === 'SERVER') return { path: `${tmp}/server.js` };
 						if (path === 'MANIFEST') return { path: manifest_file };
 						if (path === 'ROUTES') return { path: routes_file };
 						if (path === 'SERVER_OPTIONS') return { path: server_options_file };

packages/adapter-bun/internal.d.ts

@@ -1,5 +1,5 @@
 declare module 'MANIFEST' {
-	export const manifest: import('@sveltejs/kit').SSRManifest;
+	export const app_dir: string;
 	export const base: string;
 	export const embed: boolean;
 	export const env_prefix: string;
@@ -12,7 +12,7 @@ declare module 'ROUTES' {
 }
 
 declare module 'SERVER' {
-	export { Server } from '@sveltejs/kit';
+	export const server: import('@sveltejs/kit').Server;
 }
 
 declare module 'SERVER_OPTIONS' {

packages/adapter-bun/src/handler.js

@@ -1,11 +1,9 @@
 /** @import { Server as BunServer } from 'bun' */
-import { Server } from 'SERVER';
-import { manifest, origin, env_prefix } from 'MANIFEST';
+import { server } from 'SERVER';
+import { origin, env_prefix } from 'MANIFEST';
 import { server_assets } from 'ROUTES';
 import { env, number_env } from './env.js';
 
-const server = new Server(manifest);
-
 const address_header = env('ADDRESS_HEADER', '').toLowerCase();
 const protocol_header = env('PROTOCOL_HEADER', '').toLowerCase();
 const host_header = env('HOST_HEADER', '').toLowerCase();

packages/adapter-bun/src/routes-util.js

@@ -1,5 +1,5 @@
 /** @import { BunFile, BunRequest, Serve } from 'bun' */
-import { manifest, base, embed } from 'MANIFEST';
+import { app_dir, base, embed } from 'MANIFEST';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -174,7 +174,7 @@ function file_route(file, meta, extra_headers = {}) {
  * @returns {Array<[string, RouteHandler]>}
  */
 export function client_asset(url, filename = url, meta) {
-	const immutable = url.startsWith(`${manifest.appDir}/immutable/`);
+	const immutable = url.startsWith(`${app_dir}/immutable/`);
 	const route = file_route(
 		resolve_file('client', filename),
 		meta,

packages/adapter-bun/test/adapter.spec.ts

@@ -121,7 +121,7 @@ describe('Bun build configuration', () => {
 
 		const files = bun_build.mock.calls[0][0].files;
 		expect(files[manifest_file]).toBe(
-			'export const manifest = {"appDir":"_app"};\n' +
+			'export const app_dir = "_app";\n' +
 				'export const base = "/docs";\n' +
 				'export const embed = false;\n' +
 				'export const env_prefix = "APP_";\n' +
@@ -130,7 +130,9 @@ describe('Bun build configuration', () => {
 		expect(files[options_file]).toBe(
 			'export default {"hostname":"127.0.0.1","port":4000,"development":true};'
 		);
-		expect(builder.generateManifest).toHaveBeenCalledWith({ relativePath: './' });
+		expect(builder.writeServerEntrypoint).toHaveBeenCalledWith(
+			'.svelte-kit/output/bun-tmp/server.js'
+		);
 	});
 
 	test('resolves generated runtime modules through the Bun plugin', async () => {
@@ -144,7 +146,7 @@ describe('Bun build configuration', () => {
 		);
 		const resolve_module = on_resolve.mock.calls[0][1];
 		expect(resolve_module({ path: 'SERVER' })).toEqual({
-			path: '.svelte-kit/output/server/index.js'
+			path: '.svelte-kit/output/bun-tmp/server.js'
 		});
 		expect(resolve_module({ path: 'MANIFEST' })).toEqual({ path: manifest_file });
 		expect(resolve_module({ path: 'ROUTES' })).toEqual({ path: routes_file });
@@ -576,7 +578,7 @@ function create_builder({
 	instrumentation?: boolean;
 } = {}) {
 	return {
-		config: { outDir: '.svelte-kit', paths: { base, origin } },
+		config: { outDir: '.svelte-kit', paths: { base, origin }, appDir: '_app' },
 		routes,
 		prerendered: {
 			pages: new Map(prerendered_pages),
@@ -588,6 +590,9 @@ function create_builder({
 			warn: mock((_message: string) => {}),
 			info: mock((_message: string) => {})
 		},
+		getAppPath: () => `${base}/_app`,
+		writeServerEntrypoint: mock(() => {}),
+		getBuildDirectory: (dir: string) => `.svelte-kit/output/${dir}`,
 		getServerDirectory: () => '.svelte-kit/output/server',
 		writeClient: mock(() => client_files),
 		writePrerendered: mock(() => prerendered_files),