Skip to content

fix: write server files to _worker.js/ directory #13610

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 2 commits into from
Mar 20, 2025
Merged

fix: write server files to _worker.js/ directory #13610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6a5444
write server to _worker.js directory
teemingc Mar 19, 2025
57abafb
add changeset
teemingc Mar 19, 2025
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/shy-knives-matter.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: write server files to the cloudflare build directory
20 changes: 9 additions & 11 deletions packages/adapter-cloudflare/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@ export default function (options = {}) {
async adapt(builder) {
if (existsSync('_routes.json')) {
throw new Error(
'Cloudflare routes should be configured in svelte.config.js rather than _routes.json'
"Cloudflare's _routes.json should be configured in svelte.config.js. See https://svelte.dev/docs/kit/adapter-cloudflare#Options-routes"
);
}

const files = fileURLToPath(new URL('./files', import.meta.url).href);
const dest = builder.getBuildDirectory('cloudflare');
const tmp = builder.getBuildDirectory('cloudflare-tmp');
const worker_dest = `${dest}/_worker.js`;

builder.rimraf(dest);
builder.rimraf(tmp);

builder.mkdirp(dest);
builder.mkdirp(tmp);
builder.mkdirp(worker_dest);

// generate plaintext 404.html first which can then be overridden by prerendering, if the user defined such a page
const fallback = path.join(dest, '404.html');
Expand All @@ -35,12 +34,11 @@ export default function (options = {}) {
const dest_dir = `${dest}${builder.config.kit.paths.base}`;
const written_files = builder.writeClient(dest_dir);
builder.writePrerendered(dest_dir);

const relativePath = path.posix.relative(dest, builder.getServerDirectory());
builder.writeServer(`${worker_dest}/server`);

writeFileSync(
`${tmp}/manifest.js`,
`export const manifest = ${builder.generateManifest({ relativePath })};\n\n` +
`${worker_dest}/manifest.js`,
`export const manifest = ${builder.generateManifest({ relativePath: './server' })};\n\n` +
`export const prerendered = new Set(${JSON.stringify(builder.prerendered.paths)});\n\n` +
`export const base_path = ${JSON.stringify(builder.config.kit.paths.base)};\n`
);
Expand All @@ -60,10 +58,10 @@ export default function (options = {}) {

writeFileSync(`${dest}/.assetsignore`, generate_assetsignore(), { flag: 'a' });

builder.copy(`${files}/worker.js`, `${dest}/_worker.js`, {
builder.copy(`${files}/worker.js`, `${worker_dest}/index.js`, {
replace: {
SERVER: `${relativePath}/index.js`,
MANIFEST: `${path.posix.relative(dest, tmp)}/manifest.js`
SERVER: './server/index.js',
MANIFEST: './manifest.js'
}
});
},
Expand Down
Loading