Fix template string escaping

Author: jesperhoy

sample-web-site/Bin/VueJSWebForms.dll

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.3.0.0")>
-<Assembly: AssemblyFileVersion("1.3.0.0")>
+<Assembly: AssemblyVersion("1.4.0.0")>
+<Assembly: AssemblyFileVersion("1.4.0.0")>

src/My Project/AssemblyInfo.vb

@@ -35,21 +35,16 @@ Public Class App
       writer.WriteLine("<script type=""x-template"" id=""" & Name & "_template"">")
       writer.Write(x)
       writer.WriteLine("</script>")
-      tp = "#" & Name & "_template"
+      tp = "'#" & Name & "_template'"
     Else
-      REM minimize whitepace
-      x = x.Replace(vbCrLf, " ").Replace(vbLf, " ").Replace(vbCr, " ").Replace(vbTab, " ")
-      While x.IndexOf("  ") > 0
-        x = x.Replace("  ", " ")
-      End While
-      tp = x.Replace("\", "\\").Replace("'", "\'")
+      tp = JSStringEncode(x)
     End If
 
     writer.WriteLine("<div id=""" & Name & """></div>")
     writer.WriteLine("<script>")
     writer.WriteLine("var " & Name & "=new Vue({" & vbCrLf &
              "  el: '#" & Name & "'," & vbCrLf &
-             "  template: '" & tp & "'," & vbCrLf &
+             "  template: " & tp & "," & vbCrLf &
              "  data: " & DataJS & "," & vbCrLf &
              scrpt.Substring(1).Trim & ");")
     writer.WriteLine("</script>")

src/VueApp.vb

@@ -55,19 +55,14 @@ Public Class Component
       writer.WriteLine("<script type=""x-template"" id=""" & Name & "_template"">")
       writer.Write(x)
       writer.WriteLine("</script>")
-      tp = "#" & Name & "_template"
+      tp = "'#" & Name & "_template'"
     Else
-      REM minimize whitepace
-      x = x.Replace(vbCrLf, " ").Replace(vbLf, " ").Replace(vbCr, " ").Replace(vbTab, " ")
-      While x.IndexOf("  ") > 0
-        x = x.Replace("  ", " ")
-      End While
-      tp = x.Replace("\", "\\").Replace("'", "\'")
+      tp = JSStringEncode(x)
     End If
 
     writer.WriteLine("<script>")
     writer.WriteLine("Vue.component('" & Name & "', {" & vbCrLf &
-           "  template: '" & tp & "'," & vbCrLf &
+           "  template: " & tp & "," & vbCrLf &
            scrpt.Substring(1).Trim & ");")
     writer.WriteLine("</script>")
   End Sub

src/VueComponent.vb

@@ -66,6 +66,10 @@
     Return curFileVP.Substring(0, i + 1) & p
   End Function
 
+  Friend Function JSStringEncode(x As String) As String
+    Return "'" & (x.Replace("\", "\\").Replace(vbCrLf, "\n").Replace(vbCr, "\n").Replace(vbLf, "\n").Replace(vbTab, "\t").Replace("'", "\'")) & "'"
+  End Function
+
   Friend Structure ParseVueFileResult
     Public Template As String
     Public Script As String