@anansi/core 0.11.0 → 0.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,49 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [0.12.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.11.2...@anansi/core@0.12.0) (2022-06-15)
7
+
8
+
9
+ ### 🚀 Features
10
+
11
+ * Add onError option to laySpouts ([a0ef72b](https://github.com/ntucker/anansi/commit/a0ef72bcaab1440a3d997d21636f81ca767a5a1c))
12
+
13
+
14
+ ### 💅 Enhancement
15
+
16
+ * Don't crash devserver on compiler errors ([3c764e4](https://github.com/ntucker/anansi/commit/3c764e4dd67a57409c64ff7dd144386623a1d93f))
17
+
18
+
19
+ ### 📦 Package
20
+
21
+ * Update babel monorepo to v7.18.5 ([#1545](https://github.com/ntucker/anansi/issues/1545)) ([aaaa8bc](https://github.com/ntucker/anansi/commit/aaaa8bcaa4d9188e9671ee31dc09b7aa9e3ce988))
22
+
23
+
24
+
25
+ ### [0.11.2](https://github.com/ntucker/anansi/compare/@anansi/core@0.11.1...@anansi/core@0.11.2) (2022-06-13)
26
+
27
+
28
+ ### 💅 Enhancement
29
+
30
+ * Do not override 'unsafe-inline' with nonce for CSP ([cfbd2bd](https://github.com/ntucker/anansi/commit/cfbd2bdfa69ae97ef2db6a824496888420251371))
31
+ * Use 'text' to get inline JSON ([9ecdb07](https://github.com/ntucker/anansi/commit/9ecdb074d01e6f09c28a685433105cf0d6f711cc))
32
+
33
+
34
+ ### 📦 Package
35
+
36
+ * Update `webpack-cli` to v4.10.0 ([#1543](https://github.com/ntucker/anansi/issues/1543)) ([298cb01](https://github.com/ntucker/anansi/commit/298cb018db2975fb5c926c48d2145d7c1f4515b9))
37
+
38
+
39
+
40
+ ### [0.11.1](https://github.com/ntucker/anansi/compare/@anansi/core@0.11.0...@anansi/core@0.11.1) (2022-06-13)
41
+
42
+
43
+ ### 🐛 Bug Fix
44
+
45
+ * Use call user-config devServer.setupMiddleware ([99acd8c](https://github.com/ntucker/anansi/commit/99acd8c9386bfc338ef8733d19a734b2a8be21dd))
46
+
47
+
48
+
6
49
  ## [0.11.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.10.0...@anansi/core@0.11.0) (2022-06-12)
7
50
 
8
51
 
package/dist/client.js CHANGED
@@ -176,7 +176,7 @@ function JSONSpout({
176
176
 
177
177
  function getDatafromDOM(id) {
178
178
  const element = document.querySelector(`#${id}`);
179
- return element !== null && element !== void 0 && element.innerHTML ? JSON.parse(element === null || element === void 0 ? void 0 : element.innerHTML) : undefined;
179
+ return element !== null && element !== void 0 && element.text ? JSON.parse(element === null || element === void 0 ? void 0 : element.text) : undefined;
180
180
  }
181
181
  ;// CONCATENATED MODULE: ./src/index.ts
182
182
 
@@ -1 +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":""}
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: 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 CHANGED
@@ -68,67 +68,59 @@ var external_crypto_default = /*#__PURE__*/__webpack_require__.n(external_crypto
68
68
 
69
69
 
70
70
  function laySpouts(spouts, {
71
- timeoutMS = 200
71
+ timeoutMS = 200,
72
+ onError
72
73
  } = {}) {
73
74
  const render = async (clientManifest, req, res) => {
74
75
  const nonce = external_crypto_default().randomBytes(16).toString('base64');
75
- const {
76
- app
77
- } = await spouts({
78
- clientManifest,
79
- req,
80
- res,
81
- nonce
82
- });
83
- let didError = false;
84
- const {
85
- pipe,
86
- abort
87
- } = (0,server_namespaceObject.renderToPipeableStream)(app,
88
- /*
89
- This is not documented, so included the types here for reference:
90
- type Options = {|
91
- identifierPrefix?: string,
92
- namespaceURI?: string,
93
- nonce?: string,
94
- bootstrapScriptContent?: string,
95
- bootstrapScripts?: Array<string>,
96
- bootstrapModules?: Array<string>,
97
- progressiveChunkSize?: number,
98
- onShellReady?: () => void,
99
- onShellError?: () => void,
100
- onAllReady?: () => void,
101
- onError?: (error: mixed) => void,
102
- |};
103
- */
104
- {
105
- nonce,
106
-
107
- //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),
108
- onShellReady() {
109
- //managers.forEach(manager => manager.cleanup());
110
- // If something errored before we started streaming, we set the error code appropriately.
111
- res.statusCode = didError ? 500 : 200;
112
- res.setHeader('Content-type', 'text/html');
113
- pipe(res);
114
- },
115
-
116
- onShellError() {
117
- didError = true;
118
- res.statusCode = 500;
119
- pipe(res);
120
- },
121
-
122
- onError(x) {
123
- didError = true;
124
- console.error(x);
125
- res.statusCode = 500; //pipe(res); Removing this avoids, "React currently only supports piping to one writable stream."
126
- }
127
76
 
128
- }); // Abandon and switch to client rendering if enough time passes.
129
- // Try lowering this to see the client recover.
77
+ try {
78
+ const {
79
+ app
80
+ } = await spouts({
81
+ clientManifest,
82
+ req,
83
+ res,
84
+ nonce
85
+ });
86
+ let didError = false;
87
+ const {
88
+ pipe,
89
+ abort
90
+ } = (0,server_namespaceObject.renderToPipeableStream)(app, {
91
+ nonce,
92
+
93
+ //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),
94
+ onShellReady() {
95
+ //managers.forEach(manager => manager.cleanup());
96
+ // If something errored before we started streaming, we set the error code appropriately.
97
+ res.statusCode = didError ? 500 : 200;
98
+ res.setHeader('Content-type', 'text/html');
99
+ pipe(res);
100
+ },
101
+
102
+ onShellError() {
103
+ didError = true;
104
+ res.statusCode = 500;
105
+ pipe(res);
106
+ },
107
+
108
+ onError(e) {
109
+ didError = true;
110
+ console.error(e);
111
+ res.statusCode = 500; //pipe(res); Removing this avoids, "React currently only supports piping to one writable stream."
112
+
113
+ if (onError) onError(e);
114
+ }
115
+
116
+ }); // Abandon and switch to client rendering if enough time passes.
117
+ // Try lowering this to see the client recover.
130
118
 
131
- setTimeout(abort, timeoutMS);
119
+ setTimeout(() => abort(`Timeout of ${timeoutMS}ms exceeded`), timeoutMS);
120
+ } catch (e) {
121
+ if (onError) onError(e);
122
+ throw e;
123
+ }
132
124
  };
133
125
 
134
126
  return render;
@@ -175,7 +167,8 @@ function Document({
175
167
  const policy = { ...csPolicy
176
168
  };
177
169
 
178
- if (nonce) {
170
+ if (nonce && ( // nonces negate 'unsafe-inline' so do not add it if that directive exists
171
+ !policy['script-src'] || !policy['script-src'].includes("'unsafe-inline'"))) {
179
172
  if (typeof policy['script-src'] === 'string') {
180
173
  policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];
181
174
  } else {
@@ -189,7 +182,7 @@ function Document({
189
182
  __self: this,
190
183
  __source: {
191
184
  fileName: _jsxFileName,
192
- lineNumber: 41,
185
+ lineNumber: 46,
193
186
  columnNumber: 7
194
187
  }
195
188
  });
@@ -199,14 +192,14 @@ function Document({
199
192
  __self: this,
200
193
  __source: {
201
194
  fileName: _jsxFileName,
202
- lineNumber: 45,
195
+ lineNumber: 50,
203
196
  columnNumber: 5
204
197
  }
205
198
  }, /*#__PURE__*/external_react_default().createElement("head", {
206
199
  __self: this,
207
200
  __source: {
208
201
  fileName: _jsxFileName,
209
- lineNumber: 46,
202
+ lineNumber: 51,
210
203
  columnNumber: 7
211
204
  }
212
205
  }, /*#__PURE__*/external_react_default().createElement("meta", {
@@ -214,7 +207,7 @@ function Document({
214
207
  __self: this,
215
208
  __source: {
216
209
  fileName: _jsxFileName,
217
- lineNumber: 47,
210
+ lineNumber: 52,
218
211
  columnNumber: 9
219
212
  }
220
213
  }), cspMeta, head, assets.map((asset, i) => /*#__PURE__*/external_react_default().createElement("link", {
@@ -224,21 +217,21 @@ function Document({
224
217
  __self: this,
225
218
  __source: {
226
219
  fileName: _jsxFileName,
227
- lineNumber: 51,
220
+ lineNumber: 56,
228
221
  columnNumber: 11
229
222
  }
230
223
  })), /*#__PURE__*/external_react_default().createElement("title", {
231
224
  __self: this,
232
225
  __source: {
233
226
  fileName: _jsxFileName,
234
- lineNumber: 53,
227
+ lineNumber: 58,
235
228
  columnNumber: 9
236
229
  }
237
230
  }, title)), /*#__PURE__*/external_react_default().createElement("body", {
238
231
  __self: this,
239
232
  __source: {
240
233
  fileName: _jsxFileName,
241
- lineNumber: 55,
234
+ lineNumber: 60,
242
235
  columnNumber: 7
243
236
  }
244
237
  }, /*#__PURE__*/external_react_default().createElement("div", {
@@ -246,7 +239,7 @@ function Document({
246
239
  __self: this,
247
240
  __source: {
248
241
  fileName: _jsxFileName,
249
- lineNumber: 56,
242
+ lineNumber: 61,
250
243
  columnNumber: 9
251
244
  }
252
245
  }, children), scripts, assets.filter(({
@@ -260,7 +253,7 @@ function Document({
260
253
  __self: this,
261
254
  __source: {
262
255
  fileName: _jsxFileName,
263
- lineNumber: 61,
256
+ lineNumber: 66,
264
257
  columnNumber: 13
265
258
  }
266
259
  }))));
@@ -272,7 +265,7 @@ Document.defaultProps = {
272
265
  __self: undefined,
273
266
  __source: {
274
267
  fileName: _jsxFileName,
275
- lineNumber: 70,
268
+ lineNumber: 75,
276
269
  columnNumber: 7
277
270
  }
278
271
  }), /*#__PURE__*/external_react_default().createElement("link", {
@@ -281,7 +274,7 @@ Document.defaultProps = {
281
274
  __self: undefined,
282
275
  __source: {
283
276
  fileName: _jsxFileName,
284
- lineNumber: 71,
277
+ lineNumber: 76,
285
278
  columnNumber: 7
286
279
  }
287
280
  })),
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","mappings":"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","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/server\"","/home/ntucker/src/anansi/packages/core/external node-commonjs \"crypto\"","/home/ntucker/src/anansi/packages/core/src/laySpouts.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"react\"","/home/ntucker/src/anansi/packages/core/src/spouts/csp.ts","/home/ntucker/src/anansi/packages/core/src/spouts/DocumentComponent.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/document.server.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/core\"","/home/ntucker/src/anansi/packages/core/external commonjs \"rest-hooks\"","/home/ntucker/src/anansi/packages/core/external commonjs \"redux\"","/home/ntucker/src/anansi/packages/core/src/spouts/rhHelp.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.server.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.server.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/prefetch.server.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/json.server.tsx","/home/ntucker/src/anansi/packages/core/src/index.server.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/server\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"crypto\");","import { renderToPipeableStream as reactRender } from 'react-dom/server';\nimport crypto from 'crypto';\n\nimport { Render } from './scripts/types';\nimport { ServerProps } from './spouts/types';\n\nexport default function laySpouts(\n spouts: (props: ServerProps) => Promise<{\n app: JSX.Element;\n }>,\n { timeoutMS = 200 }: { timeoutMS?: number } = {},\n) {\n const render: Render = async (clientManifest, req, res) => {\n const nonce = crypto.randomBytes(16).toString('base64');\n\n const { app } = await spouts({ clientManifest, req, res, nonce });\n let didError = false;\n const { pipe, abort } = reactRender(\n app,\n /*\n This is not documented, so included the types here for reference:\ntype Options = {|\n identifierPrefix?: string,\n namespaceURI?: string,\n nonce?: string,\n bootstrapScriptContent?: string,\n bootstrapScripts?: Array<string>,\n bootstrapModules?: Array<string>,\n progressiveChunkSize?: number,\n onShellReady?: () => void,\n onShellError?: () => void,\n onAllReady?: () => void,\n onError?: (error: mixed) => void,\n|};\n */\n {\n nonce,\n //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),\n onShellReady() {\n //managers.forEach(manager => manager.cleanup());\n // If something errored before we started streaming, we set the error code appropriately.\n res.statusCode = didError ? 500 : 200;\n res.setHeader('Content-type', 'text/html');\n pipe(res);\n },\n onShellError() {\n didError = true;\n res.statusCode = 500;\n pipe(res);\n },\n onError(x: any) {\n didError = true;\n console.error(x);\n res.statusCode = 500;\n //pipe(res); Removing this avoids, \"React currently only supports piping to one writable stream.\"\n },\n },\n );\n // Abandon and switch to client rendering if enough time passes.\n // Try lowering this to see the client recover.\n setTimeout(abort, timeoutMS);\n };\n return render;\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react\");","export interface Policy {\n [directive: string]: string | string[];\n}\n\n// TODO: memoize this\nexport function buildPolicy(policyObj: Policy) {\n return Object.keys(policyObj)\n .map(key => {\n const val = Array.isArray(policyObj[key])\n ? [...new Set(policyObj[key]).values()].filter(v => v).join(' ')\n : policyObj[key];\n\n // move strict dynamic to the end of the policy if it exists to be backwards compatible with csp2\n // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src#strict-dynamic\n if (typeof val === 'string' && val.includes(\"'strict-dynamic'\")) {\n const newVal = `${val\n .replace(/\\s?'strict-dynamic'\\s?/gi, ' ')\n .trim()} 'strict-dynamic'`;\n return `${key} ${newVal}`;\n }\n\n return `${key} ${val}`;\n })\n .join('; ');\n}\n","import type { Policy } from './csp';\nimport { buildPolicy } from './csp';\n\ntype Props = {\n children: React.ReactNode;\n assets: { href: string; as?: string; rel?: string }[];\n head: React.ReactNode;\n scripts: React.ReactNode;\n title: string;\n rootId: string;\n charSet: string;\n csPolicy?: Policy;\n nonce?: string | undefined;\n};\n\nexport default function Document({\n assets,\n head,\n children,\n title,\n rootId,\n charSet,\n csPolicy,\n nonce,\n scripts,\n}: Props) {\n let cspMeta: null | React.ReactNode = null;\n if (csPolicy) {\n // add nonce to policy\n const policy = {\n ...csPolicy,\n };\n if (nonce) {\n if (typeof policy['script-src'] === 'string') {\n policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];\n } else {\n policy['script-src'] = [...policy['script-src'], `'nonce-${nonce}'`];\n }\n }\n cspMeta = (\n <meta httpEquiv=\"Content-Security-Policy\" content={buildPolicy(policy)} />\n );\n }\n return (\n <html>\n <head>\n <meta charSet={charSet} />\n {cspMeta}\n {head}\n {assets.map((asset, i) => (\n <link key={i} rel=\"preload\" {...asset} />\n ))}\n <title>{title}</title>\n </head>\n <body>\n <div id={rootId}>{children}</div>\n {scripts}\n {assets\n .filter(({ href }) => href.endsWith('.js'))\n .map(({ href }, i) => (\n <script key={i} src={href} async />\n ))}\n </body>\n </html>\n );\n}\nDocument.defaultProps = {\n head: (\n <>\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n <link\n rel=\"shortcut icon\"\n href={`${process.env.WEBPACK_PUBLIC_PATH ?? '/'}favicon.ico`}\n />\n </>\n ),\n charSet: 'utf-8',\n rootId: 'anansi-root',\n scripts: null,\n};\n","import React from 'react';\nimport type { Route } from '@anansi/router';\nimport { StatsChunkGroup } from 'webpack';\n\nimport type { ServerProps, ResolveProps } from './types';\nimport type { Policy } from './csp';\nimport Document from './DocumentComponent';\n\ntype NeededProps = {\n matchedRoutes: Route<any>[];\n title?: string;\n scripts?: React.ReactNode[];\n} & ResolveProps;\n\nexport default function DocumentSpout(options: {\n head?: React.ReactNode;\n title: string;\n rootId?: string;\n charSet?: string;\n csPolicy?: Policy;\n}) {\n return function <T extends NeededProps>(\n next: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const nextProps = await next(props);\n\n const publicPath = props.clientManifest.publicPath;\n\n if (\n Object.keys(props.clientManifest?.entrypoints ?? {}).length < 1 ||\n publicPath === undefined\n )\n throw new Error('Manifest missing entries needed');\n\n // TODO: consider using this package for build stats in future:\n // https://github.com/facebook/react/tree/main/packages/react-server-dom-webpack\n const assetMap = (assets: { name: string; size?: number }[]) =>\n assets.map(({ name }) => `${publicPath}${name}`);\n\n const assetList: string[] = [];\n Object.values(props.clientManifest?.entrypoints ?? {}).forEach(\n entrypoint => {\n assetList.push(...assetMap(entrypoint.assets ?? []));\n },\n );\n new Set(\n assetMap(\n Object.values(props.clientManifest.namedChunkGroups ?? {})\n .filter(({ name }) =>\n nextProps.matchedRoutes.some(route => name?.includes(route.name)),\n )\n .flatMap(chunk => [\n ...(chunk.assets ?? []),\n // any chunk preloads\n ...childrenAssets(chunk),\n ]),\n ),\n ).forEach(asset => assetList.push(asset));\n\n // find additional assets to preload based on matched route\n const assets: {\n href: string;\n as?: string | undefined;\n rel?: string | undefined;\n }[] = assetList\n .filter(asset => !asset.endsWith('.hot-update.js'))\n .map(asset =>\n asset.endsWith('.css')\n ? { href: asset, rel: 'stylesheet' }\n : asset.endsWith('.js')\n ? { href: asset, as: 'script' }\n : { href: asset },\n );\n\n return {\n ...nextProps,\n app: (\n <Document\n {...options}\n title={nextProps.title ?? options.title}\n assets={assets}\n rootId={options.rootId}\n nonce={props.nonce}\n csPolicy={options.csPolicy}\n scripts={nextProps.scripts}\n >\n {nextProps.app}\n </Document>\n ),\n };\n };\n };\n}\n\nfunction childrenAssets(chunk: StatsChunkGroup) {\n return chunk.children\n ? Object.values(chunk.children).flatMap(preload =>\n preload.flatMap(c => c.assets ?? []),\n )\n : [];\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/core\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"rest-hooks\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"redux\");","import { ExternalCacheProvider, PromiseifyMiddleware } from 'rest-hooks';\nimport {\n Controller,\n createReducer,\n initialState,\n Manager,\n applyManager,\n NetworkManager,\n} from '@rest-hooks/core';\nimport { createStore, applyMiddleware } from 'redux';\n\n// TODO: Rework this and upstream to rest hooks\nexport function createPersistedStore(managers?: Manager[]) {\n const controller = new Controller();\n managers = managers ?? [new NetworkManager()];\n const reducer = createReducer(controller);\n const enhancer = applyMiddleware(\n ...applyManager(managers, controller),\n PromiseifyMiddleware as any,\n );\n const store = createStore(reducer, initialState as any, enhancer);\n managers.forEach(manager => manager.init?.(store.getState()));\n\n const selector = (state: any) => state;\n function ServerCacheProvider({ children }: { children: React.ReactNode }) {\n return (\n <ExternalCacheProvider\n store={store}\n selector={selector}\n controller={controller}\n >\n {children}\n </ExternalCacheProvider>\n );\n }\n return [ServerCacheProvider, controller, store] as const;\n}\n","import { Manager, NetworkManager } from '@rest-hooks/core';\n\nimport { createPersistedStore } from './rhHelp';\nimport type { ResolveProps, ServerProps } from './types';\n\ntype NeededProps = { initData?: Record<string, () => unknown> } & ResolveProps;\n\nexport default function restHooksSpout(\n options: {\n getManagers: () => Manager[];\n } = { getManagers: () => [new NetworkManager()] },\n) {\n return function <T extends NeededProps>(\n next: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const [ServerCacheProvider, controller, store] = createPersistedStore(\n options.getManagers(),\n );\n\n const nextProps = await next(props);\n\n return {\n ...nextProps,\n controller,\n initData: {\n ...nextProps.initData,\n resthooks: () => store.getState(),\n },\n app: <ServerCacheProvider>{nextProps.app}</ServerCacheProvider>,\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 { createMemoryHistory } from 'history';\n\nimport type { ResolveProps, ServerProps, 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}) {\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 router={router} resolveWith={resolveWith}>\n {children}\n </RouteProvider>\n );\n };\n\n return function <T extends NeededProps>(\n next: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const url = props.req.url || '';\n const router = options.createRouter(\n createMemoryHistory({ initialEntries: [url] }),\n );\n const matchedRoutes: Route<ResolveWith>[] = router.getMatchedRoutes(url);\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 { Route } from '@anansi/router';\n\nimport type { ResolveProps, ServerProps } from './types';\n\ntype NeededProps<RouteWith> = {\n matchedRoutes: Route<RouteWith>[];\n} & ResolveProps;\n\nexport default function prefetchSpout<F extends string>(field: F) {\n return function <RouteWith, T extends NeededProps<RouteWith>>(\n next: (props: ServerProps) => Promise<\n {\n [K in F]: RouteWith;\n } & T\n >,\n ) {\n return async (props: ServerProps) => {\n const nextProps = await next(props);\n\n try {\n const toFetch: Promise<unknown>[] = [];\n nextProps.matchedRoutes.forEach(route => {\n if (typeof route.resolveData === 'function') {\n toFetch.push(route.resolveData(nextProps[field], route));\n }\n });\n await Promise.all(toFetch);\n } catch (e) {\n console.error(e);\n }\n return nextProps;\n };\n };\n}\n","import React from 'react';\nimport type { Route } from '@anansi/router';\nimport { StatsChunkGroup } from 'webpack';\n\nimport type { ServerProps, ResolveProps } from './types';\nimport type { Policy } from './csp';\nimport Document from './DocumentComponent';\n\ntype NeededProps = {\n initData?: Record<string, () => unknown>;\n scripts?: React.ReactNode[];\n} & ResolveProps;\n\nexport default function JSONSpout({\n id = 'anansi-json',\n}: { id?: string } = {}) {\n return function <T extends NeededProps>(\n next: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const nextProps = await next(props);\n\n const scripts: React.ReactNode[] = nextProps.scripts ?? [];\n /*\n Object.entries(nextProps.initData ?? {}).forEach(([key, data]) => {\n try {\n const encoded = JSON.stringify(data);\n scripts.push(\n <script\n key={key}\n id={`${id}-${key}`}\n type=\"application/json\"\n dangerouslySetInnerHTML={{\n __html: encoded,\n }}\n nonce={props.nonce}\n />,\n );\n } catch (e) {\n // TODO: Use unified logging\n console.error(e);\n }\n });*/\n const Script = () => {\n try {\n const data: any = {};\n Object.entries(nextProps.initData ?? {}).forEach(([key, getData]) => {\n data[key] = getData();\n });\n const encoded = JSON.stringify(data);\n return (\n <script\n key={id}\n id={id}\n type=\"application/json\"\n dangerouslySetInnerHTML={{\n __html: encoded,\n }}\n nonce={props.nonce}\n />\n );\n } catch (e) {\n // TODO: Use unified logging\n console.error('Error serializing json');\n console.error(e);\n return null;\n }\n };\n scripts.push(<Script />);\n\n return {\n ...nextProps,\n scripts,\n };\n };\n };\n}\n","export { default as laySpouts } from './laySpouts';\nexport { default as documentSpout } from './spouts/document.server';\nexport { default as restHooksSpout } from './spouts/restHooks.server';\nexport { default as routerSpout } from './spouts/router.server';\nexport { default as prefetchSpout } from './spouts/prefetch.server';\nexport { default as JSONSpout } from './spouts/json.server';\n"],"names":[],"sourceRoot":""}
1
+ {"version":3,"file":"server.js","mappings":"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","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/server\"","/home/ntucker/src/anansi/packages/core/external node-commonjs \"crypto\"","/home/ntucker/src/anansi/packages/core/src/laySpouts.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"react\"","/home/ntucker/src/anansi/packages/core/src/spouts/csp.ts","/home/ntucker/src/anansi/packages/core/src/spouts/DocumentComponent.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/document.server.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/core\"","/home/ntucker/src/anansi/packages/core/external commonjs \"rest-hooks\"","/home/ntucker/src/anansi/packages/core/external commonjs \"redux\"","/home/ntucker/src/anansi/packages/core/src/spouts/rhHelp.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.server.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.server.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/prefetch.server.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/json.server.tsx","/home/ntucker/src/anansi/packages/core/src/index.server.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/server\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"crypto\");","import { renderToPipeableStream as reactRender } from 'react-dom/server';\nimport crypto from 'crypto';\n\nimport { Render } from './scripts/types';\nimport { ServerProps } from './spouts/types';\n\nexport default function laySpouts(\n spouts: (props: ServerProps) => Promise<{\n app: JSX.Element;\n }>,\n {\n timeoutMS = 200,\n onError,\n }: { timeoutMS?: number; onError?: (error: unknown) => void } = {},\n) {\n const render: Render = async (clientManifest, req, res) => {\n const nonce = crypto.randomBytes(16).toString('base64');\n\n try {\n const { app } = await spouts({ clientManifest, req, res, nonce });\n\n let didError = false;\n const { pipe, abort } = reactRender(app, {\n nonce,\n //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),\n onShellReady() {\n //managers.forEach(manager => manager.cleanup());\n // If something errored before we started streaming, we set the error code appropriately.\n res.statusCode = didError ? 500 : 200;\n res.setHeader('Content-type', 'text/html');\n pipe(res);\n },\n onShellError() {\n didError = true;\n res.statusCode = 500;\n pipe(res);\n },\n onError(e: any) {\n didError = true;\n console.error(e);\n res.statusCode = 500;\n //pipe(res); Removing this avoids, \"React currently only supports piping to one writable stream.\"\n if (onError) onError(e);\n },\n });\n // Abandon and switch to client rendering if enough time passes.\n // Try lowering this to see the client recover.\n setTimeout(\n () => (abort as any)(`Timeout of ${timeoutMS}ms exceeded`),\n timeoutMS,\n );\n } catch (e: unknown) {\n if (onError) onError(e);\n throw e;\n }\n };\n return render;\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react\");","export interface Policy {\n [directive: string]: string | string[];\n}\n\n// TODO: memoize this\nexport function buildPolicy(policyObj: Policy) {\n return Object.keys(policyObj)\n .map(key => {\n const val = Array.isArray(policyObj[key])\n ? [...new Set(policyObj[key]).values()].filter(v => v).join(' ')\n : policyObj[key];\n\n // move strict dynamic to the end of the policy if it exists to be backwards compatible with csp2\n // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src#strict-dynamic\n if (typeof val === 'string' && val.includes(\"'strict-dynamic'\")) {\n const newVal = `${val\n .replace(/\\s?'strict-dynamic'\\s?/gi, ' ')\n .trim()} 'strict-dynamic'`;\n return `${key} ${newVal}`;\n }\n\n return `${key} ${val}`;\n })\n .join('; ');\n}\n","import type { Policy } from './csp';\nimport { buildPolicy } from './csp';\n\ntype Props = {\n children: React.ReactNode;\n assets: { href: string; as?: string; rel?: string }[];\n head: React.ReactNode;\n scripts: React.ReactNode;\n title: string;\n rootId: string;\n charSet: string;\n csPolicy?: Policy;\n nonce?: string | undefined;\n};\n\nexport default function Document({\n assets,\n head,\n children,\n title,\n rootId,\n charSet,\n csPolicy,\n nonce,\n scripts,\n}: Props) {\n let cspMeta: null | React.ReactNode = null;\n if (csPolicy) {\n // add nonce to policy\n const policy = {\n ...csPolicy,\n };\n if (\n nonce &&\n // nonces negate 'unsafe-inline' so do not add it if that directive exists\n (!policy['script-src'] ||\n !policy['script-src'].includes(\"'unsafe-inline'\"))\n ) {\n if (typeof policy['script-src'] === 'string') {\n policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];\n } else {\n policy['script-src'] = [...policy['script-src'], `'nonce-${nonce}'`];\n }\n }\n cspMeta = (\n <meta httpEquiv=\"Content-Security-Policy\" content={buildPolicy(policy)} />\n );\n }\n return (\n <html>\n <head>\n <meta charSet={charSet} />\n {cspMeta}\n {head}\n {assets.map((asset, i) => (\n <link key={i} rel=\"preload\" {...asset} />\n ))}\n <title>{title}</title>\n </head>\n <body>\n <div id={rootId}>{children}</div>\n {scripts}\n {assets\n .filter(({ href }) => href.endsWith('.js'))\n .map(({ href }, i) => (\n <script key={i} src={href} async />\n ))}\n </body>\n </html>\n );\n}\nDocument.defaultProps = {\n head: (\n <>\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n <link\n rel=\"shortcut icon\"\n href={`${process.env.WEBPACK_PUBLIC_PATH ?? '/'}favicon.ico`}\n />\n </>\n ),\n charSet: 'utf-8',\n rootId: 'anansi-root',\n scripts: null,\n};\n","import React from 'react';\nimport type { Route } from '@anansi/router';\nimport { StatsChunkGroup } from 'webpack';\n\nimport type { ServerProps, ResolveProps } from './types';\nimport type { Policy } from './csp';\nimport Document from './DocumentComponent';\n\ntype NeededProps = {\n matchedRoutes: Route<any>[];\n title?: string;\n scripts?: React.ReactNode[];\n} & ResolveProps;\n\nexport default function DocumentSpout(options: {\n head?: React.ReactNode;\n title: string;\n rootId?: string;\n charSet?: string;\n csPolicy?: Policy;\n}) {\n return function <T extends NeededProps>(\n next: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const nextProps = await next(props);\n\n const publicPath = props.clientManifest.publicPath;\n\n if (\n Object.keys(props.clientManifest?.entrypoints ?? {}).length < 1 ||\n publicPath === undefined\n )\n throw new Error('Manifest missing entries needed');\n\n // TODO: consider using this package for build stats in future:\n // https://github.com/facebook/react/tree/main/packages/react-server-dom-webpack\n const assetMap = (assets: { name: string; size?: number }[]) =>\n assets.map(({ name }) => `${publicPath}${name}`);\n\n const assetList: string[] = [];\n Object.values(props.clientManifest?.entrypoints ?? {}).forEach(\n entrypoint => {\n assetList.push(...assetMap(entrypoint.assets ?? []));\n },\n );\n new Set(\n assetMap(\n Object.values(props.clientManifest.namedChunkGroups ?? {})\n .filter(({ name }) =>\n nextProps.matchedRoutes.some(route => name?.includes(route.name)),\n )\n .flatMap(chunk => [\n ...(chunk.assets ?? []),\n // any chunk preloads\n ...childrenAssets(chunk),\n ]),\n ),\n ).forEach(asset => assetList.push(asset));\n\n // find additional assets to preload based on matched route\n const assets: {\n href: string;\n as?: string | undefined;\n rel?: string | undefined;\n }[] = assetList\n .filter(asset => !asset.endsWith('.hot-update.js'))\n .map(asset =>\n asset.endsWith('.css')\n ? { href: asset, rel: 'stylesheet' }\n : asset.endsWith('.js')\n ? { href: asset, as: 'script' }\n : { href: asset },\n );\n\n return {\n ...nextProps,\n app: (\n <Document\n {...options}\n title={nextProps.title ?? options.title}\n assets={assets}\n rootId={options.rootId}\n nonce={props.nonce}\n csPolicy={options.csPolicy}\n scripts={nextProps.scripts}\n >\n {nextProps.app}\n </Document>\n ),\n };\n };\n };\n}\n\nfunction childrenAssets(chunk: StatsChunkGroup) {\n return chunk.children\n ? Object.values(chunk.children).flatMap(preload =>\n preload.flatMap(c => c.assets ?? []),\n )\n : [];\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/core\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"rest-hooks\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"redux\");","import { ExternalCacheProvider, PromiseifyMiddleware } from 'rest-hooks';\nimport {\n Controller,\n createReducer,\n initialState,\n Manager,\n applyManager,\n NetworkManager,\n} from '@rest-hooks/core';\nimport { createStore, applyMiddleware } from 'redux';\n\n// TODO: Rework this and upstream to rest hooks\nexport function createPersistedStore(managers?: Manager[]) {\n const controller = new Controller();\n managers = managers ?? [new NetworkManager()];\n const reducer = createReducer(controller);\n const enhancer = applyMiddleware(\n ...applyManager(managers, controller),\n PromiseifyMiddleware as any,\n );\n const store = createStore(reducer, initialState as any, enhancer);\n managers.forEach(manager => manager.init?.(store.getState()));\n\n const selector = (state: any) => state;\n function ServerCacheProvider({ children }: { children: React.ReactNode }) {\n return (\n <ExternalCacheProvider\n store={store}\n selector={selector}\n controller={controller}\n >\n {children}\n </ExternalCacheProvider>\n );\n }\n return [ServerCacheProvider, controller, store] as const;\n}\n","import { Manager, NetworkManager } from '@rest-hooks/core';\n\nimport { createPersistedStore } from './rhHelp';\nimport type { ResolveProps, ServerProps } from './types';\n\ntype NeededProps = { initData?: Record<string, () => unknown> } & ResolveProps;\n\nexport default function restHooksSpout(\n options: {\n getManagers: () => Manager[];\n } = { getManagers: () => [new NetworkManager()] },\n) {\n return function <T extends NeededProps>(\n next: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const [ServerCacheProvider, controller, store] = createPersistedStore(\n options.getManagers(),\n );\n\n const nextProps = await next(props);\n\n return {\n ...nextProps,\n controller,\n initData: {\n ...nextProps.initData,\n resthooks: () => store.getState(),\n },\n app: <ServerCacheProvider>{nextProps.app}</ServerCacheProvider>,\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 { createMemoryHistory } from 'history';\n\nimport type { ResolveProps, ServerProps, 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}) {\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 router={router} resolveWith={resolveWith}>\n {children}\n </RouteProvider>\n );\n };\n\n return function <T extends NeededProps>(\n next: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const url = props.req.url || '';\n const router = options.createRouter(\n createMemoryHistory({ initialEntries: [url] }),\n );\n const matchedRoutes: Route<ResolveWith>[] = router.getMatchedRoutes(url);\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 { Route } from '@anansi/router';\n\nimport type { ResolveProps, ServerProps } from './types';\n\ntype NeededProps<RouteWith> = {\n matchedRoutes: Route<RouteWith>[];\n} & ResolveProps;\n\nexport default function prefetchSpout<F extends string>(field: F) {\n return function <RouteWith, T extends NeededProps<RouteWith>>(\n next: (props: ServerProps) => Promise<\n {\n [K in F]: RouteWith;\n } & T\n >,\n ) {\n return async (props: ServerProps) => {\n const nextProps = await next(props);\n\n try {\n const toFetch: Promise<unknown>[] = [];\n nextProps.matchedRoutes.forEach(route => {\n if (typeof route.resolveData === 'function') {\n toFetch.push(route.resolveData(nextProps[field], route));\n }\n });\n await Promise.all(toFetch);\n } catch (e) {\n console.error(e);\n }\n return nextProps;\n };\n };\n}\n","import React from 'react';\nimport type { Route } from '@anansi/router';\nimport { StatsChunkGroup } from 'webpack';\n\nimport type { ServerProps, ResolveProps } from './types';\nimport type { Policy } from './csp';\nimport Document from './DocumentComponent';\n\ntype NeededProps = {\n initData?: Record<string, () => unknown>;\n scripts?: React.ReactNode[];\n} & ResolveProps;\n\nexport default function JSONSpout({\n id = 'anansi-json',\n}: { id?: string } = {}) {\n return function <T extends NeededProps>(\n next: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const nextProps = await next(props);\n\n const scripts: React.ReactNode[] = nextProps.scripts ?? [];\n /*\n Object.entries(nextProps.initData ?? {}).forEach(([key, data]) => {\n try {\n const encoded = JSON.stringify(data);\n scripts.push(\n <script\n key={key}\n id={`${id}-${key}`}\n type=\"application/json\"\n dangerouslySetInnerHTML={{\n __html: encoded,\n }}\n nonce={props.nonce}\n />,\n );\n } catch (e) {\n // TODO: Use unified logging\n console.error(e);\n }\n });*/\n const Script = () => {\n try {\n const data: any = {};\n Object.entries(nextProps.initData ?? {}).forEach(([key, getData]) => {\n data[key] = getData();\n });\n const encoded = JSON.stringify(data);\n return (\n <script\n key={id}\n id={id}\n type=\"application/json\"\n dangerouslySetInnerHTML={{\n __html: encoded,\n }}\n nonce={props.nonce}\n />\n );\n } catch (e) {\n // TODO: Use unified logging\n console.error('Error serializing json');\n console.error(e);\n return null;\n }\n };\n scripts.push(<Script />);\n\n return {\n ...nextProps,\n scripts,\n };\n };\n };\n}\n","export { default as laySpouts } from './laySpouts';\nexport { default as documentSpout } from './spouts/document.server';\nexport { default as restHooksSpout } from './spouts/restHooks.server';\nexport { default as routerSpout } from './spouts/router.server';\nexport { default as prefetchSpout } from './spouts/prefetch.server';\nexport { default as JSONSpout } from './spouts/json.server';\n"],"names":[],"sourceRoot":""}
@@ -2,7 +2,8 @@ import { Render } from './scripts/types';
2
2
  import { ServerProps } from './spouts/types';
3
3
  export default function laySpouts(spouts: (props: ServerProps) => Promise<{
4
4
  app: JSX.Element;
5
- }>, { timeoutMS }?: {
5
+ }>, { timeoutMS, onError, }?: {
6
6
  timeoutMS?: number;
7
+ onError?: (error: unknown) => void;
7
8
  }): Render;
8
9
  //# sourceMappingURL=laySpouts.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"laySpouts.d.ts","sourceRoot":"","sources":["../src/laySpouts.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC;IACtC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC;CAClB,CAAC,EACF,EAAE,SAAe,EAAE,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,UAqDjD"}
1
+ {"version":3,"file":"laySpouts.d.ts","sourceRoot":"","sources":["../src/laySpouts.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC;IACtC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC;CAClB,CAAC,EACF,EACE,SAAe,EACf,OAAO,GACR,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;CAAO,UA4CnE"}
package/lib/laySpouts.js CHANGED
@@ -10,70 +10,61 @@ var _server = require("react-dom/server");
10
10
  var _crypto = _interopRequireDefault(require("crypto"));
11
11
 
12
12
  function laySpouts(spouts, {
13
- timeoutMS = 200
13
+ timeoutMS = 200,
14
+ onError
14
15
  } = {}) {
15
16
  const render = async (clientManifest, req, res) => {
16
17
  const nonce = _crypto.default.randomBytes(16).toString('base64');
17
18
 
18
- const {
19
- app
20
- } = await spouts({
21
- clientManifest,
22
- req,
23
- res,
24
- nonce
25
- });
26
- let didError = false;
27
- const {
28
- pipe,
29
- abort
30
- } = (0, _server.renderToPipeableStream)(app,
31
- /*
32
- This is not documented, so included the types here for reference:
33
- type Options = {|
34
- identifierPrefix?: string,
35
- namespaceURI?: string,
36
- nonce?: string,
37
- bootstrapScriptContent?: string,
38
- bootstrapScripts?: Array<string>,
39
- bootstrapModules?: Array<string>,
40
- progressiveChunkSize?: number,
41
- onShellReady?: () => void,
42
- onShellError?: () => void,
43
- onAllReady?: () => void,
44
- onError?: (error: mixed) => void,
45
- |};
46
- */
47
- {
48
- nonce,
19
+ try {
20
+ const {
21
+ app
22
+ } = await spouts({
23
+ clientManifest,
24
+ req,
25
+ res,
26
+ nonce
27
+ });
28
+ let didError = false;
29
+ const {
30
+ pipe,
31
+ abort
32
+ } = (0, _server.renderToPipeableStream)(app, {
33
+ nonce,
49
34
 
50
- //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),
51
- onShellReady() {
52
- //managers.forEach(manager => manager.cleanup());
53
- // If something errored before we started streaming, we set the error code appropriately.
54
- res.statusCode = didError ? 500 : 200;
55
- res.setHeader('Content-type', 'text/html');
56
- pipe(res);
57
- },
35
+ //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),
36
+ onShellReady() {
37
+ //managers.forEach(manager => manager.cleanup());
38
+ // If something errored before we started streaming, we set the error code appropriately.
39
+ res.statusCode = didError ? 500 : 200;
40
+ res.setHeader('Content-type', 'text/html');
41
+ pipe(res);
42
+ },
58
43
 
59
- onShellError() {
60
- didError = true;
61
- res.statusCode = 500;
62
- pipe(res);
63
- },
44
+ onShellError() {
45
+ didError = true;
46
+ res.statusCode = 500;
47
+ pipe(res);
48
+ },
64
49
 
65
- onError(x) {
66
- didError = true;
67
- console.error(x);
68
- res.statusCode = 500; //pipe(res); Removing this avoids, "React currently only supports piping to one writable stream."
69
- }
50
+ onError(e) {
51
+ didError = true;
52
+ console.error(e);
53
+ res.statusCode = 500; //pipe(res); Removing this avoids, "React currently only supports piping to one writable stream."
70
54
 
71
- }); // Abandon and switch to client rendering if enough time passes.
72
- // Try lowering this to see the client recover.
55
+ if (onError) onError(e);
56
+ }
73
57
 
74
- setTimeout(abort, timeoutMS);
58
+ }); // Abandon and switch to client rendering if enough time passes.
59
+ // Try lowering this to see the client recover.
60
+
61
+ setTimeout(() => abort(`Timeout of ${timeoutMS}ms exceeded`), timeoutMS);
62
+ } catch (e) {
63
+ if (onError) onError(e);
64
+ throw e;
65
+ }
75
66
  };
76
67
 
77
68
  return render;
78
69
  }
79
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJsYXlTcG91dHMiLCJzcG91dHMiLCJ0aW1lb3V0TVMiLCJyZW5kZXIiLCJjbGllbnRNYW5pZmVzdCIsInJlcSIsInJlcyIsIm5vbmNlIiwiY3J5cHRvIiwicmFuZG9tQnl0ZXMiLCJ0b1N0cmluZyIsImFwcCIsImRpZEVycm9yIiwicGlwZSIsImFib3J0IiwicmVhY3RSZW5kZXIiLCJvblNoZWxsUmVhZHkiLCJzdGF0dXNDb2RlIiwic2V0SGVhZGVyIiwib25TaGVsbEVycm9yIiwib25FcnJvciIsIngiLCJjb25zb2xlIiwiZXJyb3IiLCJzZXRUaW1lb3V0Il0sInNvdXJjZXMiOlsiLi4vc3JjL2xheVNwb3V0cy50c3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcmVuZGVyVG9QaXBlYWJsZVN0cmVhbSBhcyByZWFjdFJlbmRlciB9IGZyb20gJ3JlYWN0LWRvbS9zZXJ2ZXInO1xuaW1wb3J0IGNyeXB0byBmcm9tICdjcnlwdG8nO1xuXG5pbXBvcnQgeyBSZW5kZXIgfSBmcm9tICcuL3NjcmlwdHMvdHlwZXMnO1xuaW1wb3J0IHsgU2VydmVyUHJvcHMgfSBmcm9tICcuL3Nwb3V0cy90eXBlcyc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGxheVNwb3V0cyhcbiAgc3BvdXRzOiAocHJvcHM6IFNlcnZlclByb3BzKSA9PiBQcm9taXNlPHtcbiAgICBhcHA6IEpTWC5FbGVtZW50O1xuICB9PixcbiAgeyB0aW1lb3V0TVMgPSAyMDAgfTogeyB0aW1lb3V0TVM/OiBudW1iZXIgfSA9IHt9LFxuKSB7XG4gIGNvbnN0IHJlbmRlcjogUmVuZGVyID0gYXN5bmMgKGNsaWVudE1hbmlmZXN0LCByZXEsIHJlcykgPT4ge1xuICAgIGNvbnN0IG5vbmNlID0gY3J5cHRvLnJhbmRvbUJ5dGVzKDE2KS50b1N0cmluZygnYmFzZTY0Jyk7XG5cbiAgICBjb25zdCB7IGFwcCB9ID0gYXdhaXQgc3BvdXRzKHsgY2xpZW50TWFuaWZlc3QsIHJlcSwgcmVzLCBub25jZSB9KTtcbiAgICBsZXQgZGlkRXJyb3IgPSBmYWxzZTtcbiAgICBjb25zdCB7IHBpcGUsIGFib3J0IH0gPSByZWFjdFJlbmRlcihcbiAgICAgIGFwcCxcbiAgICAgIC8qXG4gICAgICBUaGlzIGlzIG5vdCBkb2N1bWVudGVkLCBzbyBpbmNsdWRlZCB0aGUgdHlwZXMgaGVyZSBmb3IgcmVmZXJlbmNlOlxudHlwZSBPcHRpb25zID0ge3xcbiAgaWRlbnRpZmllclByZWZpeD86IHN0cmluZyxcbiAgbmFtZXNwYWNlVVJJPzogc3RyaW5nLFxuICBub25jZT86IHN0cmluZyxcbiAgYm9vdHN0cmFwU2NyaXB0Q29udGVudD86IHN0cmluZyxcbiAgYm9vdHN0cmFwU2NyaXB0cz86IEFycmF5PHN0cmluZz4sXG4gIGJvb3RzdHJhcE1vZHVsZXM/OiBBcnJheTxzdHJpbmc+LFxuICBwcm9ncmVzc2l2ZUNodW5rU2l6ZT86IG51bWJlcixcbiAgb25TaGVsbFJlYWR5PzogKCkgPT4gdm9pZCxcbiAgb25TaGVsbEVycm9yPzogKCkgPT4gdm9pZCxcbiAgb25BbGxSZWFkeT86ICgpID0+IHZvaWQsXG4gIG9uRXJyb3I/OiAoZXJyb3I6IG1peGVkKSA9PiB2b2lkLFxufH07XG4gICovXG4gICAgICB7XG4gICAgICAgIG5vbmNlLFxuICAgICAgICAvL2Jvb3RzdHJhcFNjcmlwdHM6IGFzc2V0cy5maWx0ZXIoYXNzZXQgPT4gYXNzZXQuZW5kc1dpdGgoJy5qcycpKSxcbiAgICAgICAgb25TaGVsbFJlYWR5KCkge1xuICAgICAgICAgIC8vbWFuYWdlcnMuZm9yRWFjaChtYW5hZ2VyID0+IG1hbmFnZXIuY2xlYW51cCgpKTtcbiAgICAgICAgICAvLyBJZiBzb21ldGhpbmcgZXJyb3JlZCBiZWZvcmUgd2Ugc3RhcnRlZCBzdHJlYW1pbmcsIHdlIHNldCB0aGUgZXJyb3IgY29kZSBhcHByb3ByaWF0ZWx5LlxuICAgICAgICAgIHJlcy5zdGF0dXNDb2RlID0gZGlkRXJyb3IgPyA1MDAgOiAyMDA7XG4gICAgICAgICAgcmVzLnNldEhlYWRlcignQ29udGVudC10eXBlJywgJ3RleHQvaHRtbCcpO1xuICAgICAgICAgIHBpcGUocmVzKTtcbiAgICAgICAgfSxcbiAgICAgICAgb25TaGVsbEVycm9yKCkge1xuICAgICAgICAgIGRpZEVycm9yID0gdHJ1ZTtcbiAgICAgICAgICByZXMuc3RhdHVzQ29kZSA9IDUwMDtcbiAgICAgICAgICBwaXBlKHJlcyk7XG4gICAgICAgIH0sXG4gICAgICAgIG9uRXJyb3IoeDogYW55KSB7XG4gICAgICAgICAgZGlkRXJyb3IgPSB0cnVlO1xuICAgICAgICAgIGNvbnNvbGUuZXJyb3IoeCk7XG4gICAgICAgICAgcmVzLnN0YXR1c0NvZGUgPSA1MDA7XG4gICAgICAgICAgLy9waXBlKHJlcyk7IFJlbW92aW5nIHRoaXMgYXZvaWRzLCBcIlJlYWN0IGN1cnJlbnRseSBvbmx5IHN1cHBvcnRzIHBpcGluZyB0byBvbmUgd3JpdGFibGUgc3RyZWFtLlwiXG4gICAgICAgIH0sXG4gICAgICB9LFxuICAgICk7XG4gICAgLy8gQWJhbmRvbiBhbmQgc3dpdGNoIHRvIGNsaWVudCByZW5kZXJpbmcgaWYgZW5vdWdoIHRpbWUgcGFzc2VzLlxuICAgIC8vIFRyeSBsb3dlcmluZyB0aGlzIHRvIHNlZSB0aGUgY2xpZW50IHJlY292ZXIuXG4gICAgc2V0VGltZW91dChhYm9ydCwgdGltZW91dE1TKTtcbiAgfTtcbiAgcmV0dXJuIHJlbmRlcjtcbn1cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBOztBQUNBOztBQUtlLFNBQVNBLFNBQVQsQ0FDYkMsTUFEYSxFQUliO0VBQUVDLFNBQVMsR0FBRztBQUFkLElBQThDLEVBSmpDLEVBS2I7RUFDQSxNQUFNQyxNQUFjLEdBQUcsT0FBT0MsY0FBUCxFQUF1QkMsR0FBdkIsRUFBNEJDLEdBQTVCLEtBQW9DO0lBQ3pELE1BQU1DLEtBQUssR0FBR0MsZUFBQSxDQUFPQyxXQUFQLENBQW1CLEVBQW5CLEVBQXVCQyxRQUF2QixDQUFnQyxRQUFoQyxDQUFkOztJQUVBLE1BQU07TUFBRUM7SUFBRixJQUFVLE1BQU1WLE1BQU0sQ0FBQztNQUFFRyxjQUFGO01BQWtCQyxHQUFsQjtNQUF1QkMsR0FBdkI7TUFBNEJDO0lBQTVCLENBQUQsQ0FBNUI7SUFDQSxJQUFJSyxRQUFRLEdBQUcsS0FBZjtJQUNBLE1BQU07TUFBRUMsSUFBRjtNQUFRQztJQUFSLElBQWtCLElBQUFDLDhCQUFBLEVBQ3RCSixHQURzQjtJQUV0QjtBQUNOO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtJQUNNO01BQ0VKLEtBREY7O01BRUU7TUFDQVMsWUFBWSxHQUFHO1FBQ2I7UUFDQTtRQUNBVixHQUFHLENBQUNXLFVBQUosR0FBaUJMLFFBQVEsR0FBRyxHQUFILEdBQVMsR0FBbEM7UUFDQU4sR0FBRyxDQUFDWSxTQUFKLENBQWMsY0FBZCxFQUE4QixXQUE5QjtRQUNBTCxJQUFJLENBQUNQLEdBQUQsQ0FBSjtNQUNELENBVEg7O01BVUVhLFlBQVksR0FBRztRQUNiUCxRQUFRLEdBQUcsSUFBWDtRQUNBTixHQUFHLENBQUNXLFVBQUosR0FBaUIsR0FBakI7UUFDQUosSUFBSSxDQUFDUCxHQUFELENBQUo7TUFDRCxDQWRIOztNQWVFYyxPQUFPLENBQUNDLENBQUQsRUFBUztRQUNkVCxRQUFRLEdBQUcsSUFBWDtRQUNBVSxPQUFPLENBQUNDLEtBQVIsQ0FBY0YsQ0FBZDtRQUNBZixHQUFHLENBQUNXLFVBQUosR0FBaUIsR0FBakIsQ0FIYyxDQUlkO01BQ0Q7O0lBcEJILENBbEJzQixDQUF4QixDQUx5RCxDQThDekQ7SUFDQTs7SUFDQU8sVUFBVSxDQUFDVixLQUFELEVBQVFaLFNBQVIsQ0FBVjtFQUNELENBakREOztFQWtEQSxPQUFPQyxNQUFQO0FBQ0QifQ==
70
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJsYXlTcG91dHMiLCJzcG91dHMiLCJ0aW1lb3V0TVMiLCJvbkVycm9yIiwicmVuZGVyIiwiY2xpZW50TWFuaWZlc3QiLCJyZXEiLCJyZXMiLCJub25jZSIsImNyeXB0byIsInJhbmRvbUJ5dGVzIiwidG9TdHJpbmciLCJhcHAiLCJkaWRFcnJvciIsInBpcGUiLCJhYm9ydCIsInJlYWN0UmVuZGVyIiwib25TaGVsbFJlYWR5Iiwic3RhdHVzQ29kZSIsInNldEhlYWRlciIsIm9uU2hlbGxFcnJvciIsImUiLCJjb25zb2xlIiwiZXJyb3IiLCJzZXRUaW1lb3V0Il0sInNvdXJjZXMiOlsiLi4vc3JjL2xheVNwb3V0cy50c3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcmVuZGVyVG9QaXBlYWJsZVN0cmVhbSBhcyByZWFjdFJlbmRlciB9IGZyb20gJ3JlYWN0LWRvbS9zZXJ2ZXInO1xuaW1wb3J0IGNyeXB0byBmcm9tICdjcnlwdG8nO1xuXG5pbXBvcnQgeyBSZW5kZXIgfSBmcm9tICcuL3NjcmlwdHMvdHlwZXMnO1xuaW1wb3J0IHsgU2VydmVyUHJvcHMgfSBmcm9tICcuL3Nwb3V0cy90eXBlcyc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGxheVNwb3V0cyhcbiAgc3BvdXRzOiAocHJvcHM6IFNlcnZlclByb3BzKSA9PiBQcm9taXNlPHtcbiAgICBhcHA6IEpTWC5FbGVtZW50O1xuICB9PixcbiAge1xuICAgIHRpbWVvdXRNUyA9IDIwMCxcbiAgICBvbkVycm9yLFxuICB9OiB7IHRpbWVvdXRNUz86IG51bWJlcjsgb25FcnJvcj86IChlcnJvcjogdW5rbm93bikgPT4gdm9pZCB9ID0ge30sXG4pIHtcbiAgY29uc3QgcmVuZGVyOiBSZW5kZXIgPSBhc3luYyAoY2xpZW50TWFuaWZlc3QsIHJlcSwgcmVzKSA9PiB7XG4gICAgY29uc3Qgbm9uY2UgPSBjcnlwdG8ucmFuZG9tQnl0ZXMoMTYpLnRvU3RyaW5nKCdiYXNlNjQnKTtcblxuICAgIHRyeSB7XG4gICAgICBjb25zdCB7IGFwcCB9ID0gYXdhaXQgc3BvdXRzKHsgY2xpZW50TWFuaWZlc3QsIHJlcSwgcmVzLCBub25jZSB9KTtcblxuICAgICAgbGV0IGRpZEVycm9yID0gZmFsc2U7XG4gICAgICBjb25zdCB7IHBpcGUsIGFib3J0IH0gPSByZWFjdFJlbmRlcihhcHAsIHtcbiAgICAgICAgbm9uY2UsXG4gICAgICAgIC8vYm9vdHN0cmFwU2NyaXB0czogYXNzZXRzLmZpbHRlcihhc3NldCA9PiBhc3NldC5lbmRzV2l0aCgnLmpzJykpLFxuICAgICAgICBvblNoZWxsUmVhZHkoKSB7XG4gICAgICAgICAgLy9tYW5hZ2Vycy5mb3JFYWNoKG1hbmFnZXIgPT4gbWFuYWdlci5jbGVhbnVwKCkpO1xuICAgICAgICAgIC8vIElmIHNvbWV0aGluZyBlcnJvcmVkIGJlZm9yZSB3ZSBzdGFydGVkIHN0cmVhbWluZywgd2Ugc2V0IHRoZSBlcnJvciBjb2RlIGFwcHJvcHJpYXRlbHkuXG4gICAgICAgICAgcmVzLnN0YXR1c0NvZGUgPSBkaWRFcnJvciA/IDUwMCA6IDIwMDtcbiAgICAgICAgICByZXMuc2V0SGVhZGVyKCdDb250ZW50LXR5cGUnLCAndGV4dC9odG1sJyk7XG4gICAgICAgICAgcGlwZShyZXMpO1xuICAgICAgICB9LFxuICAgICAgICBvblNoZWxsRXJyb3IoKSB7XG4gICAgICAgICAgZGlkRXJyb3IgPSB0cnVlO1xuICAgICAgICAgIHJlcy5zdGF0dXNDb2RlID0gNTAwO1xuICAgICAgICAgIHBpcGUocmVzKTtcbiAgICAgICAgfSxcbiAgICAgICAgb25FcnJvcihlOiBhbnkpIHtcbiAgICAgICAgICBkaWRFcnJvciA9IHRydWU7XG4gICAgICAgICAgY29uc29sZS5lcnJvcihlKTtcbiAgICAgICAgICByZXMuc3RhdHVzQ29kZSA9IDUwMDtcbiAgICAgICAgICAvL3BpcGUocmVzKTsgUmVtb3ZpbmcgdGhpcyBhdm9pZHMsIFwiUmVhY3QgY3VycmVudGx5IG9ubHkgc3VwcG9ydHMgcGlwaW5nIHRvIG9uZSB3cml0YWJsZSBzdHJlYW0uXCJcbiAgICAgICAgICBpZiAob25FcnJvcikgb25FcnJvcihlKTtcbiAgICAgICAgfSxcbiAgICAgIH0pO1xuICAgICAgLy8gQWJhbmRvbiBhbmQgc3dpdGNoIHRvIGNsaWVudCByZW5kZXJpbmcgaWYgZW5vdWdoIHRpbWUgcGFzc2VzLlxuICAgICAgLy8gVHJ5IGxvd2VyaW5nIHRoaXMgdG8gc2VlIHRoZSBjbGllbnQgcmVjb3Zlci5cbiAgICAgIHNldFRpbWVvdXQoXG4gICAgICAgICgpID0+IChhYm9ydCBhcyBhbnkpKGBUaW1lb3V0IG9mICR7dGltZW91dE1TfW1zIGV4Y2VlZGVkYCksXG4gICAgICAgIHRpbWVvdXRNUyxcbiAgICAgICk7XG4gICAgfSBjYXRjaCAoZTogdW5rbm93bikge1xuICAgICAgaWYgKG9uRXJyb3IpIG9uRXJyb3IoZSk7XG4gICAgICB0aHJvdyBlO1xuICAgIH1cbiAgfTtcbiAgcmV0dXJuIHJlbmRlcjtcbn1cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBOztBQUNBOztBQUtlLFNBQVNBLFNBQVQsQ0FDYkMsTUFEYSxFQUliO0VBQ0VDLFNBQVMsR0FBRyxHQURkO0VBRUVDO0FBRkYsSUFHZ0UsRUFQbkQsRUFRYjtFQUNBLE1BQU1DLE1BQWMsR0FBRyxPQUFPQyxjQUFQLEVBQXVCQyxHQUF2QixFQUE0QkMsR0FBNUIsS0FBb0M7SUFDekQsTUFBTUMsS0FBSyxHQUFHQyxlQUFBLENBQU9DLFdBQVAsQ0FBbUIsRUFBbkIsRUFBdUJDLFFBQXZCLENBQWdDLFFBQWhDLENBQWQ7O0lBRUEsSUFBSTtNQUNGLE1BQU07UUFBRUM7TUFBRixJQUFVLE1BQU1YLE1BQU0sQ0FBQztRQUFFSSxjQUFGO1FBQWtCQyxHQUFsQjtRQUF1QkMsR0FBdkI7UUFBNEJDO01BQTVCLENBQUQsQ0FBNUI7TUFFQSxJQUFJSyxRQUFRLEdBQUcsS0FBZjtNQUNBLE1BQU07UUFBRUMsSUFBRjtRQUFRQztNQUFSLElBQWtCLElBQUFDLDhCQUFBLEVBQVlKLEdBQVosRUFBaUI7UUFDdkNKLEtBRHVDOztRQUV2QztRQUNBUyxZQUFZLEdBQUc7VUFDYjtVQUNBO1VBQ0FWLEdBQUcsQ0FBQ1csVUFBSixHQUFpQkwsUUFBUSxHQUFHLEdBQUgsR0FBUyxHQUFsQztVQUNBTixHQUFHLENBQUNZLFNBQUosQ0FBYyxjQUFkLEVBQThCLFdBQTlCO1VBQ0FMLElBQUksQ0FBQ1AsR0FBRCxDQUFKO1FBQ0QsQ0FUc0M7O1FBVXZDYSxZQUFZLEdBQUc7VUFDYlAsUUFBUSxHQUFHLElBQVg7VUFDQU4sR0FBRyxDQUFDVyxVQUFKLEdBQWlCLEdBQWpCO1VBQ0FKLElBQUksQ0FBQ1AsR0FBRCxDQUFKO1FBQ0QsQ0Fkc0M7O1FBZXZDSixPQUFPLENBQUNrQixDQUFELEVBQVM7VUFDZFIsUUFBUSxHQUFHLElBQVg7VUFDQVMsT0FBTyxDQUFDQyxLQUFSLENBQWNGLENBQWQ7VUFDQWQsR0FBRyxDQUFDVyxVQUFKLEdBQWlCLEdBQWpCLENBSGMsQ0FJZDs7VUFDQSxJQUFJZixPQUFKLEVBQWFBLE9BQU8sQ0FBQ2tCLENBQUQsQ0FBUDtRQUNkOztNQXJCc0MsQ0FBakIsQ0FBeEIsQ0FKRSxDQTJCRjtNQUNBOztNQUNBRyxVQUFVLENBQ1IsTUFBT1QsS0FBRCxDQUFnQixjQUFhYixTQUFVLGFBQXZDLENBREUsRUFFUkEsU0FGUSxDQUFWO0lBSUQsQ0FqQ0QsQ0FpQ0UsT0FBT21CLENBQVAsRUFBbUI7TUFDbkIsSUFBSWxCLE9BQUosRUFBYUEsT0FBTyxDQUFDa0IsQ0FBRCxDQUFQO01BQ2IsTUFBTUEsQ0FBTjtJQUNEO0VBQ0YsQ0F4Q0Q7O0VBeUNBLE9BQU9qQixNQUFQO0FBQ0QifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"startDevserver.d.ts","sourceRoot":"","sources":["../../src/scripts/startDevserver.ts"],"names":[],"mappings":";AAgBA,OAAO,sBAAsB,CAAC;AAe9B,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,QAiNlC"}
1
+ {"version":3,"file":"startDevserver.d.ts","sourceRoot":"","sources":["../../src/scripts/startDevserver.ts"],"names":[],"mappings":";AAgBA,OAAO,sBAAsB,CAAC;AAe9B,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,QAqOlC"}
@@ -138,9 +138,14 @@ function startDevServer(entrypoint, env = {}) {
138
138
 
139
139
  if (clientStats !== null && clientStats !== void 0 && (_clientStats$compilat = clientStats.compilation) !== null && _clientStats$compilat !== void 0 && (_clientStats$compilat2 = _clientStats$compilat.errors) !== null && _clientStats$compilat2 !== void 0 && _clientStats$compilat2.length || serverStats !== null && serverStats !== void 0 && (_serverStats$compilat = serverStats.compilation) !== null && _serverStats$compilat !== void 0 && (_serverStats$compilat2 = _serverStats$compilat.errors) !== null && _serverStats$compilat2 !== void 0 && _serverStats$compilat2.length) {
140
140
  log.error('Errors for client build: ' + clientStats.compilation.errors);
141
- log.error('Errors for server build: ' + serverStats.compilation.errors); // TODO: handle more gracefully
141
+ log.error('Errors for server build: ' + serverStats.compilation.errors); // first time, rather than re-render
142
142
 
143
- process.exit(-1);
143
+ if (Array.isArray(initRender)) {
144
+ process.exit(-1);
145
+ }
146
+
147
+ log.error('Above compiler errors blocking reload');
148
+ return;
144
149
  } else {
145
150
  log.info('Launching SSR');
146
151
  } // ASSETS
@@ -156,7 +161,16 @@ function startDevServer(entrypoint, env = {}) {
156
161
  render = fsRequire(serverEntry).default.bind(undefined, clientManifest); // SERVER SIDE ENTRYPOINT
157
162
 
158
163
  if (Array.isArray(initRender)) {
159
- initRender.forEach(init => render(...init.args).then(init.resolve));
164
+ initRender.forEach(async init => {
165
+ try {
166
+ log.info('Resolving queued requests');
167
+ await render(...init.args);
168
+ init.resolve();
169
+ } catch (e) {
170
+ log.error('Error when attempting to render queued requests');
171
+ log.error(e);
172
+ }
173
+ });
160
174
  initRender = undefined;
161
175
  }
162
176
  }
@@ -169,7 +183,7 @@ function startDevServer(entrypoint, env = {}) {
169
183
  }
170
184
  },
171
185
  setupMiddlewares: (middlewares, devServer) => {
172
- var _webpackConfigs$0$dev, _webpackConfigs$0$dev2, _devServer$app;
186
+ var _webpackConfigs$0$dev, _webpackConfigs$0$dev2, _devServer$app, _webpackConfigs$0$dev3;
173
187
 
174
188
  if (!devServer) {
175
189
  throw new Error('webpack-dev-server is not defined');
@@ -190,6 +204,11 @@ function startDevServer(entrypoint, env = {}) {
190
204
  });
191
205
  await render(req, res);
192
206
  }));
207
+
208
+ if ((_webpackConfigs$0$dev3 = webpackConfigs[0].devServer) !== null && _webpackConfigs$0$dev3 !== void 0 && _webpackConfigs$0$dev3.setupMiddlewares) {
209
+ return webpackConfigs[0].devServer.setupMiddlewares(middlewares, devServer);
210
+ }
211
+
193
212
  return middlewares;
194
213
  }
195
214
  }, compiler);
@@ -230,4 +249,4 @@ function startDevServer(entrypoint, env = {}) {
230
249
  });
231
250
  runServer();
232
251
  }
233
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["require","main","module","entrypoint","process","argv","console","log","exit","startDevServer","env","webpackConfig","resolve","path","join","cwd","logging","getLogger","volume","Volume","fs","createFsFromVolume","ufs","use","diskFs","fsRequire","createFsRequire","readFile","promisify","server","hotEntry","entryPath","generatedEntrypoint","tmp","fileSync","postfix","writeSync","fd","webpackConfigs","entrypath","name","mode","replace","BROWSERSLIST_ENV","target","compiler","webpack","sourceMapSupport","install","hookRequire","getServerBundle","serverStats","serverJson","toJson","assets","outputPath","handleErrors","fn","req","res","next","x","initRender","render","args","Promise","push","importRender","stats","clientStats","compilation","errors","length","error","info","clientManifest","serverEntry","Object","keys","cache","forEach","key","default","bind","undefined","Array","isArray","init","then","devServer","WebpackDevServer","devMiddleware","outputFileSystem","setupMiddlewares","middlewares","Error","otherRoutes","WEBPACK_PUBLIC_PATH","proxy","app","get","RegExp","url","endsWith","statusCode","setHeader","send","socket","on","runServer","start","hooks","done","tap","multiStats","hasOwn","e","stopServer","stop","warn"],"sources":["../../src/scripts/startDevserver.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport { promisify } from 'util';\nimport diskFs from 'fs';\nimport path from 'path';\nimport webpack, { MultiCompiler } from 'webpack';\nimport { createFsFromVolume, Volume } from 'memfs';\nimport { Server, IncomingMessage, ServerResponse } from 'http';\nimport type { NextFunction } from 'express';\nimport tmp from 'tmp';\nimport sourceMapSupport from 'source-map-support';\nimport { ufs } from 'unionfs';\nimport WebpackDevServer from 'webpack-dev-server';\nimport logging from 'webpack/lib/logging/runtime';\nimport { createFsRequire } from 'fs-require';\n\nimport 'cross-fetch/polyfill';\nimport { BoundRender } from './types';\n\n// run directly from node\nif (require.main === module) {\n  const entrypoint = process.argv[2];\n\n  if (!entrypoint) {\n    console.log(`Usage: start-anansi <entrypoint-file>`);\n    process.exit(-1);\n  }\n\n  startDevServer(entrypoint);\n}\n\nexport default function startDevServer(\n  entrypoint: string,\n  env: Record<string, unknown> = {},\n) {\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const webpackConfig = require(require.resolve(\n    // TODO: use normal resolution algorithm to find webpack file\n    path.join(process.cwd(), 'webpack.config'),\n  ));\n\n  const log = logging.getLogger('anansi-devserver');\n\n  // Set up in memory filesystem\n  const volume = new Volume();\n  const fs = createFsFromVolume(volume);\n  ufs.use(diskFs).use(fs as any);\n\n  const fsRequire = createFsRequire(ufs);\n  const readFile = promisify(ufs.readFile);\n  let server: Server | undefined;\n\n  // Generate a temporary file so we can hot reload from the root of the application\n  function hotEntry(entryPath: string) {\n    // eslint-disable-next-line\n    // @ts-ignore for some reason it's not picking up that other options are optional\n    const generatedEntrypoint = tmp.fileSync({ postfix: '.js' });\n    diskFs.writeSync(\n      generatedEntrypoint.fd,\n      `\n  import entry from \"${path.resolve(process.cwd(), entryPath)}\";\n\n  if (module.hot) {\n    module.hot.accept();\n  }\n\n  export default entry;\n    `,\n    );\n    return generatedEntrypoint;\n  }\n\n  const webpackConfigs = [\n    webpackConfig(\n      {\n        ...env,\n        entrypath: hotEntry(entrypoint).name,\n        name: 'client',\n      },\n      { mode: 'development' },\n    ),\n    webpackConfig(\n      {\n        ...env,\n        entrypath: entrypoint.replace('.tsx', '.server.tsx'),\n        name: 'server',\n        BROWSERSLIST_ENV: 'current node',\n      },\n      { mode: 'development', target: 'node' },\n    ),\n  ] as const;\n\n  // initialize the webpack compiler\n  const compiler: MultiCompiler = webpack(webpackConfigs);\n\n  sourceMapSupport.install({ hookRequire: true });\n\n  function getServerBundle(serverStats: webpack.Stats) {\n    const serverJson = serverStats.toJson({ assets: true });\n    return path.join(serverJson.outputPath ?? '', 'server.js');\n  }\n  function handleErrors<\n    F extends (\n      req: Request | IncomingMessage,\n      res: Response | ServerResponse,\n    ) => Promise<void>,\n  >(fn: F) {\n    return async function (\n      req: Request | IncomingMessage,\n      res: Response | ServerResponse,\n      next: NextFunction,\n    ) {\n      try {\n        return await fn(req, res);\n      } catch (x) {\n        next(x);\n      }\n    };\n  }\n\n  let initRender:\n    | { args: Parameters<BoundRender>; resolve: () => void }[]\n    | undefined = [];\n  let render: BoundRender = (...args) =>\n    new Promise(resolve => {\n      initRender?.push({ args, resolve });\n    });\n\n  function importRender(stats: webpack.Stats[]) {\n    const [clientStats, serverStats] = stats;\n    if (\n      clientStats?.compilation?.errors?.length ||\n      serverStats?.compilation?.errors?.length\n    ) {\n      log.error('Errors for client build: ' + clientStats.compilation.errors);\n      log.error('Errors for server build: ' + serverStats.compilation.errors);\n      // TODO: handle more gracefully\n      process.exit(-1);\n    } else {\n      log.info('Launching SSR');\n    }\n\n    // ASSETS\n    const clientManifest = clientStats.toJson();\n\n    const serverEntry = getServerBundle(serverStats);\n    // reload modules\n    Object.keys(fsRequire.cache).forEach(key => {\n      delete fsRequire.cache[key];\n    });\n    // eslint-disable-next-line @typescript-eslint/no-var-requires\n    render = (fsRequire(serverEntry) as any).default.bind(\n      undefined,\n      clientManifest,\n    );\n    // SERVER SIDE ENTRYPOINT\n    if (Array.isArray(initRender)) {\n      initRender.forEach(init => render(...init.args).then(init.resolve));\n      initRender = undefined;\n    }\n  }\n\n  const devServer = new WebpackDevServer(\n    // write to memory filesystem so we can import\n    {\n      ...webpackConfigs[0].devServer,\n      devMiddleware: {\n        ...webpackConfigs[0]?.devServer?.devMiddleware,\n        outputFileSystem: {\n          ...fs,\n          join: path.join as any,\n        } as any as typeof fs,\n      },\n      setupMiddlewares: (middlewares, devServer) => {\n        if (!devServer) {\n          throw new Error('webpack-dev-server is not defined');\n        }\n\n        const otherRoutes = [\n          process.env.WEBPACK_PUBLIC_PATH,\n          ...Object.keys(webpackConfigs[0].devServer?.proxy ?? {}),\n        ];\n        // serve SSR for non-WEBPACK_PUBLIC_PATH\n        devServer.app?.get(\n          new RegExp(`^(?!${otherRoutes.join('|')})`),\n          handleErrors(async function (req: any, res: any) {\n            if (req.url.endsWith('favicon.ico')) {\n              res.statusCode = 404;\n              res.setHeader('Content-type', 'text/html');\n              res.send('not found');\n              return;\n            }\n            res.socket.on('error', (error: unknown) => {\n              console.error('Fatal', error);\n            });\n\n            await render(req, res);\n          }),\n        );\n\n        return middlewares;\n      },\n    },\n    compiler,\n  );\n  const runServer = async () => {\n    await devServer.start();\n    devServer.compiler.hooks.done.tap(\n      'Anansi Server',\n      (multiStats: webpack.MultiStats | webpack.Stats) => {\n        if (!multiStats) {\n          log.error('stats not send');\n          process.exit(-1);\n        }\n\n        if (!Object.hasOwn(multiStats, 'stats')) return;\n        if ((multiStats as webpack.MultiStats).stats.length > 1) {\n          try {\n            importRender((multiStats as webpack.MultiStats).stats);\n          } catch (e: any) {\n            log.error('Failed to load serve entrypoint');\n            throw e;\n          }\n        } else {\n          log.error('Only compiler one stat');\n        }\n      },\n    );\n  };\n  const stopServer = async () => {\n    log.info('Stopping server...');\n    await devServer.stop();\n    log.info('Server closed');\n  };\n\n  process.on('SIGINT', () => {\n    log.warn('Received SIGINT, devserver shutting down');\n    stopServer();\n    process.exit(-1);\n  });\n\n  runServer();\n}\n"],"mappings":"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"}
252
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["require","main","module","entrypoint","process","argv","console","log","exit","startDevServer","env","webpackConfig","resolve","path","join","cwd","logging","getLogger","volume","Volume","fs","createFsFromVolume","ufs","use","diskFs","fsRequire","createFsRequire","readFile","promisify","server","hotEntry","entryPath","generatedEntrypoint","tmp","fileSync","postfix","writeSync","fd","webpackConfigs","entrypath","name","mode","replace","BROWSERSLIST_ENV","target","compiler","webpack","sourceMapSupport","install","hookRequire","getServerBundle","serverStats","serverJson","toJson","assets","outputPath","handleErrors","fn","req","res","next","x","initRender","render","args","Promise","push","importRender","stats","clientStats","compilation","errors","length","error","Array","isArray","info","clientManifest","serverEntry","Object","keys","cache","forEach","key","default","bind","undefined","init","e","devServer","WebpackDevServer","devMiddleware","outputFileSystem","setupMiddlewares","middlewares","Error","otherRoutes","WEBPACK_PUBLIC_PATH","proxy","app","get","RegExp","url","endsWith","statusCode","setHeader","send","socket","on","runServer","start","hooks","done","tap","multiStats","hasOwn","stopServer","stop","warn"],"sources":["../../src/scripts/startDevserver.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport { promisify } from 'util';\nimport diskFs from 'fs';\nimport path from 'path';\nimport webpack, { MultiCompiler } from 'webpack';\nimport { createFsFromVolume, Volume } from 'memfs';\nimport { Server, IncomingMessage, ServerResponse } from 'http';\nimport type { NextFunction } from 'express';\nimport tmp from 'tmp';\nimport sourceMapSupport from 'source-map-support';\nimport { ufs } from 'unionfs';\nimport WebpackDevServer from 'webpack-dev-server';\nimport logging from 'webpack/lib/logging/runtime';\nimport { createFsRequire } from 'fs-require';\n\nimport 'cross-fetch/polyfill';\nimport { BoundRender } from './types';\n\n// run directly from node\nif (require.main === module) {\n  const entrypoint = process.argv[2];\n\n  if (!entrypoint) {\n    console.log(`Usage: start-anansi <entrypoint-file>`);\n    process.exit(-1);\n  }\n\n  startDevServer(entrypoint);\n}\n\nexport default function startDevServer(\n  entrypoint: string,\n  env: Record<string, unknown> = {},\n) {\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const webpackConfig = require(require.resolve(\n    // TODO: use normal resolution algorithm to find webpack file\n    path.join(process.cwd(), 'webpack.config'),\n  ));\n\n  const log = logging.getLogger('anansi-devserver');\n\n  // Set up in memory filesystem\n  const volume = new Volume();\n  const fs = createFsFromVolume(volume);\n  ufs.use(diskFs).use(fs as any);\n\n  const fsRequire = createFsRequire(ufs);\n  const readFile = promisify(ufs.readFile);\n  let server: Server | undefined;\n\n  // Generate a temporary file so we can hot reload from the root of the application\n  function hotEntry(entryPath: string) {\n    // eslint-disable-next-line\n    // @ts-ignore for some reason it's not picking up that other options are optional\n    const generatedEntrypoint = tmp.fileSync({ postfix: '.js' });\n    diskFs.writeSync(\n      generatedEntrypoint.fd,\n      `\n  import entry from \"${path.resolve(process.cwd(), entryPath)}\";\n\n  if (module.hot) {\n    module.hot.accept();\n  }\n\n  export default entry;\n    `,\n    );\n    return generatedEntrypoint;\n  }\n\n  const webpackConfigs = [\n    webpackConfig(\n      {\n        ...env,\n        entrypath: hotEntry(entrypoint).name,\n        name: 'client',\n      },\n      { mode: 'development' },\n    ),\n    webpackConfig(\n      {\n        ...env,\n        entrypath: entrypoint.replace('.tsx', '.server.tsx'),\n        name: 'server',\n        BROWSERSLIST_ENV: 'current node',\n      },\n      { mode: 'development', target: 'node' },\n    ),\n  ] as const;\n\n  // initialize the webpack compiler\n  const compiler: MultiCompiler = webpack(webpackConfigs);\n\n  sourceMapSupport.install({ hookRequire: true });\n\n  function getServerBundle(serverStats: webpack.Stats) {\n    const serverJson = serverStats.toJson({ assets: true });\n    return path.join(serverJson.outputPath ?? '', 'server.js');\n  }\n  function handleErrors<\n    F extends (\n      req: Request | IncomingMessage,\n      res: Response | ServerResponse,\n    ) => Promise<void>,\n  >(fn: F) {\n    return async function (\n      req: Request | IncomingMessage,\n      res: Response | ServerResponse,\n      next: NextFunction,\n    ) {\n      try {\n        return await fn(req, res);\n      } catch (x) {\n        next(x);\n      }\n    };\n  }\n\n  let initRender:\n    | { args: Parameters<BoundRender>; resolve: () => void }[]\n    | undefined = [];\n  let render: BoundRender = (...args) =>\n    new Promise(resolve => {\n      initRender?.push({ args, resolve });\n    });\n\n  function importRender(stats: webpack.Stats[]) {\n    const [clientStats, serverStats] = stats;\n    if (\n      clientStats?.compilation?.errors?.length ||\n      serverStats?.compilation?.errors?.length\n    ) {\n      log.error('Errors for client build: ' + clientStats.compilation.errors);\n      log.error('Errors for server build: ' + serverStats.compilation.errors);\n      // first time, rather than re-render\n      if (Array.isArray(initRender)) {\n        process.exit(-1);\n      }\n      log.error('Above compiler errors blocking reload');\n      return;\n    } else {\n      log.info('Launching SSR');\n    }\n\n    // ASSETS\n    const clientManifest = clientStats.toJson();\n\n    const serverEntry = getServerBundle(serverStats);\n    // reload modules\n    Object.keys(fsRequire.cache).forEach(key => {\n      delete fsRequire.cache[key];\n    });\n    // eslint-disable-next-line @typescript-eslint/no-var-requires\n    render = (fsRequire(serverEntry) as any).default.bind(\n      undefined,\n      clientManifest,\n    );\n    // SERVER SIDE ENTRYPOINT\n    if (Array.isArray(initRender)) {\n      initRender.forEach(async init => {\n        try {\n          log.info('Resolving queued requests');\n          await render(...init.args);\n          init.resolve();\n        } catch (e) {\n          log.error('Error when attempting to render queued requests');\n          log.error(e);\n        }\n      });\n      initRender = undefined;\n    }\n  }\n\n  const devServer = new WebpackDevServer(\n    // write to memory filesystem so we can import\n    {\n      ...webpackConfigs[0].devServer,\n      devMiddleware: {\n        ...webpackConfigs[0]?.devServer?.devMiddleware,\n        outputFileSystem: {\n          ...fs,\n          join: path.join as any,\n        } as any as typeof fs,\n      },\n      setupMiddlewares: (middlewares, devServer) => {\n        if (!devServer) {\n          throw new Error('webpack-dev-server is not defined');\n        }\n\n        const otherRoutes = [\n          process.env.WEBPACK_PUBLIC_PATH,\n          ...Object.keys(webpackConfigs[0].devServer?.proxy ?? {}),\n        ];\n        // serve SSR for non-WEBPACK_PUBLIC_PATH\n        devServer.app?.get(\n          new RegExp(`^(?!${otherRoutes.join('|')})`),\n          handleErrors(async function (req: any, res: any) {\n            if (req.url.endsWith('favicon.ico')) {\n              res.statusCode = 404;\n              res.setHeader('Content-type', 'text/html');\n              res.send('not found');\n              return;\n            }\n            res.socket.on('error', (error: unknown) => {\n              console.error('Fatal', error);\n            });\n\n            await render(req, res);\n          }),\n        );\n\n        if (webpackConfigs[0].devServer?.setupMiddlewares) {\n          return webpackConfigs[0].devServer.setupMiddlewares(\n            middlewares,\n            devServer,\n          );\n        }\n\n        return middlewares;\n      },\n    },\n    compiler,\n  );\n  const runServer = async () => {\n    await devServer.start();\n    devServer.compiler.hooks.done.tap(\n      'Anansi Server',\n      (multiStats: webpack.MultiStats | webpack.Stats) => {\n        if (!multiStats) {\n          log.error('stats not send');\n          process.exit(-1);\n        }\n\n        if (!Object.hasOwn(multiStats, 'stats')) return;\n        if ((multiStats as webpack.MultiStats).stats.length > 1) {\n          try {\n            importRender((multiStats as webpack.MultiStats).stats);\n          } catch (e: any) {\n            log.error('Failed to load serve entrypoint');\n            throw e;\n          }\n        } else {\n          log.error('Only compiler one stat');\n        }\n      },\n    );\n  };\n  const stopServer = async () => {\n    log.info('Stopping server...');\n    await devServer.stop();\n    log.info('Server closed');\n  };\n\n  process.on('SIGINT', () => {\n    log.warn('Received SIGINT, devserver shutting down');\n    stopServer();\n    process.exit(-1);\n  });\n\n  runServer();\n}\n"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"DocumentComponent.d.ts","sourceRoot":"","sources":["../../src/spouts/DocumentComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAGpC,aAAK,KAAK,GAAG;IACX,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACtD,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,CAAC;AAEF,iBAAwB,QAAQ,CAAC,EAC/B,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,KAAK,EACL,OAAO,GACR,EAAE,KAAK,eAwCP;kBAlDuB,QAAQ;;;;;;;;eAAR,QAAQ"}
1
+ {"version":3,"file":"DocumentComponent.d.ts","sourceRoot":"","sources":["../../src/spouts/DocumentComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAGpC,aAAK,KAAK,GAAG;IACX,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACtD,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,CAAC;AAEF,iBAAwB,QAAQ,CAAC,EAC/B,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,KAAK,EACL,OAAO,GACR,EAAE,KAAK,eA6CP;kBAvDuB,QAAQ;;;;;;;;eAAR,QAAQ"}
@@ -31,7 +31,8 @@ function Document({
31
31
  const policy = { ...csPolicy
32
32
  };
33
33
 
34
- if (nonce) {
34
+ if (nonce && ( // nonces negate 'unsafe-inline' so do not add it if that directive exists
35
+ !policy['script-src'] || !policy['script-src'].includes("'unsafe-inline'"))) {
35
36
  if (typeof policy['script-src'] === 'string') {
36
37
  policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];
37
38
  } else {
@@ -75,4 +76,4 @@ Document.defaultProps = {
75
76
  rootId: 'anansi-root',
76
77
  scripts: null
77
78
  };
78
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJEb2N1bWVudCIsImFzc2V0cyIsImhlYWQiLCJjaGlsZHJlbiIsInRpdGxlIiwicm9vdElkIiwiY2hhclNldCIsImNzUG9saWN5Iiwibm9uY2UiLCJzY3JpcHRzIiwiY3NwTWV0YSIsInBvbGljeSIsImJ1aWxkUG9saWN5IiwibWFwIiwiYXNzZXQiLCJpIiwiZmlsdGVyIiwiaHJlZiIsImVuZHNXaXRoIiwiZGVmYXVsdFByb3BzIiwicHJvY2VzcyIsImVudiIsIldFQlBBQ0tfUFVCTElDX1BBVEgiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvc3BvdXRzL0RvY3VtZW50Q29tcG9uZW50LnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFBvbGljeSB9IGZyb20gJy4vY3NwJztcbmltcG9ydCB7IGJ1aWxkUG9saWN5IH0gZnJvbSAnLi9jc3AnO1xuXG50eXBlIFByb3BzID0ge1xuICBjaGlsZHJlbjogUmVhY3QuUmVhY3ROb2RlO1xuICBhc3NldHM6IHsgaHJlZjogc3RyaW5nOyBhcz86IHN0cmluZzsgcmVsPzogc3RyaW5nIH1bXTtcbiAgaGVhZDogUmVhY3QuUmVhY3ROb2RlO1xuICBzY3JpcHRzOiBSZWFjdC5SZWFjdE5vZGU7XG4gIHRpdGxlOiBzdHJpbmc7XG4gIHJvb3RJZDogc3RyaW5nO1xuICBjaGFyU2V0OiBzdHJpbmc7XG4gIGNzUG9saWN5PzogUG9saWN5O1xuICBub25jZT86IHN0cmluZyB8IHVuZGVmaW5lZDtcbn07XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIERvY3VtZW50KHtcbiAgYXNzZXRzLFxuICBoZWFkLFxuICBjaGlsZHJlbixcbiAgdGl0bGUsXG4gIHJvb3RJZCxcbiAgY2hhclNldCxcbiAgY3NQb2xpY3ksXG4gIG5vbmNlLFxuICBzY3JpcHRzLFxufTogUHJvcHMpIHtcbiAgbGV0IGNzcE1ldGE6IG51bGwgfCBSZWFjdC5SZWFjdE5vZGUgPSBudWxsO1xuICBpZiAoY3NQb2xpY3kpIHtcbiAgICAvLyBhZGQgbm9uY2UgdG8gcG9saWN5XG4gICAgY29uc3QgcG9saWN5ID0ge1xuICAgICAgLi4uY3NQb2xpY3ksXG4gICAgfTtcbiAgICBpZiAobm9uY2UpIHtcbiAgICAgIGlmICh0eXBlb2YgcG9saWN5WydzY3JpcHQtc3JjJ10gPT09ICdzdHJpbmcnKSB7XG4gICAgICAgIHBvbGljeVsnc2NyaXB0LXNyYyddID0gW3BvbGljeVsnc2NyaXB0LXNyYyddLCBgJ25vbmNlLSR7bm9uY2V9J2BdO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcG9saWN5WydzY3JpcHQtc3JjJ10gPSBbLi4ucG9saWN5WydzY3JpcHQtc3JjJ10sIGAnbm9uY2UtJHtub25jZX0nYF07XG4gICAgICB9XG4gICAgfVxuICAgIGNzcE1ldGEgPSAoXG4gICAgICA8bWV0YSBodHRwRXF1aXY9XCJDb250ZW50LVNlY3VyaXR5LVBvbGljeVwiIGNvbnRlbnQ9e2J1aWxkUG9saWN5KHBvbGljeSl9IC8+XG4gICAgKTtcbiAgfVxuICByZXR1cm4gKFxuICAgIDxodG1sPlxuICAgICAgPGhlYWQ+XG4gICAgICAgIDxtZXRhIGNoYXJTZXQ9e2NoYXJTZXR9IC8+XG4gICAgICAgIHtjc3BNZXRhfVxuICAgICAgICB7aGVhZH1cbiAgICAgICAge2Fzc2V0cy5tYXAoKGFzc2V0LCBpKSA9PiAoXG4gICAgICAgICAgPGxpbmsga2V5PXtpfSByZWw9XCJwcmVsb2FkXCIgey4uLmFzc2V0fSAvPlxuICAgICAgICApKX1cbiAgICAgICAgPHRpdGxlPnt0aXRsZX08L3RpdGxlPlxuICAgICAgPC9oZWFkPlxuICAgICAgPGJvZHk+XG4gICAgICAgIDxkaXYgaWQ9e3Jvb3RJZH0+e2NoaWxkcmVufTwvZGl2PlxuICAgICAgICB7c2NyaXB0c31cbiAgICAgICAge2Fzc2V0c1xuICAgICAgICAgIC5maWx0ZXIoKHsgaHJlZiB9KSA9PiBocmVmLmVuZHNXaXRoKCcuanMnKSlcbiAgICAgICAgICAubWFwKCh7IGhyZWYgfSwgaSkgPT4gKFxuICAgICAgICAgICAgPHNjcmlwdCBrZXk9e2l9IHNyYz17aHJlZn0gYXN5bmMgLz5cbiAgICAgICAgICApKX1cbiAgICAgIDwvYm9keT5cbiAgICA8L2h0bWw+XG4gICk7XG59XG5Eb2N1bWVudC5kZWZhdWx0UHJvcHMgPSB7XG4gIGhlYWQ6IChcbiAgICA8PlxuICAgICAgPG1ldGEgbmFtZT1cInZpZXdwb3J0XCIgY29udGVudD1cIndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0xXCIgLz5cbiAgICAgIDxsaW5rXG4gICAgICAgIHJlbD1cInNob3J0Y3V0IGljb25cIlxuICAgICAgICBocmVmPXtgJHtwcm9jZXNzLmVudi5XRUJQQUNLX1BVQkxJQ19QQVRIID8/ICcvJ31mYXZpY29uLmljb2B9XG4gICAgICAvPlxuICAgIDwvPlxuICApLFxuICBjaGFyU2V0OiAndXRmLTgnLFxuICByb290SWQ6ICdhbmFuc2ktcm9vdCcsXG4gIHNjcmlwdHM6IG51bGwsXG59O1xuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUNBOzs7O0FBY2UsU0FBU0EsUUFBVCxDQUFrQjtFQUMvQkMsTUFEK0I7RUFFL0JDLElBRitCO0VBRy9CQyxRQUgrQjtFQUkvQkMsS0FKK0I7RUFLL0JDLE1BTCtCO0VBTS9CQyxPQU4rQjtFQU8vQkMsUUFQK0I7RUFRL0JDLEtBUitCO0VBUy9CQztBQVQrQixDQUFsQixFQVVMO0VBQ1IsSUFBSUMsT0FBK0IsR0FBRyxJQUF0Qzs7RUFDQSxJQUFJSCxRQUFKLEVBQWM7SUFDWjtJQUNBLE1BQU1JLE1BQU0sR0FBRyxFQUNiLEdBQUdKO0lBRFUsQ0FBZjs7SUFHQSxJQUFJQyxLQUFKLEVBQVc7TUFDVCxJQUFJLE9BQU9HLE1BQU0sQ0FBQyxZQUFELENBQWIsS0FBZ0MsUUFBcEMsRUFBOEM7UUFDNUNBLE1BQU0sQ0FBQyxZQUFELENBQU4sR0FBdUIsQ0FBQ0EsTUFBTSxDQUFDLFlBQUQsQ0FBUCxFQUF3QixVQUFTSCxLQUFNLEdBQXZDLENBQXZCO01BQ0QsQ0FGRCxNQUVPO1FBQ0xHLE1BQU0sQ0FBQyxZQUFELENBQU4sR0FBdUIsQ0FBQyxHQUFHQSxNQUFNLENBQUMsWUFBRCxDQUFWLEVBQTJCLFVBQVNILEtBQU0sR0FBMUMsQ0FBdkI7TUFDRDtJQUNGOztJQUNERSxPQUFPLGdCQUNMO01BQU0sU0FBUyxFQUFDLHlCQUFoQjtNQUEwQyxPQUFPLEVBQUUsSUFBQUUsZ0JBQUEsRUFBWUQsTUFBWjtJQUFuRCxFQURGO0VBR0Q7O0VBQ0Qsb0JBQ0Usb0RBQ0Usb0RBQ0U7SUFBTSxPQUFPLEVBQUVMO0VBQWYsRUFERixFQUVHSSxPQUZILEVBR0dSLElBSEgsRUFJR0QsTUFBTSxDQUFDWSxHQUFQLENBQVcsQ0FBQ0MsS0FBRCxFQUFRQyxDQUFSLGtCQUNWO0lBQU0sR0FBRyxFQUFFQSxDQUFYO0lBQWMsR0FBRyxFQUFDLFNBQWxCO0lBQUEsR0FBZ0NEO0VBQWhDLEVBREQsQ0FKSCxlQU9FLHdDQUFRVixLQUFSLENBUEYsQ0FERixlQVVFLG9EQUNFO0lBQUssRUFBRSxFQUFFQztFQUFULFdBQWtCRixRQUFsQixDQURGLEVBRUdNLE9BRkgsRUFHR1IsTUFBTSxDQUNKZSxNQURGLENBQ1MsQ0FBQztJQUFFQztFQUFGLENBQUQsS0FBY0EsSUFBSSxDQUFDQyxRQUFMLENBQWMsS0FBZCxDQUR2QixFQUVFTCxHQUZGLENBRU0sQ0FBQztJQUFFSTtFQUFGLENBQUQsRUFBV0YsQ0FBWCxrQkFDSDtJQUFnQixHQUFHLEVBQUVFLElBQXJCO0lBQTJCLEtBQUs7RUFBaEMsR0FBYUYsQ0FBYixDQUhILENBSEgsQ0FWRixDQURGO0FBc0JEOztBQUNEZixRQUFRLENBQUNtQixZQUFULEdBQXdCO0VBQ3RCakIsSUFBSSxlQUNGLHlFQUNFO0lBQU0sSUFBSSxFQUFDLFVBQVg7SUFBc0IsT0FBTyxFQUFDO0VBQTlCLEVBREYsZUFFRTtJQUNFLEdBQUcsRUFBQyxlQUROO0lBRUUsSUFBSSxFQUFHLEdBQUQseUJBQUdrQixPQUFPLENBQUNDLEdBQVIsQ0FBWUMsbUJBQWYsb0NBQXNDLEdBQUk7RUFGbEQsRUFGRixDQUZvQjtFQVV0QmhCLE9BQU8sRUFBRSxPQVZhO0VBV3RCRCxNQUFNLEVBQUUsYUFYYztFQVl0QkksT0FBTyxFQUFFO0FBWmEsQ0FBeEIifQ==
79
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJEb2N1bWVudCIsImFzc2V0cyIsImhlYWQiLCJjaGlsZHJlbiIsInRpdGxlIiwicm9vdElkIiwiY2hhclNldCIsImNzUG9saWN5Iiwibm9uY2UiLCJzY3JpcHRzIiwiY3NwTWV0YSIsInBvbGljeSIsImluY2x1ZGVzIiwiYnVpbGRQb2xpY3kiLCJtYXAiLCJhc3NldCIsImkiLCJmaWx0ZXIiLCJocmVmIiwiZW5kc1dpdGgiLCJkZWZhdWx0UHJvcHMiLCJwcm9jZXNzIiwiZW52IiwiV0VCUEFDS19QVUJMSUNfUEFUSCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvRG9jdW1lbnRDb21wb25lbnQudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgUG9saWN5IH0gZnJvbSAnLi9jc3AnO1xuaW1wb3J0IHsgYnVpbGRQb2xpY3kgfSBmcm9tICcuL2NzcCc7XG5cbnR5cGUgUHJvcHMgPSB7XG4gIGNoaWxkcmVuOiBSZWFjdC5SZWFjdE5vZGU7XG4gIGFzc2V0czogeyBocmVmOiBzdHJpbmc7IGFzPzogc3RyaW5nOyByZWw/OiBzdHJpbmcgfVtdO1xuICBoZWFkOiBSZWFjdC5SZWFjdE5vZGU7XG4gIHNjcmlwdHM6IFJlYWN0LlJlYWN0Tm9kZTtcbiAgdGl0bGU6IHN0cmluZztcbiAgcm9vdElkOiBzdHJpbmc7XG4gIGNoYXJTZXQ6IHN0cmluZztcbiAgY3NQb2xpY3k/OiBQb2xpY3k7XG4gIG5vbmNlPzogc3RyaW5nIHwgdW5kZWZpbmVkO1xufTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gRG9jdW1lbnQoe1xuICBhc3NldHMsXG4gIGhlYWQsXG4gIGNoaWxkcmVuLFxuICB0aXRsZSxcbiAgcm9vdElkLFxuICBjaGFyU2V0LFxuICBjc1BvbGljeSxcbiAgbm9uY2UsXG4gIHNjcmlwdHMsXG59OiBQcm9wcykge1xuICBsZXQgY3NwTWV0YTogbnVsbCB8IFJlYWN0LlJlYWN0Tm9kZSA9IG51bGw7XG4gIGlmIChjc1BvbGljeSkge1xuICAgIC8vIGFkZCBub25jZSB0byBwb2xpY3lcbiAgICBjb25zdCBwb2xpY3kgPSB7XG4gICAgICAuLi5jc1BvbGljeSxcbiAgICB9O1xuICAgIGlmIChcbiAgICAgIG5vbmNlICYmXG4gICAgICAvLyBub25jZXMgbmVnYXRlICd1bnNhZmUtaW5saW5lJyBzbyBkbyBub3QgYWRkIGl0IGlmIHRoYXQgZGlyZWN0aXZlIGV4aXN0c1xuICAgICAgKCFwb2xpY3lbJ3NjcmlwdC1zcmMnXSB8fFxuICAgICAgICAhcG9saWN5WydzY3JpcHQtc3JjJ10uaW5jbHVkZXMoXCIndW5zYWZlLWlubGluZSdcIikpXG4gICAgKSB7XG4gICAgICBpZiAodHlwZW9mIHBvbGljeVsnc2NyaXB0LXNyYyddID09PSAnc3RyaW5nJykge1xuICAgICAgICBwb2xpY3lbJ3NjcmlwdC1zcmMnXSA9IFtwb2xpY3lbJ3NjcmlwdC1zcmMnXSwgYCdub25jZS0ke25vbmNlfSdgXTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHBvbGljeVsnc2NyaXB0LXNyYyddID0gWy4uLnBvbGljeVsnc2NyaXB0LXNyYyddLCBgJ25vbmNlLSR7bm9uY2V9J2BdO1xuICAgICAgfVxuICAgIH1cbiAgICBjc3BNZXRhID0gKFxuICAgICAgPG1ldGEgaHR0cEVxdWl2PVwiQ29udGVudC1TZWN1cml0eS1Qb2xpY3lcIiBjb250ZW50PXtidWlsZFBvbGljeShwb2xpY3kpfSAvPlxuICAgICk7XG4gIH1cbiAgcmV0dXJuIChcbiAgICA8aHRtbD5cbiAgICAgIDxoZWFkPlxuICAgICAgICA8bWV0YSBjaGFyU2V0PXtjaGFyU2V0fSAvPlxuICAgICAgICB7Y3NwTWV0YX1cbiAgICAgICAge2hlYWR9XG4gICAgICAgIHthc3NldHMubWFwKChhc3NldCwgaSkgPT4gKFxuICAgICAgICAgIDxsaW5rIGtleT17aX0gcmVsPVwicHJlbG9hZFwiIHsuLi5hc3NldH0gLz5cbiAgICAgICAgKSl9XG4gICAgICAgIDx0aXRsZT57dGl0bGV9PC90aXRsZT5cbiAgICAgIDwvaGVhZD5cbiAgICAgIDxib2R5PlxuICAgICAgICA8ZGl2IGlkPXtyb290SWR9PntjaGlsZHJlbn08L2Rpdj5cbiAgICAgICAge3NjcmlwdHN9XG4gICAgICAgIHthc3NldHNcbiAgICAgICAgICAuZmlsdGVyKCh7IGhyZWYgfSkgPT4gaHJlZi5lbmRzV2l0aCgnLmpzJykpXG4gICAgICAgICAgLm1hcCgoeyBocmVmIH0sIGkpID0+IChcbiAgICAgICAgICAgIDxzY3JpcHQga2V5PXtpfSBzcmM9e2hyZWZ9IGFzeW5jIC8+XG4gICAgICAgICAgKSl9XG4gICAgICA8L2JvZHk+XG4gICAgPC9odG1sPlxuICApO1xufVxuRG9jdW1lbnQuZGVmYXVsdFByb3BzID0ge1xuICBoZWFkOiAoXG4gICAgPD5cbiAgICAgIDxtZXRhIG5hbWU9XCJ2aWV3cG9ydFwiIGNvbnRlbnQ9XCJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MVwiIC8+XG4gICAgICA8bGlua1xuICAgICAgICByZWw9XCJzaG9ydGN1dCBpY29uXCJcbiAgICAgICAgaHJlZj17YCR7cHJvY2Vzcy5lbnYuV0VCUEFDS19QVUJMSUNfUEFUSCA/PyAnLyd9ZmF2aWNvbi5pY29gfVxuICAgICAgLz5cbiAgICA8Lz5cbiAgKSxcbiAgY2hhclNldDogJ3V0Zi04JyxcbiAgcm9vdElkOiAnYW5hbnNpLXJvb3QnLFxuICBzY3JpcHRzOiBudWxsLFxufTtcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFDQTs7OztBQWNlLFNBQVNBLFFBQVQsQ0FBa0I7RUFDL0JDLE1BRCtCO0VBRS9CQyxJQUYrQjtFQUcvQkMsUUFIK0I7RUFJL0JDLEtBSitCO0VBSy9CQyxNQUwrQjtFQU0vQkMsT0FOK0I7RUFPL0JDLFFBUCtCO0VBUS9CQyxLQVIrQjtFQVMvQkM7QUFUK0IsQ0FBbEIsRUFVTDtFQUNSLElBQUlDLE9BQStCLEdBQUcsSUFBdEM7O0VBQ0EsSUFBSUgsUUFBSixFQUFjO0lBQ1o7SUFDQSxNQUFNSSxNQUFNLEdBQUcsRUFDYixHQUFHSjtJQURVLENBQWY7O0lBR0EsSUFDRUMsS0FBSyxNQUNMO0lBQ0MsQ0FBQ0csTUFBTSxDQUFDLFlBQUQsQ0FBUCxJQUNDLENBQUNBLE1BQU0sQ0FBQyxZQUFELENBQU4sQ0FBcUJDLFFBQXJCLENBQThCLGlCQUE5QixDQUhFLENBRFAsRUFLRTtNQUNBLElBQUksT0FBT0QsTUFBTSxDQUFDLFlBQUQsQ0FBYixLQUFnQyxRQUFwQyxFQUE4QztRQUM1Q0EsTUFBTSxDQUFDLFlBQUQsQ0FBTixHQUF1QixDQUFDQSxNQUFNLENBQUMsWUFBRCxDQUFQLEVBQXdCLFVBQVNILEtBQU0sR0FBdkMsQ0FBdkI7TUFDRCxDQUZELE1BRU87UUFDTEcsTUFBTSxDQUFDLFlBQUQsQ0FBTixHQUF1QixDQUFDLEdBQUdBLE1BQU0sQ0FBQyxZQUFELENBQVYsRUFBMkIsVUFBU0gsS0FBTSxHQUExQyxDQUF2QjtNQUNEO0lBQ0Y7O0lBQ0RFLE9BQU8sZ0JBQ0w7TUFBTSxTQUFTLEVBQUMseUJBQWhCO01BQTBDLE9BQU8sRUFBRSxJQUFBRyxnQkFBQSxFQUFZRixNQUFaO0lBQW5ELEVBREY7RUFHRDs7RUFDRCxvQkFDRSxvREFDRSxvREFDRTtJQUFNLE9BQU8sRUFBRUw7RUFBZixFQURGLEVBRUdJLE9BRkgsRUFHR1IsSUFISCxFQUlHRCxNQUFNLENBQUNhLEdBQVAsQ0FBVyxDQUFDQyxLQUFELEVBQVFDLENBQVIsa0JBQ1Y7SUFBTSxHQUFHLEVBQUVBLENBQVg7SUFBYyxHQUFHLEVBQUMsU0FBbEI7SUFBQSxHQUFnQ0Q7RUFBaEMsRUFERCxDQUpILGVBT0Usd0NBQVFYLEtBQVIsQ0FQRixDQURGLGVBVUUsb0RBQ0U7SUFBSyxFQUFFLEVBQUVDO0VBQVQsV0FBa0JGLFFBQWxCLENBREYsRUFFR00sT0FGSCxFQUdHUixNQUFNLENBQ0pnQixNQURGLENBQ1MsQ0FBQztJQUFFQztFQUFGLENBQUQsS0FBY0EsSUFBSSxDQUFDQyxRQUFMLENBQWMsS0FBZCxDQUR2QixFQUVFTCxHQUZGLENBRU0sQ0FBQztJQUFFSTtFQUFGLENBQUQsRUFBV0YsQ0FBWCxrQkFDSDtJQUFnQixHQUFHLEVBQUVFLElBQXJCO0lBQTJCLEtBQUs7RUFBaEMsR0FBYUYsQ0FBYixDQUhILENBSEgsQ0FWRixDQURGO0FBc0JEOztBQUNEaEIsUUFBUSxDQUFDb0IsWUFBVCxHQUF3QjtFQUN0QmxCLElBQUksZUFDRix5RUFDRTtJQUFNLElBQUksRUFBQyxVQUFYO0lBQXNCLE9BQU8sRUFBQztFQUE5QixFQURGLGVBRUU7SUFDRSxHQUFHLEVBQUMsZUFETjtJQUVFLElBQUksRUFBRyxHQUFELHlCQUFHbUIsT0FBTyxDQUFDQyxHQUFSLENBQVlDLG1CQUFmLG9DQUFzQyxHQUFJO0VBRmxELEVBRkYsQ0FGb0I7RUFVdEJqQixPQUFPLEVBQUUsT0FWYTtFQVd0QkQsTUFBTSxFQUFFLGFBWGM7RUFZdEJJLE9BQU8sRUFBRTtBQVphLENBQXhCIn0=
@@ -17,6 +17,6 @@ function JSONSpout({
17
17
 
18
18
  function getDatafromDOM(id) {
19
19
  const element = document.querySelector(`#${id}`);
20
- return element !== null && element !== void 0 && element.innerHTML ? JSON.parse(element === null || element === void 0 ? void 0 : element.innerHTML) : undefined;
20
+ return element !== null && element !== void 0 && element.text ? JSON.parse(element === null || element === void 0 ? void 0 : element.text) : undefined;
21
21
  }
22
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJKU09OU3BvdXQiLCJpZCIsIm5leHQiLCJpbml0RGF0YSIsImdldERhdGFmcm9tRE9NIiwibmV4dFByb3BzIiwiZWxlbWVudCIsImRvY3VtZW50IiwicXVlcnlTZWxlY3RvciIsImlubmVySFRNTCIsIkpTT04iLCJwYXJzZSIsInVuZGVmaW5lZCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvanNvbi50c3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFJlYWN0IGZyb20gJ3JlYWN0JztcbmltcG9ydCB0eXBlIHsgUm91dGUgfSBmcm9tICdAYW5hbnNpL3JvdXRlcic7XG5cbmltcG9ydCB0eXBlIHsgUmVzb2x2ZVByb3BzIH0gZnJvbSAnLi90eXBlcyc7XG5cbnR5cGUgTmVlZGVkUHJvcHMgPSBSZXNvbHZlUHJvcHM7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIEpTT05TcG91dCh7XG4gIGlkID0gJ2FuYW5zaS1qc29uJyxcbn06IHsgaWQ/OiBzdHJpbmcgfSA9IHt9KSB7XG4gIHJldHVybiBmdW5jdGlvbiA8VCBleHRlbmRzIE5lZWRlZFByb3BzPihcbiAgICBuZXh0OiAoaW5pdERhdGE6IFJlY29yZDxzdHJpbmcsIHVua25vd24+KSA9PiBQcm9taXNlPFQ+LFxuICApIHtcbiAgICByZXR1cm4gYXN5bmMgKCkgPT4ge1xuICAgICAgY29uc3QgaW5pdERhdGEgPSBnZXREYXRhZnJvbURPTShpZCk7XG4gICAgICBjb25zdCBuZXh0UHJvcHMgPSBhd2FpdCBuZXh0KGluaXREYXRhKTtcblxuICAgICAgcmV0dXJuIG5leHRQcm9wcztcbiAgICB9O1xuICB9O1xufVxuZnVuY3Rpb24gZ2V0RGF0YWZyb21ET00oaWQ6IHN0cmluZyk6IFJlY29yZDxzdHJpbmcsIHVua25vd24+IHtcbiAgY29uc3QgZWxlbWVudCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYCMke2lkfWApO1xuICByZXR1cm4gZWxlbWVudD8uaW5uZXJIVE1MID8gSlNPTi5wYXJzZShlbGVtZW50Py5pbm5lckhUTUwpIDogdW5kZWZpbmVkO1xufVxuIl0sIm1hcHBpbmdzIjoiOzs7OztBQU9lLFNBQVNBLFNBQVQsQ0FBbUI7RUFDaENDLEVBQUUsR0FBRztBQUQyQixJQUViLEVBRk4sRUFFVTtFQUN2QixPQUFPLFVBQ0xDLElBREssRUFFTDtJQUNBLE9BQU8sWUFBWTtNQUNqQixNQUFNQyxRQUFRLEdBQUdDLGNBQWMsQ0FBQ0gsRUFBRCxDQUEvQjtNQUNBLE1BQU1JLFNBQVMsR0FBRyxNQUFNSCxJQUFJLENBQUNDLFFBQUQsQ0FBNUI7TUFFQSxPQUFPRSxTQUFQO0lBQ0QsQ0FMRDtFQU1ELENBVEQ7QUFVRDs7QUFDRCxTQUFTRCxjQUFULENBQXdCSCxFQUF4QixFQUE2RDtFQUMzRCxNQUFNSyxPQUFPLEdBQUdDLFFBQVEsQ0FBQ0MsYUFBVCxDQUF3QixJQUFHUCxFQUFHLEVBQTlCLENBQWhCO0VBQ0EsT0FBT0ssT0FBTyxTQUFQLElBQUFBLE9BQU8sV0FBUCxJQUFBQSxPQUFPLENBQUVHLFNBQVQsR0FBcUJDLElBQUksQ0FBQ0MsS0FBTCxDQUFXTCxPQUFYLGFBQVdBLE9BQVgsdUJBQVdBLE9BQU8sQ0FBRUcsU0FBcEIsQ0FBckIsR0FBc0RHLFNBQTdEO0FBQ0QifQ==
22
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJKU09OU3BvdXQiLCJpZCIsIm5leHQiLCJpbml0RGF0YSIsImdldERhdGFmcm9tRE9NIiwibmV4dFByb3BzIiwiZWxlbWVudCIsImRvY3VtZW50IiwicXVlcnlTZWxlY3RvciIsInRleHQiLCJKU09OIiwicGFyc2UiLCJ1bmRlZmluZWQiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvc3BvdXRzL2pzb24udHN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgdHlwZSB7IFJvdXRlIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuXG5pbXBvcnQgdHlwZSB7IFJlc29sdmVQcm9wcyB9IGZyb20gJy4vdHlwZXMnO1xuXG50eXBlIE5lZWRlZFByb3BzID0gUmVzb2x2ZVByb3BzO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBKU09OU3BvdXQoe1xuICBpZCA9ICdhbmFuc2ktanNvbicsXG59OiB7IGlkPzogc3RyaW5nIH0gPSB7fSkge1xuICByZXR1cm4gZnVuY3Rpb24gPFQgZXh0ZW5kcyBOZWVkZWRQcm9wcz4oXG4gICAgbmV4dDogKGluaXREYXRhOiBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPikgPT4gUHJvbWlzZTxUPixcbiAgKSB7XG4gICAgcmV0dXJuIGFzeW5jICgpID0+IHtcbiAgICAgIGNvbnN0IGluaXREYXRhID0gZ2V0RGF0YWZyb21ET00oaWQpO1xuICAgICAgY29uc3QgbmV4dFByb3BzID0gYXdhaXQgbmV4dChpbml0RGF0YSk7XG5cbiAgICAgIHJldHVybiBuZXh0UHJvcHM7XG4gICAgfTtcbiAgfTtcbn1cbmZ1bmN0aW9uIGdldERhdGFmcm9tRE9NKGlkOiBzdHJpbmcpOiBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPiB7XG4gIGNvbnN0IGVsZW1lbnQ6IEhUTUxTY3JpcHRFbGVtZW50IHwgbnVsbCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYCMke2lkfWApO1xuICByZXR1cm4gZWxlbWVudD8udGV4dCA/IEpTT04ucGFyc2UoZWxlbWVudD8udGV4dCkgOiB1bmRlZmluZWQ7XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7O0FBT2UsU0FBU0EsU0FBVCxDQUFtQjtFQUNoQ0MsRUFBRSxHQUFHO0FBRDJCLElBRWIsRUFGTixFQUVVO0VBQ3ZCLE9BQU8sVUFDTEMsSUFESyxFQUVMO0lBQ0EsT0FBTyxZQUFZO01BQ2pCLE1BQU1DLFFBQVEsR0FBR0MsY0FBYyxDQUFDSCxFQUFELENBQS9CO01BQ0EsTUFBTUksU0FBUyxHQUFHLE1BQU1ILElBQUksQ0FBQ0MsUUFBRCxDQUE1QjtNQUVBLE9BQU9FLFNBQVA7SUFDRCxDQUxEO0VBTUQsQ0FURDtBQVVEOztBQUNELFNBQVNELGNBQVQsQ0FBd0JILEVBQXhCLEVBQTZEO0VBQzNELE1BQU1LLE9BQWlDLEdBQUdDLFFBQVEsQ0FBQ0MsYUFBVCxDQUF3QixJQUFHUCxFQUFHLEVBQTlCLENBQTFDO0VBQ0EsT0FBT0ssT0FBTyxTQUFQLElBQUFBLE9BQU8sV0FBUCxJQUFBQSxPQUFPLENBQUVHLElBQVQsR0FBZ0JDLElBQUksQ0FBQ0MsS0FBTCxDQUFXTCxPQUFYLGFBQVdBLE9BQVgsdUJBQVdBLE9BQU8sQ0FBRUcsSUFBcEIsQ0FBaEIsR0FBNENHLFNBQW5EO0FBQ0QifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@anansi/core",
3
- "version": "0.11.0",
3
+ "version": "0.12.0",
4
4
  "description": "React 18 Framework",
5
5
  "homepage": "https://github.com/ntucker/anansi/tree/master/packages/core#readme",
6
6
  "repository": {
@@ -65,11 +65,11 @@
65
65
  "browser"
66
66
  ],
67
67
  "devDependencies": {
68
- "@anansi/babel-preset": "^3.2.4",
68
+ "@anansi/babel-preset": "^3.2.5",
69
69
  "@anansi/browserslist-config": "1.3.3",
70
- "@anansi/webpack-config": "^11.6.4",
70
+ "@anansi/webpack-config": "^11.6.5",
71
71
  "@babel/cli": "7.17.10",
72
- "@babel/core": "7.18.2",
72
+ "@babel/core": "7.18.5",
73
73
  "@types/compression": "^1.7.2",
74
74
  "@types/source-map-support": "^0.5.4",
75
75
  "@types/tmp": "^0.2.3",
@@ -77,10 +77,10 @@
77
77
  "jest": "28.1.1",
78
78
  "rimraf": "^3.0.0",
79
79
  "webpack": "^5.72.1",
80
- "webpack-cli": "^4.9.2"
80
+ "webpack-cli": "4.10.0"
81
81
  },
82
82
  "dependencies": {
83
- "@anansi/router": "^0.6.1",
83
+ "@anansi/router": "^0.6.3",
84
84
  "@babel/runtime": "^7.10.5",
85
85
  "@rest-hooks/ssr": "^0.2.0",
86
86
  "chalk": "^4.0.0",
package/src/laySpouts.tsx CHANGED
@@ -8,32 +8,19 @@ export default function laySpouts(
8
8
  spouts: (props: ServerProps) => Promise<{
9
9
  app: JSX.Element;
10
10
  }>,
11
- { timeoutMS = 200 }: { timeoutMS?: number } = {},
11
+ {
12
+ timeoutMS = 200,
13
+ onError,
14
+ }: { timeoutMS?: number; onError?: (error: unknown) => void } = {},
12
15
  ) {
13
16
  const render: Render = async (clientManifest, req, res) => {
14
17
  const nonce = crypto.randomBytes(16).toString('base64');
15
18
 
16
- const { app } = await spouts({ clientManifest, req, res, nonce });
17
- let didError = false;
18
- const { pipe, abort } = reactRender(
19
- app,
20
- /*
21
- This is not documented, so included the types here for reference:
22
- type Options = {|
23
- identifierPrefix?: string,
24
- namespaceURI?: string,
25
- nonce?: string,
26
- bootstrapScriptContent?: string,
27
- bootstrapScripts?: Array<string>,
28
- bootstrapModules?: Array<string>,
29
- progressiveChunkSize?: number,
30
- onShellReady?: () => void,
31
- onShellError?: () => void,
32
- onAllReady?: () => void,
33
- onError?: (error: mixed) => void,
34
- |};
35
- */
36
- {
19
+ try {
20
+ const { app } = await spouts({ clientManifest, req, res, nonce });
21
+
22
+ let didError = false;
23
+ const { pipe, abort } = reactRender(app, {
37
24
  nonce,
38
25
  //bootstrapScripts: assets.filter(asset => asset.endsWith('.js')),
39
26
  onShellReady() {
@@ -48,17 +35,24 @@ type Options = {|
48
35
  res.statusCode = 500;
49
36
  pipe(res);
50
37
  },
51
- onError(x: any) {
38
+ onError(e: any) {
52
39
  didError = true;
53
- console.error(x);
40
+ console.error(e);
54
41
  res.statusCode = 500;
55
42
  //pipe(res); Removing this avoids, "React currently only supports piping to one writable stream."
43
+ if (onError) onError(e);
56
44
  },
57
- },
58
- );
59
- // Abandon and switch to client rendering if enough time passes.
60
- // Try lowering this to see the client recover.
61
- setTimeout(abort, timeoutMS);
45
+ });
46
+ // Abandon and switch to client rendering if enough time passes.
47
+ // Try lowering this to see the client recover.
48
+ setTimeout(
49
+ () => (abort as any)(`Timeout of ${timeoutMS}ms exceeded`),
50
+ timeoutMS,
51
+ );
52
+ } catch (e: unknown) {
53
+ if (onError) onError(e);
54
+ throw e;
55
+ }
62
56
  };
63
57
  return render;
64
58
  }
@@ -134,8 +134,12 @@ export default function startDevServer(
134
134
  ) {
135
135
  log.error('Errors for client build: ' + clientStats.compilation.errors);
136
136
  log.error('Errors for server build: ' + serverStats.compilation.errors);
137
- // TODO: handle more gracefully
138
- process.exit(-1);
137
+ // first time, rather than re-render
138
+ if (Array.isArray(initRender)) {
139
+ process.exit(-1);
140
+ }
141
+ log.error('Above compiler errors blocking reload');
142
+ return;
139
143
  } else {
140
144
  log.info('Launching SSR');
141
145
  }
@@ -155,7 +159,16 @@ export default function startDevServer(
155
159
  );
156
160
  // SERVER SIDE ENTRYPOINT
157
161
  if (Array.isArray(initRender)) {
158
- initRender.forEach(init => render(...init.args).then(init.resolve));
162
+ initRender.forEach(async init => {
163
+ try {
164
+ log.info('Resolving queued requests');
165
+ await render(...init.args);
166
+ init.resolve();
167
+ } catch (e) {
168
+ log.error('Error when attempting to render queued requests');
169
+ log.error(e);
170
+ }
171
+ });
159
172
  initRender = undefined;
160
173
  }
161
174
  }
@@ -198,6 +211,13 @@ export default function startDevServer(
198
211
  }),
199
212
  );
200
213
 
214
+ if (webpackConfigs[0].devServer?.setupMiddlewares) {
215
+ return webpackConfigs[0].devServer.setupMiddlewares(
216
+ middlewares,
217
+ devServer,
218
+ );
219
+ }
220
+
201
221
  return middlewares;
202
222
  },
203
223
  },
@@ -30,7 +30,12 @@ export default function Document({
30
30
  const policy = {
31
31
  ...csPolicy,
32
32
  };
33
- if (nonce) {
33
+ if (
34
+ nonce &&
35
+ // nonces negate 'unsafe-inline' so do not add it if that directive exists
36
+ (!policy['script-src'] ||
37
+ !policy['script-src'].includes("'unsafe-inline'"))
38
+ ) {
34
39
  if (typeof policy['script-src'] === 'string') {
35
40
  policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];
36
41
  } else {
@@ -20,6 +20,6 @@ export default function JSONSpout({
20
20
  };
21
21
  }
22
22
  function getDatafromDOM(id: string): Record<string, unknown> {
23
- const element = document.querySelector(`#${id}`);
24
- return element?.innerHTML ? JSON.parse(element?.innerHTML) : undefined;
23
+ const element: HTMLScriptElement | null = document.querySelector(`#${id}`);
24
+ return element?.text ? JSON.parse(element?.text) : undefined;
25
25
  }