Revert "return instance _and_ props in runes mode, move flushSync into shared code, don't set accessors in runes mode"

This reverts commit a47827e.

Author: Rich-Harris

packages/svelte/tests/runtime-legacy/shared.ts

@@ -131,7 +131,7 @@ async function common_setup(cwd: string, runes: boolean | undefined, config: Run
 		generate: 'client',
 		...config.compileOptions,
 		immutable: config.immutable,
-		accessors: 'accessors' in config ? config.accessors : runes ? undefined : true,
+		accessors: 'accessors' in config ? config.accessors : true,
 		runes
 	};
 
@@ -292,35 +292,20 @@ async function run_test_variant(
 			};
 
 			let instance: any;
-			let component: any;
+			let props: any;
 
 			if (runes) {
-				const props: any = proxy({ ...(config.props || {}) });
-				const render = variant === 'hydrate' ? hydrate : mount;
+				props = proxy({ ...(config.props || {}) });
 
+				const render = variant === 'hydrate' ? hydrate : mount;
 				instance = render(mod.default, {
 					target,
 					props,
 					intro: config.intro,
 					recover: config.recover ?? false
 				});
-
-				component = new Proxy(instance, {
-					get(target, key) {
-						if (key in target) return target[key];
-						return props[key];
-					},
-					set(target, key, value) {
-						if (key in target) {
-							target[key] = value;
-						} else {
-							flushSync(() => (props[key] = value));
-						}
-						return true;
-					}
-				});
 			} else {
-				instance = component = createClassComponent({
+				instance = createClassComponent({
 					component: mod.default,
 					props: config.props,
 					target,
@@ -359,7 +344,7 @@ async function run_test_variant(
 							htmlEqualWithOptions: assert_html_equal_with_options
 						},
 						variant,
-						component,
+						component: runes ? props : instance,
 						mod,
 						target,
 						snapshot,

packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js

@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -27,7 +28,7 @@ export default test({
 
 		logs.length = 0;
 
-		component.n += 1;
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, [
 			'parent: $effect.pre 1',

packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js

@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -22,7 +23,7 @@ export default test({
 
 		logs.length = 0;
 
-		component.n += 1;
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, [
 			'parent: render 1',

packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js

@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -26,7 +27,8 @@ export default test({
 		]);
 
 		logs.length = 0;
-		component.n += 1;
+
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, [
 			'parent: $effect.pre 1',

packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js

@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -9,7 +10,7 @@ export default test({
 		assert.deepEqual(logs, ['$effect.pre 0', 'another $effect.pre 1', 'render n0', 'render i1']);
 
 		logs.length = 0;
-		component.n += 1;
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, ['$effect.pre 1', 'another $effect.pre 2', 'render n1', 'render i2']);
 	}

packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js

@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -22,7 +23,8 @@ export default test({
 		]);
 
 		logs.length = 0;
-		component.n += 1;
+
+		flushSync(() => (component.n += 1));
 
 		assert.deepEqual(logs, [
 			'parent: $effect.pre 1',

packages/svelte/tests/runtime-runes/samples/props-default-value-lazy-accessors/_config.js

@@ -1,3 +1,4 @@
+import { flushSync } from '../../../../src/index-client.js';
 import { test } from '../../test';
 
 // Tests that default values only fire lazily when the prop is undefined, and every time
@@ -12,20 +13,24 @@ export default test({
 	html: `<p>props: 0 0 0 0 1 1 1 1</p><p>log: nested.fallback_value,fallback_fn`,
 
 	async test({ assert, target, component }) {
-		component.p0 = undefined;
-		component.p1 = undefined;
-		component.p2 = undefined;
-		component.p3 = undefined;
+		flushSync(() => {
+			component.p0 = undefined;
+			component.p1 = undefined;
+			component.p2 = undefined;
+			component.p3 = undefined;
+		});
 
 		assert.htmlEqual(
 			target.innerHTML,
 			`<p>props: 1 1 1 1 1 1 1 1</p><p>log: nested.fallback_value,fallback_fn,nested.fallback_value,fallback_fn`
 		);
 
-		component.p4 = undefined;
-		component.p5 = undefined;
-		component.p6 = undefined;
-		component.p7 = undefined;
+		flushSync(() => {
+			component.p4 = undefined;
+			component.p5 = undefined;
+			component.p6 = undefined;
+			component.p7 = undefined;
+		});
 
 		assert.htmlEqual(
 			target.innerHTML,

packages/svelte/tests/runtime-runes/samples/props-quoted/_config.js

@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -8,7 +9,7 @@ export default test({
 	html: `hello`,
 
 	async test({ assert, target, component }) {
-		component['kebab-case'] = 'goodbye';
+		flushSync(() => (component['kebab-case'] = 'goodbye'));
 		assert.htmlEqual(target.innerHTML, `goodbye`);
 	}
 });

packages/svelte/tests/runtime-runes/samples/props/_config.js

@@ -1,3 +1,4 @@
+import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
@@ -13,10 +14,10 @@ export default test({
 	html: `x 1 2 3 z`,
 
 	async test({ assert, target, component }) {
-		component.foo = 'y';
+		flushSync(() => (component.foo = 'y'));
 		assert.htmlEqual(target.innerHTML, `y 1 2 3 z`);
 
-		component.bar = 'w';
+		flushSync(() => (component.bar = 'w'));
 		assert.htmlEqual(target.innerHTML, `y 1 2 3 w`);
 	}
 });

packages/svelte/tests/runtime-runes/samples/transition-evaluation/_config.js

@@ -1,12 +1,15 @@
+import { flushSync } from '../../../../src/index-client.js';
 import { test } from '../../test';
 
 export default test({
 	test({ assert, component, target }) {
 		const div = /** @type {HTMLDivElement & { foo?: number }} */ (target.querySelector('div'));
 
 		assert.equal(div.foo, undefined);
-		component.foo = 2;
-		component.visible = false;
+		flushSync(() => {
+			component.foo = 2;
+			component.visible = false;
+		});
 		assert.equal(div.foo, 2);
 	}
 });