diff --git a/packages/svelte/tests/runtime-runes/samples/derived-stale-value/_config.js b/packages/svelte/tests/runtime-runes/samples/derived-stale-value/_config.js index 4ae1c413b9..275b6711d7 100644 --- a/packages/svelte/tests/runtime-runes/samples/derived-stale-value/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/derived-stale-value/_config.js @@ -1,12 +1,13 @@ import { test } from '../../test'; import { flushSync } from 'svelte'; +import { log } from './log.js'; export default test({ - get props() { - return { log: [] }; + before_test() { + log.length = 0; }, - async test({ assert, target, component }) { + async test({ assert, target }) { const [b1] = target.querySelectorAll('button'); flushSync(() => { b1.click(); @@ -20,6 +21,6 @@ export default test({ flushSync(() => { b1.click(); }); - assert.deepEqual(component.log, [0, 2, 4]); + assert.deepEqual(log, [0, 2, 4]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/derived-stale-value/log.js b/packages/svelte/tests/runtime-runes/samples/derived-stale-value/log.js new file mode 100644 index 0000000000..d3df521f4d --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/derived-stale-value/log.js @@ -0,0 +1,2 @@ +/** @type {any[]} */ +export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/derived-stale-value/main.svelte b/packages/svelte/tests/runtime-runes/samples/derived-stale-value/main.svelte index 413028647e..91baf81e4a 100644 --- a/packages/svelte/tests/runtime-runes/samples/derived-stale-value/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/derived-stale-value/main.svelte @@ -1,5 +1,5 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js index 098a6c8c58..2667fff13c 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js @@ -1,24 +1,17 @@ import { test } from '../../test'; - -/** - * @type {any[]} - */ -let order = []; -let n = 0; +import { log } from './log.js'; export default test({ get props() { - return { - order, - n - }; + return { n: 0 }; }, + before_test() { - order.length = 0; - n = 0; + log.length = 0; }, - async test({ assert, compileOptions, component }) { - assert.deepEqual(order, [ + + async test({ assert, component }) { + assert.deepEqual(log, [ 'parent: $effect.pre 0', 'parent: $effect.pre (2) 0', 'parent: render 0', @@ -37,11 +30,11 @@ export default test({ 'parent: $effect 0' ]); - order.length = 0; + log.length = 0; component.n += 1; - assert.deepEqual(order, [ + assert.deepEqual(log, [ 'parent: $effect.pre 1', 'parent: $effect.pre (2) 1', 'parent: render 1', diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/log.js new file mode 100644 index 0000000000..d3df521f4d --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/log.js @@ -0,0 +1,2 @@ +/** @type {any[]} */ +export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/main.svelte index bab1b4cd27..cc21df4f1b 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/main.svelte @@ -1,30 +1,31 @@ {logRender()} diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/Item.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/Item.svelte index eb9bf54f12..8719c578f9 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/Item.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/Item.svelte @@ -1,17 +1,19 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js index 6547999c0c..e528189597 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js @@ -1,24 +1,17 @@ import { test } from '../../test'; - -/** - * @type {any[]} - */ -let order = []; -let n = 0; +import { log } from './log.js'; export default test({ get props() { - return { - order, - n - }; + return { n: 0 }; }, + before_test() { - order.length = 0; - n = 0; + log.length = 0; }, - async test({ assert, compileOptions, component }) { - assert.deepEqual(order, [ + + async test({ assert, component }) { + assert.deepEqual(log, [ 'parent: render 0', '1: $effect.pre 0', '1: render 0', @@ -32,11 +25,11 @@ export default test({ 'parent: $effect 0' ]); - order.length = 0; + log.length = 0; component.n += 1; - assert.deepEqual(order, [ + assert.deepEqual(log, [ 'parent: render 1', '1: $effect.pre 1', '1: render 1', diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/log.js new file mode 100644 index 0000000000..d3df521f4d --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/log.js @@ -0,0 +1,2 @@ +/** @type {any[]} */ +export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/main.svelte index 6a84700f0d..57d85095d5 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/main.svelte @@ -1,22 +1,23 @@ {logRender()} diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/Item.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/Item.svelte index 4e048313a2..2e9dc09c7a 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/Item.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/Item.svelte @@ -1,21 +1,23 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js index e61b574d27..62a4b85546 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js @@ -1,24 +1,17 @@ import { test } from '../../test'; - -/** - * @type {any[]} - */ -let order = []; -let n = 0; +import { log } from './log.js'; export default test({ get props() { - return { - order, - n - }; + return { n: 0 }; }, + before_test() { - order.length = 0; - n = 0; + log.length = 0; }, - async test({ assert, compileOptions, component }) { - assert.deepEqual(order, [ + + async test({ assert, component }) { + assert.deepEqual(log, [ 'parent: $effect.pre 0', 'parent: nested $effect.pre 0', 'parent: render 0', @@ -37,11 +30,11 @@ export default test({ 'parent: $effect 0' ]); - order.length = 0; + log.length = 0; component.n += 1; - assert.deepEqual(order, [ + assert.deepEqual(log, [ 'parent: $effect.pre 1', 'parent: nested $effect.pre 1', 'parent: render 1', diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/log.js new file mode 100644 index 0000000000..d3df521f4d --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/log.js @@ -0,0 +1,2 @@ +/** @type {any[]} */ +export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/main.svelte index 644bef3278..d9b83f837c 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/main.svelte @@ -1,30 +1,31 @@ {logRender()} diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/Item.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/Item.svelte index eb9bf54f12..8719c578f9 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/Item.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/Item.svelte @@ -1,17 +1,19 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js index f9b5122151..0c7118df75 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js @@ -1,24 +1,17 @@ import { test } from '../../test'; - -/** - * @type {any[]} - */ -let order = []; -let n = 0; +import { log } from './log.js'; export default test({ get props() { - return { - order, - n - }; + return { n: 0 }; }, + before_test() { - order.length = 0; - n = 0; + log.length = 0; }, - async test({ assert, compileOptions, component }) { - assert.deepEqual(order, [ + + async test({ assert, component }) { + assert.deepEqual(log, [ 'parent: $effect.pre 0', 'parent: render 0', '1: $effect.pre 0', @@ -33,11 +26,11 @@ export default test({ 'parent: $effect 0' ]); - order.length = 0; + log.length = 0; component.n += 1; - assert.deepEqual(order, [ + assert.deepEqual(log, [ 'parent: $effect.pre 1', 'parent: render 1', '1: $effect.pre 1', diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/log.js new file mode 100644 index 0000000000..d3df521f4d --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/log.js @@ -0,0 +1,2 @@ +/** @type {any[]} */ +export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/main.svelte index fd2cce5beb..9cfa2b834c 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/main.svelte @@ -1,26 +1,27 @@ {logRender()} diff --git a/packages/svelte/tests/runtime-runes/samples/nullish-operator/_config.js b/packages/svelte/tests/runtime-runes/samples/nullish-operator/_config.js index 4c425bc5f7..11e729c3c7 100644 --- a/packages/svelte/tests/runtime-runes/samples/nullish-operator/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/nullish-operator/_config.js @@ -1,13 +1,14 @@ import { test } from '../../test'; +import { log } from './log.js'; export default test({ - get props() { - return { log: [] }; + before_test() { + log.length = 0; }, - async test({ assert, target, component }) { + async test({ assert }) { await Promise.resolve(); await Promise.resolve(); - assert.deepEqual(component.log, ['a1: ', true, 'b1: ', true]); + assert.deepEqual(log, ['a1: ', true, 'b1: ', true]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/nullish-operator/log.js b/packages/svelte/tests/runtime-runes/samples/nullish-operator/log.js new file mode 100644 index 0000000000..d3df521f4d --- /dev/null +++ b/packages/svelte/tests/runtime-runes/samples/nullish-operator/log.js @@ -0,0 +1,2 @@ +/** @type {any[]} */ +export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/nullish-operator/main.svelte b/packages/svelte/tests/runtime-runes/samples/nullish-operator/main.svelte index 892973063a..a98c4b4f39 100644 --- a/packages/svelte/tests/runtime-runes/samples/nullish-operator/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/nullish-operator/main.svelte @@ -1,12 +1,13 @@