@anansi/core 0.10.0 → 0.11.2

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.11.2](https://github.com/ntucker/anansi/compare/@anansi/core@0.11.1...@anansi/core@0.11.2) (2022-06-13)
+
+
+### 💅 Enhancement
+
+* Do not override 'unsafe-inline' with nonce for CSP ([cfbd2bd](https://github.com/ntucker/anansi/commit/cfbd2bdfa69ae97ef2db6a824496888420251371))
+* Use 'text' to get inline JSON ([9ecdb07](https://github.com/ntucker/anansi/commit/9ecdb074d01e6f09c28a685433105cf0d6f711cc))
+
+
+### 📦 Package
+
+* Update `webpack-cli` to v4.10.0 ([#1543](https://github.com/ntucker/anansi/issues/1543)) ([298cb01](https://github.com/ntucker/anansi/commit/298cb018db2975fb5c926c48d2145d7c1f4515b9))
+
+
+
+### [0.11.1](https://github.com/ntucker/anansi/compare/@anansi/core@0.11.0...@anansi/core@0.11.1) (2022-06-13)
+
+
+### 🐛 Bug Fix
+
+* Use call user-config devServer.setupMiddleware ([99acd8c](https://github.com/ntucker/anansi/commit/99acd8c9386bfc338ef8733d19a734b2a8be21dd))
+
+
+
+## [0.11.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.10.0...@anansi/core@0.11.0) (2022-06-12)
+
+
+### 🚀 Features
+
+* Add CSP support ([#1541](https://github.com/ntucker/anansi/issues/1541)) ([e8a7415](https://github.com/ntucker/anansi/commit/e8a7415db892d725b76a2d7d451670437d6fb8eb))
+
+
+### 💅 Enhancement
+
+* Multi-module server side devserver ([b1b6f87](https://github.com/ntucker/anansi/commit/b1b6f873f2a50a9af05683a80d587ac87d90f8f9))
+
+
+
 ## [0.10.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.9.0...@anansi/core@0.10.0) (2022-06-09)
 
 

package/dist/client.js

@@ -51,6 +51,7 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
+  "JSONSpout": () => (/* reexport */ JSONSpout),
   "documentSpout": () => (/* reexport */ documentSpout),
   "floodSpouts": () => (/* reexport */ floodSpouts),
   "restHooksSpout": () => (/* reexport */ restHooksSpout),
@@ -74,8 +75,8 @@ async function floodSpouts(spouts, {
 ;// CONCATENATED MODULE: ./src/spouts/document.tsx
 function documentSpout(options) {
   return function (next) {
-    return async () => {
-      const nextProps = await next();
+    return async initData => {
+      const nextProps = await next(initData);
       return nextProps;
     };
   };
@@ -85,20 +86,17 @@ const external_react_namespaceObject = require("react");
 var external_react_default = /*#__PURE__*/__webpack_require__.n(external_react_namespaceObject);
 ;// CONCATENATED MODULE: external "@rest-hooks/core"
 const core_namespaceObject = require("@rest-hooks/core");
-;// CONCATENATED MODULE: external "@rest-hooks/ssr"
-const ssr_namespaceObject = require("@rest-hooks/ssr");
 ;// CONCATENATED MODULE: ./src/spouts/restHooks.tsx
 var _jsxFileName = "/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.tsx";
 
 
-
 function restHooksSpout(options = {
   getManagers: () => [new core_namespaceObject.NetworkManager()]
 }) {
   return function (next) {
-    return async () => {
-      const data = (0,ssr_namespaceObject.getDatafromDOM)();
-      const nextProps = await next();
+    return async initData => {
+      const data = initData.resthooks;
+      const nextProps = await next(initData);
       return { ...nextProps,
         app: /*#__PURE__*/external_react_default().createElement(core_namespaceObject.CacheProvider, {
           initialState: data,
@@ -106,18 +104,10 @@ function restHooksSpout(options = {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 22,
+            lineNumber: 28,
             columnNumber: 11
           }
-        }, nextProps.app, /*#__PURE__*/external_react_default().createElement(ssr_namespaceObject.ServerDataComponent, {
-          data: data,
-          __self: this,
-          __source: {
-            fileName: _jsxFileName,
-            lineNumber: 24,
-            columnNumber: 13
-          }
-        }))
+        }, nextProps.app)
       };
     };
   };
@@ -150,11 +140,11 @@ function routerSpout(options) {
   };
 
   return function (next) {
-    return async () => {
+    return async initData => {
       const history = (0,external_history_namespaceObject.createBrowserHistory)();
       const router = options.createRouter(history);
       const matchedRoutes = router.getMatchedRoutes(history.location.pathname);
-      const nextProps = await next();
+      const nextProps = await next(initData);
       const Router = createRouteComponent(router);
       return { ...nextProps,
         matchedRoutes,
@@ -163,7 +153,7 @@ function routerSpout(options) {
           __self: this,
           __source: {
             fileName: router_jsxFileName,
-            lineNumber: 46,
+            lineNumber: 48,
             columnNumber: 14
           }
         }, nextProps.app)
@@ -171,11 +161,29 @@ function routerSpout(options) {
     };
   };
 }
+;// CONCATENATED MODULE: ./src/spouts/json.tsx
+function JSONSpout({
+  id = 'anansi-json'
+} = {}) {
+  return function (next) {
+    return async () => {
+      const initData = getDatafromDOM(id);
+      const nextProps = await next(initData);
+      return nextProps;
+    };
+  };
+}
+
+function getDatafromDOM(id) {
+  const element = document.querySelector(`#${id}`);
+  return element !== null && element !== void 0 && element.text ? JSON.parse(element === null || element === void 0 ? void 0 : element.text) : undefined;
+}
 ;// CONCATENATED MODULE: ./src/index.ts
 
 
 
 
+
 module.exports = __webpack_exports__;
 /******/ })()
 ;

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","mappings":";;AAAA;AACA;AACA;;;;ACFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;;;;;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;ACNA;;ACAA;AAEA;AAIA;AAAA;AACA;;AACA;AAAA;AAAA;AAEA;AACA;;ACDA;AAIA;AACA;AACA;AAEA;AACA;AACA;AACA;;ACrBA;;;ACAA;;ACAA;;;;ACAA;AACA;AAMA;AAGA;AAAA;AAEA;AACA;AACA;AAEA;AAEA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AALA;AASA;AACA;AACA;;AC7BA;;ACAA;;;ACAA;AACA;AACA;AAOA;AAMA;AAGA;AAAA;AACA;AAEA;AAEA;AACA;AACA;AAHA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA;;AAEA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAJA;AAMA;AACA;AACA;;ACjDA;AACA;AACA","sources":["/home/ntucker/src/anansi/packages/core/webpack/bootstrap","/home/ntucker/src/anansi/packages/core/webpack/runtime/compat get default export","/home/ntucker/src/anansi/packages/core/webpack/runtime/define property getters","/home/ntucker/src/anansi/packages/core/webpack/runtime/hasOwnProperty shorthand","/home/ntucker/src/anansi/packages/core/webpack/runtime/make namespace object","/home/ntucker/src/anansi/packages/core/external commonjs \"react-dom/client\"","/home/ntucker/src/anansi/packages/core/src/floodSpouts.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/document.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"react\"","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/core\"","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/ssr\"","/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"@anansi/router\"","/home/ntucker/src/anansi/packages/core/external commonjs \"history\"","/home/ntucker/src/anansi/packages/core/src/spouts/router.tsx","/home/ntucker/src/anansi/packages/core/src/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react-dom/client\");","import { hydrateRoot } from 'react-dom/client';\n\nexport default async function floodSpouts(\n  spouts: () => Promise<{\n    app: JSX.Element;\n  }>,\n  { rootId = 'anansi-root' }: { rootId?: string } = {},\n) {\n  const { app } = await spouts();\n\n  hydrateRoot(document.getElementById(rootId) ?? document, app);\n}\n","import React from 'react';\nimport type { Route } from '@anansi/router';\n\nimport type { ResolveProps } from './types';\n\ntype NeededProps = {\n  matchedRoutes: Route<any>[];\n  title?: string;\n} & ResolveProps;\n\nexport default function documentSpout(options: {\n  head?: React.ReactNode;\n  title: string;\n}) {\n  return function <T extends NeededProps>(next: () => Promise<T>) {\n    return async () => {\n      const nextProps = await next();\n\n      return nextProps;\n    };\n  };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/core\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/ssr\");","import { CacheProvider, Manager, NetworkManager } from '@rest-hooks/core';\nimport { ServerDataComponent, getDatafromDOM } from '@rest-hooks/ssr';\n\nimport type { ResolveProps } from './types';\n\ntype NeededProps = ResolveProps;\n\nexport default function restHooksSpout(\n  options: {\n    getManagers: () => Manager[];\n  } = { getManagers: () => [new NetworkManager()] },\n) {\n  return function <T extends NeededProps>(next: () => Promise<T>) {\n    return async () => {\n      const data = getDatafromDOM();\n\n      const nextProps = await next();\n\n      return {\n        ...nextProps,\n        app: (\n          <CacheProvider initialState={data} managers={options.getManagers()}>\n            {nextProps.app}\n            <ServerDataComponent data={data} />\n          </CacheProvider>\n        ),\n      };\n    };\n  };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@anansi/router\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"history\");","import { Route, RouteProvider, RouteController } from '@anansi/router';\nimport React from 'react';\nimport { createBrowserHistory } from 'history';\nimport type { Update } from 'history';\n\nimport type { ResolveProps, CreateRouter } from './types';\n\ntype NeededProps = ResolveProps;\n\nexport default function routerSpout<ResolveWith>(options: {\n  resolveWith?: any;\n  useResolveWith: () => ResolveWith;\n  createRouter: CreateRouter<ResolveWith>;\n  onChange?: (update: Update, callback: () => void | undefined) => void;\n}) {\n  const createRouteComponent = (\n    router: RouteController<Route<ResolveWith, any>>,\n  ) =>\n    function Router({ children }: { children: React.ReactNode }) {\n      const resolveWith = options.useResolveWith();\n\n      return (\n        <RouteProvider\n          router={router}\n          resolveWith={resolveWith}\n          onChange={options.onChange}\n        >\n          {children}\n        </RouteProvider>\n      );\n    };\n\n  return function <T extends NeededProps>(next: () => Promise<T>) {\n    return async () => {\n      const history = createBrowserHistory();\n      const router = options.createRouter(history);\n      const matchedRoutes = router.getMatchedRoutes(history.location.pathname);\n\n      const nextProps = await next();\n\n      const Router = createRouteComponent(router);\n      return {\n        ...nextProps,\n        matchedRoutes,\n        router,\n        app: <Router>{nextProps.app}</Router>,\n      };\n    };\n  };\n}\n","export { default as floodSpouts } from './floodSpouts';\nexport { default as documentSpout } from './spouts/document';\nexport { default as restHooksSpout } from './spouts/restHooks';\nexport { default as routerSpout } from './spouts/router';\n"],"names":[],"sourceRoot":""}
+{"version":3,"file":"client.js","mappings":";;AAAA;AACA;AACA;;;;ACFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;;;;;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;;ACNA;;ACAA;AAEA;AAIA;AAAA;AACA;;AACA;AAAA;AAAA;AAEA;AACA;;ACDA;AAIA;AAGA;AACA;AAEA;AACA;AACA;AACA;;ACvBA;;;ACAA;;;;ACAA;AAWA;AAGA;AAAA;AAEA;AAGA;AACA;AAEA;AAEA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAHA;AAQA;AACA;AACA;;AClCA;;ACAA;;;ACAA;AACA;AACA;AAOA;AAMA;AAGA;AAAA;AACA;AAEA;AAEA;AACA;AACA;AAHA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA;;AAEA;AAGA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAJA;AAMA;AACA;AACA;;AC5CA;AACA;AADA;AAGA;AAGA;AACA;AACA;AAEA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA","sources":["/home/ntucker/src/anansi/packages/core/webpack/bootstrap","/home/ntucker/src/anansi/packages/core/webpack/runtime/compat get default export","/home/ntucker/src/anansi/packages/core/webpack/runtime/define property getters","/home/ntucker/src/anansi/packages/core/webpack/runtime/hasOwnProperty shorthand","/home/ntucker/src/anansi/packages/core/webpack/runtime/make namespace object","/home/ntucker/src/anansi/packages/core/external commonjs \"react-dom/client\"","/home/ntucker/src/anansi/packages/core/src/floodSpouts.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/document.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"react\"","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/core\"","/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"@anansi/router\"","/home/ntucker/src/anansi/packages/core/external commonjs \"history\"","/home/ntucker/src/anansi/packages/core/src/spouts/router.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/json.tsx","/home/ntucker/src/anansi/packages/core/src/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react-dom/client\");","import { hydrateRoot } from 'react-dom/client';\n\nexport default async function floodSpouts(\n  spouts: () => Promise<{\n    app: JSX.Element;\n  }>,\n  { rootId = 'anansi-root' }: { rootId?: string } = {},\n) {\n  const { app } = await spouts();\n\n  hydrateRoot(document.getElementById(rootId) ?? document, app);\n}\n","import React from 'react';\nimport type { Route } from '@anansi/router';\n\nimport type { ResolveProps } from './types';\n\ntype NeededProps = {\n  matchedRoutes: Route<any>[];\n  title?: string;\n} & ResolveProps;\n\nexport default function documentSpout(options: {\n  head?: React.ReactNode;\n  title: string;\n}) {\n  return function <T extends NeededProps>(\n    next: (initData: Record<string, unknown>) => Promise<T>,\n  ) {\n    return async (initData: Record<string, unknown>) => {\n      const nextProps = await next(initData);\n\n      return nextProps;\n    };\n  };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/core\");","import {\n  CacheProvider,\n  Manager,\n  NetworkManager,\n  State,\n} from '@rest-hooks/core';\n\nimport type { ResolveProps } from './types';\n\ntype NeededProps = ResolveProps;\n\nexport default function restHooksSpout(\n  options: {\n    getManagers: () => Manager[];\n  } = { getManagers: () => [new NetworkManager()] },\n) {\n  return function <T extends NeededProps>(\n    next: (initData: Record<string, unknown>) => Promise<T>,\n  ) {\n    return async (initData: Record<string, unknown>) => {\n      const data = initData.resthooks as State<unknown>;\n\n      const nextProps = await next(initData);\n\n      return {\n        ...nextProps,\n        app: (\n          <CacheProvider initialState={data} managers={options.getManagers()}>\n            {nextProps.app}\n          </CacheProvider>\n        ),\n      };\n    };\n  };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@anansi/router\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"history\");","import { Route, RouteProvider, RouteController } from '@anansi/router';\nimport React from 'react';\nimport { createBrowserHistory } from 'history';\nimport type { Update } from 'history';\n\nimport type { ResolveProps, CreateRouter } from './types';\n\ntype NeededProps = ResolveProps;\n\nexport default function routerSpout<ResolveWith>(options: {\n  resolveWith?: any;\n  useResolveWith: () => ResolveWith;\n  createRouter: CreateRouter<ResolveWith>;\n  onChange?: (update: Update, callback: () => void | undefined) => void;\n}) {\n  const createRouteComponent = (\n    router: RouteController<Route<ResolveWith, any>>,\n  ) =>\n    function Router({ children }: { children: React.ReactNode }) {\n      const resolveWith = options.useResolveWith();\n\n      return (\n        <RouteProvider\n          router={router}\n          resolveWith={resolveWith}\n          onChange={options.onChange}\n        >\n          {children}\n        </RouteProvider>\n      );\n    };\n\n  return function <T extends NeededProps>(\n    next: (initData: Record<string, unknown>) => Promise<T>,\n  ) {\n    return async (initData: Record<string, unknown>) => {\n      const history = createBrowserHistory();\n      const router = options.createRouter(history);\n      const matchedRoutes = router.getMatchedRoutes(history.location.pathname);\n\n      const nextProps = await next(initData);\n\n      const Router = createRouteComponent(router);\n      return {\n        ...nextProps,\n        matchedRoutes,\n        router,\n        app: <Router>{nextProps.app}</Router>,\n      };\n    };\n  };\n}\n","import React from 'react';\nimport type { Route } from '@anansi/router';\n\nimport type { ResolveProps } from './types';\n\ntype NeededProps = ResolveProps;\n\nexport default function JSONSpout({\n  id = 'anansi-json',\n}: { id?: string } = {}) {\n  return function <T extends NeededProps>(\n    next: (initData: Record<string, unknown>) => Promise<T>,\n  ) {\n    return async () => {\n      const initData = getDatafromDOM(id);\n      const nextProps = await next(initData);\n\n      return nextProps;\n    };\n  };\n}\nfunction getDatafromDOM(id: string): Record<string, unknown> {\n  const element: HTMLScriptElement | null = document.querySelector(`#${id}`);\n  return element?.text ? JSON.parse(element?.text) : undefined;\n}\n","export { default as floodSpouts } from './floodSpouts';\nexport { default as documentSpout } from './spouts/document';\nexport { default as restHooksSpout } from './spouts/restHooks';\nexport { default as routerSpout } from './spouts/router';\nexport { default as JSONSpout } from './spouts/json';\n"],"names":[],"sourceRoot":""}

package/dist/server.js

@@ -51,6 +51,7 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
+  "JSONSpout": () => (/* reexport */ JSONSpout),
   "documentSpout": () => (/* reexport */ DocumentSpout),
   "laySpouts": () => (/* reexport */ laySpouts),
   "prefetchSpout": () => (/* reexport */ prefetchSpout),
@@ -60,18 +61,24 @@ __webpack_require__.d(__webpack_exports__, {
 
 ;// CONCATENATED MODULE: external "react-dom/server"
 const server_namespaceObject = require("react-dom/server");
+;// CONCATENATED MODULE: external "crypto"
+const external_crypto_namespaceObject = require("crypto");
+var external_crypto_default = /*#__PURE__*/__webpack_require__.n(external_crypto_namespaceObject);
 ;// CONCATENATED MODULE: ./src/laySpouts.tsx
 
+
 function laySpouts(spouts, {
   timeoutMS = 200
 } = {}) {
   const render = async (clientManifest, req, res) => {
+    const nonce = external_crypto_default().randomBytes(16).toString('base64');
     const {
       app
     } = await spouts({
       clientManifest,
       req,
-      res
+      res,
+      nonce
     });
     let didError = false;
     const {
@@ -95,6 +102,8 @@ function laySpouts(spouts, {
     |};
     */
     {
+      nonce,
+
       //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),
       onShellReady() {
         //managers.forEach(manager => manager.cleanup());
@@ -127,31 +136,78 @@ function laySpouts(spouts, {
 ;// CONCATENATED MODULE: external "react"
 const external_react_namespaceObject = require("react");
 var external_react_default = /*#__PURE__*/__webpack_require__.n(external_react_namespaceObject);
+;// CONCATENATED MODULE: ./src/spouts/csp.ts
+// TODO: memoize this
+function buildPolicy(policyObj) {
+  return Object.keys(policyObj).map(key => {
+    const val = Array.isArray(policyObj[key]) ? [...new Set(policyObj[key]).values()].filter(v => v).join(' ') : policyObj[key]; // move strict dynamic to the end of the policy if it exists to be backwards compatible with csp2
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src#strict-dynamic
+
+    if (typeof val === 'string' && val.includes("'strict-dynamic'")) {
+      const newVal = `${val.replace(/\s?'strict-dynamic'\s?/gi, ' ').trim()} 'strict-dynamic'`;
+      return `${key} ${newVal}`;
+    }
+
+    return `${key} ${val}`;
+  }).join('; ');
+}
 ;// CONCATENATED MODULE: ./src/spouts/DocumentComponent.tsx
 var _jsxFileName = "/home/ntucker/src/anansi/packages/core/src/spouts/DocumentComponent.tsx",
     _process$env$WEBPACK_;
 
 
+
 function Document({
   assets,
   head,
   children,
   title,
   rootId,
-  charSet
+  charSet,
+  csPolicy,
+  nonce,
+  scripts
 }) {
+  let cspMeta = null;
+
+  if (csPolicy) {
+    // add nonce to policy
+    const policy = { ...csPolicy
+    };
+
+    if (nonce && ( // nonces negate 'unsafe-inline' so do not add it if that directive exists
+    !policy['script-src'] || !policy['script-src'].includes("'unsafe-inline'"))) {
+      if (typeof policy['script-src'] === 'string') {
+        policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];
+      } else {
+        policy['script-src'] = [...policy['script-src'], `'nonce-${nonce}'`];
+      }
+    }
+
+    cspMeta = /*#__PURE__*/external_react_default().createElement("meta", {
+      httpEquiv: "Content-Security-Policy",
+      content: buildPolicy(policy),
+      __self: this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 46,
+        columnNumber: 7
+      }
+    });
+  }
+
   return /*#__PURE__*/external_react_default().createElement("html", {
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 19,
+      lineNumber: 50,
       columnNumber: 5
     }
   }, /*#__PURE__*/external_react_default().createElement("head", {
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 20,
+      lineNumber: 51,
       columnNumber: 7
     }
   }, /*#__PURE__*/external_react_default().createElement("meta", {
@@ -159,31 +215,31 @@ function Document({
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 21,
+      lineNumber: 52,
       columnNumber: 9
     }
-  }), head, assets.map((asset, i) => /*#__PURE__*/external_react_default().createElement("link", {
+  }), cspMeta, head, assets.map((asset, i) => /*#__PURE__*/external_react_default().createElement("link", {
     key: i,
     rel: "preload",
     ...asset,
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 24,
+      lineNumber: 56,
       columnNumber: 11
     }
   })), /*#__PURE__*/external_react_default().createElement("title", {
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 26,
+      lineNumber: 58,
       columnNumber: 9
     }
   }, title)), /*#__PURE__*/external_react_default().createElement("body", {
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 28,
+      lineNumber: 60,
       columnNumber: 7
     }
   }, /*#__PURE__*/external_react_default().createElement("div", {
@@ -191,20 +247,10 @@ function Document({
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 29,
+      lineNumber: 61,
       columnNumber: 9
     }
-  }, children), /*#__PURE__*/external_react_default().createElement("script", {
-    dangerouslySetInnerHTML: {
-      __html: `assetManifest = ${JSON.stringify(assets)};`
-    },
-    __self: this,
-    __source: {
-      fileName: _jsxFileName,
-      lineNumber: 31,
-      columnNumber: 9
-    }
-  }), assets.filter(({
+  }, children), scripts, assets.filter(({
     href
   }) => href.endsWith('.js')).map(({
     href
@@ -215,7 +261,7 @@ function Document({
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 39,
+      lineNumber: 66,
       columnNumber: 13
     }
   }))));
@@ -227,7 +273,7 @@ Document.defaultProps = {
     __self: undefined,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 48,
+      lineNumber: 75,
       columnNumber: 7
     }
   }), /*#__PURE__*/external_react_default().createElement("link", {
@@ -236,12 +282,13 @@ Document.defaultProps = {
     __self: undefined,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 49,
+      lineNumber: 76,
       columnNumber: 7
     }
   })),
   charSet: 'utf-8',
-  rootId: 'anansi-root'
+  rootId: 'anansi-root',
+  scripts: null
 };
 ;// CONCATENATED MODULE: ./src/spouts/document.server.tsx
 var document_server_jsxFileName = "/home/ntucker/src/anansi/packages/core/src/spouts/document.server.tsx";
@@ -290,10 +337,13 @@ function DocumentSpout(options) {
           title: (_nextProps$title = nextProps.title) != null ? _nextProps$title : options.title,
           assets: assets,
           rootId: options.rootId,
+          nonce: props.nonce,
+          csPolicy: options.csPolicy,
+          scripts: nextProps.scripts,
           __self: this,
           __source: {
             fileName: document_server_jsxFileName,
-            lineNumber: 53,
+            lineNumber: 56,
             columnNumber: 14
           }
         }, nextProps.app)
@@ -311,8 +361,51 @@ function childrenAssets(chunk) {
 }
 ;// CONCATENATED MODULE: external "@rest-hooks/core"
 const core_namespaceObject = require("@rest-hooks/core");
-;// CONCATENATED MODULE: external "@rest-hooks/ssr"
-const ssr_namespaceObject = require("@rest-hooks/ssr");
+;// CONCATENATED MODULE: external "rest-hooks"
+const external_rest_hooks_namespaceObject = require("rest-hooks");
+;// CONCATENATED MODULE: external "redux"
+const external_redux_namespaceObject = require("redux");
+;// CONCATENATED MODULE: ./src/spouts/rhHelp.tsx
+var rhHelp_jsxFileName = "/home/ntucker/src/anansi/packages/core/src/spouts/rhHelp.tsx";
+
+
+
+ // TODO: Rework this and upstream to rest hooks
+
+function createPersistedStore(managers) {
+  var _managers;
+
+  const controller = new core_namespaceObject.Controller();
+  managers = (_managers = managers) != null ? _managers : [new core_namespaceObject.NetworkManager()];
+  const reducer = (0,core_namespaceObject.createReducer)(controller);
+  const enhancer = (0,external_redux_namespaceObject.applyMiddleware)(...(0,core_namespaceObject.applyManager)(managers, controller), external_rest_hooks_namespaceObject.PromiseifyMiddleware);
+  const store = (0,external_redux_namespaceObject.createStore)(reducer, core_namespaceObject.initialState, enhancer);
+  managers.forEach(manager => {
+    var _manager$init;
+
+    return (_manager$init = manager.init) === null || _manager$init === void 0 ? void 0 : _manager$init.call(manager, store.getState());
+  });
+
+  const selector = state => state;
+
+  function ServerCacheProvider({
+    children
+  }) {
+    return /*#__PURE__*/external_react_default().createElement(external_rest_hooks_namespaceObject.ExternalCacheProvider, {
+      store: store,
+      selector: selector,
+      controller: controller,
+      __self: this,
+      __source: {
+        fileName: rhHelp_jsxFileName,
+        lineNumber: 27,
+        columnNumber: 7
+      }
+    }, children);
+  }
+
+  return [ServerCacheProvider, controller, store];
+}
 ;// CONCATENATED MODULE: ./src/spouts/restHooks.server.tsx
 var restHooks_server_jsxFileName = "/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.server.tsx";
 
@@ -323,15 +416,18 @@ function restHooksSpout(options = {
 }) {
   return function (next) {
     return async props => {
-      const [ServerCacheProvider, controller] = (0,ssr_namespaceObject.createPersistedStore)(options.getManagers());
+      const [ServerCacheProvider, controller, store] = createPersistedStore(options.getManagers());
       const nextProps = await next(props);
       return { ...nextProps,
         controller,
+        initData: { ...nextProps.initData,
+          resthooks: () => store.getState()
+        },
         app: /*#__PURE__*/external_react_default().createElement(ServerCacheProvider, {
           __self: this,
           __source: {
             fileName: restHooks_server_jsxFileName,
-            lineNumber: 26,
+            lineNumber: 30,
             columnNumber: 14
           }
         }, nextProps.app)
@@ -411,12 +507,92 @@ function prefetchSpout(field) {
     };
   };
 }
+;// CONCATENATED MODULE: ./src/spouts/json.server.tsx
+var json_server_jsxFileName = "/home/ntucker/src/anansi/packages/core/src/spouts/json.server.tsx";
+
+function JSONSpout({
+  id = 'anansi-json'
+} = {}) {
+  return function (next) {
+    return async props => {
+      var _nextProps$scripts;
+
+      const nextProps = await next(props);
+      const scripts = (_nextProps$scripts = nextProps.scripts) != null ? _nextProps$scripts : [];
+      /*
+      Object.entries(nextProps.initData ?? {}).forEach(([key, data]) => {
+        try {
+          const encoded = JSON.stringify(data);
+          scripts.push(
+            <script
+              key={key}
+              id={`${id}-${key}`}
+              type="application/json"
+              dangerouslySetInnerHTML={{
+                __html: encoded,
+              }}
+              nonce={props.nonce}
+            />,
+          );
+        } catch (e) {
+          // TODO: Use unified logging
+          console.error(e);
+        }
+      });*/
+
+      const Script = () => {
+        try {
+          var _nextProps$initData;
+
+          const data = {};
+          Object.entries((_nextProps$initData = nextProps.initData) != null ? _nextProps$initData : {}).forEach(([key, getData]) => {
+            data[key] = getData();
+          });
+          const encoded = JSON.stringify(data);
+          return /*#__PURE__*/external_react_default().createElement("script", {
+            key: id,
+            id: id,
+            type: "application/json",
+            dangerouslySetInnerHTML: {
+              __html: encoded
+            },
+            nonce: props.nonce,
+            __self: this,
+            __source: {
+              fileName: json_server_jsxFileName,
+              lineNumber: 52,
+              columnNumber: 13
+            }
+          });
+        } catch (e) {
+          // TODO: Use unified logging
+          console.error('Error serializing json');
+          console.error(e);
+          return null;
+        }
+      };
+
+      scripts.push( /*#__PURE__*/external_react_default().createElement(Script, {
+        __self: this,
+        __source: {
+          fileName: json_server_jsxFileName,
+          lineNumber: 69,
+          columnNumber: 20
+        }
+      }));
+      return { ...nextProps,
+        scripts
+      };
+    };
+  };
+}
 ;// CONCATENATED MODULE: ./src/index.server.ts
 
 
 
 
 
+
 module.exports = __webpack_exports__;
 /******/ })()
 ;