fix: serve files in _app from function, if not already handled (#11593)

* fix: serve files in _app from function, if not already handled

* Update .changeset/old-masks-thank.md

* fix

* same but for cloudflare-workers

* changeset

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>

Author: Rich-Harris

.changeset/old-masks-thank.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare': patch
+---
+
+fix: serve static files in `_app` from function, if not already handled

.changeset/rude-countries-sing.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-cloudflare-workers': patch
+---
+
+fix: serve static files in `_app` from function, if not already handled

packages/adapter-cloudflare-workers/files/entry.js

@@ -6,7 +6,10 @@ const static_asset_manifest = JSON.parse(static_asset_manifest_json);
 
 const server = new Server(manifest);
 
-const app_path = `/${manifest.appPath}/`;
+const app_path = `/${manifest.appPath}`;
+
+const immutable = `${app_path}/immutable/`;
+const version_file = `${app_path}/version.json`;
 
 export default {
 	/**
@@ -25,7 +28,7 @@ export default {
 			const res = await get_asset_from_kv(req, env, context);
 			if (is_error(res.status)) return res;
 
-			const cache_control = url.pathname.startsWith(app_path + 'immutable/')
+			const cache_control = url.pathname.startsWith(immutable)
 				? 'public, immutable, max-age=31536000'
 				: 'no-cache';
 
@@ -59,7 +62,12 @@ export default {
 
 		let location = pathname.at(-1) === '/' ? stripped_pathname : pathname + '/';
 
-		if (is_static_asset || prerendered.has(pathname)) {
+		if (
+			is_static_asset ||
+			prerendered.has(pathname) ||
+			pathname === version_file ||
+			pathname.startsWith(immutable)
+		) {
 			return get_asset_from_kv(req, env, context, (request, options) => {
 				if (prerendered.has(pathname)) {
 					url.pathname = '/' + prerendered.get(pathname).file;

packages/adapter-cloudflare/index.js

@@ -28,7 +28,8 @@ export default function (options = {}) {
 			writeFileSync(
 				`${tmp}/manifest.js`,
 				`export const manifest = ${builder.generateManifest({ relativePath })};\n\n` +
-					`export const prerendered = new Set(${JSON.stringify(builder.prerendered.paths)});\n`
+					`export const prerendered = new Set(${JSON.stringify(builder.prerendered.paths)});\n\n` +
+					`export const app_path = ${JSON.stringify(builder.getAppPath())};\n`
 			);
 
 			writeFileSync(

packages/adapter-cloudflare/placeholders.d.ts

@@ -7,4 +7,5 @@ declare module 'MANIFEST' {
 
 	export const manifest: SSRManifest;
 	export const prerendered: Set<string>;
+	export const app_path: string;
 }

packages/adapter-cloudflare/src/worker.js

@@ -1,9 +1,12 @@
 import { Server } from 'SERVER';
-import { manifest, prerendered } from 'MANIFEST';
+import { manifest, prerendered, app_path } from 'MANIFEST';
 import * as Cache from 'worktop/cfw.cache';
 
 const server = new Server(manifest);
 
+const immutable = `/${app_path}/immutable/`;
+const version_file = `/${app_path}/version.json`;
+
 /** @type {import('worktop/cfw').Module.Worker<{ ASSETS: import('worktop/cfw.durable').Durable.Object }>} */
 const worker = {
 	async fetch(req, env, context) {
@@ -33,7 +36,12 @@ const worker = {
 
 		let location = pathname.at(-1) === '/' ? stripped_pathname : pathname + '/';
 
-		if (is_static_asset || prerendered.has(pathname)) {
+		if (
+			is_static_asset ||
+			prerendered.has(pathname) ||
+			pathname === version_file ||
+			pathname.startsWith(immutable)
+		) {
 			res = await env.ASSETS.fetch(req);
 		} else if (location && prerendered.has(location)) {
 			if (search) location += search;