From 265c99e05430c8e9fb2d563345e91d60faaac6ab Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jul 2017 19:38:08 -0400
Subject: [PATCH] fix unescaping edge case

---
 src/generators/server-side-rendering/visitors/Text.ts | 2 +-
 src/utils/stringify.ts                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/generators/server-side-rendering/visitors/Text.ts b/src/generators/server-side-rendering/visitors/Text.ts
index b7aad398f2..493d32a936 100644
--- a/src/generators/server-side-rendering/visitors/Text.ts
+++ b/src/generators/server-side-rendering/visitors/Text.ts
@@ -7,5 +7,5 @@ export default function visitText(
 	block: Block,
 	node: Node
 ) {
-	generator.append(node.data.replace(/(\${|`|\\)/g, '\\$1').replace(/([^\\])?([@#])/g, '$1\\$2'));
+	generator.append(node.data.replace(/(\${|`|\\)/g, '\\$1').replace(/([^\\@#])?([@#])/g, '$1\\$2'));
 }
diff --git a/src/utils/stringify.ts b/src/utils/stringify.ts
index 7c63b45ce1..b4c65addfd 100644
--- a/src/utils/stringify.ts
+++ b/src/utils/stringify.ts
@@ -1,3 +1,3 @@
 export default function stringify(data: string) {
-	return JSON.stringify(data.replace(/([^\\])?([@#])/g, '$1\\$2'));
+	return JSON.stringify(data.replace(/([^\\@#])?([@#])/g, '$1\\$2'));
 }