From c12e7d6389159835ab0d42062d7a9a244fcda6fe Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sun, 8 Sep 2019 18:35:34 -0400
Subject: [PATCH] invalidate store values in <script> block - fixes #3537

---
 src/compiler/compile/utils/invalidate.ts            |  3 ++-
 .../samples/store-unreferenced/Nested.svelte        |  5 +++++
 test/runtime/samples/store-unreferenced/_config.js  | 13 +++++++++++++
 test/runtime/samples/store-unreferenced/main.svelte | 10 ++++++++++
 test/runtime/samples/store-unreferenced/store.js    |  3 +++
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/store-unreferenced/Nested.svelte
 create mode 100644 test/runtime/samples/store-unreferenced/_config.js
 create mode 100644 test/runtime/samples/store-unreferenced/main.svelte
 create mode 100644 test/runtime/samples/store-unreferenced/store.js

diff --git a/src/compiler/compile/utils/invalidate.ts b/src/compiler/compile/utils/invalidate.ts
index 0c93ce2694..55f5d49977 100644
--- a/src/compiler/compile/utils/invalidate.ts
+++ b/src/compiler/compile/utils/invalidate.ts
@@ -18,7 +18,8 @@ export function invalidate(component: Component, scope: Scope, code: MagicString
 			(
 				variable.referenced ||
 				variable.is_reactive_dependency ||
-				variable.export_name
+				variable.export_name ||
+				variable.name[0] === '$'
 			)
 		);
 	});
diff --git a/test/runtime/samples/store-unreferenced/Nested.svelte b/test/runtime/samples/store-unreferenced/Nested.svelte
new file mode 100644
index 0000000000..4af1890781
--- /dev/null
+++ b/test/runtime/samples/store-unreferenced/Nested.svelte
@@ -0,0 +1,5 @@
+<script>
+	import { count } from './store.js';
+</script>
+
+<p>count: {$count}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/store-unreferenced/_config.js b/test/runtime/samples/store-unreferenced/_config.js
new file mode 100644
index 0000000000..0695edf8dc
--- /dev/null
+++ b/test/runtime/samples/store-unreferenced/_config.js
@@ -0,0 +1,13 @@
+import { count } from './store.js';
+
+export default {
+	html: `<p>count: 0</p>`,
+
+	async test({ assert, component, target }) {
+		await component.increment();
+
+		assert.htmlEqual(target.innerHTML, `<p>count: 1</p>`);
+
+		count.set(0);
+	}
+};
diff --git a/test/runtime/samples/store-unreferenced/main.svelte b/test/runtime/samples/store-unreferenced/main.svelte
new file mode 100644
index 0000000000..f55a5bdbdf
--- /dev/null
+++ b/test/runtime/samples/store-unreferenced/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	import Nested from './Nested.svelte';
+	import { count } from './store.js';
+
+	export function increment() {
+		$count++;
+	}
+</script>
+
+<Nested />
\ No newline at end of file
diff --git a/test/runtime/samples/store-unreferenced/store.js b/test/runtime/samples/store-unreferenced/store.js
new file mode 100644
index 0000000000..99e27e5584
--- /dev/null
+++ b/test/runtime/samples/store-unreferenced/store.js
@@ -0,0 +1,3 @@
+import { writable } from '../../../../store';
+
+export const count = writable(0);
\ No newline at end of file