@anansi/core 0.11.1 → 0.13.0

package/CHANGELOG.md

@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.13.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.12.0...@anansi/core@0.13.0) (2022-06-23)
+
+
+### ⚠ 💥 BREAKING CHANGES
+
+* Must use appSpout; Spouts need two generics
+
+### 💅 Enhancement
+
+* Spouts produce props in both directions ([#1559](https://github.com/ntucker/anansi/issues/1559)) ([898cdde](https://github.com/ntucker/anansi/commit/898cdde500a204a7a4dc155ac7ee51930172380e))
+
+
+
+## [0.12.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.11.2...@anansi/core@0.12.0) (2022-06-15)
+
+
+### 🚀 Features
+
+* Add onError option to laySpouts ([a0ef72b](https://github.com/ntucker/anansi/commit/a0ef72bcaab1440a3d997d21636f81ca767a5a1c))
+
+
+### 💅 Enhancement
+
+* Don't crash devserver on compiler errors ([3c764e4](https://github.com/ntucker/anansi/commit/3c764e4dd67a57409c64ff7dd144386623a1d93f))
+
+
+### 📦 Package
+
+* Update babel monorepo to v7.18.5 ([#1545](https://github.com/ntucker/anansi/issues/1545)) ([aaaa8bc](https://github.com/ntucker/anansi/commit/aaaa8bcaa4d9188e9671ee31dc09b7aa9e3ce988))
+
+
+
+### [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)
 
 

package/README.md

@@ -1,5 +1,7 @@
 # @anansi/core
+
 <!--[![CircleCI](https://circleci.com/gh/notwillk/pojo-router.svg?style=shield)](https://circleci.com/gh/notwillk/pojo-router)-->
+
 [![npm downloads](https://img.shields.io/npm/dm/@anansi/core.svg?style=flat-square)](https://www.npmjs.com/package/@anansi/core)
 [![bundle size](https://img.shields.io/bundlephobia/minzip/@anansi/core?style=flat-square)](https://bundlephobia.com/result?p=@anansi/core)
 [![npm version](https://img.shields.io/npm/v/@anansi/core.svg?style=flat-square)](https://www.npmjs.com/package/@anansi/core)
@@ -28,24 +30,27 @@ import {
   restHooksSpout,
   prefetchSpout,
   routerSpout,
+  JSONSpout,
+  appSpout,
 } from '@anansi/core/server';
 
 import app from 'app';
 
 import { createRouter } from './routing';
 
-const appSpout = () => Promise.resolve({ app });
-
 const spouts = prefetchSpout('controller')(
   documentSpout({ title: 'anansi' })(
-    restHooksSpout()(
-      routerSpout({ useResolveWith: useController, createRouter })(appSpout),
+    JSONSpout()(
+      restHooksSpout()(
+        routerSpout({ useResolveWith: useController, createRouter })(
+          appSpout(app),
+        ),
+      ),
     ),
   ),
 );
 
 export default laySpouts(spouts);
-
 ```
 
 </details>
@@ -59,6 +64,8 @@ import {
   documentSpout,
   restHooksSpout,
   routerSpout,
+  JSONSpout,
+  appSpout,
 } from '@anansi/core';
 
 import app from 'app';
@@ -68,8 +75,12 @@ import { createRouter } from './routing';
 const appSpout = () => Promise.resolve({ app });
 
 const spouts = documentSpout({ title: 'anansi' })(
-  restHooksSpout()(
-    routerSpout({ useResolveWith: useController, createRouter })(appSpout),
+  JSONSpout()(
+    restHooksSpout()(
+      routerSpout({ useResolveWith: useController, createRouter })(
+        appSpout(app),
+      ),
+    ),
   ),
 );
 

package/dist/client.js

@@ -52,12 +52,18 @@ __webpack_require__.r(__webpack_exports__);
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
   "JSONSpout": () => (/* reexport */ JSONSpout),
+  "ServerProps": () => (/* reexport */ types_namespaceObject.ServerProps),
+  "appSpout": () => (/* reexport */ app),
   "documentSpout": () => (/* reexport */ documentSpout),
   "floodSpouts": () => (/* reexport */ floodSpouts),
   "restHooksSpout": () => (/* reexport */ restHooksSpout),
   "routerSpout": () => (/* reexport */ routerSpout)
 });
 
+// NAMESPACE OBJECT: ./src/spouts/types.ts
+var types_namespaceObject = {};
+__webpack_require__.r(types_namespaceObject);
+
 ;// CONCATENATED MODULE: external "react-dom/client"
 const client_namespaceObject = require("react-dom/client");
 ;// CONCATENATED MODULE: ./src/floodSpouts.tsx
@@ -69,14 +75,14 @@ async function floodSpouts(spouts, {
 
   const {
     app
-  } = await spouts();
+  } = await spouts({});
   (0,client_namespaceObject.hydrateRoot)((_document$getElementB = document.getElementById(rootId)) != null ? _document$getElementB : document, app);
 }
 ;// CONCATENATED MODULE: ./src/spouts/document.tsx
 function documentSpout(options) {
   return function (next) {
-    return async initData => {
-      const nextProps = await next(initData);
+    return async props => {
+      const nextProps = await next(props);
       return nextProps;
     };
   };
@@ -94,9 +100,9 @@ function restHooksSpout(options = {
   getManagers: () => [new core_namespaceObject.NetworkManager()]
 }) {
   return function (next) {
-    return async initData => {
-      const data = initData.resthooks;
-      const nextProps = await next(initData);
+    return async props => {
+      const data = props.initData.resthooks;
+      const nextProps = await next(props);
       return { ...nextProps,
         app: /*#__PURE__*/external_react_default().createElement(core_namespaceObject.CacheProvider, {
           initialState: data,
@@ -140,11 +146,11 @@ function routerSpout(options) {
   };
 
   return function (next) {
-    return async initData => {
+    return async props => {
       const history = (0,external_history_namespaceObject.createBrowserHistory)();
       const router = options.createRouter(history);
       const matchedRoutes = router.getMatchedRoutes(history.location.pathname);
-      const nextProps = await next(initData);
+      const nextProps = await next(props);
       const Router = createRouteComponent(router);
       return { ...nextProps,
         matchedRoutes,
@@ -166,24 +172,35 @@ function JSONSpout({
   id = 'anansi-json'
 } = {}) {
   return function (next) {
-    return async () => {
+    return async props => {
       const initData = getDatafromDOM(id);
-      const nextProps = await next(initData);
-      return nextProps;
+      return await next({ ...props,
+        initData
+      });
     };
   };
 }
 
 function getDatafromDOM(id) {
   const element = document.querySelector(`#${id}`);
-  return element !== null && element !== void 0 && element.innerHTML ? JSON.parse(element === null || element === void 0 ? void 0 : element.innerHTML) : undefined;
+  return element !== null && element !== void 0 && element.text ? JSON.parse(element === null || element === void 0 ? void 0 : element.text) : undefined;
 }
+;// CONCATENATED MODULE: ./src/spouts/app.tsx
+const appSpout = app => props => Promise.resolve({ ...props,
+  app
+});
+
+/* harmony default export */ const app = (appSpout);
+;// CONCATENATED MODULE: ./src/spouts/types.ts
+
 ;// 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;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 = document.querySelector(`#${id}`);\n  return element?.innerHTML ? JSON.parse(element?.innerHTML) : 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":""}
+{"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;;AC/CA;AACA;AADA;AAGA;AAGA;AACA;AACA;AAAA;AAAA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;;ACnBA;AAGA;AAAA;;AAEA;;;;AELA;AACA;AACA;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/spouts/app.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/types.ts","/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: (props: Record<string, unknown>) => 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 NeededNext = {\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 <N extends NeededNext, I extends Record<string, unknown>>(\n    next: (props: I) => Promise<N>,\n  ) {\n    return async (props: I) => {\n      const nextProps = await next(props);\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 NeededNext = ResolveProps;\n\nexport default function restHooksSpout(\n  options: {\n    getManagers: () => Manager[];\n  } = { getManagers: () => [new NetworkManager()] },\n) {\n  return function <N extends NeededNext, I extends Record<string, unknown>>(\n    next: (props: I) => Promise<N>,\n  ) {\n    return async (props: I & { initData: Record<string, unknown> }) => {\n      const data = props.initData.resthooks as State<unknown>;\n\n      const nextProps = await next(props);\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 NeededNext = 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 <N extends NeededNext, I extends Record<string, unknown>>(\n    next: (initData: Record<string, unknown>) => Promise<N>,\n  ) {\n    return async (props: I) => {\n      const history = createBrowserHistory();\n      const router = options.createRouter(history);\n      const matchedRoutes = router.getMatchedRoutes(history.location.pathname);\n\n      const nextProps = await next(props);\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 type { ResolveProps } from './types';\n\ntype NeededNext = ResolveProps;\n\nexport default function JSONSpout({\n  id = 'anansi-json',\n}: { id?: string } = {}) {\n  return function <N extends NeededNext, I extends Record<string, unknown>>(\n    next: (props: I & { initData: Record<string, unknown> }) => Promise<N>,\n  ) {\n    return async (props: I) => {\n      const initData = getDatafromDOM(id);\n      return await next({ ...props, initData });\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","const appSpout =\n  (app: JSX.Element) =>\n  <P extends Record<string, unknown>>(props: P) =>\n    Promise.resolve({ ...props, app });\n\nexport default appSpout;\n","import { IncomingMessage, ServerResponse } from 'http';\nimport { Request, Response } from 'express';\nimport type { StatsCompilation } from 'webpack';\nimport { History } from 'history';\nimport { Route, RouteController } from '@anansi/router';\n\n/* Variables from the rendering call */\nexport type ServerProps = {\n  req: Request | IncomingMessage;\n  res: Response | ServerResponse;\n  clientManifest: StatsCompilation;\n  nonce: string;\n};\n\n/* Baseline expectations of return value */\nexport type ResolveProps = {\n  app: JSX.Element;\n};\n\nexport type CreateRouter<T> = (\n  history: History,\n) => RouteController<Route<T, any>>;\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';\nexport { default as appSpout } from './spouts/app';\nexport { ServerProps } from './spouts/types';\n"],"names":[],"sourceRoot":""}

package/dist/server.js

@@ -52,6 +52,8 @@ __webpack_require__.r(__webpack_exports__);
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
   "JSONSpout": () => (/* reexport */ JSONSpout),
+  "ServerProps": () => (/* reexport */ types_namespaceObject.ServerProps),
+  "appSpout": () => (/* reexport */ app_server),
   "documentSpout": () => (/* reexport */ DocumentSpout),
   "laySpouts": () => (/* reexport */ laySpouts),
   "prefetchSpout": () => (/* reexport */ prefetchSpout),
@@ -59,6 +61,10 @@ __webpack_require__.d(__webpack_exports__, {
   "routerSpout": () => (/* reexport */ routerSpout)
 });
 
+// NAMESPACE OBJECT: ./src/spouts/types.ts
+var types_namespaceObject = {};
+__webpack_require__.r(types_namespaceObject);
+
 ;// CONCATENATED MODULE: external "react-dom/server"
 const server_namespaceObject = require("react-dom/server");
 ;// CONCATENATED MODULE: external "crypto"
@@ -68,67 +74,59 @@ var external_crypto_default = /*#__PURE__*/__webpack_require__.n(external_crypto
 
 
 function laySpouts(spouts, {
-  timeoutMS = 200
+  timeoutMS = 200,
+  onError
 } = {}) {
   const render = async (clientManifest, req, res) => {
     const nonce = external_crypto_default().randomBytes(16).toString('base64');
-    const {
-      app
-    } = await spouts({
-      clientManifest,
-      req,
-      res,
-      nonce
-    });
-    let didError = false;
-    const {
-      pipe,
-      abort
-    } = (0,server_namespaceObject.renderToPipeableStream)(app,
-    /*
-    This is not documented, so included the types here for reference:
-    type Options = {|
-    identifierPrefix?: string,
-    namespaceURI?: string,
-    nonce?: string,
-    bootstrapScriptContent?: string,
-    bootstrapScripts?: Array<string>,
-    bootstrapModules?: Array<string>,
-    progressiveChunkSize?: number,
-    onShellReady?: () => void,
-    onShellError?: () => void,
-    onAllReady?: () => void,
-    onError?: (error: mixed) => void,
-    |};
-    */
-    {
-      nonce,
-
-      //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),
-      onShellReady() {
-        //managers.forEach(manager => manager.cleanup());
-        // If something errored before we started streaming, we set the error code appropriately.
-        res.statusCode = didError ? 500 : 200;
-        res.setHeader('Content-type', 'text/html');
-        pipe(res);
-      },
-
-      onShellError() {
-        didError = true;
-        res.statusCode = 500;
-        pipe(res);
-      },
-
-      onError(x) {
-        didError = true;
-        console.error(x);
-        res.statusCode = 500; //pipe(res); Removing this avoids, "React currently only supports piping to one writable stream."
-      }
 
-    }); // Abandon and switch to client rendering if enough time passes.
-    // Try lowering this to see the client recover.
+    try {
+      const {
+        app
+      } = await spouts({
+        clientManifest,
+        req,
+        res,
+        nonce
+      });
+      let didError = false;
+      const {
+        pipe,
+        abort
+      } = (0,server_namespaceObject.renderToPipeableStream)(app, {
+        nonce,
+
+        //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),
+        onShellReady() {
+          //managers.forEach(manager => manager.cleanup());
+          // If something errored before we started streaming, we set the error code appropriately.
+          res.statusCode = didError ? 500 : 200;
+          res.setHeader('Content-type', 'text/html');
+          pipe(res);
+        },
+
+        onShellError() {
+          didError = true;
+          res.statusCode = 500;
+          pipe(res);
+        },
+
+        onError(e) {
+          didError = true;
+          console.error(e);
+          res.statusCode = 500; //pipe(res); Removing this avoids, "React currently only supports piping to one writable stream."
+
+          if (onError) onError(e);
+        }
+
+      }); // Abandon and switch to client rendering if enough time passes.
+      // Try lowering this to see the client recover.
 
-    setTimeout(abort, timeoutMS);
+      setTimeout(() => abort(`Timeout of ${timeoutMS}ms exceeded`), timeoutMS);
+    } catch (e) {
+      if (onError) onError(e);
+      throw e;
+    }
   };
 
   return render;
@@ -175,7 +173,8 @@ function Document({
     const policy = { ...csPolicy
     };
 
-    if (nonce) {
+    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 {
@@ -189,7 +188,7 @@ function Document({
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 41,
+        lineNumber: 46,
         columnNumber: 7
       }
     });
@@ -199,14 +198,14 @@ function Document({
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 45,
+      lineNumber: 50,
       columnNumber: 5
     }
   }, /*#__PURE__*/external_react_default().createElement("head", {
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 46,
+      lineNumber: 51,
       columnNumber: 7
     }
   }, /*#__PURE__*/external_react_default().createElement("meta", {
@@ -214,7 +213,7 @@ function Document({
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 47,
+      lineNumber: 52,
       columnNumber: 9
     }
   }), cspMeta, head, assets.map((asset, i) => /*#__PURE__*/external_react_default().createElement("link", {
@@ -224,21 +223,21 @@ function Document({
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 51,
+      lineNumber: 56,
       columnNumber: 11
     }
   })), /*#__PURE__*/external_react_default().createElement("title", {
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 53,
+      lineNumber: 58,
       columnNumber: 9
     }
   }, title)), /*#__PURE__*/external_react_default().createElement("body", {
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 55,
+      lineNumber: 60,
       columnNumber: 7
     }
   }, /*#__PURE__*/external_react_default().createElement("div", {
@@ -246,7 +245,7 @@ function Document({
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 56,
+      lineNumber: 61,
       columnNumber: 9
     }
   }, children), scripts, assets.filter(({
@@ -260,7 +259,7 @@ function Document({
     __self: this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 61,
+      lineNumber: 66,
       columnNumber: 13
     }
   }))));
@@ -272,7 +271,7 @@ Document.defaultProps = {
     __self: undefined,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 70,
+      lineNumber: 75,
       columnNumber: 7
     }
   }), /*#__PURE__*/external_react_default().createElement("link", {
@@ -281,7 +280,7 @@ Document.defaultProps = {
     __self: undefined,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 71,
+      lineNumber: 76,
       columnNumber: 7
     }
   })),
@@ -416,9 +415,11 @@ function restHooksSpout(options = {
   return function (next) {
     return async props => {
       const [ServerCacheProvider, controller, store] = createPersistedStore(options.getManagers());
-      const nextProps = await next(props);
-      return { ...nextProps,
+      const nextProps = await next({ ...props,
         controller,
+        store
+      });
+      return { ...nextProps,
         initData: { ...nextProps.initData,
           resthooks: () => store.getState()
         },
@@ -426,10 +427,13 @@ function restHooksSpout(options = {
           __self: this,
           __source: {
             fileName: restHooks_server_jsxFileName,
-            lineNumber: 30,
+            lineNumber: 36,
             columnNumber: 14
           }
-        }, nextProps.app)
+        }, nextProps.app),
+        // TODO: figure out how to only inject in next and not have to also put here
+        controller,
+        store
       };
     };
   };
@@ -467,19 +471,23 @@ function routerSpout(options) {
         initialEntries: [url]
       }));
       const matchedRoutes = router.getMatchedRoutes(url);
-      const nextProps = await next(props);
+      const nextProps = await next({ ...props,
+        matchedRoutes,
+        router
+      });
       const Router = createRouteComponent(router);
       return { ...nextProps,
-        matchedRoutes,
-        router,
         app: /*#__PURE__*/external_react_default().createElement(Router, {
           __self: this,
           __source: {
             fileName: router_server_jsxFileName,
-            lineNumber: 44,
+            lineNumber: 52,
             columnNumber: 14
           }
-        }, nextProps.app)
+        }, nextProps.app),
+        // TODO: figure out how to only inject in next and not have to also put here
+        matchedRoutes,
+        router
       };
     };
   };
@@ -559,7 +567,7 @@ function JSONSpout({
             __self: this,
             __source: {
               fileName: json_server_jsxFileName,
-              lineNumber: 52,
+              lineNumber: 48,
               columnNumber: 13
             }
           });
@@ -575,7 +583,7 @@ function JSONSpout({
         __self: this,
         __source: {
           fileName: json_server_jsxFileName,
-          lineNumber: 69,
+          lineNumber: 65,
           columnNumber: 20
         }
       }));
@@ -585,6 +593,14 @@ function JSONSpout({
     };
   };
 }
+;// CONCATENATED MODULE: ./src/spouts/app.server.tsx
+const appSpout = app => props => Promise.resolve({ ...props,
+  app
+});
+
+/* harmony default export */ const app_server = (appSpout);
+;// CONCATENATED MODULE: ./src/spouts/types.ts
+
 ;// CONCATENATED MODULE: ./src/index.server.ts
 
 
@@ -592,6 +608,8 @@ function JSONSpout({
 
 
 
+
+
 module.exports = __webpack_exports__;
 /******/ })()
 ;