From 8a90af5c487bb37d36b78a7fcd32ac85ebb7b0a5 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 19 Apr 2025 16:35:20 -0400 Subject: [PATCH 1/6] squelch some console spam --- packages/svelte/tests/signals/test.ts | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/svelte/tests/signals/test.ts b/packages/svelte/tests/signals/test.ts index 3a427e939274..8421ae4a7cbf 100644 --- a/packages/svelte/tests/signals/test.ts +++ b/packages/svelte/tests/signals/test.ts @@ -15,6 +15,7 @@ import { derived } from '../../src/internal/client/reactivity/deriveds'; import { snapshot } from '../../src/internal/shared/clone.js'; import { SvelteSet } from '../../src/reactivity/set'; import { DESTROYED } from '../../src/internal/client/constants'; +import { noop } from 'svelte/internal/client'; /** * @param runes runes mode @@ -469,6 +470,9 @@ describe('signals', () => { test('schedules rerun when writing to signal before reading it', (runes) => { if (!runes) return () => {}; + const error = console.error; + console.error = noop; + const value = state({ count: 0 }); user_effect(() => { set(value, { count: 0 }); @@ -482,14 +486,19 @@ describe('signals', () => { } catch (e: any) { assert.include(e.message, 'effect_update_depth_exceeded'); errored = true; + } finally { + assert.equal(errored, true); + console.error = error; } - assert.equal(errored, true); }; }); test('schedules rerun when updating deeply nested value', (runes) => { if (!runes) return () => {}; + const error = console.error; + console.error = noop; + const value = proxy({ a: { b: { c: 0 } } }); user_effect(() => { value.a.b.c += 1; @@ -502,14 +511,19 @@ describe('signals', () => { } catch (e: any) { assert.include(e.message, 'effect_update_depth_exceeded'); errored = true; + } finally { + assert.equal(errored, true); + console.error = error; } - assert.equal(errored, true); }; }); test('schedules rerun when writing to signal before reading it', (runes) => { if (!runes) return () => {}; + const error = console.error; + console.error = noop; + const value = proxy({ arr: [] }); user_effect(() => { value.arr = []; @@ -523,8 +537,10 @@ describe('signals', () => { } catch (e: any) { assert.include(e.message, 'effect_update_depth_exceeded'); errored = true; + } finally { + assert.equal(errored, true); + console.error = error; } - assert.equal(errored, true); }; }); From 54ac9cded9c3b25b9d5b80b03f9693899fb887d4 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 19 Apr 2025 16:36:26 -0400 Subject: [PATCH 2/6] another --- .../runtime-legacy/samples/ondestroy-prop-access/_config.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/svelte/tests/runtime-legacy/samples/ondestroy-prop-access/_config.js b/packages/svelte/tests/runtime-legacy/samples/ondestroy-prop-access/_config.js index 2ffb7e653f15..4f75e82aaea7 100644 --- a/packages/svelte/tests/runtime-legacy/samples/ondestroy-prop-access/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/ondestroy-prop-access/_config.js @@ -36,8 +36,6 @@ export default test({ btn1.click(); }); - console.warn(logs); - // the five components guarded by `count < 2` unmount and log assert.deepEqual(logs, [1, true, 1, true, 1, true, 1, true, 1, true]); From 2c410bb8a53fd2e9df6077ec8d87bf712823334f Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 19 Apr 2025 16:47:26 -0400 Subject: [PATCH 3/6] more --- .../_config.js | 10 ++-------- .../event-handler-invalid-values/_config.js | 18 ++++-------------- .../event-handler-invalid-warning/_config.js | 10 ++-------- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/packages/svelte/tests/runtime-runes/samples/event-handler-component-invalid-warning/_config.js b/packages/svelte/tests/runtime-runes/samples/event-handler-component-invalid-warning/_config.js index 01ac3c9ad0d9..e77101066994 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-handler-component-invalid-warning/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-handler-component-invalid-warning/_config.js @@ -7,12 +7,8 @@ export default test({ dev: true }, - test({ assert, target, warnings }) { - /** @type {any} */ - let error; - + test({ assert, target, warnings, errors }) { const handler = (/** @type {any}} */ e) => { - error = e.error; e.stopImmediatePropagation(); }; @@ -20,9 +16,7 @@ export default test({ target.querySelector('button')?.click(); - assert.throws(() => { - throw error; - }, /state_unsafe_mutation/); + assert.include(errors[0], 'state_unsafe_mutation'); window.removeEventListener('error', handler, true); diff --git a/packages/svelte/tests/runtime-runes/samples/event-handler-invalid-values/_config.js b/packages/svelte/tests/runtime-runes/samples/event-handler-invalid-values/_config.js index d53812d4c39e..7ca12af774b0 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-handler-invalid-values/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-handler-invalid-values/_config.js @@ -1,4 +1,3 @@ -import { assertType } from 'vitest'; import { test } from '../../test'; export default test({ @@ -8,12 +7,8 @@ export default test({ dev: true }, - test({ assert, target, warnings, logs }) { - /** @type {any} */ - let error = null; - + test({ assert, target, warnings, logs, errors }) { const handler = (/** @type {any} */ e) => { - error = e.error; e.stopImmediatePropagation(); }; @@ -23,16 +18,12 @@ export default test({ b1.click(); assert.deepEqual(logs, []); - assert.equal(error, null); - - error = null; - logs.length = 0; + assert.deepEqual(errors, []); b2.click(); assert.deepEqual(logs, ['clicked']); - assert.equal(error, null); + assert.deepEqual(errors, []); - error = null; logs.length = 0; b3.click(); @@ -40,8 +31,7 @@ export default test({ assert.deepEqual(warnings, [ '`click` handler at main.svelte:10:17 should be a function. Did you mean to add a leading `() =>`?' ]); - assert.isNotNull(error); - assert.match(error.message, /is not a function/); + assert.include(errors[0], 'is not a function'); window.removeEventListener('error', handler, true); } diff --git a/packages/svelte/tests/runtime-runes/samples/event-handler-invalid-warning/_config.js b/packages/svelte/tests/runtime-runes/samples/event-handler-invalid-warning/_config.js index 423351a4c7cf..a0c792360e3b 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-handler-invalid-warning/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-handler-invalid-warning/_config.js @@ -7,12 +7,8 @@ export default test({ dev: true }, - test({ assert, target, warnings }) { - /** @type {any} */ - let error; - + test({ assert, target, warnings, errors }) { const handler = (/** @type {any} */ e) => { - error = e.error; e.stopImmediatePropagation(); }; @@ -20,9 +16,7 @@ export default test({ target.querySelector('button')?.click(); - assert.throws(() => { - throw error; - }, /state_unsafe_mutation/); + assert.include(errors[0], 'state_unsafe_mutation'); window.removeEventListener('error', handler, true); From cfb47115ca31bc0c9bca3e97d272ff396ba87152 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 19 Apr 2025 16:53:11 -0400 Subject: [PATCH 4/6] more --- .../runtime-runes/samples/inspect-exception/_config.js | 3 ++- .../runtime-runes/samples/inspect-trace-null/_config.js | 6 +++++- .../samples/unhoist-function-accessing-snippet/main.svelte | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-exception/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-exception/_config.js index 57caf6e08dbc..e155ff236a48 100644 --- a/packages/svelte/tests/runtime-runes/samples/inspect-exception/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/inspect-exception/_config.js @@ -6,11 +6,12 @@ export default test({ dev: true }, - async test({ assert, target, logs }) { + async test({ assert, target, logs, errors }) { const b1 = target.querySelector('button'); b1?.click(); flushSync(); + assert.ok(errors.length > 0); assert.deepEqual(logs, ['init', 'a', 'init', 'b']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-trace-null/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-trace-null/_config.js index e779a835c2ef..7982e8c1c62c 100644 --- a/packages/svelte/tests/runtime-runes/samples/inspect-trace-null/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/inspect-trace-null/_config.js @@ -1,8 +1,12 @@ +import { assert } from 'vitest'; import { test } from '../../test'; export default test({ compileOptions: { dev: true }, - test() {} + + test({ logs }) { + assert.ok(logs.length > 0); + } }); diff --git a/packages/svelte/tests/runtime-runes/samples/unhoist-function-accessing-snippet/main.svelte b/packages/svelte/tests/runtime-runes/samples/unhoist-function-accessing-snippet/main.svelte index e909d77fd670..9f3a56a9ede9 100644 --- a/packages/svelte/tests/runtime-runes/samples/unhoist-function-accessing-snippet/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/unhoist-function-accessing-snippet/main.svelte @@ -1,6 +1,6 @@ @@ -9,4 +9,4 @@ {#snippet snip()} snippet {x} -{/snippet} \ No newline at end of file +{/snippet} From 28e266947375daa86325ab819ee3c58da12ef17b Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 19 Apr 2025 16:57:08 -0400 Subject: [PATCH 5/6] more --- packages/svelte/tests/runtime-legacy/shared.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts index fc748ce6b299..a95a5afee1e5 100644 --- a/packages/svelte/tests/runtime-legacy/shared.ts +++ b/packages/svelte/tests/runtime-legacy/shared.ts @@ -469,10 +469,6 @@ async function run_test_variant( throw err; } } finally { - console.log = console_log; - console.warn = console_warn; - console.error = console_error; - config.after_test?.(); // Free up the microtask queue @@ -486,6 +482,10 @@ async function run_test_variant( process.on('unhandledRejection', listener); }); } + + console.log = console_log; + console.warn = console_warn; + console.error = console_error; } } From a9ffd3a53f423574dff32a558ae1e7416bf78044 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 19 Apr 2025 17:08:54 -0400 Subject: [PATCH 6/6] last one --- packages/svelte/tests/runtime-legacy/shared.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts index a95a5afee1e5..14b6cff841bd 100644 --- a/packages/svelte/tests/runtime-legacy/shared.ts +++ b/packages/svelte/tests/runtime-legacy/shared.ts @@ -351,7 +351,7 @@ async function run_test_variant( // @ts-expect-error globalThis.__svelte.uid = 1; - if (manual_hydrate) { + if (manual_hydrate && variant === 'hydrate') { hydrate_fn = () => { instance = hydrate(mod.default, { target,