Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/shaggy-mails-eat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@sveltejs/kit": patch
---

fix: use the UTF-8 byte length when reading inline assets
6 changes: 3 additions & 3 deletions packages/kit/src/runtime/app/server/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { read_implementation, manifest } from '../../server/internal.js';
import { assets } from '#app/paths';
import { base64_decode } from '../../utils.js';
import { base64_decode, text_encoder } from '../../utils.js';
import * as e from '../../../messages/server-errors.js';

/**
Expand Down Expand Up @@ -42,11 +42,11 @@ export function read(asset) {
});
}

const decoded = decodeURIComponent(data);
const decoded = text_encoder.encode(decodeURIComponent(data));

return new Response(decoded, {
headers: {
'Content-Length': decoded.length.toString(),
'Content-Length': decoded.byteLength.toString(),
'Content-Type': type
}
});
Expand Down
33 changes: 33 additions & 0 deletions packages/kit/src/runtime/app/server/index.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { afterAll, expect, test, vi } from 'vitest';

vi.stubGlobal('__SVELTEKIT_DEV__', false);
vi.stubGlobal('__SVELTEKIT_APP_VERSION__', 'test');
vi.stubGlobal('__SVELTEKIT_TRACK__', vi.fn());
afterAll(() => vi.unstubAllGlobals());

const { read } = await import('./index.js');
const { set_read_implementation } = await import('../../server/internal.js');
set_read_implementation(() => new ReadableStream());

test.each(['', 'hello', 'café', '中文', '\u{1f680}'])(
'read uses the byte length of an inline asset: %j',
async (title) => {
const text = `<svg xmlns="http://www.w3.org/2000/svg"><title>${title}</title></svg>`;
const response = read(`data:image/svg+xml,${encodeURIComponent(text)}`);
const body = await response.arrayBuffer();

expect(new TextDecoder().decode(body)).toBe(text);
expect(response.headers.get('content-type')).toBe('image/svg+xml');
expect(response.headers.get('content-length')).toBe(body.byteLength.toString());
}
);

test.each(['data:text/plain,café', 'data:text/plain;base64,Y2Fmw6k='])(
'read preserves unescaped and base64 inline assets: %s',
async (asset) => {
const response = read(asset);
expect(await response.text()).toBe('café');
expect(response.headers.get('content-type')).toBe('text/plain');
expect(response.headers.get('content-length')).toBe('5');
}
);
Loading