@kaliber/build 0.0.125 → 0.0.128

package/.eslintrc

@@ -70,6 +70,7 @@
     "dot-location": ["warn", "property"],
     "eol-last": "warn",
     "eqeqeq": "warn",
+    "key-spacing": "warn",
     "keyword-spacing": "warn",
     "new-parens": "warn",
     "no-array-constructor": "warn",

package/lib/universalComponents.js

@@ -1,4 +1,5 @@
 import ReactDom from 'react-dom'
+import { safeJsonStringify } from '@kaliber/safe-json-stringify'
 
 const containerMarker = 'data-kaliber-component-container'
 
@@ -12,7 +13,9 @@ export function ComponentServerWrapper({ componentName, props, renderedComponent
 
       {/* Use render blocking script to remove the container and supply the correct  comment nodes.
           This ensures the page is never rendered with the intermediate structure */}
-      <script dangerouslySetInnerHTML={{ __html: restructureDomNodes(componentInfo) }} />
+      <script dangerouslySetInnerHTML={{
+        __html: restructureDomNodes(componentInfo).replace(/<\/?script>/gi, '')
+      }} />
     </>
   )
 }
@@ -81,10 +84,11 @@ function groupComponentsByName(allComponents) {
 }
 
 function restructureDomNodes(componentInfo) {
+  const safeComponentInfo = safeJsonStringify(componentInfo)
   return `|var d=document,s=d.currentScript,p=s.parentNode,c=s.previousSibling;
           |p.setAttribute('${containerMarker}','');                             // set marker on container so we can retrieve nodes that contain components
           |p.replaceChild(d.createComment('start'),c);                          // replace kaliber-component-container element with a 'start' comment
-          |p.insertBefore(d.createComment(JSON.stringify(${componentInfo})),s); // create a comment containing the component info
+          |p.insertBefore(d.createComment(${safeComponentInfo}),s);             // create a comment containing the component info
           |Array.from(c.childNodes).forEach(x=>{p.insertBefore(x,s)});          // insert all children from the kaliber-component-container element
           |p.replaceChild(d.createComment('end'),s);                            // create an 'end' comment
           |`.replace(/^\s*\|/gm, '').replace(/\s*\/\/[^;]*?$/gm, '').replace(/\n/g, '')

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.125",
+  "version": "0.0.128",
   "name": "@kaliber/build",
   "description": "Zero configuration, opinionated webpack / react build setup",
   "scripts": {
@@ -29,6 +29,7 @@
     "@babel/runtime": "^7.11.2",
     "@kaliber/config": "^0.0.8",
     "@kaliber/eslint-plugin": "*",
+    "@kaliber/safe-json-stringify": "^1.1.0",
     "ansi-regex": "^5.0.0",
     "babel-loader": "^8.0.6",
     "cache-loader": "^4.1.0",

package/webpack-plugins/template-plugin.js

@@ -93,8 +93,9 @@ module.exports = function templatePlugin(renderers) {
         */
         compilation.hooks.chunkAsset.tap(p, (chunk, file) => {
           if (!chunk.entryModule) return
+          const rootModule = chunk.entryModule.rootModule || chunk.entryModule
           const { module } =
-            chunk.entryModule.dependencies.find(x =>
+            rootModule.dependencies.find(x =>
               x.module && x.module.request.endsWith('?template-source')
             ) || {}
           if (!module) return