Internal: replace escapeJSONforHTML(JSON.stringify()) by a single ser…

…ialize() method

Ref #397

src/_utils/serialize/__tests__/index.js

@@ -0,0 +1,47 @@
+import test from "ava"
+
+import serializer from ".."
+
+test("serialize JS for HTML", (t) => {
+  const escaped = serializer("<script></script><script></script>")
+  t.is(
+    escaped,
+    "\"<script><\\/script><script><\\/script>\"",
+    "function should escape all end of script tag"
+  )
+  t.falsy(
+    escaped.includes("</script>"),
+    "result should not contain unescaped end of script tag"
+  )
+})
+
+/* serialize-javascript version
+test("serialize JS object", (t) => {
+  const serialized = serializer("<script></script><script></script>")
+  t.is(
+    serialized,
+    "\"\\u003Cscript\\u003E\\u003C\\u002Fscript\\u003E" +
+      "\\u003Cscript\\u003E\\u003C\\u002Fscript\\u003E\"",
+    "function should escape all end of script tag"
+  )
+  t.falsy(
+    serialized.includes("</script>"),
+    "result should not contain unescaped end of script tag"
+  )
+})
+*/
+
+// https://github.com/MoOx/phenomic/issues/397
+// blocked by
+// https://github.com/MoOx/phenomic/issues/434
+// and also
+// https://github.com/yahoo/serialize-javascript/pull/16
+/*
+test("keep date", (t) => {
+  const ISODate = "2016-04-28T22:02:17.156Z"
+  t.is(
+    serializer({ d: new Date(ISODate) }),
+    `{"d":new Date("${ ISODate }")}`,
+  )
+})
+*/

src/_utils/serialize/index.js

@@ -0,0 +1,5 @@
+// @flow
+
+export default (value: any): string => {
+  return JSON.stringify(value).replace(/\<\/script>/g, "<\\/script>")
+}

src/builder/server.js

@@ -11,7 +11,7 @@ import debug from "debug"
 import portFinder from "portfinder"
 
 import minifyCollection from "../content-loader/minify"
-import escapeJSONforHTML from "../_utils/escape-json-for-html"
+import serialize from "../_utils/serialize"
 
 import collection from "../content-loader/cache.js"
 import joinUri from "../_utils/join-uri"
@@ -136,7 +136,7 @@ export default (config) => {
     </div>
     <script>
     window.__COLLECTION__ = ${
-      escapeJSONforHTML(JSON.stringify(collectionMin))
+      serialize(collectionMin)
     };
     </script>
     ${

src/static/to-html/url-as-html.js

@@ -10,7 +10,7 @@ import htmlMetas from "../../_utils/html-metas"
 import joinUri from "../../_utils/join-uri"
 import Html from "./Html"
 import PhenomicContextProvider from "../../ContextProvider"
-import escapeJSONforHTML from "../../_utils/escape-json-for-html"
+import serialize from "../../_utils/serialize"
 
 import minifyCollection from "../../content-loader/minify"
 
@@ -107,10 +107,10 @@ export default function(
             }
             script =
               `window.__COLLECTION__ = ${
-                escapeJSONforHTML(JSON.stringify(collectionMin))
+                serialize(collectionMin)
               };` +
               `window.__INITIAL_STATE__ = ${
-                escapeJSONforHTML(JSON.stringify(initialState))
+                serialize(initialState)
               }`
           }