@anansi/core 0.6.1 → 0.7.2

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.7.2](https://github.com/ntucker/anansi/compare/@anansi/core@0.7.1...@anansi/core@0.7.2) (2022-05-28)
7
+
8
+
9
+ ### 💅 Enhancement
10
+
11
+ * More error handling ([129d444](https://github.com/ntucker/anansi/commit/129d44407ac3ea9838e240d82f774c73100cc9da))
12
+
13
+
14
+
15
+ ### [0.7.1](https://github.com/ntucker/anansi/compare/@anansi/core@0.7.0...@anansi/core@0.7.1) (2022-05-28)
16
+
17
+
18
+ ### 💅 Enhancement
19
+
20
+ * Do not use additional express server for dev ([ce29cbb](https://github.com/ntucker/anansi/commit/ce29cbb0b8547b736a31f9bac6309338b6114bae))
21
+ * Target current node for server devbuild ([262bd1e](https://github.com/ntucker/anansi/commit/262bd1e79d56dacdb4114d8ea959d819df16b687))
22
+
23
+
24
+ ### 🐛 Bug Fix
25
+
26
+ * SSR hot reloading ([3b08106](https://github.com/ntucker/anansi/commit/3b081066463020fdbef2c01efd4922d09e02d8aa))
27
+
28
+
29
+
30
+ ## [0.7.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.6.1...@anansi/core@0.7.0) (2022-05-28)
31
+
32
+
33
+ ### 🚀 Features
34
+
35
+ * env.entrypath override ([a918d32](https://github.com/ntucker/anansi/commit/a918d3247c22ea00d0e1d5395553752280d32d99))
36
+
37
+
38
+ ### 💅 Enhancement
39
+
40
+ * Improve route asset identification ([c07e9a2](https://github.com/ntucker/anansi/commit/c07e9a29935e0e24f815371ad6610bed77da967e))
41
+
42
+
43
+ ### 📦 Package
44
+
45
+ * Update babel monorepo to v7.18.2 ([#1520](https://github.com/ntucker/anansi/issues/1520)) ([e0fe514](https://github.com/ntucker/anansi/commit/e0fe5142b0c308aff24b86faef6d70084c80691f))
46
+
47
+
48
+
6
49
  ### [0.6.1](https://github.com/ntucker/anansi/compare/@anansi/core@0.6.0...@anansi/core@0.6.1) (2022-05-24)
7
50
 
8
51
 
package/dist/server.js CHANGED
@@ -246,22 +246,33 @@ var document_server_jsxFileName = "/home/ntucker/src/anansi/packages/core/src/sp
246
246
  function DocumentSpout(options) {
247
247
  return function (next) {
248
248
  return async props => {
249
- var _props$clientManifest, _props$clientManifest2, _entrypoint$assets, _entrypoint$children$, _entrypoint$children, _entrypoint$children$2, _entrypoint$children$3, _entrypoint$children$4, _nextProps$title;
249
+ var _props$clientManifest, _props$clientManifest2, _props$clientManifest3, _props$clientManifest4, _props$clientManifest5, _nextProps$title;
250
250
 
251
251
  const nextProps = await next(props);
252
- const entrypoint = (_props$clientManifest = props.clientManifest) === null || _props$clientManifest === void 0 ? void 0 : (_props$clientManifest2 = _props$clientManifest.entrypoints) === null || _props$clientManifest2 === void 0 ? void 0 : _props$clientManifest2.main;
253
252
  const publicPath = props.clientManifest.publicPath;
254
- if (entrypoint === undefined || publicPath === undefined) throw new Error('Manifest missing entries needed'); // TODO: consider using this package for build stats in future:
253
+ if (Object.keys((_props$clientManifest = (_props$clientManifest2 = props.clientManifest) === null || _props$clientManifest2 === void 0 ? void 0 : _props$clientManifest2.entrypoints) != null ? _props$clientManifest : {}).length < 1 || publicPath === undefined) throw new Error('Manifest missing entries needed'); // TODO: consider using this package for build stats in future:
255
254
  // https://github.com/facebook/react/tree/main/packages/react-server-dom-webpack
256
255
 
257
256
  const assetMap = assets => assets.map(({
258
257
  name
259
- }) => `${publicPath}${name}`); // find additional assets to preload based on matched route
258
+ }) => `${publicPath}${name}`);
260
259
 
260
+ const assetList = [];
261
+ Object.values((_props$clientManifest3 = (_props$clientManifest4 = props.clientManifest) === null || _props$clientManifest4 === void 0 ? void 0 : _props$clientManifest4.entrypoints) != null ? _props$clientManifest3 : {}).forEach(entrypoint => {
262
+ var _entrypoint$assets;
261
263
 
262
- const assets = assetMap([...((_entrypoint$assets = entrypoint.assets) != null ? _entrypoint$assets : []), ...((_entrypoint$children$ = (_entrypoint$children = entrypoint.children) === null || _entrypoint$children === void 0 ? void 0 : (_entrypoint$children$2 = _entrypoint$children.prefetch) === null || _entrypoint$children$2 === void 0 ? void 0 : (_entrypoint$children$3 = _entrypoint$children$2.find) === null || _entrypoint$children$3 === void 0 ? void 0 : (_entrypoint$children$4 = _entrypoint$children$3.call(_entrypoint$children$2, ({
264
+ assetList.push(...assetMap((_entrypoint$assets = entrypoint.assets) != null ? _entrypoint$assets : []));
265
+ });
266
+ new Set(assetMap(Object.values((_props$clientManifest5 = props.clientManifest.namedChunkGroups) != null ? _props$clientManifest5 : {}).filter(({
263
267
  name
264
- }) => nextProps.matchedRoutes.some(route => name === route.name))) === null || _entrypoint$children$4 === void 0 ? void 0 : _entrypoint$children$4.assets) != null ? _entrypoint$children$ : [])]).map(asset => asset.endsWith('.css') ? {
268
+ }) => nextProps.matchedRoutes.some(route => name === null || name === void 0 ? void 0 : name.includes(route.name))).flatMap(chunk => {
269
+ var _chunk$assets;
270
+
271
+ return [...((_chunk$assets = chunk.assets) != null ? _chunk$assets : []), // any chunk preloads
272
+ ...childrenAssets(chunk)];
273
+ }))).forEach(asset => assetList.push(asset)); // find additional assets to preload based on matched route
274
+
275
+ const assets = assetList.filter(asset => !asset.endsWith('.hot-update.js')).map(asset => asset.endsWith('.css') ? {
265
276
  href: asset,
266
277
  rel: 'stylesheet'
267
278
  } : asset.endsWith('.js') ? {
@@ -278,7 +289,7 @@ function DocumentSpout(options) {
278
289
  __self: this,
279
290
  __source: {
280
291
  fileName: document_server_jsxFileName,
281
- lineNumber: 42,
292
+ lineNumber: 52,
282
293
  columnNumber: 14
283
294
  }
284
295
  }, nextProps.app)
@@ -286,6 +297,14 @@ function DocumentSpout(options) {
286
297
  };
287
298
  };
288
299
  }
300
+
301
+ function childrenAssets(chunk) {
302
+ return chunk.children ? Object.values(chunk.children).flatMap(preload => preload.flatMap(c => {
303
+ var _c$assets;
304
+
305
+ return (_c$assets = c.assets) != null ? _c$assets : [];
306
+ })) : [];
307
+ }
289
308
  ;// CONCATENATED MODULE: external "@rest-hooks/core"
290
309
  const core_namespaceObject = require("@rest-hooks/core");
291
310
  ;// CONCATENATED MODULE: external "@rest-hooks/ssr"
@@ -1 +1 @@
1
- {"version":3,"file":"server.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;AAKA;AAIA;AAAA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AAAA;AAAA;AAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;AAEA;;AAnBA;AAuBA;;AACA;AACA;;AACA;AACA;;AC3DA;;;;;ACQA;AACA;AACA;AACA;AACA;AACA;AALA;AAOA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA;AACA;AADA;AADA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA;AACA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA;AACA;AACA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA;AARA;;;ACzCA;AAIA;AAOA;AAKA;AAGA;AAAA;;AACA;AAEA;AACA;AAEA;AAIA;;AACA;AACA;AAAA;;;AAEA;AAEA;AAAA;AAKA;AAAA;AAAA;AAEA;AAAA;AAAA;AACA;AAAA;AAGA;AAEA;AAGA;AACA;AACA;AAJA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAHA;AA3BA;AAHA;AA6CA;;AC7DA;;ACAA;;;;ACAA;AACA;AAMA;AAGA;AAAA;AAEA;AAGA;AACA;AAIA;AAEA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAHA;AAKA;AACA;AACA;;AC7BA;;ACAA;;;ACAA;AACA;AACA;AAMA;AAKA;AAGA;AAAA;AACA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA;;AAEA;AAGA;AACA;AACA;AACA;AAAA;AAEA;AAEA;AAEA;AACA;AAEA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAJA;AAMA;AACA;AACA;;ACvCA;AACA;AAOA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;;ACjCA;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/server\"","/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/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/ssr\"","/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/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\");","import { renderToPipeableStream as reactRender } from 'react-dom/server';\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 { app } = await spouts({ clientManifest, req, res });\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 //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\");","type Props = {\n children: React.ReactNode;\n assets: { href: string; as?: string; rel?: string }[];\n head: React.ReactNode;\n title: string;\n rootId: string;\n};\n\nexport default function Document({\n assets,\n head,\n children,\n title,\n rootId,\n}: Props) {\n return (\n <html>\n <head>\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 {/* this ensures the client can hydrate the assets prop */}\n <script\n dangerouslySetInnerHTML={{\n __html: `assetManifest = ${JSON.stringify(assets)};`,\n }}\n />\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 charSet=\"utf-8\" />\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n <link rel=\"shortcut icon\" href=\"/assets/favicon.ico\" />\n </>\n ),\n rootId: 'anansi-root',\n};\n","import React from 'react';\nimport type { Route } from '@anansi/router';\n\nimport type { ServerProps, ResolveProps } from './types';\nimport Document from './DocumentComponent';\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 rootId: string;\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 entrypoint = props.clientManifest?.entrypoints?.main;\n const publicPath = props.clientManifest.publicPath;\n\n if (entrypoint === undefined || publicPath === undefined)\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 // find additional assets to preload based on matched route\n const assets = assetMap([\n ...(entrypoint.assets ?? []),\n ...(entrypoint.children?.prefetch?.find?.(({ name }) =>\n nextProps.matchedRoutes.some(route => name === route.name),\n )?.assets ?? []),\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 >\n {nextProps.app}\n </Document>\n ),\n };\n };\n };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/core\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/ssr\");","import { Manager, NetworkManager } from '@rest-hooks/core';\nimport { createPersistedStore } from '@rest-hooks/ssr';\n\nimport type { ResolveProps, ServerProps } 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: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const [ServerCacheProvider, controller] = createPersistedStore(\n options.getManagers(),\n );\n\n const nextProps = await next(props);\n\n return {\n ...nextProps,\n controller,\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","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';\n"],"names":[],"sourceRoot":""}
1
+ {"version":3,"file":"server.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;AAKA;AAIA;AAAA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACA;AAAA;AAAA;AAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;AAEA;;AAnBA;AAuBA;;AACA;AACA;;AACA;AACA;;AC3DA;;;;;ACQA;AACA;AACA;AACA;AACA;AACA;AALA;AAOA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA;AACA;AADA;AADA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA;AACA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA;AACA;AACA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA;AARA;;;ACzCA;AAKA;AAOA;AAKA;AAGA;AAAA;;AACA;AAEA;AAEA;AAOA;;AACA;AACA;AAAA;;AAEA;AACA;AACA;;AACA;AAFA;AAKA;AAGA;AAAA;AAGA;;AAAA;AAGA;AAHA;;AASA;AAQA;AAAA;AAAA;AAEA;AAAA;AAAA;AACA;AAAA;AAGA;AAEA;AAGA;AACA;AACA;AAJA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAHA;AAnDA;AAHA;AAqEA;;AAEA;AACA;AAEA;;AAAA;AAAA;AAGA;;AC9FA;;ACAA;;;;ACAA;AACA;AAMA;AAGA;AAAA;AAEA;AAGA;AACA;AAIA;AAEA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAHA;AAKA;AACA;AACA;;AC7BA;;ACAA;;;ACAA;AACA;AACA;AAMA;AAKA;AAGA;AAAA;AACA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA;;AAEA;AAGA;AACA;AACA;AACA;AAAA;AAEA;AAEA;AAEA;AACA;AAEA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAJA;AAMA;AACA;AACA;;ACvCA;AACA;AAOA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA;AACA;AACA;AACA;;ACjCA;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/server\"","/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/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/ssr\"","/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/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\");","import { renderToPipeableStream as reactRender } from 'react-dom/server';\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 { app } = await spouts({ clientManifest, req, res });\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 //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\");","type Props = {\n children: React.ReactNode;\n assets: { href: string; as?: string; rel?: string }[];\n head: React.ReactNode;\n title: string;\n rootId: string;\n};\n\nexport default function Document({\n assets,\n head,\n children,\n title,\n rootId,\n}: Props) {\n return (\n <html>\n <head>\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 {/* this ensures the client can hydrate the assets prop */}\n <script\n dangerouslySetInnerHTML={{\n __html: `assetManifest = ${JSON.stringify(assets)};`,\n }}\n />\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 charSet=\"utf-8\" />\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n <link rel=\"shortcut icon\" href=\"/assets/favicon.ico\" />\n </>\n ),\n rootId: 'anansi-root',\n};\n","import React from 'react';\nimport type { Route } from '@anansi/router';\nimport { StatsChunkGroup } from 'webpack';\n\nimport type { ServerProps, ResolveProps } from './types';\nimport Document from './DocumentComponent';\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 rootId: string;\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 >\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/ssr\");","import { Manager, NetworkManager } from '@rest-hooks/core';\nimport { createPersistedStore } from '@rest-hooks/ssr';\n\nimport type { ResolveProps, ServerProps } 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: (props: ServerProps) => Promise<T>,\n ) {\n return async (props: ServerProps) => {\n const [ServerCacheProvider, controller] = createPersistedStore(\n options.getManagers(),\n );\n\n const nextProps = await next(props);\n\n return {\n ...nextProps,\n controller,\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","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';\n"],"names":[],"sourceRoot":""}
@@ -1 +1 @@
1
- {"version":3,"file":"startDevserver.d.ts","sourceRoot":"","sources":["../../src/scripts/startDevserver.ts"],"names":[],"mappings":";AAmBA,OAAO,sBAAsB,CAAC"}
1
+ {"version":3,"file":"startDevserver.d.ts","sourceRoot":"","sources":["../../src/scripts/startDevserver.ts"],"names":[],"mappings":";AAiBA,OAAO,sBAAsB,CAAC"}
@@ -13,10 +13,6 @@ var _webpack = _interopRequireDefault(require("webpack"));
13
13
 
14
14
  var _memfs = require("memfs");
15
15
 
16
- var _express = _interopRequireDefault(require("express"));
17
-
18
- var _ora = _interopRequireDefault(require("ora"));
19
-
20
16
  var _fsMonkey = require("fs-monkey");
21
17
 
22
18
  var _tmp = _interopRequireDefault(require("tmp"));
@@ -25,13 +21,11 @@ var _sourceMapSupport = _interopRequireDefault(require("source-map-support"));
25
21
 
26
22
  var _unionfs = require("unionfs");
27
23
 
28
- var _compression = _interopRequireDefault(require("compression"));
29
-
30
24
  var _webpackDevServer = _interopRequireDefault(require("webpack-dev-server"));
31
25
 
32
26
  var _importFresh = _interopRequireDefault(require("import-fresh"));
33
27
 
34
- var _chalk = _interopRequireDefault(require("chalk"));
28
+ var _runtime = _interopRequireDefault(require("webpack/lib/logging/runtime"));
35
29
 
36
30
  require("cross-fetch/polyfill");
37
31
 
@@ -41,8 +35,7 @@ var _webpackConfigs$, _webpackConfigs$$devS;
41
35
  const webpackConfig = require(require.resolve( // TODO: use normal resolution algorithm to find webpack file
42
36
  _path.default.join(process.cwd(), 'webpack.config')));
43
37
 
44
- const entrypoint = process.argv[2];
45
- const PORT = process.env.PORT || 3000; //process.env.WEBPACK_PUBLIC_HOST = `http://localhost:${PORT}`; this breaks compatibility with stackblitz
38
+ const entrypoint = process.argv[2]; //process.env.WEBPACK_PUBLIC_HOST = `http://localhost:${PORT}`; this breaks compatibility with stackblitz
46
39
 
47
40
  process.env.WEBPACK_PUBLIC_PATH = '/assets/';
48
41
 
@@ -51,8 +44,8 @@ if (!entrypoint) {
51
44
  process.exit(-1);
52
45
  }
53
46
 
54
- console.log(_chalk.default.greenBright(`Starting SSR at:`), _chalk.default.cyanBright(process.env.WEBPACK_PUBLIC_HOST || `http://localhost:${PORT}`));
55
- const loader = (0, _ora.default)().start(); // Set up in memory filesystem
47
+ const log = _runtime.default.getLogger('anansi-devserver'); // Set up in memory filesystem
48
+
56
49
 
57
50
  const volume = new _memfs.Volume();
58
51
  const fs = (0, _memfs.createFsFromVolume)(volume);
@@ -84,13 +77,14 @@ export default entry;
84
77
  }
85
78
 
86
79
  const webpackConfigs = [webpackConfig({
87
- entrypoint: hotEntry(entrypoint).name,
80
+ entrypath: hotEntry(entrypoint).name,
88
81
  name: 'client'
89
82
  }, {
90
83
  mode: 'development'
91
84
  }), webpackConfig({
92
- entrypoint: entrypoint.replace('.tsx', '.server.tsx'),
93
- name: 'server'
85
+ entrypath: entrypoint.replace('.tsx', '.server.tsx'),
86
+ name: 'server',
87
+ BROWSERSLIST_ENV: 'current node'
94
88
  }, {
95
89
  mode: 'development',
96
90
  target: 'node'
@@ -112,7 +106,7 @@ function getServerBundle(serverStats) {
112
106
  const serverJson = serverStats.toJson({
113
107
  assets: true
114
108
  });
115
- return _path.default.join((_serverJson$outputPat = serverJson.outputPath) != null ? _serverJson$outputPat : '', 'main.js');
109
+ return _path.default.join((_serverJson$outputPat = serverJson.outputPath) != null ? _serverJson$outputPat : '', 'server.js');
116
110
  }
117
111
 
118
112
  function handleErrors(fn) {
@@ -125,90 +119,27 @@ function handleErrors(fn) {
125
119
  };
126
120
  }
127
121
 
128
- let render; // Start the express server after the first compilation
122
+ let render;
129
123
 
130
- function initializeApp(stats) {
124
+ function importRender(stats) {
131
125
  var _clientStats$compilat, _clientStats$compilat2, _serverStats$compilat, _serverStats$compilat2;
132
126
 
133
127
  const [clientStats, serverStats] = stats;
134
128
 
135
129
  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) {
136
- loader.fail('Errors for client build: ' + clientStats.compilation.errors);
137
- loader.fail('Errors for server build: ' + serverStats.compilation.errors); // TODO: handle more gracefully
130
+ log.error('Errors for client build: ' + clientStats.compilation.errors);
131
+ log.error('Errors for server build: ' + serverStats.compilation.errors); // TODO: handle more gracefully
138
132
 
139
133
  process.exit(-1);
140
134
  } else {
141
- loader.info('Launching server');
142
- }
143
-
144
- const wrappingApp = (0, _express.default)(); // eslint-disable-next-line
145
- //@ts-ignore
146
-
147
- wrappingApp.use((0, _compression.default)()); // ASSETS
148
-
149
- const clientManifest = clientStats.toJson();
150
-
151
- const assetRoute = async (req, res) => {
152
- var _req$url$substring$sp, _req$url, _clientManifest$outpu;
135
+ log.info('Launching SSR');
136
+ } // ASSETS
153
137
 
154
- const filename = (_req$url$substring$sp = (_req$url = req.url) === null || _req$url === void 0 ? void 0 : _req$url.substring(process.env.WEBPACK_PUBLIC_PATH.length).split('?')[0]) != null ? _req$url$substring$sp : '';
155
138
 
156
- const assetPath = _path.default.join((_clientManifest$outpu = clientManifest.outputPath) != null ? _clientManifest$outpu : '', filename);
157
-
158
- try {
159
- const fileContent = (await readFile(assetPath)).toString();
160
- res.contentType(filename);
161
- res.send(fileContent);
162
- } catch (e) {
163
- res.status(404);
164
- res.send(e);
165
- return;
166
- }
167
- };
168
-
169
- wrappingApp.get(`${process.env.WEBPACK_PUBLIC_PATH}*`, assetRoute); // SERVER SIDE RENDERING
139
+ const clientManifest = clientStats.toJson(); // SERVER SIDE RENDERING
170
140
  // eslint-disable-next-line @typescript-eslint/no-var-requires
171
141
 
172
- render = require(getServerBundle(serverStats)).default;
173
- wrappingApp.get('/*', handleErrors(async function (req, res) {
174
- if (req.url.endsWith('favicon.ico')) {
175
- res.statusCode = 404;
176
- res.setHeader('Content-type', 'text/html');
177
- res.send('not found');
178
- return;
179
- }
180
-
181
- res.socket.on('error', error => {
182
- console.error('Fatal', error);
183
- });
184
- await render(clientManifest, req, res);
185
- }));
186
- server = wrappingApp.listen(PORT, () => {
187
- loader.succeed(`SSR Running`);
188
- }).on('error', function (error) {
189
- if (error.syscall !== 'listen') {
190
- throw error;
191
- }
192
-
193
- const isPipe = portOrPipe => Number.isNaN(portOrPipe);
194
-
195
- const bind = isPipe(PORT) ? 'Pipe ' + PORT : 'Port ' + PORT;
196
-
197
- switch (error.code) {
198
- case 'EACCES':
199
- console.error(bind + ' requires elevated privileges');
200
- process.exit(1);
201
- break;
202
-
203
- case 'EADDRINUSE':
204
- console.error(bind + ' is already in use');
205
- process.exit(1);
206
- break;
207
-
208
- default:
209
- throw error;
210
- }
211
- });
142
+ render = (0, _importFresh.default)(getServerBundle(serverStats)).default.bind(undefined, clientManifest);
212
143
  }
213
144
 
214
145
  const devServer = new _webpackDevServer.default( // write to memory filesystem so we can import
@@ -225,6 +156,37 @@ const devServer = new _webpackDevServer.default( // write to memory filesystem s
225
156
  outputFileSystem: { ...fs,
226
157
  join: _path.default.join
227
158
  }
159
+ },
160
+ setupMiddlewares: (middlewares, devServer) => {
161
+ var _devServer$app;
162
+
163
+ if (!devServer) {
164
+ throw new Error('webpack-dev-server is not defined');
165
+ } // serve SSR for non-WEBPACK_PUBLIC_PATH
166
+
167
+
168
+ (_devServer$app = devServer.app) === null || _devServer$app === void 0 ? void 0 : _devServer$app.get(new RegExp(`^(?!${process.env.WEBPACK_PUBLIC_PATH})`), handleErrors(async function (req, res) {
169
+ if (req.url.endsWith('favicon.ico')) {
170
+ res.statusCode = 404;
171
+ res.setHeader('Content-type', 'text/html');
172
+ res.send('not found');
173
+ return;
174
+ }
175
+
176
+ res.socket.on('error', error => {
177
+ console.error('Fatal', error);
178
+ });
179
+
180
+ if (!render) {
181
+ res.statusCode = 500;
182
+ res.setHeader('Content-type', 'text/html');
183
+ res.send('Render not initialized');
184
+ return;
185
+ }
186
+
187
+ await render(req, res);
188
+ }));
189
+ return middlewares;
228
190
  }
229
191
  }, compiler);
230
192
 
@@ -232,38 +194,36 @@ const runServer = async () => {
232
194
  await devServer.start();
233
195
  devServer.compiler.hooks.done.tap('Anansi Server', multiStats => {
234
196
  if (!multiStats) {
235
- loader.fail('stats not send');
197
+ log.error('stats not send');
236
198
  process.exit(-1);
237
199
  }
238
200
 
239
201
  if (!Object.hasOwn(multiStats, 'stats')) return;
240
202
 
241
- if (server && multiStats.stats.length > 1) {
242
- render = (0, _importFresh.default)(getServerBundle(multiStats.stats[1])).default;
243
- return;
244
- }
245
-
246
- if (!server) {
203
+ if (multiStats.stats.length > 1) {
247
204
  try {
248
- initializeApp(multiStats.stats);
205
+ importRender(multiStats.stats);
249
206
  } catch (e) {
250
- loader.fail('Failed to initialize app');
207
+ log.error('Failed to load serve entrypoint');
251
208
  console.error(e);
209
+ console.error(e.stack);
252
210
  }
211
+ } else {
212
+ log.error('Only compiler one stat');
253
213
  }
254
214
  });
255
215
  };
256
216
 
257
217
  const stopServer = async () => {
258
- loader.info('Stopping server...');
218
+ log.info('Stopping server...');
259
219
  await devServer.stop();
260
- loader.info('Server closed');
220
+ log.info('Server closed');
261
221
  };
262
222
 
263
223
  process.on('SIGINT', () => {
264
- loader.warn('Received SIGINT, devserver shutting down');
224
+ log.warn('Received SIGINT, devserver shutting down');
265
225
  stopServer();
266
226
  process.exit(-1);
267
227
  });
268
228
  runServer();
269
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["webpackConfig","require","resolve","path","join","process","cwd","entrypoint","argv","PORT","env","WEBPACK_PUBLIC_PATH","console","log","exit","chalk","greenBright","cyanBright","WEBPACK_PUBLIC_HOST","loader","ora","start","volume","Volume","fs","createFsFromVolume","ufs","use","diskFs","patchRequire","readFile","promisify","server","hotEntry","entryPath","generatedEntrypoint","tmp","fileSync","postfix","writeSync","fd","webpackConfigs","name","mode","replace","target","plugins","push","webpack","optimize","LimitChunkCountPlugin","maxChunks","compiler","sourceMapSupport","install","hookRequire","getServerBundle","serverStats","serverJson","toJson","assets","outputPath","handleErrors","fn","req","res","next","x","render","initializeApp","stats","clientStats","compilation","errors","length","fail","info","wrappingApp","express","compress","clientManifest","assetRoute","filename","url","substring","split","assetPath","fileContent","toString","contentType","send","e","status","get","default","endsWith","statusCode","setHeader","socket","on","error","listen","succeed","syscall","isPipe","portOrPipe","Number","isNaN","bind","code","devServer","WebpackDevServer","devMiddleware","outputFileSystem","runServer","hooks","done","tap","multiStats","Object","hasOwn","importFresh","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 express, { NextFunction } from 'express';\nimport ora from 'ora';\nimport { patchRequire } from 'fs-monkey';\nimport tmp from 'tmp';\nimport sourceMapSupport from 'source-map-support';\nimport { ufs } from 'unionfs';\nimport compress from 'compression';\nimport WebpackDevServer from 'webpack-dev-server';\nimport importFresh from 'import-fresh';\nimport chalk from 'chalk';\n\nimport 'cross-fetch/polyfill';\nimport { Render } from './types';\n\n// eslint-disable-next-line @typescript-eslint/no-var-requires\nconst webpackConfig = require(require.resolve(\n  // TODO: use normal resolution algorithm to find webpack file\n  path.join(process.cwd(), 'webpack.config'),\n));\n\nconst entrypoint = process.argv[2];\nconst PORT = process.env.PORT || 3000;\n//process.env.WEBPACK_PUBLIC_HOST = `http://localhost:${PORT}`; this breaks compatibility with stackblitz\nprocess.env.WEBPACK_PUBLIC_PATH = '/assets/';\n\nif (!entrypoint) {\n  console.log(`Usage: start-anansi <entrypoint-file>`);\n  process.exit(-1);\n}\n\nconsole.log(\n  chalk.greenBright(`Starting SSR at:`),\n  chalk.cyanBright(process.env.WEBPACK_PUBLIC_HOST || `http://localhost:${PORT}`),\n);\nconst loader = ora().start();\n\n// Set up in memory filesystem\nconst volume = new Volume();\nconst fs = createFsFromVolume(volume);\nufs.use(diskFs).use(fs as any);\n\npatchRequire(ufs);\nconst readFile = promisify(ufs.readFile);\nlet server: Server | undefined;\n\n// Generate a temporary file so we can hot reload from the root of the application\nfunction 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    `\nimport entry from \"${path.resolve(process.cwd(), entryPath)}\";\n\nif (module.hot) {\n  module.hot.accept();\n}\n\nexport default entry;\n  `,\n  );\n  return generatedEntrypoint;\n}\n\nconst webpackConfigs = [\n  webpackConfig(\n    {\n      entrypoint: hotEntry(entrypoint).name,\n      name: 'client',\n    },\n    { mode: 'development' },\n  ),\n  webpackConfig(\n    {\n      entrypoint: entrypoint.replace('.tsx', '.server.tsx'),\n      name: 'server',\n    },\n    { mode: 'development', target: 'node' },\n  ),\n] as const;\n// only have one output for server so we can avoid cached modules\nwebpackConfigs[1].plugins.push(\n  new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),\n);\n// initialize the webpack compiler\nconst compiler: MultiCompiler = webpack(webpackConfigs);\n\nsourceMapSupport.install({ hookRequire: true });\n\nfunction getServerBundle(serverStats: webpack.Stats) {\n  const serverJson = serverStats.toJson({ assets: true });\n  return path.join(serverJson.outputPath ?? '', 'main.js');\n}\nfunction 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}\nlet render: Render;\n// Start the express server after the first compilation\nfunction initializeApp(stats: webpack.Stats[]) {\n  const [clientStats, serverStats] = stats;\n  if (\n    clientStats?.compilation?.errors?.length ||\n    serverStats?.compilation?.errors?.length\n  ) {\n    loader.fail('Errors for client build: ' + clientStats.compilation.errors);\n    loader.fail('Errors for server build: ' + serverStats.compilation.errors);\n    // TODO: handle more gracefully\n    process.exit(-1);\n  } else {\n    loader.info('Launching server');\n  }\n\n  const wrappingApp = express();\n  // eslint-disable-next-line\n  //@ts-ignore\n  wrappingApp.use(compress());\n\n  // ASSETS\n  const clientManifest = clientStats.toJson();\n  const assetRoute = async (req: Request | IncomingMessage, res: any) => {\n    const filename =\n      req.url\n        ?.substring((process.env.WEBPACK_PUBLIC_PATH as string).length)\n        .split('?')[0] ?? '';\n    const assetPath = path.join(clientManifest.outputPath ?? '', filename);\n\n    try {\n      const fileContent = (await readFile(assetPath)).toString();\n      res.contentType(filename);\n      res.send(fileContent);\n    } catch (e) {\n      res.status(404);\n      res.send(e);\n      return;\n    }\n  };\n  wrappingApp.get(`${process.env.WEBPACK_PUBLIC_PATH}*`, assetRoute);\n\n  // SERVER SIDE RENDERING\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  render = require(getServerBundle(serverStats)).default;\n  wrappingApp.get(\n    '/*',\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(clientManifest, req, res);\n    }),\n  );\n\n  server = wrappingApp\n    .listen(PORT, () => {\n      loader.succeed(`SSR Running`);\n    })\n    .on('error', function (error: any) {\n      if (error.syscall !== 'listen') {\n        throw error;\n      }\n      const isPipe = (portOrPipe: string | number) => Number.isNaN(portOrPipe);\n      const bind = isPipe(PORT) ? 'Pipe ' + PORT : 'Port ' + PORT;\n      switch (error.code) {\n        case 'EACCES':\n          console.error(bind + ' requires elevated privileges');\n          process.exit(1);\n          break;\n        case 'EADDRINUSE':\n          console.error(bind + ' is already in use');\n          process.exit(1);\n          break;\n        default:\n          throw error;\n      }\n    });\n}\n\nconst devServer = new WebpackDevServer(\n  // write to memory filesystem so we can import\n  {\n    ...webpackConfigs[0].devServer,\n    /*client: {\n      ...webpackConfigs[0].devServer?.client,\n      webSocketURL: {\n        ...webpackConfigs[0].devServer?.client.webSocketURL,\n        port: 8080,\n      },\n    },*/\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  },\n  compiler,\n);\nconst 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        loader.fail('stats not send');\n        process.exit(-1);\n      }\n\n      if (!Object.hasOwn(multiStats, 'stats')) return;\n      if (server && (multiStats as webpack.MultiStats).stats.length > 1) {\n        render = (\n          importFresh(\n            getServerBundle((multiStats as webpack.MultiStats).stats[1]),\n          ) as any\n        ).default;\n        return;\n      }\n      if (!server) {\n        try {\n          initializeApp((multiStats as webpack.MultiStats).stats);\n        } catch (e) {\n          loader.fail('Failed to initialize app');\n          console.error(e);\n        }\n      }\n    },\n  );\n};\nconst stopServer = async () => {\n  loader.info('Stopping server...');\n  await devServer.stop();\n  loader.info('Server closed');\n};\n\nprocess.on('SIGINT', () => {\n  loader.warn('Received SIGINT, devserver shutting down');\n  stopServer();\n  process.exit(-1);\n});\n\nrunServer();\n"],"mappings":"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"}
229
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["webpackConfig","require","resolve","path","join","process","cwd","entrypoint","argv","env","WEBPACK_PUBLIC_PATH","console","log","exit","logging","getLogger","volume","Volume","fs","createFsFromVolume","ufs","use","diskFs","patchRequire","readFile","promisify","server","hotEntry","entryPath","generatedEntrypoint","tmp","fileSync","postfix","writeSync","fd","webpackConfigs","entrypath","name","mode","replace","BROWSERSLIST_ENV","target","plugins","push","webpack","optimize","LimitChunkCountPlugin","maxChunks","compiler","sourceMapSupport","install","hookRequire","getServerBundle","serverStats","serverJson","toJson","assets","outputPath","handleErrors","fn","req","res","next","x","render","importRender","stats","clientStats","compilation","errors","length","error","info","clientManifest","importFresh","default","bind","undefined","devServer","WebpackDevServer","devMiddleware","outputFileSystem","setupMiddlewares","middlewares","Error","app","get","RegExp","url","endsWith","statusCode","setHeader","send","socket","on","runServer","start","hooks","done","tap","multiStats","Object","hasOwn","e","stack","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 { patchRequire } from 'fs-monkey';\nimport tmp from 'tmp';\nimport sourceMapSupport from 'source-map-support';\nimport { ufs } from 'unionfs';\nimport WebpackDevServer from 'webpack-dev-server';\nimport importFresh from 'import-fresh';\nimport logging from 'webpack/lib/logging/runtime';\n\nimport 'cross-fetch/polyfill';\nimport { BoundRender } from './types';\n\n// eslint-disable-next-line @typescript-eslint/no-var-requires\nconst webpackConfig = require(require.resolve(\n  // TODO: use normal resolution algorithm to find webpack file\n  path.join(process.cwd(), 'webpack.config'),\n));\n\nconst entrypoint = process.argv[2];\n//process.env.WEBPACK_PUBLIC_HOST = `http://localhost:${PORT}`; this breaks compatibility with stackblitz\nprocess.env.WEBPACK_PUBLIC_PATH = '/assets/';\n\nif (!entrypoint) {\n  console.log(`Usage: start-anansi <entrypoint-file>`);\n  process.exit(-1);\n}\n\nconst log = logging.getLogger('anansi-devserver');\n\n// Set up in memory filesystem\nconst volume = new Volume();\nconst fs = createFsFromVolume(volume);\nufs.use(diskFs).use(fs as any);\n\npatchRequire(ufs);\nconst readFile = promisify(ufs.readFile);\nlet server: Server | undefined;\n\n// Generate a temporary file so we can hot reload from the root of the application\nfunction 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    `\nimport entry from \"${path.resolve(process.cwd(), entryPath)}\";\n\nif (module.hot) {\n  module.hot.accept();\n}\n\nexport default entry;\n  `,\n  );\n  return generatedEntrypoint;\n}\n\nconst webpackConfigs = [\n  webpackConfig(\n    {\n      entrypath: hotEntry(entrypoint).name,\n      name: 'client',\n    },\n    { mode: 'development' },\n  ),\n  webpackConfig(\n    {\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// only have one output for server so we can avoid cached modules\nwebpackConfigs[1].plugins.push(\n  new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),\n);\n// initialize the webpack compiler\nconst compiler: MultiCompiler = webpack(webpackConfigs);\n\nsourceMapSupport.install({ hookRequire: true });\n\nfunction getServerBundle(serverStats: webpack.Stats) {\n  const serverJson = serverStats.toJson({ assets: true });\n  return path.join(serverJson.outputPath ?? '', 'server.js');\n}\nfunction 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}\nlet render: BoundRender;\nfunction 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  // SERVER SIDE RENDERING\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  render = (importFresh(getServerBundle(serverStats)) as any).default.bind(\n    undefined,\n    clientManifest,\n  );\n}\n\nconst devServer = new WebpackDevServer(\n  // write to memory filesystem so we can import\n  {\n    ...webpackConfigs[0].devServer,\n    /*client: {\n      ...webpackConfigs[0].devServer?.client,\n      webSocketURL: {\n        ...webpackConfigs[0].devServer?.client.webSocketURL,\n        port: 8080,\n      },\n    },*/\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      // serve SSR for non-WEBPACK_PUBLIC_PATH\n      devServer.app?.get(\n        new RegExp(`^(?!${process.env.WEBPACK_PUBLIC_PATH})`),\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          if (!render) {\n            res.statusCode = 500;\n            res.setHeader('Content-type', 'text/html');\n            res.send('Render not initialized');\n            return;\n          }\n          await render(req, res);\n        }),\n      );\n\n      return middlewares;\n    },\n  },\n  compiler,\n);\nconst 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          console.error(e);\n          console.error(e.stack);\n        }\n      } else {\n        log.error('Only compiler one stat');\n      }\n    },\n  );\n};\nconst stopServer = async () => {\n  log.info('Stopping server...');\n  await devServer.stop();\n  log.info('Server closed');\n};\n\nprocess.on('SIGINT', () => {\n  log.warn('Received SIGINT, devserver shutting down');\n  stopServer();\n  process.exit(-1);\n});\n\nrunServer();\n"],"mappings":"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"}
@@ -3,4 +3,5 @@ import { ServerResponse, IncomingMessage } from 'http';
3
3
  import { StatsCompilation } from 'webpack';
4
4
  import { Request, Response } from 'express';
5
5
  export declare type Render = (clientManifest: StatsCompilation, req: Request | IncomingMessage, res: Response | ServerResponse) => Promise<void>;
6
+ export declare type BoundRender = (req: Request | IncomingMessage, res: Response | ServerResponse) => Promise<void>;
6
7
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/scripts/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,oBAAY,MAAM,GAAG,CACnB,cAAc,EAAE,gBAAgB,EAChC,GAAG,EAAE,OAAO,GAAG,eAAe,EAC9B,GAAG,EAAE,QAAQ,GAAG,cAAc,KAC3B,OAAO,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/scripts/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,oBAAY,MAAM,GAAG,CACnB,cAAc,EAAE,gBAAgB,EAChC,GAAG,EAAE,OAAO,GAAG,eAAe,EAC9B,GAAG,EAAE,QAAQ,GAAG,cAAc,KAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,oBAAY,WAAW,GAAG,CACxB,GAAG,EAAE,OAAO,GAAG,eAAe,EAC9B,GAAG,EAAE,QAAQ,GAAG,cAAc,KAC3B,OAAO,CAAC,IAAI,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
1
  "use strict";
2
2
 
3
3
  exports.__esModule = true;
4
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NjcmlwdHMvdHlwZXMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU2VydmVyUmVzcG9uc2UsIEluY29taW5nTWVzc2FnZSB9IGZyb20gJ2h0dHAnO1xuaW1wb3J0IHsgU3RhdHNDb21waWxhdGlvbiB9IGZyb20gJ3dlYnBhY2snO1xuaW1wb3J0IHsgUmVxdWVzdCwgUmVzcG9uc2UgfSBmcm9tICdleHByZXNzJztcblxuZXhwb3J0IHR5cGUgUmVuZGVyID0gKFxuICBjbGllbnRNYW5pZmVzdDogU3RhdHNDb21waWxhdGlvbixcbiAgcmVxOiBSZXF1ZXN0IHwgSW5jb21pbmdNZXNzYWdlLFxuICByZXM6IFJlc3BvbnNlIHwgU2VydmVyUmVzcG9uc2UsXG4pID0+IFByb21pc2U8dm9pZD47XG4iXSwibWFwcGluZ3MiOiIifQ==
4
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NjcmlwdHMvdHlwZXMudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU2VydmVyUmVzcG9uc2UsIEluY29taW5nTWVzc2FnZSB9IGZyb20gJ2h0dHAnO1xuaW1wb3J0IHsgU3RhdHNDb21waWxhdGlvbiB9IGZyb20gJ3dlYnBhY2snO1xuaW1wb3J0IHsgUmVxdWVzdCwgUmVzcG9uc2UgfSBmcm9tICdleHByZXNzJztcblxuZXhwb3J0IHR5cGUgUmVuZGVyID0gKFxuICBjbGllbnRNYW5pZmVzdDogU3RhdHNDb21waWxhdGlvbixcbiAgcmVxOiBSZXF1ZXN0IHwgSW5jb21pbmdNZXNzYWdlLFxuICByZXM6IFJlc3BvbnNlIHwgU2VydmVyUmVzcG9uc2UsXG4pID0+IFByb21pc2U8dm9pZD47XG5cbmV4cG9ydCB0eXBlIEJvdW5kUmVuZGVyID0gKFxuICByZXE6IFJlcXVlc3QgfCBJbmNvbWluZ01lc3NhZ2UsXG4gIHJlczogUmVzcG9uc2UgfCBTZXJ2ZXJSZXNwb25zZSxcbikgPT4gUHJvbWlzZTx2b2lkPjtcbiJdLCJtYXBwaW5ncyI6IiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"document.server.d.ts","sourceRoot":"","sources":["../../src/spouts/document.server.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAGzD,aAAK,WAAW,GAAG;IACjB,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,YAAY,CAAC;AAEjB,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,OAAO,EAAE;IAC7C,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,yCAEiB,WAAW,4BAEJ,WAAW;;GA0CnC"}
1
+ {"version":3,"file":"document.server.d.ts","sourceRoot":"","sources":["../../src/spouts/document.server.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAGzD,aAAK,WAAW,GAAG;IACjB,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,YAAY,CAAC;AAEjB,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,OAAO,EAAE;IAC7C,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,yCAEiB,WAAW,4BAEJ,WAAW;;GAkEnC"}
@@ -12,22 +12,33 @@ var _DocumentComponent = _interopRequireDefault(require("./DocumentComponent"));
12
12
  function DocumentSpout(options) {
13
13
  return function (next) {
14
14
  return async props => {
15
- var _props$clientManifest, _props$clientManifest2, _entrypoint$assets, _entrypoint$children$, _entrypoint$children, _entrypoint$children$2, _entrypoint$children$3, _entrypoint$children$4, _nextProps$title;
15
+ var _props$clientManifest, _props$clientManifest2, _props$clientManifest3, _props$clientManifest4, _props$clientManifest5, _nextProps$title;
16
16
 
17
17
  const nextProps = await next(props);
18
- const entrypoint = (_props$clientManifest = props.clientManifest) === null || _props$clientManifest === void 0 ? void 0 : (_props$clientManifest2 = _props$clientManifest.entrypoints) === null || _props$clientManifest2 === void 0 ? void 0 : _props$clientManifest2.main;
19
18
  const publicPath = props.clientManifest.publicPath;
20
- if (entrypoint === undefined || publicPath === undefined) throw new Error('Manifest missing entries needed'); // TODO: consider using this package for build stats in future:
19
+ if (Object.keys((_props$clientManifest = (_props$clientManifest2 = props.clientManifest) === null || _props$clientManifest2 === void 0 ? void 0 : _props$clientManifest2.entrypoints) != null ? _props$clientManifest : {}).length < 1 || publicPath === undefined) throw new Error('Manifest missing entries needed'); // TODO: consider using this package for build stats in future:
21
20
  // https://github.com/facebook/react/tree/main/packages/react-server-dom-webpack
22
21
 
23
22
  const assetMap = assets => assets.map(({
24
23
  name
25
- }) => `${publicPath}${name}`); // find additional assets to preload based on matched route
24
+ }) => `${publicPath}${name}`);
26
25
 
26
+ const assetList = [];
27
+ Object.values((_props$clientManifest3 = (_props$clientManifest4 = props.clientManifest) === null || _props$clientManifest4 === void 0 ? void 0 : _props$clientManifest4.entrypoints) != null ? _props$clientManifest3 : {}).forEach(entrypoint => {
28
+ var _entrypoint$assets;
27
29
 
28
- const assets = assetMap([...((_entrypoint$assets = entrypoint.assets) != null ? _entrypoint$assets : []), ...((_entrypoint$children$ = (_entrypoint$children = entrypoint.children) === null || _entrypoint$children === void 0 ? void 0 : (_entrypoint$children$2 = _entrypoint$children.prefetch) === null || _entrypoint$children$2 === void 0 ? void 0 : (_entrypoint$children$3 = _entrypoint$children$2.find) === null || _entrypoint$children$3 === void 0 ? void 0 : (_entrypoint$children$4 = _entrypoint$children$3.call(_entrypoint$children$2, ({
30
+ assetList.push(...assetMap((_entrypoint$assets = entrypoint.assets) != null ? _entrypoint$assets : []));
31
+ });
32
+ new Set(assetMap(Object.values((_props$clientManifest5 = props.clientManifest.namedChunkGroups) != null ? _props$clientManifest5 : {}).filter(({
29
33
  name
30
- }) => nextProps.matchedRoutes.some(route => name === route.name))) === null || _entrypoint$children$4 === void 0 ? void 0 : _entrypoint$children$4.assets) != null ? _entrypoint$children$ : [])]).map(asset => asset.endsWith('.css') ? {
34
+ }) => nextProps.matchedRoutes.some(route => name === null || name === void 0 ? void 0 : name.includes(route.name))).flatMap(chunk => {
35
+ var _chunk$assets;
36
+
37
+ return [...((_chunk$assets = chunk.assets) != null ? _chunk$assets : []), // any chunk preloads
38
+ ...childrenAssets(chunk)];
39
+ }))).forEach(asset => assetList.push(asset)); // find additional assets to preload based on matched route
40
+
41
+ const assets = assetList.filter(asset => !asset.endsWith('.hot-update.js')).map(asset => asset.endsWith('.css') ? {
31
42
  href: asset,
32
43
  rel: 'stylesheet'
33
44
  } : asset.endsWith('.js') ? {
@@ -46,4 +57,12 @@ function DocumentSpout(options) {
46
57
  };
47
58
  };
48
59
  }
49
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJEb2N1bWVudFNwb3V0Iiwib3B0aW9ucyIsIm5leHQiLCJwcm9wcyIsIm5leHRQcm9wcyIsImVudHJ5cG9pbnQiLCJjbGllbnRNYW5pZmVzdCIsImVudHJ5cG9pbnRzIiwibWFpbiIsInB1YmxpY1BhdGgiLCJ1bmRlZmluZWQiLCJFcnJvciIsImFzc2V0TWFwIiwiYXNzZXRzIiwibWFwIiwibmFtZSIsImNoaWxkcmVuIiwicHJlZmV0Y2giLCJmaW5kIiwibWF0Y2hlZFJvdXRlcyIsInNvbWUiLCJyb3V0ZSIsImFzc2V0IiwiZW5kc1dpdGgiLCJocmVmIiwicmVsIiwiYXMiLCJhcHAiLCJ0aXRsZSIsInJvb3RJZCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvZG9jdW1lbnQuc2VydmVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHR5cGUgeyBSb3V0ZSB9IGZyb20gJ0BhbmFuc2kvcm91dGVyJztcblxuaW1wb3J0IHR5cGUgeyBTZXJ2ZXJQcm9wcywgUmVzb2x2ZVByb3BzIH0gZnJvbSAnLi90eXBlcyc7XG5pbXBvcnQgRG9jdW1lbnQgZnJvbSAnLi9Eb2N1bWVudENvbXBvbmVudCc7XG5cbnR5cGUgTmVlZGVkUHJvcHMgPSB7XG4gIG1hdGNoZWRSb3V0ZXM6IFJvdXRlPGFueT5bXTtcbiAgdGl0bGU/OiBzdHJpbmc7XG59ICYgUmVzb2x2ZVByb3BzO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBEb2N1bWVudFNwb3V0KG9wdGlvbnM6IHtcbiAgaGVhZD86IFJlYWN0LlJlYWN0Tm9kZTtcbiAgdGl0bGU6IHN0cmluZztcbiAgcm9vdElkOiBzdHJpbmc7XG59KSB7XG4gIHJldHVybiBmdW5jdGlvbiA8VCBleHRlbmRzIE5lZWRlZFByb3BzPihcbiAgICBuZXh0OiAocHJvcHM6IFNlcnZlclByb3BzKSA9PiBQcm9taXNlPFQ+LFxuICApIHtcbiAgICByZXR1cm4gYXN5bmMgKHByb3BzOiBTZXJ2ZXJQcm9wcykgPT4ge1xuICAgICAgY29uc3QgbmV4dFByb3BzID0gYXdhaXQgbmV4dChwcm9wcyk7XG5cbiAgICAgIGNvbnN0IGVudHJ5cG9pbnQgPSBwcm9wcy5jbGllbnRNYW5pZmVzdD8uZW50cnlwb2ludHM/Lm1haW47XG4gICAgICBjb25zdCBwdWJsaWNQYXRoID0gcHJvcHMuY2xpZW50TWFuaWZlc3QucHVibGljUGF0aDtcblxuICAgICAgaWYgKGVudHJ5cG9pbnQgPT09IHVuZGVmaW5lZCB8fCBwdWJsaWNQYXRoID09PSB1bmRlZmluZWQpXG4gICAgICAgIHRocm93IG5ldyBFcnJvcignTWFuaWZlc3QgbWlzc2luZyBlbnRyaWVzIG5lZWRlZCcpO1xuXG4gICAgICAvLyBUT0RPOiBjb25zaWRlciB1c2luZyB0aGlzIHBhY2thZ2UgZm9yIGJ1aWxkIHN0YXRzIGluIGZ1dHVyZTpcbiAgICAgIC8vIGh0dHBzOi8vZ2l0aHViLmNvbS9mYWNlYm9vay9yZWFjdC90cmVlL21haW4vcGFja2FnZXMvcmVhY3Qtc2VydmVyLWRvbS13ZWJwYWNrXG4gICAgICBjb25zdCBhc3NldE1hcCA9IChhc3NldHM6IHsgbmFtZTogc3RyaW5nOyBzaXplPzogbnVtYmVyIH1bXSkgPT5cbiAgICAgICAgYXNzZXRzLm1hcCgoeyBuYW1lIH0pID0+IGAke3B1YmxpY1BhdGh9JHtuYW1lfWApO1xuICAgICAgLy8gZmluZCBhZGRpdGlvbmFsIGFzc2V0cyB0byBwcmVsb2FkIGJhc2VkIG9uIG1hdGNoZWQgcm91dGVcbiAgICAgIGNvbnN0IGFzc2V0cyA9IGFzc2V0TWFwKFtcbiAgICAgICAgLi4uKGVudHJ5cG9pbnQuYXNzZXRzID8/IFtdKSxcbiAgICAgICAgLi4uKGVudHJ5cG9pbnQuY2hpbGRyZW4/LnByZWZldGNoPy5maW5kPy4oKHsgbmFtZSB9KSA9PlxuICAgICAgICAgIG5leHRQcm9wcy5tYXRjaGVkUm91dGVzLnNvbWUocm91dGUgPT4gbmFtZSA9PT0gcm91dGUubmFtZSksXG4gICAgICAgICk/LmFzc2V0cyA/PyBbXSksXG4gICAgICBdKS5tYXAoYXNzZXQgPT5cbiAgICAgICAgYXNzZXQuZW5kc1dpdGgoJy5jc3MnKVxuICAgICAgICAgID8geyBocmVmOiBhc3NldCwgcmVsOiAnc3R5bGVzaGVldCcgfVxuICAgICAgICAgIDogYXNzZXQuZW5kc1dpdGgoJy5qcycpXG4gICAgICAgICAgPyB7IGhyZWY6IGFzc2V0LCBhczogJ3NjcmlwdCcgfVxuICAgICAgICAgIDogeyBocmVmOiBhc3NldCB9LFxuICAgICAgKTtcblxuICAgICAgcmV0dXJuIHtcbiAgICAgICAgLi4ubmV4dFByb3BzLFxuICAgICAgICBhcHA6IChcbiAgICAgICAgICA8RG9jdW1lbnRcbiAgICAgICAgICAgIHsuLi5vcHRpb25zfVxuICAgICAgICAgICAgdGl0bGU9e25leHRQcm9wcy50aXRsZSA/PyBvcHRpb25zLnRpdGxlfVxuICAgICAgICAgICAgYXNzZXRzPXthc3NldHN9XG4gICAgICAgICAgICByb290SWQ9e29wdGlvbnMucm9vdElkfVxuICAgICAgICAgID5cbiAgICAgICAgICAgIHtuZXh0UHJvcHMuYXBwfVxuICAgICAgICAgIDwvRG9jdW1lbnQ+XG4gICAgICAgICksXG4gICAgICB9O1xuICAgIH07XG4gIH07XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQTs7QUFJQTs7QUFPZSxTQUFTQSxhQUFULENBQXVCQyxPQUF2QixFQUlaO0VBQ0QsT0FBTyxVQUNMQyxJQURLLEVBRUw7SUFDQSxPQUFPLE1BQU9DLEtBQVAsSUFBOEI7TUFBQTs7TUFDbkMsTUFBTUMsU0FBUyxHQUFHLE1BQU1GLElBQUksQ0FBQ0MsS0FBRCxDQUE1QjtNQUVBLE1BQU1FLFVBQVUsNEJBQUdGLEtBQUssQ0FBQ0csY0FBVCxvRkFBRyxzQkFBc0JDLFdBQXpCLDJEQUFHLHVCQUFtQ0MsSUFBdEQ7TUFDQSxNQUFNQyxVQUFVLEdBQUdOLEtBQUssQ0FBQ0csY0FBTixDQUFxQkcsVUFBeEM7TUFFQSxJQUFJSixVQUFVLEtBQUtLLFNBQWYsSUFBNEJELFVBQVUsS0FBS0MsU0FBL0MsRUFDRSxNQUFNLElBQUlDLEtBQUosQ0FBVSxpQ0FBVixDQUFOLENBUGlDLENBU25DO01BQ0E7O01BQ0EsTUFBTUMsUUFBUSxHQUFJQyxNQUFELElBQ2ZBLE1BQU0sQ0FBQ0MsR0FBUCxDQUFXLENBQUM7UUFBRUM7TUFBRixDQUFELEtBQWUsR0FBRU4sVUFBVyxHQUFFTSxJQUFLLEVBQTlDLENBREYsQ0FYbUMsQ0FhbkM7OztNQUNBLE1BQU1GLE1BQU0sR0FBR0QsUUFBUSxDQUFDLENBQ3RCLDBCQUFJUCxVQUFVLENBQUNRLE1BQWYsaUNBQXlCLEVBQXpCLENBRHNCLEVBRXRCLHFEQUFJUixVQUFVLENBQUNXLFFBQWYsbUZBQUkscUJBQXFCQyxRQUF6QixxRkFBSSx1QkFBK0JDLElBQW5DLHFGQUFJLG9EQUFzQyxDQUFDO1FBQUVIO01BQUYsQ0FBRCxLQUN4Q1gsU0FBUyxDQUFDZSxhQUFWLENBQXdCQyxJQUF4QixDQUE2QkMsS0FBSyxJQUFJTixJQUFJLEtBQUtNLEtBQUssQ0FBQ04sSUFBckQsQ0FERSxDQUFKLDJEQUFJLHVCQUVERixNQUZILG9DQUVhLEVBRmIsQ0FGc0IsQ0FBRCxDQUFSLENBS1pDLEdBTFksQ0FLUlEsS0FBSyxJQUNWQSxLQUFLLENBQUNDLFFBQU4sQ0FBZSxNQUFmLElBQ0k7UUFBRUMsSUFBSSxFQUFFRixLQUFSO1FBQWVHLEdBQUcsRUFBRTtNQUFwQixDQURKLEdBRUlILEtBQUssQ0FBQ0MsUUFBTixDQUFlLEtBQWYsSUFDQTtRQUFFQyxJQUFJLEVBQUVGLEtBQVI7UUFBZUksRUFBRSxFQUFFO01BQW5CLENBREEsR0FFQTtRQUFFRixJQUFJLEVBQUVGO01BQVIsQ0FWUyxDQUFmO01BYUEsT0FBTyxFQUNMLEdBQUdsQixTQURFO1FBRUx1QixHQUFHLGVBQ0QsNkJBQUMsMEJBQUQsT0FDTTFCLE9BRE47VUFFRSxLQUFLLHNCQUFFRyxTQUFTLENBQUN3QixLQUFaLCtCQUFxQjNCLE9BQU8sQ0FBQzJCLEtBRnBDO1VBR0UsTUFBTSxFQUFFZixNQUhWO1VBSUUsTUFBTSxFQUFFWixPQUFPLENBQUM0QjtRQUpsQixHQU1HekIsU0FBUyxDQUFDdUIsR0FOYjtNQUhHLENBQVA7SUFhRCxDQXhDRDtFQXlDRCxDQTVDRDtBQTZDRCJ9
60
+
61
+ function childrenAssets(chunk) {
62
+ return chunk.children ? Object.values(chunk.children).flatMap(preload => preload.flatMap(c => {
63
+ var _c$assets;
64
+
65
+ return (_c$assets = c.assets) != null ? _c$assets : [];
66
+ })) : [];
67
+ }
68
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJEb2N1bWVudFNwb3V0Iiwib3B0aW9ucyIsIm5leHQiLCJwcm9wcyIsIm5leHRQcm9wcyIsInB1YmxpY1BhdGgiLCJjbGllbnRNYW5pZmVzdCIsIk9iamVjdCIsImtleXMiLCJlbnRyeXBvaW50cyIsImxlbmd0aCIsInVuZGVmaW5lZCIsIkVycm9yIiwiYXNzZXRNYXAiLCJhc3NldHMiLCJtYXAiLCJuYW1lIiwiYXNzZXRMaXN0IiwidmFsdWVzIiwiZm9yRWFjaCIsImVudHJ5cG9pbnQiLCJwdXNoIiwiU2V0IiwibmFtZWRDaHVua0dyb3VwcyIsImZpbHRlciIsIm1hdGNoZWRSb3V0ZXMiLCJzb21lIiwicm91dGUiLCJpbmNsdWRlcyIsImZsYXRNYXAiLCJjaHVuayIsImNoaWxkcmVuQXNzZXRzIiwiYXNzZXQiLCJlbmRzV2l0aCIsImhyZWYiLCJyZWwiLCJhcyIsImFwcCIsInRpdGxlIiwicm9vdElkIiwiY2hpbGRyZW4iLCJwcmVsb2FkIiwiYyJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvZG9jdW1lbnQuc2VydmVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHR5cGUgeyBSb3V0ZSB9IGZyb20gJ0BhbmFuc2kvcm91dGVyJztcbmltcG9ydCB7IFN0YXRzQ2h1bmtHcm91cCB9IGZyb20gJ3dlYnBhY2snO1xuXG5pbXBvcnQgdHlwZSB7IFNlcnZlclByb3BzLCBSZXNvbHZlUHJvcHMgfSBmcm9tICcuL3R5cGVzJztcbmltcG9ydCBEb2N1bWVudCBmcm9tICcuL0RvY3VtZW50Q29tcG9uZW50JztcblxudHlwZSBOZWVkZWRQcm9wcyA9IHtcbiAgbWF0Y2hlZFJvdXRlczogUm91dGU8YW55PltdO1xuICB0aXRsZT86IHN0cmluZztcbn0gJiBSZXNvbHZlUHJvcHM7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIERvY3VtZW50U3BvdXQob3B0aW9uczoge1xuICBoZWFkPzogUmVhY3QuUmVhY3ROb2RlO1xuICB0aXRsZTogc3RyaW5nO1xuICByb290SWQ6IHN0cmluZztcbn0pIHtcbiAgcmV0dXJuIGZ1bmN0aW9uIDxUIGV4dGVuZHMgTmVlZGVkUHJvcHM+KFxuICAgIG5leHQ6IChwcm9wczogU2VydmVyUHJvcHMpID0+IFByb21pc2U8VD4sXG4gICkge1xuICAgIHJldHVybiBhc3luYyAocHJvcHM6IFNlcnZlclByb3BzKSA9PiB7XG4gICAgICBjb25zdCBuZXh0UHJvcHMgPSBhd2FpdCBuZXh0KHByb3BzKTtcblxuICAgICAgY29uc3QgcHVibGljUGF0aCA9IHByb3BzLmNsaWVudE1hbmlmZXN0LnB1YmxpY1BhdGg7XG5cbiAgICAgIGlmIChcbiAgICAgICAgT2JqZWN0LmtleXMocHJvcHMuY2xpZW50TWFuaWZlc3Q/LmVudHJ5cG9pbnRzID8/IHt9KS5sZW5ndGggPCAxIHx8XG4gICAgICAgIHB1YmxpY1BhdGggPT09IHVuZGVmaW5lZFxuICAgICAgKVxuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ01hbmlmZXN0IG1pc3NpbmcgZW50cmllcyBuZWVkZWQnKTtcblxuICAgICAgLy8gVE9ETzogY29uc2lkZXIgdXNpbmcgdGhpcyBwYWNrYWdlIGZvciBidWlsZCBzdGF0cyBpbiBmdXR1cmU6XG4gICAgICAvLyBodHRwczovL2dpdGh1Yi5jb20vZmFjZWJvb2svcmVhY3QvdHJlZS9tYWluL3BhY2thZ2VzL3JlYWN0LXNlcnZlci1kb20td2VicGFja1xuICAgICAgY29uc3QgYXNzZXRNYXAgPSAoYXNzZXRzOiB7IG5hbWU6IHN0cmluZzsgc2l6ZT86IG51bWJlciB9W10pID0+XG4gICAgICAgIGFzc2V0cy5tYXAoKHsgbmFtZSB9KSA9PiBgJHtwdWJsaWNQYXRofSR7bmFtZX1gKTtcblxuICAgICAgY29uc3QgYXNzZXRMaXN0OiBzdHJpbmdbXSA9IFtdO1xuICAgICAgT2JqZWN0LnZhbHVlcyhwcm9wcy5jbGllbnRNYW5pZmVzdD8uZW50cnlwb2ludHMgPz8ge30pLmZvckVhY2goXG4gICAgICAgIGVudHJ5cG9pbnQgPT4ge1xuICAgICAgICAgIGFzc2V0TGlzdC5wdXNoKC4uLmFzc2V0TWFwKGVudHJ5cG9pbnQuYXNzZXRzID8/IFtdKSk7XG4gICAgICAgIH0sXG4gICAgICApO1xuICAgICAgbmV3IFNldChcbiAgICAgICAgYXNzZXRNYXAoXG4gICAgICAgICAgT2JqZWN0LnZhbHVlcyhwcm9wcy5jbGllbnRNYW5pZmVzdC5uYW1lZENodW5rR3JvdXBzID8/IHt9KVxuICAgICAgICAgICAgLmZpbHRlcigoeyBuYW1lIH0pID0+XG4gICAgICAgICAgICAgIG5leHRQcm9wcy5tYXRjaGVkUm91dGVzLnNvbWUocm91dGUgPT4gbmFtZT8uaW5jbHVkZXMocm91dGUubmFtZSkpLFxuICAgICAgICAgICAgKVxuICAgICAgICAgICAgLmZsYXRNYXAoY2h1bmsgPT4gW1xuICAgICAgICAgICAgICAuLi4oY2h1bmsuYXNzZXRzID8/IFtdKSxcbiAgICAgICAgICAgICAgLy8gYW55IGNodW5rIHByZWxvYWRzXG4gICAgICAgICAgICAgIC4uLmNoaWxkcmVuQXNzZXRzKGNodW5rKSxcbiAgICAgICAgICAgIF0pLFxuICAgICAgICApLFxuICAgICAgKS5mb3JFYWNoKGFzc2V0ID0+IGFzc2V0TGlzdC5wdXNoKGFzc2V0KSk7XG5cbiAgICAgIC8vIGZpbmQgYWRkaXRpb25hbCBhc3NldHMgdG8gcHJlbG9hZCBiYXNlZCBvbiBtYXRjaGVkIHJvdXRlXG4gICAgICBjb25zdCBhc3NldHM6IHtcbiAgICAgICAgaHJlZjogc3RyaW5nO1xuICAgICAgICBhcz86IHN0cmluZyB8IHVuZGVmaW5lZDtcbiAgICAgICAgcmVsPzogc3RyaW5nIHwgdW5kZWZpbmVkO1xuICAgICAgfVtdID0gYXNzZXRMaXN0XG4gICAgICAgIC5maWx0ZXIoYXNzZXQgPT4gIWFzc2V0LmVuZHNXaXRoKCcuaG90LXVwZGF0ZS5qcycpKVxuICAgICAgICAubWFwKGFzc2V0ID0+XG4gICAgICAgICAgYXNzZXQuZW5kc1dpdGgoJy5jc3MnKVxuICAgICAgICAgICAgPyB7IGhyZWY6IGFzc2V0LCByZWw6ICdzdHlsZXNoZWV0JyB9XG4gICAgICAgICAgICA6IGFzc2V0LmVuZHNXaXRoKCcuanMnKVxuICAgICAgICAgICAgPyB7IGhyZWY6IGFzc2V0LCBhczogJ3NjcmlwdCcgfVxuICAgICAgICAgICAgOiB7IGhyZWY6IGFzc2V0IH0sXG4gICAgICAgICk7XG5cbiAgICAgIHJldHVybiB7XG4gICAgICAgIC4uLm5leHRQcm9wcyxcbiAgICAgICAgYXBwOiAoXG4gICAgICAgICAgPERvY3VtZW50XG4gICAgICAgICAgICB7Li4ub3B0aW9uc31cbiAgICAgICAgICAgIHRpdGxlPXtuZXh0UHJvcHMudGl0bGUgPz8gb3B0aW9ucy50aXRsZX1cbiAgICAgICAgICAgIGFzc2V0cz17YXNzZXRzfVxuICAgICAgICAgICAgcm9vdElkPXtvcHRpb25zLnJvb3RJZH1cbiAgICAgICAgICA+XG4gICAgICAgICAgICB7bmV4dFByb3BzLmFwcH1cbiAgICAgICAgICA8L0RvY3VtZW50PlxuICAgICAgICApLFxuICAgICAgfTtcbiAgICB9O1xuICB9O1xufVxuXG5mdW5jdGlvbiBjaGlsZHJlbkFzc2V0cyhjaHVuazogU3RhdHNDaHVua0dyb3VwKSB7XG4gIHJldHVybiBjaHVuay5jaGlsZHJlblxuICAgID8gT2JqZWN0LnZhbHVlcyhjaHVuay5jaGlsZHJlbikuZmxhdE1hcChwcmVsb2FkID0+XG4gICAgICAgIHByZWxvYWQuZmxhdE1hcChjID0+IGMuYXNzZXRzID8/IFtdKSxcbiAgICAgIClcbiAgICA6IFtdO1xufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUE7O0FBS0E7O0FBT2UsU0FBU0EsYUFBVCxDQUF1QkMsT0FBdkIsRUFJWjtFQUNELE9BQU8sVUFDTEMsSUFESyxFQUVMO0lBQ0EsT0FBTyxNQUFPQyxLQUFQLElBQThCO01BQUE7O01BQ25DLE1BQU1DLFNBQVMsR0FBRyxNQUFNRixJQUFJLENBQUNDLEtBQUQsQ0FBNUI7TUFFQSxNQUFNRSxV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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@anansi/core",
3
- "version": "0.6.1",
3
+ "version": "0.7.2",
4
4
  "description": "React 18 Framework",
5
5
  "homepage": "https://github.com/ntucker/anansi/tree/master/packages/core#readme",
6
6
  "repository": {
@@ -60,12 +60,11 @@
60
60
  "browser"
61
61
  ],
62
62
  "devDependencies": {
63
- "@anansi/babel-preset": "^3.2.1",
63
+ "@anansi/babel-preset": "^3.2.2",
64
64
  "@anansi/browserslist-config": "1.3.3",
65
- "@anansi/webpack-config": "^11.5.3",
65
+ "@anansi/webpack-config": "^11.6.1",
66
66
  "@babel/cli": "7.17.10",
67
- "@babel/core": "7.18.0",
68
- "@types/compression": "^1.7.2",
67
+ "@babel/core": "7.18.2",
69
68
  "@types/source-map-support": "^0.5.4",
70
69
  "@types/tmp": "^0.2.3",
71
70
  "@types/webpack-hot-middleware": "^2.25.6",
@@ -75,13 +74,11 @@
75
74
  "webpack-cli": "^4.9.2"
76
75
  },
77
76
  "dependencies": {
78
- "@anansi/router": "^0.5.3",
77
+ "@anansi/router": "^0.5.5",
79
78
  "@babel/runtime": "^7.10.5",
80
79
  "@rest-hooks/ssr": "^0.1.3",
81
80
  "chalk": "^4.0.0",
82
- "compression": "^1.7.4",
83
81
  "cross-fetch": "^3.1.5",
84
- "express": "^4.17.3",
85
82
  "fs-monkey": "^1.0.3",
86
83
  "history": "^5.3.0",
87
84
  "import-fresh": "^3.3.0",
@@ -6,19 +6,17 @@ import path from 'path';
6
6
  import webpack, { MultiCompiler } from 'webpack';
7
7
  import { createFsFromVolume, Volume } from 'memfs';
8
8
  import { Server, IncomingMessage, ServerResponse } from 'http';
9
- import express, { NextFunction } from 'express';
10
- import ora from 'ora';
9
+ import type { NextFunction } from 'express';
11
10
  import { patchRequire } from 'fs-monkey';
12
11
  import tmp from 'tmp';
13
12
  import sourceMapSupport from 'source-map-support';
14
13
  import { ufs } from 'unionfs';
15
- import compress from 'compression';
16
14
  import WebpackDevServer from 'webpack-dev-server';
17
15
  import importFresh from 'import-fresh';
18
- import chalk from 'chalk';
16
+ import logging from 'webpack/lib/logging/runtime';
19
17
 
20
18
  import 'cross-fetch/polyfill';
21
- import { Render } from './types';
19
+ import { BoundRender } from './types';
22
20
 
23
21
  // eslint-disable-next-line @typescript-eslint/no-var-requires
24
22
  const webpackConfig = require(require.resolve(
@@ -27,7 +25,6 @@ const webpackConfig = require(require.resolve(
27
25
  ));
28
26
 
29
27
  const entrypoint = process.argv[2];
30
- const PORT = process.env.PORT || 3000;
31
28
  //process.env.WEBPACK_PUBLIC_HOST = `http://localhost:${PORT}`; this breaks compatibility with stackblitz
32
29
  process.env.WEBPACK_PUBLIC_PATH = '/assets/';
33
30
 
@@ -36,11 +33,7 @@ if (!entrypoint) {
36
33
  process.exit(-1);
37
34
  }
38
35
 
39
- console.log(
40
- chalk.greenBright(`Starting SSR at:`),
41
- chalk.cyanBright(process.env.WEBPACK_PUBLIC_HOST || `http://localhost:${PORT}`),
42
- );
43
- const loader = ora().start();
36
+ const log = logging.getLogger('anansi-devserver');
44
37
 
45
38
  // Set up in memory filesystem
46
39
  const volume = new Volume();
@@ -74,15 +67,16 @@ export default entry;
74
67
  const webpackConfigs = [
75
68
  webpackConfig(
76
69
  {
77
- entrypoint: hotEntry(entrypoint).name,
70
+ entrypath: hotEntry(entrypoint).name,
78
71
  name: 'client',
79
72
  },
80
73
  { mode: 'development' },
81
74
  ),
82
75
  webpackConfig(
83
76
  {
84
- entrypoint: entrypoint.replace('.tsx', '.server.tsx'),
77
+ entrypath: entrypoint.replace('.tsx', '.server.tsx'),
85
78
  name: 'server',
79
+ BROWSERSLIST_ENV: 'current node',
86
80
  },
87
81
  { mode: 'development', target: 'node' },
88
82
  ),
@@ -98,7 +92,7 @@ sourceMapSupport.install({ hookRequire: true });
98
92
 
99
93
  function getServerBundle(serverStats: webpack.Stats) {
100
94
  const serverJson = serverStats.toJson({ assets: true });
101
- return path.join(serverJson.outputPath ?? '', 'main.js');
95
+ return path.join(serverJson.outputPath ?? '', 'server.js');
102
96
  }
103
97
  function handleErrors<
104
98
  F extends (
@@ -118,91 +112,30 @@ function handleErrors<
118
112
  }
119
113
  };
120
114
  }
121
- let render: Render;
122
- // Start the express server after the first compilation
123
- function initializeApp(stats: webpack.Stats[]) {
115
+ let render: BoundRender;
116
+ function importRender(stats: webpack.Stats[]) {
124
117
  const [clientStats, serverStats] = stats;
125
118
  if (
126
119
  clientStats?.compilation?.errors?.length ||
127
120
  serverStats?.compilation?.errors?.length
128
121
  ) {
129
- loader.fail('Errors for client build: ' + clientStats.compilation.errors);
130
- loader.fail('Errors for server build: ' + serverStats.compilation.errors);
122
+ log.error('Errors for client build: ' + clientStats.compilation.errors);
123
+ log.error('Errors for server build: ' + serverStats.compilation.errors);
131
124
  // TODO: handle more gracefully
132
125
  process.exit(-1);
133
126
  } else {
134
- loader.info('Launching server');
127
+ log.info('Launching SSR');
135
128
  }
136
129
 
137
- const wrappingApp = express();
138
- // eslint-disable-next-line
139
- //@ts-ignore
140
- wrappingApp.use(compress());
141
-
142
130
  // ASSETS
143
131
  const clientManifest = clientStats.toJson();
144
- const assetRoute = async (req: Request | IncomingMessage, res: any) => {
145
- const filename =
146
- req.url
147
- ?.substring((process.env.WEBPACK_PUBLIC_PATH as string).length)
148
- .split('?')[0] ?? '';
149
- const assetPath = path.join(clientManifest.outputPath ?? '', filename);
150
-
151
- try {
152
- const fileContent = (await readFile(assetPath)).toString();
153
- res.contentType(filename);
154
- res.send(fileContent);
155
- } catch (e) {
156
- res.status(404);
157
- res.send(e);
158
- return;
159
- }
160
- };
161
- wrappingApp.get(`${process.env.WEBPACK_PUBLIC_PATH}*`, assetRoute);
162
132
 
163
133
  // SERVER SIDE RENDERING
164
134
  // eslint-disable-next-line @typescript-eslint/no-var-requires
165
- render = require(getServerBundle(serverStats)).default;
166
- wrappingApp.get(
167
- '/*',
168
- handleErrors(async function (req: any, res: any) {
169
- if (req.url.endsWith('favicon.ico')) {
170
- res.statusCode = 404;
171
- res.setHeader('Content-type', 'text/html');
172
- res.send('not found');
173
- return;
174
- }
175
- res.socket.on('error', (error: unknown) => {
176
- console.error('Fatal', error);
177
- });
178
-
179
- await render(clientManifest, req, res);
180
- }),
135
+ render = (importFresh(getServerBundle(serverStats)) as any).default.bind(
136
+ undefined,
137
+ clientManifest,
181
138
  );
182
-
183
- server = wrappingApp
184
- .listen(PORT, () => {
185
- loader.succeed(`SSR Running`);
186
- })
187
- .on('error', function (error: any) {
188
- if (error.syscall !== 'listen') {
189
- throw error;
190
- }
191
- const isPipe = (portOrPipe: string | number) => Number.isNaN(portOrPipe);
192
- const bind = isPipe(PORT) ? 'Pipe ' + PORT : 'Port ' + PORT;
193
- switch (error.code) {
194
- case 'EACCES':
195
- console.error(bind + ' requires elevated privileges');
196
- process.exit(1);
197
- break;
198
- case 'EADDRINUSE':
199
- console.error(bind + ' is already in use');
200
- process.exit(1);
201
- break;
202
- default:
203
- throw error;
204
- }
205
- });
206
139
  }
207
140
 
208
141
  const devServer = new WebpackDevServer(
@@ -223,6 +156,37 @@ const devServer = new WebpackDevServer(
223
156
  join: path.join as any,
224
157
  } as any as typeof fs,
225
158
  },
159
+ setupMiddlewares: (middlewares, devServer) => {
160
+ if (!devServer) {
161
+ throw new Error('webpack-dev-server is not defined');
162
+ }
163
+
164
+ // serve SSR for non-WEBPACK_PUBLIC_PATH
165
+ devServer.app?.get(
166
+ new RegExp(`^(?!${process.env.WEBPACK_PUBLIC_PATH})`),
167
+ handleErrors(async function (req: any, res: any) {
168
+ if (req.url.endsWith('favicon.ico')) {
169
+ res.statusCode = 404;
170
+ res.setHeader('Content-type', 'text/html');
171
+ res.send('not found');
172
+ return;
173
+ }
174
+ res.socket.on('error', (error: unknown) => {
175
+ console.error('Fatal', error);
176
+ });
177
+
178
+ if (!render) {
179
+ res.statusCode = 500;
180
+ res.setHeader('Content-type', 'text/html');
181
+ res.send('Render not initialized');
182
+ return;
183
+ }
184
+ await render(req, res);
185
+ }),
186
+ );
187
+
188
+ return middlewares;
189
+ },
226
190
  },
227
191
  compiler,
228
192
  );
@@ -232,38 +196,33 @@ const runServer = async () => {
232
196
  'Anansi Server',
233
197
  (multiStats: webpack.MultiStats | webpack.Stats) => {
234
198
  if (!multiStats) {
235
- loader.fail('stats not send');
199
+ log.error('stats not send');
236
200
  process.exit(-1);
237
201
  }
238
202
 
239
203
  if (!Object.hasOwn(multiStats, 'stats')) return;
240
- if (server && (multiStats as webpack.MultiStats).stats.length > 1) {
241
- render = (
242
- importFresh(
243
- getServerBundle((multiStats as webpack.MultiStats).stats[1]),
244
- ) as any
245
- ).default;
246
- return;
247
- }
248
- if (!server) {
204
+ if ((multiStats as webpack.MultiStats).stats.length > 1) {
249
205
  try {
250
- initializeApp((multiStats as webpack.MultiStats).stats);
251
- } catch (e) {
252
- loader.fail('Failed to initialize app');
206
+ importRender((multiStats as webpack.MultiStats).stats);
207
+ } catch (e: any) {
208
+ log.error('Failed to load serve entrypoint');
253
209
  console.error(e);
210
+ console.error(e.stack);
254
211
  }
212
+ } else {
213
+ log.error('Only compiler one stat');
255
214
  }
256
215
  },
257
216
  );
258
217
  };
259
218
  const stopServer = async () => {
260
- loader.info('Stopping server...');
219
+ log.info('Stopping server...');
261
220
  await devServer.stop();
262
- loader.info('Server closed');
221
+ log.info('Server closed');
263
222
  };
264
223
 
265
224
  process.on('SIGINT', () => {
266
- loader.warn('Received SIGINT, devserver shutting down');
225
+ log.warn('Received SIGINT, devserver shutting down');
267
226
  stopServer();
268
227
  process.exit(-1);
269
228
  });
@@ -7,3 +7,8 @@ export type Render = (
7
7
  req: Request | IncomingMessage,
8
8
  res: Response | ServerResponse,
9
9
  ) => Promise<void>;
10
+
11
+ export type BoundRender = (
12
+ req: Request | IncomingMessage,
13
+ res: Response | ServerResponse,
14
+ ) => Promise<void>;
@@ -0,0 +1,4 @@
1
+ declare module 'webpack/lib/logging/runtime' {
2
+ const logging: any;
3
+ export = logging;
4
+ }
@@ -1,5 +1,6 @@
1
1
  import React from 'react';
2
2
  import type { Route } from '@anansi/router';
3
+ import { StatsChunkGroup } from 'webpack';
3
4
 
4
5
  import type { ServerProps, ResolveProps } from './types';
5
6
  import Document from './DocumentComponent';
@@ -20,29 +21,53 @@ export default function DocumentSpout(options: {
20
21
  return async (props: ServerProps) => {
21
22
  const nextProps = await next(props);
22
23
 
23
- const entrypoint = props.clientManifest?.entrypoints?.main;
24
24
  const publicPath = props.clientManifest.publicPath;
25
25
 
26
- if (entrypoint === undefined || publicPath === undefined)
26
+ if (
27
+ Object.keys(props.clientManifest?.entrypoints ?? {}).length < 1 ||
28
+ publicPath === undefined
29
+ )
27
30
  throw new Error('Manifest missing entries needed');
28
31
 
29
32
  // TODO: consider using this package for build stats in future:
30
33
  // https://github.com/facebook/react/tree/main/packages/react-server-dom-webpack
31
34
  const assetMap = (assets: { name: string; size?: number }[]) =>
32
35
  assets.map(({ name }) => `${publicPath}${name}`);
33
- // find additional assets to preload based on matched route
34
- const assets = assetMap([
35
- ...(entrypoint.assets ?? []),
36
- ...(entrypoint.children?.prefetch?.find?.(({ name }) =>
37
- nextProps.matchedRoutes.some(route => name === route.name),
38
- )?.assets ?? []),
39
- ]).map(asset =>
40
- asset.endsWith('.css')
41
- ? { href: asset, rel: 'stylesheet' }
42
- : asset.endsWith('.js')
43
- ? { href: asset, as: 'script' }
44
- : { href: asset },
36
+
37
+ const assetList: string[] = [];
38
+ Object.values(props.clientManifest?.entrypoints ?? {}).forEach(
39
+ entrypoint => {
40
+ assetList.push(...assetMap(entrypoint.assets ?? []));
41
+ },
45
42
  );
43
+ new Set(
44
+ assetMap(
45
+ Object.values(props.clientManifest.namedChunkGroups ?? {})
46
+ .filter(({ name }) =>
47
+ nextProps.matchedRoutes.some(route => name?.includes(route.name)),
48
+ )
49
+ .flatMap(chunk => [
50
+ ...(chunk.assets ?? []),
51
+ // any chunk preloads
52
+ ...childrenAssets(chunk),
53
+ ]),
54
+ ),
55
+ ).forEach(asset => assetList.push(asset));
56
+
57
+ // find additional assets to preload based on matched route
58
+ const assets: {
59
+ href: string;
60
+ as?: string | undefined;
61
+ rel?: string | undefined;
62
+ }[] = assetList
63
+ .filter(asset => !asset.endsWith('.hot-update.js'))
64
+ .map(asset =>
65
+ asset.endsWith('.css')
66
+ ? { href: asset, rel: 'stylesheet' }
67
+ : asset.endsWith('.js')
68
+ ? { href: asset, as: 'script' }
69
+ : { href: asset },
70
+ );
46
71
 
47
72
  return {
48
73
  ...nextProps,
@@ -60,3 +85,11 @@ export default function DocumentSpout(options: {
60
85
  };
61
86
  };
62
87
  }
88
+
89
+ function childrenAssets(chunk: StatsChunkGroup) {
90
+ return chunk.children
91
+ ? Object.values(chunk.children).flatMap(preload =>
92
+ preload.flatMap(c => c.assets ?? []),
93
+ )
94
+ : [];
95
+ }