feat: use Workers Static Assets

.changeset/green-students-lay.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare-workers': major
+---
+
+feat: remove esbuild step

.changeset/new-kings-talk.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+---
+
+fix: change `esbuild` to a dev dependency

.changeset/ninety-fans-end.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+---
+
+fix: serve files from `_app/*` from the worker if the `_app/*` route was not excluded

.changeset/smart-owls-trade.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare-workers': major
+---
+
+feat: use Workers Static Assets instead of Workers Sites

.changeset/weak-chairs-think.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare-workers': minor
+---
+
+feat: optimize cache usage with `worktop`

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

@@ -6,11 +6,7 @@ To deploy to [Cloudflare Pages](https://pages.cloudflare.com/), use [`adapter-cl
 
 This adapter will be installed by default when you use [`adapter-auto`](adapter-auto). If you plan on staying with Cloudflare Pages, 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.
 
-## Comparisons
-
-- `adapter-cloudflare` – supports all SvelteKit features; builds for [Cloudflare Pages](https://blog.cloudflare.com/cloudflare-pages-goes-full-stack/)
-- `adapter-cloudflare-workers` – supports all SvelteKit features; builds for Cloudflare Workers
-- `adapter-static` – only produces client-side static assets; compatible with Cloudflare Pages
+> [!NOTE] Unless you have a specific reason to use `adapter-cloudflare`, it's recommended that you use [`adapter-cloudflare-workers`](adapter-cloudflare-workers) instead since Cloudflare plans to deprecate Cloudflare Pages in favour of Cloudflare Workers. Refer to the [compatibility matrix](https://developers.cloudflare.com/workers/static-assets/compatibility-matrix/) for more information.
 
 ## Usage
 
@@ -62,7 +58,7 @@ Preferences for the emulated `platform.env` local bindings. See the [getPlatform
 
 Please follow the [Get Started Guide](https://developers.cloudflare.com/pages/get-started/) for Cloudflare Pages to begin.
 
-When configuring your project settings, you must use the following settings:
+If you're using the [Git integration](https://developers.cloudflare.com/pages/get-started/git-integration/), your build settings should look like this:
 
 - **Framework preset** – SvelteKit
 - **Build command** – `npm run build` or `vite build`
@@ -101,7 +97,7 @@ declare global {
 export {};
 ```
 
-### Testing Locally
+### Testing locally
 
 Cloudflare Workers specific values in the `platform` property are emulated during dev and preview modes. Local [bindings](https://developers.cloudflare.com/pages/functions/bindings/) are created based on your [Wrangler configuration file](https://developers.cloudflare.com/pages/functions/wrangler-configuration/#local-development) 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.
 

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

@@ -4,7 +4,11 @@ title: Cloudflare Workers
 
 To deploy to [Cloudflare Workers](https://workers.cloudflare.com/), use [`adapter-cloudflare-workers`](https://github.com/sveltejs/kit/tree/main/packages/adapter-cloudflare-workers).
 
-> [!NOTE] Unless you have a specific reason to use `adapter-cloudflare-workers`, it's recommended that you use [`adapter-cloudflare`](adapter-cloudflare) instead. Both adapters have equivalent functionality, but Cloudflare Pages offers features like GitHub integration with automatic builds and deploys, preview deployments, instant rollback and so on.
+## Comparisons
+
+- `adapter-cloudflare-workers` – supports all SvelteKit features; builds for Cloudflare Workers
+- `adapter-cloudflare` – supports all SvelteKit features; builds for Cloudflare Pages
+- `adapter-static` – only produces client-side static assets; compatible with Cloudflare Pages and Cloudflare Workers
 
 ## Usage
 
@@ -34,46 +38,26 @@ Path to your [Wrangler configuration file](https://developers.cloudflare.com/wor
 
 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.
 
-## Basic Configuration
+## Basic configuration
 
 This adapter expects to find a [Wrangler configuration file](https://developers.cloudflare.com/workers/configuration/sites/configuration/) in the project root. It should look something like this:
 
 ```jsonc
 /// file: wrangler.jsonc
 {
 	"name": "<your-service-name>",
-	"account_id": "<your-account-id>",
-	"main": "./.cloudflare/worker.js",
-	"site": {
-		"bucket": "./.cloudflare/public"
-	},
-	"build": {
-		"command": "npm run build"
-	},
-	"compatibility_date": "2021-11-12"
+	"main": ".svelte-kit/cloudflare/_worker.js",
+	"compatibility_date": "2025-01-01",
+	"assets": {
+		"binding": "ASSETS",
+		"directory": ".svelte-kit/cloudflare",
+	}
 }
 ```
 
-`<your-service-name>` can be anything. `<your-account-id>` can be found by running `wrangler whoami` using the Wrangler CLI tool or by logging into your [Cloudflare dashboard](https://dash.cloudflare.com) and grabbing it from the end of the URL:
+## Deployment
 
-```
-https://dash.cloudflare.com/<your-account-id>/home
-```
-
-> [!NOTE] You should add the `.cloudflare` directory (or whichever directories you specified for `main` and `site.bucket`) and the `.wrangler` directory to your `.gitignore`.
-
-You will need to install [Wrangler](https://developers.cloudflare.com/workers/wrangler/install-and-update/) and log in, if you haven't already:
-
-```sh
-npm i -D wrangler
-wrangler login
-```
-
-Then, you can build your app and deploy it:
-
-```sh
-wrangler deploy
-```
+Please follow the [framework guide](https://developers.cloudflare.com/workers/frameworks/framework-guides/svelte/) for Cloudflare Workers to begin.
 
 ## Runtime APIs
 
@@ -108,12 +92,16 @@ declare global {
 export {};
 ```
 
-### Testing Locally
+### Testing locally
 
 Cloudflare Workers 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.
 
 For testing the build, you should use [Wrangler](https://developers.cloudflare.com/workers/wrangler/) **version 3**. Once you have built your site, run `wrangler dev`.
 
+## Notes
+
+The [`_headers`](https://developers.cloudflare.com/pages/configuration/headers/) and [`_redirects`](https://developers.cloudflare.com/pages/configuration/redirects/) files specific to Cloudflare Pages can be used for static asset responses (like images) by putting them into the project root folder.
+
 ## Troubleshooting
 
 ### Node.js compatibility
@@ -134,3 +122,31 @@ When deploying your application, the server generated by SvelteKit is bundled in
 ### Accessing the file system
 
 You can't use `fs` in Cloudflare Workers — you must [prerender](page-options#prerender) the routes in question.
+
+## Migrating from Workers Sites to Workers Static Assets
+
+Cloudflare no longer recommends using [Workers Sites](https://developers.cloudflare.com/workers/configuration/sites/configuration/) and instead recommends using [Workers Static Assets](https://developers.cloudflare.com/workers/static-assets/). To migrate, remove all `site` configuration settings from your Wrangler configuration file and add the `assets.directory` and `assets.binding` configuration settings:
+
+### wrangler.toml
+
+```toml
+/// file: wrangler.toml
+---site.bucket = ".cloudflare/public"---
++++assets.directory = ".cloudflare/public"
+assets.binding = "ASSETS"+++
+```
+
+### wrangler.jsonc
+
+```jsonc
+/// file: wrangler.jsonc
+{
+---	"site": {
+		"bucket": ".cloudflare/public"
+	},---
++++	"assets": {
+		"directory": ".cloudflare/public",
+		"binding": "ASSETS"
+	}+++
+}
+```

packages/adapter-cloudflare-workers/.gitignore

@@ -1,2 +1 @@
-.DS_Store
-node_modules
+/files

packages/adapter-cloudflare-workers/README.md

@@ -1,8 +1,8 @@
 # adapter-cloudflare-workers
 
-SvelteKit adapter that creates a Cloudflare Workers site using a function for dynamic server rendering.
+[Adapter](https://svelte.dev/docs/kit/building-your-app) for building SvelteKit applications on [Cloudflare Workers](https://developers.cloudflare.com/workers/) with [static assets](https://developers.cloudflare.com/workers/static-assets/).
 
-**Requires [Wrangler v2](https://developers.cloudflare.com/workers/wrangler/get-started/).** Wrangler v1 is no longer supported.
+**Requires [Wrangler v3.91.0 or later](https://developers.cloudflare.com/workers/wrangler/get-started/).**.
 
 ## Docs
 

packages/adapter-cloudflare-workers/ambient.d.ts

@@ -1,13 +1,14 @@
-import { CacheStorage, IncomingRequestCfProperties } from '@cloudflare/workers-types';
+import { CacheStorage, CfProperties } from '@cloudflare/workers-types';
 
 declare global {
 	namespace App {
 		export interface Platform {
+			env: unknown;
 			context: {
 				waitUntil(promise: Promise<any>): void;
 			};
 			caches: CacheStorage;
-			cf?: IncomingRequestCfProperties;
+			cf?: CfProperties;
 		}
 	}
 }