Skip to content

Commit c158d2c

Browse files
authored
fix and changeset (#13622)
1 parent 6df1496 commit c158d2c

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.changeset/silent-tables-raise.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/adapter-cloudflare': patch
3+
---
4+
5+
fix: revert writing server files to the cloudflare build directory

packages/adapter-cloudflare/index.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ export default function (options = {}) {
2828

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

3333
builder.rimraf(dest);
3434

3535
builder.mkdirp(dest);
36-
builder.mkdirp(worker_dest);
36+
builder.mkdirp(tmp);
3737

3838
// generate plaintext 404.html first which can then be overridden by prerendering, if the user defined such a page
3939
const fallback = path.join(dest, '404.html');
@@ -46,14 +46,20 @@ export default function (options = {}) {
4646
const dest_dir = `${dest}${builder.config.kit.paths.base}`;
4747
const written_files = builder.writeClient(dest_dir);
4848
builder.writePrerendered(dest_dir);
49-
builder.writeServer(`${worker_dest}/server`);
5049

50+
const relativePath = path.posix.relative(dest, builder.getServerDirectory());
5151
writeFileSync(
52-
`${worker_dest}/manifest.js`,
53-
`export const manifest = ${builder.generateManifest({ relativePath: './server' })};\n\n` +
52+
`${tmp}/manifest.js`,
53+
`export const manifest = ${builder.generateManifest({ relativePath })};\n\n` +
5454
`export const prerendered = new Set(${JSON.stringify(builder.prerendered.paths)});\n\n` +
5555
`export const base_path = ${JSON.stringify(builder.config.kit.paths.base)};\n`
5656
);
57+
builder.copy(`${files}/worker.js`, `${dest}/_worker.js`, {
58+
replace: {
59+
SERVER: `${relativePath}/index.js`,
60+
MANIFEST: `${path.posix.relative(dest, tmp)}/manifest.js`
61+
}
62+
});
5763

5864
writeFileSync(
5965
`${dest}/_routes.json`,
@@ -77,13 +83,6 @@ export default function (options = {}) {
7783
}
7884

7985
writeFileSync(`${dest}/.assetsignore`, generate_assetsignore(), { flag: 'a' });
80-
81-
builder.copy(`${files}/worker.js`, `${worker_dest}/index.js`, {
82-
replace: {
83-
SERVER: './server/index.js',
84-
MANIFEST: './manifest.js'
85-
}
86-
});
8786
},
8887
emulate() {
8988
// we want to invoke `getPlatformProxy` only once, but await it only when it is accessed.

0 commit comments

Comments
 (0)