Skip to content

Commit 3229f8d

Browse files
fix: correctly return asset list when building (#9095)
* pass array of assets into the buider.writeClient Set * add asset path prefix to server assets * copy test from #9102 * tweak changeset * one of the things needs to be posixified and i do not know which * try this --------- Co-authored-by: Rich Harris <[email protected]>
1 parent e8641bf commit 3229f8d

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

.changeset/late-rings-warn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/kit': patch
3+
---
4+
5+
fix: return correct asset list from `builder.writeClient()`

packages/kit/src/core/adapt/builder.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ export function create_builder({
185185
const server_assets = copy(
186186
`${config.kit.outDir}/output/server/${config.kit.appDir}/immutable/assets`,
187187
join(dest, config.kit.appDir, 'immutable/assets')
188-
);
188+
).map((filename) => join(config.kit.appDir, 'immutable/assets', filename));
189189
const client_assets = copy(`${config.kit.outDir}/output/client`, dest);
190-
return Array.from(new Set(...server_assets, ...client_assets));
190+
return Array.from(new Set([...server_assets, ...client_assets]));
191191
},
192192

193193
// @ts-expect-error

packages/kit/src/core/adapt/builder.spec.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { test } from 'uvu';
55
import * as assert from 'uvu/assert';
66
import glob from 'tiny-glob/sync.js';
77
import { create_builder } from './builder.js';
8+
import { posixify } from '../../utils/filesystem.js';
89

910
const __filename = fileURLToPath(import.meta.url);
1011
const __dirname = join(__filename, '..');
@@ -45,15 +46,23 @@ test('copy files', () => {
4546
const dest = join(__dirname, 'output');
4647

4748
rmSync(dest, { recursive: true, force: true });
48-
builder.writeClient(dest);
49+
50+
assert.equal(
51+
builder.writeClient(dest),
52+
glob('**', { cwd: dest, dot: true, filesOnly: true }).map(posixify)
53+
);
4954

5055
assert.equal(
5156
glob('**', { cwd: `${outDir}/output/client`, dot: true }),
5257
glob('**', { cwd: dest, dot: true })
5358
);
5459

5560
rmSync(dest, { recursive: true, force: true });
56-
builder.writeServer(dest);
61+
62+
assert.equal(
63+
builder.writeServer(dest),
64+
glob('**', { cwd: dest, dot: true, filesOnly: true }).map(posixify)
65+
);
5766

5867
assert.equal(
5968
glob('**', { cwd: `${outDir}/output/server`, dot: true }),

0 commit comments

Comments
 (0)