Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 11, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ab8c17
fix: serve files in _app from function, if not already handled
Rich-Harris Jan 10, 2024
f48c2b5
Update .changeset/old-masks-thank.md
Rich-Harris Jan 10, 2024
a3a978a
fix
Rich-Harris Jan 10, 2024
bc000e8
Merge branch 'cloudflare-serve-app-assets' of github.com:sveltejs/kit…
Rich-Harris Jan 10, 2024
4a2c7e3
same but for cloudflare-workers
Rich-Harris Jan 11, 2024
a2f0465
changeset
Rich-Harris Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/old-masks-thank.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/adapter-cloudflare': patch
---

fix: serve static files in \_app from function, if not already handled
3 changes: 2 additions & 1 deletion packages/adapter-cloudflare/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions packages/adapter-cloudflare/placeholders.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ declare module 'MANIFEST' {

export const manifest: SSRManifest;
export const prerendered: Set<string>;
export const app_path: string;
}
12 changes: 10 additions & 2 deletions packages/adapter-cloudflare/src/worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down Expand Up @@ -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;
Expand Down