@@ -10,19 +10,18 @@ export default function (options = {}) {
10
10
async adapt ( builder ) {
11
11
if ( existsSync ( '_routes.json' ) ) {
12
12
throw new Error (
13
- ' Cloudflare routes should be configured in svelte.config.js rather than _routes.json'
13
+ " Cloudflare's _routes.json should be configured in svelte.config.js. See https://svelte.dev/docs/kit/adapter-cloudflare#Options-routes"
14
14
) ;
15
15
}
16
16
17
17
const files = fileURLToPath ( new URL ( './files' , import . meta. url ) . href ) ;
18
18
const dest = builder . getBuildDirectory ( 'cloudflare' ) ;
19
- const tmp = builder . getBuildDirectory ( 'cloudflare-tmp' ) ;
19
+ const worker_dest = ` ${ dest } /_worker.js` ;
20
20
21
21
builder . rimraf ( dest ) ;
22
- builder . rimraf ( tmp ) ;
23
22
24
23
builder . mkdirp ( dest ) ;
25
- builder . mkdirp ( tmp ) ;
24
+ builder . mkdirp ( worker_dest ) ;
26
25
27
26
// generate plaintext 404.html first which can then be overridden by prerendering, if the user defined such a page
28
27
const fallback = path . join ( dest , '404.html' ) ;
@@ -35,12 +34,11 @@ export default function (options = {}) {
35
34
const dest_dir = `${ dest } ${ builder . config . kit . paths . base } ` ;
36
35
const written_files = builder . writeClient ( dest_dir ) ;
37
36
builder . writePrerendered ( dest_dir ) ;
38
-
39
- const relativePath = path . posix . relative ( dest , builder . getServerDirectory ( ) ) ;
37
+ builder . writeServer ( `${ worker_dest } /server` ) ;
40
38
41
39
writeFileSync (
42
- `${ tmp } /manifest.js` ,
43
- `export const manifest = ${ builder . generateManifest ( { relativePath } ) } ;\n\n` +
40
+ `${ worker_dest } /manifest.js` ,
41
+ `export const manifest = ${ builder . generateManifest ( { relativePath : './server' } ) } ;\n\n` +
44
42
`export const prerendered = new Set(${ JSON . stringify ( builder . prerendered . paths ) } );\n\n` +
45
43
`export const base_path = ${ JSON . stringify ( builder . config . kit . paths . base ) } ;\n`
46
44
) ;
@@ -60,10 +58,10 @@ export default function (options = {}) {
60
58
61
59
writeFileSync ( `${ dest } /.assetsignore` , generate_assetsignore ( ) , { flag : 'a' } ) ;
62
60
63
- builder . copy ( `${ files } /worker.js` , `${ dest } /_worker .js` , {
61
+ builder . copy ( `${ files } /worker.js` , `${ worker_dest } /index .js` , {
64
62
replace : {
65
- SERVER : ` ${ relativePath } / index.js` ,
66
- MANIFEST : ` ${ path . posix . relative ( dest , tmp ) } /manifest.js`
63
+ SERVER : './server/ index.js' ,
64
+ MANIFEST : '. /manifest.js'
67
65
}
68
66
} ) ;
69
67
} ,
0 commit comments