1.0.7

leebenson · leebenson · commit 213330688420 · 2017-04-20T09:37:39.000+01:00
1.0.7 - 2017-04-17
------------------------------------------------
* Optimises `window.*` initial variables on SSR by removing whitespace
* Allows passing a `window` prop to `&lt;Html&gt;` on SSR, instead of
separate props for `webpackManifest` / `state`
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+1.0.7 - 2017-04-17
+------------------------------------------------
+* Optimises `window.*` initial variables on SSR by removing whitespace
+* Allows passing a `window` prop to `<Html>` on SSR, instead of separate props for `webpackManifest` / `state`
+
 1.0.6 - 2017-04-17
 ------------------------------------------------
 * Moves `manifest.json` and `chunk-manifest.json` to `dist` instead of `dist/public` (stops them being accessible publicly)
diff --git a/kit/entry/server.js b/kit/entry/server.js
@@ -146,9 +146,11 @@ const PORT = process.env.PORT || 4000;
         <Html
           html={html}
           head={Helmet.rewind()}
-          state={store.getState()}
+          window={{
+            webpackManifest: chunkManifest,
+            __STATE__: store.getState(),
+          }}
           scripts={scripts}
-          chunkManifest={chunkManifest}
           css={manifest['browser.css']} />,
       )}`;
     });
diff --git a/kit/views/ssr.js b/kit/views/ssr.js
@@ -1,4 +1,4 @@
-/* eslint-disable react/no-danger */
+/* eslint-disable react/no-danger, no-return-assign, no-param-reassign */
 
 // Component to render the full HTML response in React
 
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 
 // ----------------------
 
-const Html = ({ head, html, state, scripts, chunkManifest, css }) => (
+const Html = ({ head, html, scripts, window, css }) => (
   <html lang="en" prefix="og: http://ogp.me/ns#">
     <head>
       <meta charSet="utf-8" />
@@ -19,18 +19,16 @@ const Html = ({ head, html, state, scripts, chunkManifest, css }) => (
       {head.meta.toComponent()}
       <link rel="stylesheet" href={css} />
       {head.title.toComponent()}
-      <script
-        dangerouslySetInnerHTML={{
-          __html: `window.webpackManifest = ${JSON.stringify(chunkManifest)}`,
-        }} />
     </head>
     <body>
       <div
         id="main"
         dangerouslySetInnerHTML={{ __html: html }} />
       <script
         dangerouslySetInnerHTML={{
-          __html: `window.__STATE__ = ${JSON.stringify(state)}`,
+          __html: Object.keys(window).reduce(
+            (out, key) => out += `window.${key}=${JSON.stringify(window[key])};`,
+          ''),
         }} />
       {scripts.map(src => <script key={src} defer src={src} />)}
     </body>
@@ -40,9 +38,8 @@ const Html = ({ head, html, state, scripts, chunkManifest, css }) => (
 Html.propTypes = {
   head: PropTypes.object.isRequired,
   html: PropTypes.string.isRequired,
-  state: PropTypes.object.isRequired,
+  window: PropTypes.object.isRequired,
   scripts: PropTypes.arrayOf(PropTypes.string).isRequired,
-  chunkManifest: PropTypes.object.isRequired,
   css: PropTypes.string.isRequired,
 };
 
