Skip to content

Commit 7d988c8

Browse files
committed
chore: add uid_prefix to config for test suites
1 parent f2ab74a commit 7d988c8

File tree

7 files changed

+28
-8
lines changed

7 files changed

+28
-8
lines changed

packages/svelte/src/server/index.d.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,18 @@ export function render<
1212
...args: {} extends Props
1313
? [
1414
component: Comp extends SvelteComponent<any> ? ComponentType<Comp> : Comp,
15-
options?: { props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any> }
15+
options?: {
16+
props?: Omit<Props, '$$slots' | '$$events'>;
17+
context?: Map<any, any>;
18+
uidPrefix?: string;
19+
}
1620
]
1721
: [
1822
component: Comp extends SvelteComponent<any> ? ComponentType<Comp> : Comp,
19-
options: { props: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any> }
23+
options: {
24+
props: Omit<Props, '$$slots' | '$$events'>;
25+
context?: Map<any, any>;
26+
uidPrefix?: string;
27+
}
2028
]
2129
): RenderOutput;

packages/svelte/tests/hydration/test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { flushSync } from 'svelte';
1313
interface HydrationTest extends BaseTest {
1414
load_compiled?: boolean;
1515
server_props?: Record<string, any>;
16+
uid_prefix?: string;
1617
props?: Record<string, any>;
1718
compileOptions?: Partial<CompileOptions>;
1819
/**
@@ -50,7 +51,8 @@ const { test, run } = suite<HydrationTest>(async (config, cwd) => {
5051
const head = window.document.head;
5152

5253
const rendered = render((await import(`${cwd}/_output/server/main.svelte.js`)).default, {
53-
props: config.server_props ?? config.props ?? {}
54+
props: config.server_props ?? config.props ?? {},
55+
uidPrefix: config?.uid_prefix
5456
});
5557

5658
const override = read(`${cwd}/_override.html`);

packages/svelte/tests/runtime-browser/assert.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ function normalize_children(node) {
119119
* skip_mode?: Array<'server' | 'client' | 'hydrate'>;
120120
* html?: string;
121121
* ssrHtml?: string;
122+
* uid_prefix?: string;
122123
* props?: Props;
123124
* compileOptions?: Partial<CompileOptions>;
124125
* test?: (args: {

packages/svelte/tests/runtime-browser/driver-ssr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import config from '__CONFIG__';
66
import { render } from 'svelte/server';
77

88
export default function () {
9-
return render(SvelteComponent, { props: config.props || {} });
9+
return render(SvelteComponent, { props: config.props || {}, prefixUid: config.prefixUid });
1010
}

packages/svelte/tests/runtime-browser/test-ssr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export async function run_ssr_test(
2020
await compile_directory(test_dir, 'server', config.compileOptions);
2121

2222
const Component = (await import(`${test_dir}/_output/server/main.svelte.js`)).default;
23-
const { body } = render(Component, { props: config.props || {} });
23+
const { body } = render(Component, { props: config.props || {}, uidPrefix: config.uid_prefix });
2424

2525
fs.writeFileSync(`${test_dir}/_output/rendered.html`, body);
2626

packages/svelte/tests/server-side-rendering/test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type { CompileOptions } from '#compiler';
1515
interface SSRTest extends BaseTest {
1616
compileOptions?: Partial<CompileOptions>;
1717
props?: Record<string, any>;
18+
uid_prefix?: string;
1819
withoutNormalizeHtml?: boolean;
1920
errors?: string[];
2021
}
@@ -33,7 +34,7 @@ const { test, run } = suite<SSRTest>(async (config, test_dir) => {
3334

3435
const Component = (await import(`${test_dir}/_output/server/main.svelte.js`)).default;
3536
const expected_html = try_read_file(`${test_dir}/_expected.html`);
36-
const rendered = render(Component, { props: config.props || {} });
37+
const rendered = render(Component, { props: config.props || {}, uidPrefix: config.uid_prefix });
3738
const { body, head } = rendered;
3839

3940
fs.writeFileSync(`${test_dir}/_output/rendered.html`, body);

packages/svelte/types/index.d.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,11 +2080,19 @@ declare module 'svelte/server' {
20802080
...args: {} extends Props
20812081
? [
20822082
component: Comp extends SvelteComponent<any> ? ComponentType<Comp> : Comp,
2083-
options?: { props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any> }
2083+
options?: {
2084+
props?: Omit<Props, '$$slots' | '$$events'>;
2085+
context?: Map<any, any>;
2086+
uidPrefix?: string;
2087+
}
20842088
]
20852089
: [
20862090
component: Comp extends SvelteComponent<any> ? ComponentType<Comp> : Comp,
2087-
options: { props: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any> }
2091+
options: {
2092+
props: Omit<Props, '$$slots' | '$$events'>;
2093+
context?: Map<any, any>;
2094+
uidPrefix?: string;
2095+
}
20882096
]
20892097
): RenderOutput;
20902098
interface RenderOutput {

0 commit comments

Comments
 (0)