Skip to content

chore: use queue_microtask on #await again #12647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2024
Merged

chore: use queue_microtask on #await again #12647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
978c4d7
chore: use queue_microtask on `#await` again
dummdidumm Jul 29, 2024
843fbac
add explicit test for behavior
dummdidumm Jul 29, 2024
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
2 changes: 1 addition & 1 deletion packages/svelte/src/internal/client/dom/blocks/await.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) {
} else {
// Wait a microtask before checking if we should show the pending state as
// the promise might have resolved by the next microtask.
Promise.resolve().then(() => {
queue_micro_task(() => {
if (!resolved) update(PENDING, true);
});
}
Expand Down
6 changes: 3 additions & 3 deletions ...s/svelte/tests/css/samples/general-siblings-combinator-await-not-exhaustive/expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="a svelte-xyz"></div>
<div class="b svelte-xyz"></div>
<div class="g svelte-xyz"></div>
<div class="h svelte-xyz"></div>
<div class="d svelte-xyz"></div>
<div class="f svelte-xyz"></div>
<div class="h svelte-xyz"></div>
11 changes: 7 additions & 4 deletions ...es/svelte/tests/css/samples/general-siblings-combinator-await-not-exhaustive/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<script>
let promise = Promise.resolve();
</script>

<style>
.a ~ .b { color: green; }
.a ~ .c { color: green; }
Expand All @@ -16,20 +20,19 @@

<div class="a"></div>

<!-- non-promise, so that something renders initially -->
{#await true then value}
{#await promise then value}
<div class="b"></div>
{:catch error}
<div class="c"></div>
{/await}

{#await true}
{#await promise}
<div class="d"></div>
{:catch error}
<div class="e"></div>
{/await}

{#await true}
{#await promise}
<div class="f"></div>
{:then error}
<div class="g"></div>
Expand Down
12 changes: 6 additions & 6 deletions packages/svelte/tests/css/samples/general-siblings-combinator-await/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ export default test({
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".b ~ .c"',
start: { character: 217, column: 1, line: 13 },
end: { character: 224, column: 8, line: 13 }
start: { character: 269, column: 1, line: 15 },
end: { character: 276, column: 8, line: 15 }
},
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".c ~ .d"',
start: { character: 242, column: 1, line: 14 },
end: { character: 249, column: 8, line: 14 }
start: { character: 296, column: 1, line: 16 },
end: { character: 303, column: 8, line: 16 }
},
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".b ~ .d"',
start: { character: 267, column: 1, line: 15 },
end: { character: 274, column: 8, line: 15 }
start: { character: 323, column: 1, line: 17 },
end: { character: 330, column: 8, line: 17 }
}
]
});
6 changes: 3 additions & 3 deletions packages/svelte/tests/css/samples/general-siblings-combinator-await/expected.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
.a.svelte-xyz ~ .e:where(.svelte-xyz) { color: green; }

/* no match */
/* (unused) .b ~ .c { color: red; }*/
/* (unused) .c ~ .d { color: red; }*/
/* (unused) .b ~ .d { color: red; }*/
/* (unused) .b ~ .c { color: green; }*/
/* (unused) .c ~ .d { color: green; }*/
/* (unused) .b ~ .d { color: green; }*/
4 changes: 2 additions & 2 deletions packages/svelte/tests/css/samples/general-siblings-combinator-await/expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="a svelte-xyz"></div>
<div class="c svelte-xyz"></div>
<div class="e svelte-xyz"></div>
<div class="b svelte-xyz"></div>
<div class="e svelte-xyz"></div>
13 changes: 7 additions & 6 deletions packages/svelte/tests/css/samples/general-siblings-combinator-await/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

<script>
let promise = Promise.resolve();
</script>

<style>
.a ~ .b { color: green; }
Expand All @@ -10,15 +12,14 @@
.a ~ .e { color: green; }

/* no match */
.b ~ .c { color: red; }
.c ~ .d { color: red; }
.b ~ .d { color: red; }
.b ~ .c { color: green; }
.c ~ .d { color: green; }
.b ~ .d { color: green; }
</style>

<div class="a"></div>

<!-- non-promise, so that something renders initially -->
{#await true}
{#await promise}
<div class="b"></div>
{:then value}
<div class="c"></div>
Expand Down
6 changes: 3 additions & 3 deletions packages/svelte/tests/css/samples/siblings-combinator-await-not-exhaustive/expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="a svelte-xyz"></div>
<div class="b svelte-xyz"></div>
<div class="g svelte-xyz"></div>
<div class="h svelte-xyz"></div>
<div class="d svelte-xyz"></div>
<div class="f svelte-xyz"></div>
<div class="h svelte-xyz"></div>
13 changes: 8 additions & 5 deletions packages/svelte/tests/css/samples/siblings-combinator-await-not-exhaustive/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<script>
let promise = Promise.resolve();
</script>

<style>
.a + .b { color: green; }
.a + .c { color: green; }
Expand All @@ -16,22 +20,21 @@

<div class="a"></div>

<!-- non-promise, so that something renders initially -->
{#await true then value}
{#await promise then value}
<div class="b"></div>
{:catch error}
<div class="c"></div>
{/await}

{#await true}
{#await promise}
<div class="d"></div>
{:catch error}
<div class="e"></div>
{/await}

{#await true}
{#await promise}
<div class="f"></div>
{:then value}
{:then error}
<div class="g"></div>
{/await}

Expand Down
16 changes: 8 additions & 8 deletions packages/svelte/tests/css/samples/siblings-combinator-await/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@ export default test({
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".a + .e"',
start: { character: 188, column: 1, line: 10 },
end: { character: 195, column: 8, line: 10 }
start: { character: 242, column: 1, line: 14 },
end: { character: 249, column: 8, line: 14 }
},
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".b + .c"',
start: { character: 213, column: 1, line: 11 },
end: { character: 220, column: 8, line: 11 }
start: { character: 269, column: 1, line: 15 },
end: { character: 276, column: 8, line: 15 }
},
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".c + .d"',
start: { character: 238, column: 1, line: 12 },
end: { character: 245, column: 8, line: 12 }
start: { character: 296, column: 1, line: 16 },
end: { character: 303, column: 8, line: 16 }
},
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".b + .d"',
start: { character: 263, column: 1, line: 13 },
end: { character: 270, column: 8, line: 13 }
start: { character: 323, column: 1, line: 17 },
end: { character: 330, column: 8, line: 17 }
}
]
});
8 changes: 4 additions & 4 deletions packages/svelte/tests/css/samples/siblings-combinator-await/expected.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.d.svelte-xyz + .e:where(.svelte-xyz) { color: green; }

/* no match */
/* (unused) .a + .e { color: red; }*/
/* (unused) .b + .c { color: red; }*/
/* (unused) .c + .d { color: red; }*/
/* (unused) .b + .d { color: red; }*/
/* (unused) .a + .e { color: green; }*/
/* (unused) .b + .c { color: green; }*/
/* (unused) .c + .d { color: green; }*/
/* (unused) .b + .d { color: green; }*/
4 changes: 2 additions & 2 deletions packages/svelte/tests/css/samples/siblings-combinator-await/expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="a svelte-xyz"></div>
<div class="c svelte-xyz"></div>
<div class="e svelte-xyz"></div>
<div class="b svelte-xyz"></div>
<div class="e svelte-xyz"></div>
15 changes: 9 additions & 6 deletions packages/svelte/tests/css/samples/siblings-combinator-await/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<script>
let promise = Promise.resolve();
</script>

<style>
.a + .b { color: green; }
.a + .c { color: green; }
Expand All @@ -7,16 +11,15 @@
.d + .e { color: green; }

/* no match */
.a + .e { color: red; }
.b + .c { color: red; }
.c + .d { color: red; }
.b + .d { color: red; }
.a + .e { color: green; }
.b + .c { color: green; }
.c + .d { color: green; }
.b + .d { color: green; }
</style>

<div class="a"></div>

<!-- non-promise, so that something renders initially -->
{#await true}
{#await promise}
<div class="b"></div>
{:then value}
<div class="c"></div>
Expand Down
3 changes: 2 additions & 1 deletion packages/svelte/tests/css/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as fs from 'node:fs';
import { assert } from 'vitest';
import { compile_directory, try_read_file } from '../helpers.js';
import { assert_html_equal } from '../html_equal.js';
import { mount, unmount } from 'svelte';
import { flushSync, mount, unmount } from 'svelte';
import { suite, type BaseTest } from '../suite.js';
import type { CompileOptions, Warning } from '#compiler';

Expand Down Expand Up @@ -60,6 +60,7 @@ const { test, run } = suite<CssTest>(async (config, cwd) => {
const target = window.document.createElement('main');

const component = mount(ClientComponent, { props: config.props ?? {}, target });
flushSync();

const html = target.innerHTML;

Expand Down
4 changes: 4 additions & 0 deletions packages/svelte/tests/runtime-legacy/samples/await-block-func-function/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ export default test({
};
},

html: `
Waiting...
`,

async test({ assert, component, target }) {
await (component.thePromise = Promise.resolve({ func: 12345 }));

Expand Down
6 changes: 5 additions & 1 deletion packages/svelte/tests/runtime-legacy/samples/await-catch-no-expression/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ export default test({
return { thePromise: deferred.promise };
},

html: `
<br />
<p>the promise is pending</p>
`,

async test({ assert, component, target }) {
deferred.resolve(42);

Expand All @@ -22,7 +27,6 @@ export default test({

deferred = create_deferred();
component.thePromise = deferred.promise;
await Promise.resolve();

assert.htmlEqual(target.innerHTML, '<br /><p>the promise is pending</p>');

Expand Down
4 changes: 4 additions & 0 deletions packages/svelte/tests/runtime-legacy/samples/await-conservative-update/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import { test } from '../../test';
import { sleep } from './sleep.js';

export default test({
html: `
<p>loading...</p>
`,

test({ assert, target }) {
return sleep(50).then(() => {
assert.htmlEqual(
Expand Down
4 changes: 4 additions & 0 deletions packages/svelte/tests/runtime-legacy/samples/await-containing-if/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ export default test({
return { thePromise: deferred.promise, show: true };
},

html: `
<div><p>loading...</p></div>
`,

test({ assert, component, target }) {
deferred.resolve(42);

Expand Down
4 changes: 4 additions & 0 deletions packages/svelte/tests/runtime-legacy/samples/await-in-each/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ export default test({
return { items };
},

html: `
<p>a title: loading...</p>
`,

test({ assert, target }) {
fulfil(42);

Expand Down
1 change: 1 addition & 0 deletions packages/svelte/tests/runtime-legacy/samples/await-mount-and-unmount-immediately/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { test } from '../../test';

export default test({
html: 'Loading...',
async test({ assert, component, target }) {
await component.test();

Expand Down
3 changes: 2 additions & 1 deletion packages/svelte/tests/runtime-legacy/samples/await-set-simultaneous-reactive/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { test } from '../../test';

export default test({
html: '<p>wait for it...</p>',
test({ assert, component, target }) {
return component.promise.then(() => {
return component.promise.then(async () => {
assert.htmlEqual(
target.innerHTML,
`
Expand Down
1 change: 0 additions & 1 deletion packages/svelte/tests/runtime-legacy/samples/await-set-simultaneous/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export default test({
});

component.promise = promise;
await Promise.resolve();

assert.htmlEqual(target.innerHTML, '<p>wait for it...</p>');

Expand Down
2 changes: 2 additions & 0 deletions packages/svelte/tests/runtime-legacy/samples/await-then-blowback-reactive/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { ok, test } from '../../test';

export default test({
async test({ assert, component, target }) {
assert.htmlEqual(target.innerHTML, 'Loading...');

await component.promise;
await Promise.resolve();
const span = target.querySelector('span');
Expand Down
7 changes: 5 additions & 2 deletions packages/svelte/tests/runtime-legacy/samples/await-then-catch-anchor/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ export default test({
return { thePromise: deferred.promise };
},

html: `
<div><p>loading...</p></div>
`,

test({ assert, component, target }) {
deferred.resolve(42);

return deferred.promise
.then(async () => {
.then(() => {
assert.htmlEqual(
target.innerHTML,
`
Expand All @@ -28,7 +32,6 @@ export default test({
deferred = create_deferred();

component.thePromise = deferred.promise;
await Promise.resolve();

assert.htmlEqual(target.innerHTML, '<div><p>loading...</p></div>');

Expand Down
Loading
Loading