fix hoisting of imported, mutated stores (#5022)

sveltejs · Jun 23, 2020 · 0e2bc35 · 0e2bc35
1 parent 9257870
commit 0e2bc35
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
@@ -1152,7 +1152,9 @@ export default class Component {
 			for (const specifier of specifiers) {
 				const variable = var_lookup.get(specifier.local.name);
 
-				if (!variable.mutated) variable.hoistable = true;
+				if (!variable.mutated || variable.subscribable) {
+					variable.hoistable = true;
+				}
 			}
 		}
 	}

diff --git a/test/runtime/samples/store-imports-hoisted/_config.js b/test/runtime/samples/store-imports-hoisted/_config.js
@@ -0,0 +1,7 @@
+export default {
+	compileOptions: { dev: true }, // tests `@validate_store` code generation
+
+	html: `
+		<p>42</p>
+	`
+};
diff --git a/test/runtime/samples/store-imports-hoisted/foo.js b/test/runtime/samples/store-imports-hoisted/foo.js
@@ -0,0 +1,3 @@
+import { writable } from '../../../../store';
+
+export default writable(42);
diff --git a/test/runtime/samples/store-imports-hoisted/main.svelte b/test/runtime/samples/store-imports-hoisted/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	import foo from './foo.js';
+	foo.bar = 'baz';
+	const answer = $foo;
+</script>
+
+<p>{answer}</p>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { writable } from '../../../../store';

		export default writable(42);