@anansi/core 0.9.0 → 0.10.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 +28 -0
- package/dist/client.js +3 -2
- package/dist/client.js.map +1 -1
- package/dist/server.js.map +1 -1
- package/lib/scripts/startDevserver.d.ts.map +1 -1
- package/lib/scripts/startDevserver.js +16 -13
- package/lib/spouts/document.server.d.ts +1 -1
- package/lib/spouts/document.server.d.ts.map +1 -1
- package/lib/spouts/document.server.js +1 -1
- package/lib/spouts/router.d.ts +2 -0
- package/lib/spouts/router.d.ts.map +1 -1
- package/lib/spouts/router.js +3 -2
- package/package.json +9 -8
- package/src/scripts/startDevserver.ts +14 -15
- package/src/spouts/document.server.tsx +1 -1
- package/src/spouts/router.tsx +7 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,34 @@
|
|
|
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.10.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.9.0...@anansi/core@0.10.0) (2022-06-09)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### 🚀 Features
|
|
10
|
+
|
|
11
|
+
* add router onChange() ([5c981ed](https://github.com/ntucker/anansi/commit/5c981ed587b55a80fd4f604fc24fb143d2355a06))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### 💅 Enhancement
|
|
15
|
+
|
|
16
|
+
* Do require cache invalidation ourselves ([22b4e4c](https://github.com/ntucker/anansi/commit/22b4e4c2e4ce3d7de999813bd4e9397e770fe788))
|
|
17
|
+
* Improve devserver node 'require' reliability ([#1538](https://github.com/ntucker/anansi/issues/1538)) ([96b6a54](https://github.com/ntucker/anansi/commit/96b6a54562b97f116fc987b41fbf7547770debc8))
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### 🐛 Bug Fix
|
|
21
|
+
|
|
22
|
+
* rootId is optional ([ff43166](https://github.com/ntucker/anansi/commit/ff43166d457ac93ffca2eae0738d81e734b6936e))
|
|
23
|
+
* SSR hot-reloading ([9809ad5](https://github.com/ntucker/anansi/commit/9809ad5798e9082554f0358fcd9c301a87e4acbf))
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
### 📦 Package
|
|
27
|
+
|
|
28
|
+
* Move compression to correct package ([1ce18ba](https://github.com/ntucker/anansi/commit/1ce18ba9d7dc4d04682184bc1fa74354684294bb))
|
|
29
|
+
* Update all non-major dependencies ([#1531](https://github.com/ntucker/anansi/issues/1531)) ([2677241](https://github.com/ntucker/anansi/commit/26772415c2763f35c1720a08bb4b5417214f20d3))
|
|
30
|
+
* Update jest monorepo to ^28.1.1 ([#1534](https://github.com/ntucker/anansi/issues/1534)) ([b73dea2](https://github.com/ntucker/anansi/commit/b73dea2ee14f914bdbca189000265693d7fb112f))
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
6
34
|
## [0.9.0](https://github.com/ntucker/anansi/compare/@anansi/core@0.8.0...@anansi/core@0.9.0) (2022-05-29)
|
|
7
35
|
|
|
8
36
|
|
package/dist/client.js
CHANGED
|
@@ -139,10 +139,11 @@ function routerSpout(options) {
|
|
|
139
139
|
return /*#__PURE__*/external_react_default().createElement(router_namespaceObject.RouteProvider, {
|
|
140
140
|
router: router,
|
|
141
141
|
resolveWith: resolveWith,
|
|
142
|
+
onChange: options.onChange,
|
|
142
143
|
__self: this,
|
|
143
144
|
__source: {
|
|
144
145
|
fileName: router_jsxFileName,
|
|
145
|
-
lineNumber:
|
|
146
|
+
lineNumber: 23,
|
|
146
147
|
columnNumber: 9
|
|
147
148
|
}
|
|
148
149
|
}, children);
|
|
@@ -162,7 +163,7 @@ function routerSpout(options) {
|
|
|
162
163
|
__self: this,
|
|
163
164
|
__source: {
|
|
164
165
|
fileName: router_jsxFileName,
|
|
165
|
-
lineNumber:
|
|
166
|
+
lineNumber: 46,
|
|
166
167
|
columnNumber: 14
|
|
167
168
|
}
|
|
168
169
|
}, nextProps.app)
|
package/dist/client.js.map
CHANGED
|
@@ -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;AACA;AACA;AAEA;AACA;AACA;AACA;;ACrBA;;;ACAA;;ACAA;;;;ACAA;AACA;AAMA;AAGA;AAAA;AAEA;AACA;AACA;AAEA;AAEA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AALA;AASA;AACA;AACA;;AC7BA;;ACAA;;;ACAA;AACA;AACA;AAMA;
|
|
1
|
+
{"version":3,"file":"client.js","mappings":";;AAAA;AACA;AACA;;;;ACFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;ACPA;;;;;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;;;;;ACNA;;ACAA;AAEA;AAIA;AAAA;AACA;;AACA;AAAA;AAAA;AAEA;AACA;;ACDA;AAIA;AACA;AACA;AAEA;AACA;AACA;AACA;;ACrBA;;;ACAA;;ACAA;;;;ACAA;AACA;AAMA;AAGA;AAAA;AAEA;AACA;AACA;AAEA;AAEA;AAEA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AALA;AASA;AACA;AACA;;AC7BA;;ACAA;;;ACAA;AACA;AACA;AAOA;AAMA;AAGA;AAAA;AACA;AAEA;AAEA;AACA;AACA;AAHA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA;;AAEA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AAEA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAJA;AAMA;AACA;AACA;;ACjDA;AACA;AACA","sources":["/home/ntucker/src/anansi/packages/core/webpack/bootstrap","/home/ntucker/src/anansi/packages/core/webpack/runtime/compat get default export","/home/ntucker/src/anansi/packages/core/webpack/runtime/define property getters","/home/ntucker/src/anansi/packages/core/webpack/runtime/hasOwnProperty shorthand","/home/ntucker/src/anansi/packages/core/webpack/runtime/make namespace object","/home/ntucker/src/anansi/packages/core/external commonjs \"react-dom/client\"","/home/ntucker/src/anansi/packages/core/src/floodSpouts.tsx","/home/ntucker/src/anansi/packages/core/src/spouts/document.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"react\"","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/core\"","/home/ntucker/src/anansi/packages/core/external commonjs \"@rest-hooks/ssr\"","/home/ntucker/src/anansi/packages/core/src/spouts/restHooks.tsx","/home/ntucker/src/anansi/packages/core/external commonjs \"@anansi/router\"","/home/ntucker/src/anansi/packages/core/external commonjs \"history\"","/home/ntucker/src/anansi/packages/core/src/spouts/router.tsx","/home/ntucker/src/anansi/packages/core/src/index.ts"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react-dom/client\");","import { hydrateRoot } from 'react-dom/client';\n\nexport default async function floodSpouts(\n spouts: () => Promise<{\n app: JSX.Element;\n }>,\n { rootId = 'anansi-root' }: { rootId?: string } = {},\n) {\n const { app } = await spouts();\n\n hydrateRoot(document.getElementById(rootId) ?? document, app);\n}\n","import React from 'react';\nimport type { Route } from '@anansi/router';\n\nimport type { ResolveProps } from './types';\n\ntype NeededProps = {\n matchedRoutes: Route<any>[];\n title?: string;\n} & ResolveProps;\n\nexport default function documentSpout(options: {\n head?: React.ReactNode;\n title: string;\n}) {\n return function <T extends NeededProps>(next: () => Promise<T>) {\n return async () => {\n const nextProps = await next();\n\n return nextProps;\n };\n };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"react\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/core\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@rest-hooks/ssr\");","import { CacheProvider, Manager, NetworkManager } from '@rest-hooks/core';\nimport { ServerDataComponent, getDatafromDOM } from '@rest-hooks/ssr';\n\nimport type { ResolveProps } from './types';\n\ntype NeededProps = ResolveProps;\n\nexport default function restHooksSpout(\n options: {\n getManagers: () => Manager[];\n } = { getManagers: () => [new NetworkManager()] },\n) {\n return function <T extends NeededProps>(next: () => Promise<T>) {\n return async () => {\n const data = getDatafromDOM();\n\n const nextProps = await next();\n\n return {\n ...nextProps,\n app: (\n <CacheProvider initialState={data} managers={options.getManagers()}>\n {nextProps.app}\n <ServerDataComponent data={data} />\n </CacheProvider>\n ),\n };\n };\n };\n}\n","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"@anansi/router\");","const __WEBPACK_NAMESPACE_OBJECT__ = require(\"history\");","import { Route, RouteProvider, RouteController } from '@anansi/router';\nimport React from 'react';\nimport { createBrowserHistory } from 'history';\nimport type { Update } from 'history';\n\nimport type { ResolveProps, CreateRouter } from './types';\n\ntype NeededProps = ResolveProps;\n\nexport default function routerSpout<ResolveWith>(options: {\n resolveWith?: any;\n useResolveWith: () => ResolveWith;\n createRouter: CreateRouter<ResolveWith>;\n onChange?: (update: Update, callback: () => void | undefined) => void;\n}) {\n const createRouteComponent = (\n router: RouteController<Route<ResolveWith, any>>,\n ) =>\n function Router({ children }: { children: React.ReactNode }) {\n const resolveWith = options.useResolveWith();\n\n return (\n <RouteProvider\n router={router}\n resolveWith={resolveWith}\n onChange={options.onChange}\n >\n {children}\n </RouteProvider>\n );\n };\n\n return function <T extends NeededProps>(next: () => Promise<T>) {\n return async () => {\n const history = createBrowserHistory();\n const router = options.createRouter(history);\n const matchedRoutes = router.getMatchedRoutes(history.location.pathname);\n\n const nextProps = await next();\n\n const Router = createRouteComponent(router);\n return {\n ...nextProps,\n matchedRoutes,\n router,\n app: <Router>{nextProps.app}</Router>,\n };\n };\n };\n}\n","export { default as floodSpouts } from './floodSpouts';\nexport { default as documentSpout } from './spouts/document';\nexport { default as restHooksSpout } from './spouts/restHooks';\nexport { default as routerSpout } from './spouts/router';\n"],"names":[],"sourceRoot":""}
|
package/dist/server.js.map
CHANGED
|
@@ -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;;;;;;;ACSA;AACA;AACA;AACA;AACA;AACA;AACA;AANA;AAQA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;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;AAAA;AAEA;AACA;AAFA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AACA;AAXA;;;AC5CA;AAKA;AAOA;AAMA;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;;AC/FA;;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 charSet: string;\n};\n\nexport default function Document({\n assets,\n head,\n children,\n title,\n rootId,\n charSet,\n}: Props) {\n return (\n <html>\n <head>\n <meta charSet={charSet} />\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 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};\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 charSet?: 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
|
+
{"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;;;;;;;ACSA;AACA;AACA;AACA;AACA;AACA;AACA;AANA;AAQA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AAAA;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;AAAA;AAEA;AACA;AAFA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AACA;AAXA;;;AC5CA;AAKA;AAOA;AAMA;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;;AC/FA;;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 charSet: string;\n};\n\nexport default function Document({\n assets,\n head,\n children,\n title,\n rootId,\n charSet,\n}: Props) {\n return (\n <html>\n <head>\n <meta charSet={charSet} />\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 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};\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 charSet?: 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":";
|
|
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,QAmNlC"}
|
|
@@ -16,8 +16,6 @@ var _webpack = _interopRequireDefault(require("webpack"));
|
|
|
16
16
|
|
|
17
17
|
var _memfs = require("memfs");
|
|
18
18
|
|
|
19
|
-
var _fsMonkey = require("fs-monkey");
|
|
20
|
-
|
|
21
19
|
var _tmp = _interopRequireDefault(require("tmp"));
|
|
22
20
|
|
|
23
21
|
var _sourceMapSupport = _interopRequireDefault(require("source-map-support"));
|
|
@@ -26,10 +24,10 @@ var _unionfs = require("unionfs");
|
|
|
26
24
|
|
|
27
25
|
var _webpackDevServer = _interopRequireDefault(require("webpack-dev-server"));
|
|
28
26
|
|
|
29
|
-
var _importFresh = _interopRequireDefault(require("import-fresh"));
|
|
30
|
-
|
|
31
27
|
var _runtime = _interopRequireDefault(require("webpack/lib/logging/runtime"));
|
|
32
28
|
|
|
29
|
+
var _fsRequire = require("fs-require");
|
|
30
|
+
|
|
33
31
|
require("cross-fetch/polyfill");
|
|
34
32
|
|
|
35
33
|
// run directly from node
|
|
@@ -59,7 +57,7 @@ function startDevServer(entrypoint, env = {}) {
|
|
|
59
57
|
|
|
60
58
|
_unionfs.ufs.use(_fs.default).use(fs);
|
|
61
59
|
|
|
62
|
-
(0,
|
|
60
|
+
const fsRequire = (0, _fsRequire.createFsRequire)(_unionfs.ufs);
|
|
63
61
|
const readFile = (0, _util.promisify)(_unionfs.ufs.readFile);
|
|
64
62
|
let server; // Generate a temporary file so we can hot reload from the root of the application
|
|
65
63
|
|
|
@@ -126,10 +124,12 @@ function startDevServer(entrypoint, env = {}) {
|
|
|
126
124
|
};
|
|
127
125
|
}
|
|
128
126
|
|
|
129
|
-
|
|
127
|
+
let initRender = [];
|
|
130
128
|
|
|
131
129
|
let render = (...args) => new Promise(resolve => {
|
|
132
|
-
|
|
130
|
+
var _initRender;
|
|
131
|
+
|
|
132
|
+
(_initRender = initRender) === null || _initRender === void 0 ? void 0 : _initRender.push({
|
|
133
133
|
args,
|
|
134
134
|
resolve
|
|
135
135
|
});
|
|
@@ -150,14 +150,17 @@ function startDevServer(entrypoint, env = {}) {
|
|
|
150
150
|
} // ASSETS
|
|
151
151
|
|
|
152
152
|
|
|
153
|
-
const clientManifest = clientStats.toJson();
|
|
153
|
+
const clientManifest = clientStats.toJson();
|
|
154
|
+
const serverEntry = getServerBundle(serverStats); // reload modules
|
|
155
|
+
// TODO: should we just reset entire cache each time? then we could avoid needing one output
|
|
156
|
+
|
|
157
|
+
delete fsRequire.cache[fsRequire.resolve(serverEntry)]; // eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
158
|
+
|
|
159
|
+
render = fsRequire(serverEntry).default.bind(undefined, clientManifest); // SERVER SIDE ENTRYPOINT
|
|
154
160
|
|
|
155
161
|
if (Array.isArray(initRender)) {
|
|
156
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
157
|
-
render = require(getServerBundle(serverStats)).default.bind(undefined, clientManifest);
|
|
158
162
|
initRender.forEach(init => render(...init.args).then(init.resolve));
|
|
159
|
-
|
|
160
|
-
render = (0, _importFresh.default)(getServerBundle(serverStats)).default.bind(undefined, clientManifest);
|
|
163
|
+
initRender = undefined;
|
|
161
164
|
}
|
|
162
165
|
}
|
|
163
166
|
|
|
@@ -230,4 +233,4 @@ function startDevServer(entrypoint, env = {}) {
|
|
|
230
233
|
});
|
|
231
234
|
runServer();
|
|
232
235
|
}
|
|
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","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","initRender","render","args","Promise","importRender","stats","clientStats","compilation","errors","length","error","info","clientManifest","Array","isArray","default","bind","undefined","forEach","init","then","importFresh","devServer","WebpackDevServer","devMiddleware","outputFileSystem","setupMiddlewares","middlewares","Error","otherRoutes","WEBPACK_PUBLIC_PATH","Object","keys","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 { 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// 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  patchRequire(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  // only have one output for server so we can avoid cached modules\n  webpackConfigs[1].plugins.push(\n    new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),\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  const 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    // SERVER SIDE ENTRYPOINT\n    if (Array.isArray(initRender)) {\n      // eslint-disable-next-line @typescript-eslint/no-var-requires\n      render = (require(getServerBundle(serverStats)) as any).default.bind(\n        undefined,\n        clientManifest,\n      );\n      initRender.forEach(init => render(...init.args).then(init.resolve));\n    } else {\n      render = (importFresh(getServerBundle(serverStats)) as any).default.bind(\n        undefined,\n        clientManifest,\n      );\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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"}
|
|
236
|
+
//# 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","plugins","push","webpack","optimize","LimitChunkCountPlugin","maxChunks","compiler","sourceMapSupport","install","hookRequire","getServerBundle","serverStats","serverJson","toJson","assets","outputPath","handleErrors","fn","req","res","next","x","initRender","render","args","Promise","importRender","stats","clientStats","compilation","errors","length","error","info","clientManifest","serverEntry","cache","default","bind","undefined","Array","isArray","forEach","init","then","devServer","WebpackDevServer","devMiddleware","outputFileSystem","setupMiddlewares","middlewares","Error","otherRoutes","WEBPACK_PUBLIC_PATH","Object","keys","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  // only have one output for server so we can avoid cached modules\n  webpackConfigs[1].plugins.push(\n    new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),\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    // TODO: should we just reset entire cache each time? then we could avoid needing one output\n    delete fsRequire.cache[fsRequire.resolve(serverEntry)];\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":"AAAA;;;;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;AAGA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA;;AAGA;AACA,IAAIA,OAAO,CAACC,IAAR,KAAiBC,MAArB,EAA6B;EAC3B,MAAMC,UAAU,GAAGC,OAAO,CAACC,IAAR,CAAa,CAAb,CAAnB;;EAEA,IAAI,CAACF,UAAL,EAAiB;IACfG,OAAO,CAACC,GAAR,CAAa,uCAAb;IACAH,OAAO,CAACI,IAAR,CAAa,CAAC,CAAd;EACD;;EAEDC,cAAc,CAACN,UAAD,CAAd;AACD;;AAEc,SAASM,cAAT,CACbN,UADa,EAEbO,GAA4B,GAAG,EAFlB,EAGb;EAAA;;EACA;EACA,MAAMC,aAAa,GAAGX,OAAO,CAACA,OAAO,CAACY,OAAR,EAC5B;EACAC,aAAA,CAAKC,IAAL,CAAUV,OAAO,CAACW,GAAR,EAAV,EAAyB,gBAAzB,CAF4B,CAAD,CAA7B;;EAKA,MAAMR,GAAG,GAAGS,gBAAA,CAAQC,SAAR,CAAkB,kBAAlB,CAAZ,CAPA,CASA;;;EACA,MAAMC,MAAM,GAAG,IAAIC,aAAJ,EAAf;EACA,MAAMC,EAAE,GAAG,IAAAC,yBAAA,EAAmBH,MAAnB,CAAX;;EACAI,YAAA,CAAIC,GAAJ,CAAQC,WAAR,EAAgBD,GAAhB,CAAoBH,EAApB;;EAEA,MAAMK,SAAS,GAAG,IAAAC,0BAAA,EAAgBJ,YAAhB,CAAlB;EACA,MAAMK,QAAQ,GAAG,IAAAC,eAAA,EAAUN,YAAA,CAAIK,QAAd,CAAjB;EACA,IAAIE,MAAJ,CAhBA,CAkBA;;EACA,SAASC,QAAT,CAAkBC,SAAlB,EAAqC;IACnC;IACA;IACA,MAAMC,mBAAmB,GAAGC,YAAA,CAAIC,QAAJ,CAAa;MAAEC,OAAO,EAAE;IAAX,CAAb,CAA5B;;IACAX,WAAA,CAAOY,SAAP,CACEJ,mBAAmB,CAACK,EADtB,EAEG;AACP,uBAAuBxB,aAAA,CAAKD,OAAL,CAAaR,OAAO,CAACW,GAAR,EAAb,EAA4BgB,SAA5B,CAAuC;AAC9D;AACA;AACA;AACA;AACA;AACA;AACA,KAVI;;IAYA,OAAOC,mBAAP;EACD;;EAED,MAAMM,cAAc,GAAG,CACrB3B,aAAa,CACX,EACE,GAAGD,GADL;IAEE6B,SAAS,EAAET,QAAQ,CAAC3B,UAAD,CAAR,CAAqBqC,IAFlC;IAGEA,IAAI,EAAE;EAHR,CADW,EAMX;IAAEC,IAAI,EAAE;EAAR,CANW,CADQ,EASrB9B,aAAa,CACX,EACE,GAAGD,GADL;IAEE6B,SAAS,EAAEpC,UAAU,CAACuC,OAAX,CAAmB,MAAnB,EAA2B,aAA3B,CAFb;IAGEF,IAAI,EAAE,QAHR;IAIEG,gBAAgB,EAAE;EAJpB,CADW,EAOX;IAAEF,IAAI,EAAE,aAAR;IAAuBG,MAAM,EAAE;EAA/B,CAPW,CATQ,CAAvB,CAtCA,CAyDA;;EACAN,cAAc,CAAC,CAAD,CAAd,CAAkBO,OAAlB,CAA0BC,IAA1B,CACE,IAAIC,gBAAA,CAAQC,QAAR,CAAiBC,qBAArB,CAA2C;IAAEC,SAAS,EAAE;EAAb,CAA3C,CADF,EA1DA,CA6DA;;EACA,MAAMC,QAAuB,GAAG,IAAAJ,gBAAA,EAAQT,cAAR,CAAhC;;EAEAc,yBAAA,CAAiBC,OAAjB,CAAyB;IAAEC,WAAW,EAAE;EAAf,CAAzB;;EAEA,SAASC,eAAT,CAAyBC,WAAzB,EAAqD;IAAA;;IACnD,MAAMC,UAAU,GAAGD,WAAW,CAACE,MAAZ,CAAmB;MAAEC,MAAM,EAAE;IAAV,CAAnB,CAAnB;IACA,OAAO9C,aAAA,CAAKC,IAAL,0BAAU2C,UAAU,CAACG,UAArB,oCAAmC,EAAnC,EAAuC,WAAvC,CAAP;EACD;;EACD,SAASC,YAAT,CAKEC,EALF,EAKS;IACP,OAAO,gBACLC,GADK,EAELC,GAFK,EAGLC,IAHK,EAIL;MACA,IAAI;QACF,OAAO,MAAMH,EAAE,CAACC,GAAD,EAAMC,GAAN,CAAf;MACD,CAFD,CAEE,OAAOE,CAAP,EAAU;QACVD,IAAI,CAACC,CAAD,CAAJ;MACD;IACF,CAVD;EAWD;;EAED,IAAIC,UAES,GAAG,EAFhB;;EAGA,IAAIC,MAAmB,GAAG,CAAC,GAAGC,IAAJ,KACxB,IAAIC,OAAJ,CAAY1D,OAAO,IAAI;IAAA;;IACrB,eAAAuD,UAAU,UAAV,kDAAYrB,IAAZ,CAAiB;MAAEuB,IAAF;MAAQzD;IAAR,CAAjB;EACD,CAFD,CADF;;EAKA,SAAS2D,YAAT,CAAsBC,KAAtB,EAA8C;IAAA;;IAC5C,MAAM,CAACC,WAAD,EAAcjB,WAAd,IAA6BgB,KAAnC;;IACA,IACEC,WAAW,SAAX,IAAAA,WAAW,WAAX,6BAAAA,WAAW,CAAEC,WAAb,kGAA0BC,MAA1B,0EAAkCC,MAAlC,IACApB,WADA,aACAA,WADA,wCACAA,WAAW,CAAEkB,WADb,4EACA,sBAA0BC,MAD1B,mDACA,uBAAkCC,MAFpC,EAGE;MACArE,GAAG,CAACsE,KAAJ,CAAU,8BAA8BJ,WAAW,CAACC,WAAZ,CAAwBC,MAAhE;MACApE,GAAG,CAACsE,KAAJ,CAAU,8BAA8BrB,WAAW,CAACkB,WAAZ,CAAwBC,MAAhE,EAFA,CAGA;;MACAvE,OAAO,CAACI,IAAR,CAAa,CAAC,CAAd;IACD,CARD,MAQO;MACLD,GAAG,CAACuE,IAAJ,CAAS,eAAT;IACD,CAZ2C,CAc5C;;;IACA,MAAMC,cAAc,GAAGN,WAAW,CAACf,MAAZ,EAAvB;IAEA,MAAMsB,WAAW,GAAGzB,eAAe,CAACC,WAAD,CAAnC,CAjB4C,CAkB5C;IACA;;IACA,OAAO/B,SAAS,CAACwD,KAAV,CAAgBxD,SAAS,CAACb,OAAV,CAAkBoE,WAAlB,CAAhB,CAAP,CApB4C,CAqB5C;;IACAZ,MAAM,GAAI3C,SAAS,CAACuD,WAAD,CAAV,CAAgCE,OAAhC,CAAwCC,IAAxC,CACPC,SADO,EAEPL,cAFO,CAAT,CAtB4C,CA0B5C;;IACA,IAAIM,KAAK,CAACC,OAAN,CAAcnB,UAAd,CAAJ,EAA+B;MAC7BA,UAAU,CAACoB,OAAX,CAAmBC,IAAI,IAAIpB,MAAM,CAAC,GAAGoB,IAAI,CAACnB,IAAT,CAAN,CAAqBoB,IAArB,CAA0BD,IAAI,CAAC5E,OAA/B,CAA3B;MACAuD,UAAU,GAAGiB,SAAb;IACD;EACF;;EAED,MAAMM,SAAS,GAAG,IAAIC,yBAAJ,EAChB;EACA,EACE,GAAGrD,cAAc,CAAC,CAAD,CAAd,CAAkBoD,SADvB;IAEEE,aAAa,EAAE,EACb,wBAAGtD,cAAc,CAAC,CAAD,CAAjB,8EAAG,iBAAmBoD,SAAtB,0DAAG,sBAA8BE,aAAjC,CADa;MAEbC,gBAAgB,EAAE,EAChB,GAAGzE,EADa;QAEhBN,IAAI,EAAED,aAAA,CAAKC;MAFK;IAFL,CAFjB;IASEgF,gBAAgB,EAAE,CAACC,WAAD,EAAcL,SAAd,KAA4B;MAAA;;MAC5C,IAAI,CAACA,SAAL,EAAgB;QACd,MAAM,IAAIM,KAAJ,CAAU,mCAAV,CAAN;MACD;;MAED,MAAMC,WAAW,GAAG,CAClB7F,OAAO,CAACM,GAAR,CAAYwF,mBADM,EAElB,GAAGC,MAAM,CAACC,IAAP,oDAAY9D,cAAc,CAAC,CAAD,CAAd,CAAkBoD,SAA9B,2DAAY,uBAA6BW,KAAzC,oCAAkD,EAAlD,CAFe,CAApB,CAL4C,CAS5C;;MACA,kBAAAX,SAAS,CAACY,GAAV,kEAAeC,GAAf,CACE,IAAIC,MAAJ,CAAY,OAAMP,WAAW,CAACnF,IAAZ,CAAiB,GAAjB,CAAsB,GAAxC,CADF,EAEE+C,YAAY,CAAC,gBAAgBE,GAAhB,EAA0BC,GAA1B,EAAoC;QAC/C,IAAID,GAAG,CAAC0C,GAAJ,CAAQC,QAAR,CAAiB,aAAjB,CAAJ,EAAqC;UACnC1C,GAAG,CAAC2C,UAAJ,GAAiB,GAAjB;UACA3C,GAAG,CAAC4C,SAAJ,CAAc,cAAd,EAA8B,WAA9B;UACA5C,GAAG,CAAC6C,IAAJ,CAAS,WAAT;UACA;QACD;;QACD7C,GAAG,CAAC8C,MAAJ,CAAWC,EAAX,CAAc,OAAd,EAAwBlC,KAAD,IAAoB;UACzCvE,OAAO,CAACuE,KAAR,CAAc,OAAd,EAAuBA,KAAvB;QACD,CAFD;QAIA,MAAMT,MAAM,CAACL,GAAD,EAAMC,GAAN,CAAZ;MACD,CAZW,CAFd;MAiBA,OAAO+B,WAAP;IACD;EArCH,CAFgB,EAyChB5C,QAzCgB,CAAlB;;EA2CA,MAAM6D,SAAS,GAAG,YAAY;IAC5B,MAAMtB,SAAS,CAACuB,KAAV,EAAN;IACAvB,SAAS,CAACvC,QAAV,CAAmB+D,KAAnB,CAAyBC,IAAzB,CAA8BC,GAA9B,CACE,eADF,EAEGC,UAAD,IAAoD;MAClD,IAAI,CAACA,UAAL,EAAiB;QACf9G,GAAG,CAACsE,KAAJ,CAAU,gBAAV;QACAzE,OAAO,CAACI,IAAR,CAAa,CAAC,CAAd;MACD;;MAED,IAAI,CAAC2F,MAAM,CAACmB,MAAP,CAAcD,UAAd,EAA0B,OAA1B,CAAL,EAAyC;;MACzC,IAAKA,UAAD,CAAmC7C,KAAnC,CAAyCI,MAAzC,GAAkD,CAAtD,EAAyD;QACvD,IAAI;UACFL,YAAY,CAAE8C,UAAD,CAAmC7C,KAApC,CAAZ;QACD,CAFD,CAEE,OAAO+C,CAAP,EAAe;UACfhH,GAAG,CAACsE,KAAJ,CAAU,iCAAV;UACA,MAAM0C,CAAN;QACD;MACF,CAPD,MAOO;QACLhH,GAAG,CAACsE,KAAJ,CAAU,wBAAV;MACD;IACF,CAnBH;EAqBD,CAvBD;;EAwBA,MAAM2C,UAAU,GAAG,YAAY;IAC7BjH,GAAG,CAACuE,IAAJ,CAAS,oBAAT;IACA,MAAMY,SAAS,CAAC+B,IAAV,EAAN;IACAlH,GAAG,CAACuE,IAAJ,CAAS,eAAT;EACD,CAJD;;EAMA1E,OAAO,CAAC2G,EAAR,CAAW,QAAX,EAAqB,MAAM;IACzBxG,GAAG,CAACmH,IAAJ,CAAS,0CAAT;IACAF,UAAU;IACVpH,OAAO,CAACI,IAAR,CAAa,CAAC,CAAd;EACD,CAJD;EAMAwG,SAAS;AACV"}
|
|
@@ -8,7 +8,7 @@ declare type NeededProps = {
|
|
|
8
8
|
export default function DocumentSpout(options: {
|
|
9
9
|
head?: React.ReactNode;
|
|
10
10
|
title: string;
|
|
11
|
-
rootId
|
|
11
|
+
rootId?: string;
|
|
12
12
|
charSet?: string;
|
|
13
13
|
}): <T extends NeededProps>(next: (props: ServerProps) => Promise<T>) => (props: ServerProps) => Promise<T & {
|
|
14
14
|
app: JSX.Element;
|
|
@@ -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;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;
|
|
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,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,yCAEiB,WAAW,4BAEJ,WAAW;;GAkEnC"}
|
|
@@ -65,4 +65,4 @@ function childrenAssets(chunk) {
|
|
|
65
65
|
return (_c$assets = c.assets) != null ? _c$assets : [];
|
|
66
66
|
})) : [];
|
|
67
67
|
}
|
|
68
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJEb2N1bWVudFNwb3V0Iiwib3B0aW9ucyIsIm5leHQiLCJwcm9wcyIsIm5leHRQcm9wcyIsInB1YmxpY1BhdGgiLCJjbGllbnRNYW5pZmVzdCIsIk9iamVjdCIsImtleXMiLCJlbnRyeXBvaW50cyIsImxlbmd0aCIsInVuZGVmaW5lZCIsIkVycm9yIiwiYXNzZXRNYXAiLCJhc3NldHMiLCJtYXAiLCJuYW1lIiwiYXNzZXRMaXN0IiwidmFsdWVzIiwiZm9yRWFjaCIsImVudHJ5cG9pbnQiLCJwdXNoIiwiU2V0IiwibmFtZWRDaHVua0dyb3VwcyIsImZpbHRlciIsIm1hdGNoZWRSb3V0ZXMiLCJzb21lIiwicm91dGUiLCJpbmNsdWRlcyIsImZsYXRNYXAiLCJjaHVuayIsImNoaWxkcmVuQXNzZXRzIiwiYXNzZXQiLCJlbmRzV2l0aCIsImhyZWYiLCJyZWwiLCJhcyIsImFwcCIsInRpdGxlIiwicm9vdElkIiwiY2hpbGRyZW4iLCJwcmVsb2FkIiwiYyJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvZG9jdW1lbnQuc2VydmVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHR5cGUgeyBSb3V0ZSB9IGZyb20gJ0BhbmFuc2kvcm91dGVyJztcbmltcG9ydCB7IFN0YXRzQ2h1bmtHcm91cCB9IGZyb20gJ3dlYnBhY2snO1xuXG5pbXBvcnQgdHlwZSB7IFNlcnZlclByb3BzLCBSZXNvbHZlUHJvcHMgfSBmcm9tICcuL3R5cGVzJztcbmltcG9ydCBEb2N1bWVudCBmcm9tICcuL0RvY3VtZW50Q29tcG9uZW50JztcblxudHlwZSBOZWVkZWRQcm9wcyA9IHtcbiAgbWF0Y2hlZFJvdXRlczogUm91dGU8YW55PltdO1xuICB0aXRsZT86IHN0cmluZztcbn0gJiBSZXNvbHZlUHJvcHM7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIERvY3VtZW50U3BvdXQob3B0aW9uczoge1xuICBoZWFkPzogUmVhY3QuUmVhY3ROb2RlO1xuICB0aXRsZTogc3RyaW5nO1xuICByb290SWQ/OiBzdHJpbmc7XG4gIGNoYXJTZXQ/OiBzdHJpbmc7XG59KSB7XG4gIHJldHVybiBmdW5jdGlvbiA8VCBleHRlbmRzIE5lZWRlZFByb3BzPihcbiAgICBuZXh0OiAocHJvcHM6IFNlcnZlclByb3BzKSA9PiBQcm9taXNlPFQ+LFxuICApIHtcbiAgICByZXR1cm4gYXN5bmMgKHByb3BzOiBTZXJ2ZXJQcm9wcykgPT4ge1xuICAgICAgY29uc3QgbmV4dFByb3BzID0gYXdhaXQgbmV4dChwcm9wcyk7XG5cbiAgICAgIGNvbnN0IHB1YmxpY1BhdGggPSBwcm9wcy5jbGllbnRNYW5pZmVzdC5wdWJsaWNQYXRoO1xuXG4gICAgICBpZiAoXG4gICAgICAgIE9iamVjdC5rZXlzKHByb3BzLmNsaWVudE1hbmlmZXN0Py5lbnRyeXBvaW50cyA/PyB7fSkubGVuZ3RoIDwgMSB8fFxuICAgICAgICBwdWJsaWNQYXRoID09PSB1bmRlZmluZWRcbiAgICAgIClcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKCdNYW5pZmVzdCBtaXNzaW5nIGVudHJpZXMgbmVlZGVkJyk7XG5cbiAgICAgIC8vIFRPRE86IGNvbnNpZGVyIHVzaW5nIHRoaXMgcGFja2FnZSBmb3IgYnVpbGQgc3RhdHMgaW4gZnV0dXJlOlxuICAgICAgLy8gaHR0cHM6Ly9naXRodWIuY29tL2ZhY2Vib29rL3JlYWN0L3RyZWUvbWFpbi9wYWNrYWdlcy9yZWFjdC1zZXJ2ZXItZG9tLXdlYnBhY2tcbiAgICAgIGNvbnN0IGFzc2V0TWFwID0gKGFzc2V0czogeyBuYW1lOiBzdHJpbmc7IHNpemU/OiBudW1iZXIgfVtdKSA9PlxuICAgICAgICBhc3NldHMubWFwKCh7IG5hbWUgfSkgPT4gYCR7cHVibGljUGF0aH0ke25hbWV9YCk7XG5cbiAgICAgIGNvbnN0IGFzc2V0TGlzdDogc3RyaW5nW10gPSBbXTtcbiAgICAgIE9iamVjdC52YWx1ZXMocHJvcHMuY2xpZW50TWFuaWZlc3Q/LmVudHJ5cG9pbnRzID8/IHt9KS5mb3JFYWNoKFxuICAgICAgICBlbnRyeXBvaW50ID0+IHtcbiAgICAgICAgICBhc3NldExpc3QucHVzaCguLi5hc3NldE1hcChlbnRyeXBvaW50LmFzc2V0cyA/PyBbXSkpO1xuICAgICAgICB9LFxuICAgICAgKTtcbiAgICAgIG5ldyBTZXQoXG4gICAgICAgIGFzc2V0TWFwKFxuICAgICAgICAgIE9iamVjdC52YWx1ZXMocHJvcHMuY2xpZW50TWFuaWZlc3QubmFtZWRDaHVua0dyb3VwcyA/PyB7fSlcbiAgICAgICAgICAgIC5maWx0ZXIoKHsgbmFtZSB9KSA9PlxuICAgICAgICAgICAgICBuZXh0UHJvcHMubWF0Y2hlZFJvdXRlcy5zb21lKHJvdXRlID0+IG5hbWU/LmluY2x1ZGVzKHJvdXRlLm5hbWUpKSxcbiAgICAgICAgICAgIClcbiAgICAgICAgICAgIC5mbGF0TWFwKGNodW5rID0+IFtcbiAgICAgICAgICAgICAgLi4uKGNodW5rLmFzc2V0cyA/PyBbXSksXG4gICAgICAgICAgICAgIC8vIGFueSBjaHVuayBwcmVsb2Fkc1xuICAgICAgICAgICAgICAuLi5jaGlsZHJlbkFzc2V0cyhjaHVuayksXG4gICAgICAgICAgICBdKSxcbiAgICAgICAgKSxcbiAgICAgICkuZm9yRWFjaChhc3NldCA9PiBhc3NldExpc3QucHVzaChhc3NldCkpO1xuXG4gICAgICAvLyBmaW5kIGFkZGl0aW9uYWwgYXNzZXRzIHRvIHByZWxvYWQgYmFzZWQgb24gbWF0Y2hlZCByb3V0ZVxuICAgICAgY29uc3QgYXNzZXRzOiB7XG4gICAgICAgIGhyZWY6IHN0cmluZztcbiAgICAgICAgYXM/OiBzdHJpbmcgfCB1bmRlZmluZWQ7XG4gICAgICAgIHJlbD86IHN0cmluZyB8IHVuZGVmaW5lZDtcbiAgICAgIH1bXSA9IGFzc2V0TGlzdFxuICAgICAgICAuZmlsdGVyKGFzc2V0ID0+ICFhc3NldC5lbmRzV2l0aCgnLmhvdC11cGRhdGUuanMnKSlcbiAgICAgICAgLm1hcChhc3NldCA9PlxuICAgICAgICAgIGFzc2V0LmVuZHNXaXRoKCcuY3NzJylcbiAgICAgICAgICAgID8geyBocmVmOiBhc3NldCwgcmVsOiAnc3R5bGVzaGVldCcgfVxuICAgICAgICAgICAgOiBhc3NldC5lbmRzV2l0aCgnLmpzJylcbiAgICAgICAgICAgID8geyBocmVmOiBhc3NldCwgYXM6ICdzY3JpcHQnIH1cbiAgICAgICAgICAgIDogeyBocmVmOiBhc3NldCB9LFxuICAgICAgICApO1xuXG4gICAgICByZXR1cm4ge1xuICAgICAgICAuLi5uZXh0UHJvcHMsXG4gICAgICAgIGFwcDogKFxuICAgICAgICAgIDxEb2N1bWVudFxuICAgICAgICAgICAgey4uLm9wdGlvbnN9XG4gICAgICAgICAgICB0aXRsZT17bmV4dFByb3BzLnRpdGxlID8/IG9wdGlvbnMudGl0bGV9XG4gICAgICAgICAgICBhc3NldHM9e2Fzc2V0c31cbiAgICAgICAgICAgIHJvb3RJZD17b3B0aW9ucy5yb290SWR9XG4gICAgICAgICAgPlxuICAgICAgICAgICAge25leHRQcm9wcy5hcHB9XG4gICAgICAgICAgPC9Eb2N1bWVudD5cbiAgICAgICAgKSxcbiAgICAgIH07XG4gICAgfTtcbiAgfTtcbn1cblxuZnVuY3Rpb24gY2hpbGRyZW5Bc3NldHMoY2h1bms6IFN0YXRzQ2h1bmtHcm91cCkge1xuICByZXR1cm4gY2h1bmsuY2hpbGRyZW5cbiAgICA/IE9iamVjdC52YWx1ZXMoY2h1bmsuY2hpbGRyZW4pLmZsYXRNYXAocHJlbG9hZCA9PlxuICAgICAgICBwcmVsb2FkLmZsYXRNYXAoYyA9PiBjLmFzc2V0cyA/PyBbXSksXG4gICAgICApXG4gICAgOiBbXTtcbn1cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBOztBQUtBOztBQU9lLFNBQVNBLGFBQVQsQ0FBdUJDLE9BQXZCLEVBS1o7RUFDRCxPQUFPLFVBQ0xDLElBREssRUFFTDtJQUNBLE9BQU8sTUFBT0MsS0FBUCxJQUE4QjtNQUFBOztNQUNuQyxNQUFNQyxTQUFTLEdBQUcsTUFBTUYsSUFBSSxDQUFDQyxL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
|
package/lib/spouts/router.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { Route, RouteController } from '@anansi/router';
|
|
2
|
+
import type { Update } from 'history';
|
|
2
3
|
import type { ResolveProps, CreateRouter } from './types';
|
|
3
4
|
export default function routerSpout<ResolveWith>(options: {
|
|
4
5
|
resolveWith?: any;
|
|
5
6
|
useResolveWith: () => ResolveWith;
|
|
6
7
|
createRouter: CreateRouter<ResolveWith>;
|
|
8
|
+
onChange?: (update: Update, callback: () => void | undefined) => void;
|
|
7
9
|
}): <T extends ResolveProps>(next: () => Promise<T>) => () => Promise<T & {
|
|
8
10
|
matchedRoutes: (Route<ResolveWith, any> & object)[];
|
|
9
11
|
router: RouteController<Route<ResolveWith, any>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/spouts/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/spouts/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAI1D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE;IACxD,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,KAAK,IAAI,CAAC;CACvE;;;;GAmCA"}
|
package/lib/spouts/router.js
CHANGED
|
@@ -20,7 +20,8 @@ function routerSpout(options) {
|
|
|
20
20
|
const resolveWith = options.useResolveWith();
|
|
21
21
|
return /*#__PURE__*/(0, _jsx2.default)(_router.RouteProvider, {
|
|
22
22
|
router: router,
|
|
23
|
-
resolveWith: resolveWith
|
|
23
|
+
resolveWith: resolveWith,
|
|
24
|
+
onChange: options.onChange
|
|
24
25
|
}, void 0, children);
|
|
25
26
|
};
|
|
26
27
|
|
|
@@ -39,4 +40,4 @@ function routerSpout(options) {
|
|
|
39
40
|
};
|
|
40
41
|
};
|
|
41
42
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJyb3V0ZXJTcG91dCIsIm9wdGlvbnMiLCJjcmVhdGVSb3V0ZUNvbXBvbmVudCIsInJvdXRlciIsIlJvdXRlciIsImNoaWxkcmVuIiwicmVzb2x2ZVdpdGgiLCJ1c2VSZXNvbHZlV2l0aCIsIm9uQ2hhbmdlIiwibmV4dCIsImhpc3RvcnkiLCJjcmVhdGVCcm93c2VySGlzdG9yeSIsImNyZWF0ZVJvdXRlciIsIm1hdGNoZWRSb3V0ZXMiLCJnZXRNYXRjaGVkUm91dGVzIiwibG9jYXRpb24iLCJwYXRobmFtZSIsIm5leHRQcm9wcyIsImFwcCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvcm91dGVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZSwgUm91dGVQcm92aWRlciwgUm91dGVDb250cm9sbGVyIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuaW1wb3J0IFJlYWN0IGZyb20gJ3JlYWN0JztcbmltcG9ydCB7IGNyZWF0ZUJyb3dzZXJIaXN0b3J5IH0gZnJvbSAnaGlzdG9yeSc7XG5pbXBvcnQgdHlwZSB7IFVwZGF0ZSB9IGZyb20gJ2hpc3RvcnknO1xuXG5pbXBvcnQgdHlwZSB7IFJlc29sdmVQcm9wcywgQ3JlYXRlUm91dGVyIH0gZnJvbSAnLi90eXBlcyc7XG5cbnR5cGUgTmVlZGVkUHJvcHMgPSBSZXNvbHZlUHJvcHM7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHJvdXRlclNwb3V0PFJlc29sdmVXaXRoPihvcHRpb25zOiB7XG4gIHJlc29sdmVXaXRoPzogYW55O1xuICB1c2VSZXNvbHZlV2l0aDogKCkgPT4gUmVzb2x2ZVdpdGg7XG4gIGNyZWF0ZVJvdXRlcjogQ3JlYXRlUm91dGVyPFJlc29sdmVXaXRoPjtcbiAgb25DaGFuZ2U/OiAodXBkYXRlOiBVcGRhdGUsIGNhbGxiYWNrOiAoKSA9PiB2b2lkIHwgdW5kZWZpbmVkKSA9PiB2b2lkO1xufSkge1xuICBjb25zdCBjcmVhdGVSb3V0ZUNvbXBvbmVudCA9IChcbiAgICByb3V0ZXI6IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxSZXNvbHZlV2l0aCwgYW55Pj4sXG4gICkgPT5cbiAgICBmdW5jdGlvbiBSb3V0ZXIoeyBjaGlsZHJlbiB9OiB7IGNoaWxkcmVuOiBSZWFjdC5SZWFjdE5vZGUgfSkge1xuICAgICAgY29uc3QgcmVzb2x2ZVdpdGggPSBvcHRpb25zLnVzZVJlc29sdmVXaXRoKCk7XG5cbiAgICAgIHJldHVybiAoXG4gICAgICAgIDxSb3V0ZVByb3ZpZGVyXG4gICAgICAgICAgcm91dGVyPXtyb3V0ZXJ9XG4gICAgICAgICAgcmVzb2x2ZVdpdGg9e3Jlc29sdmVXaXRofVxuICAgICAgICAgIG9uQ2hhbmdlPXtvcHRpb25zLm9uQ2hhbmdlfVxuICAgICAgICA+XG4gICAgICAgICAge2NoaWxkcmVufVxuICAgICAgICA8L1JvdXRlUHJvdmlkZXI+XG4gICAgICApO1xuICAgIH07XG5cbiAgcmV0dXJuIGZ1bmN0aW9uIDxUIGV4dGVuZHMgTmVlZGVkUHJvcHM+KG5leHQ6ICgpID0+IFByb21pc2U8VD4pIHtcbiAgICByZXR1cm4gYXN5bmMgKCkgPT4ge1xuICAgICAgY29uc3QgaGlzdG9yeSA9IGNyZWF0ZUJyb3dzZXJIaXN0b3J5KCk7XG4gICAgICBjb25zdCByb3V0ZXIgPSBvcHRpb25zLmNyZWF0ZVJvdXRlcihoaXN0b3J5KTtcbiAgICAgIGNvbnN0IG1hdGNoZWRSb3V0ZXMgPSByb3V0ZXIuZ2V0TWF0Y2hlZFJvdXRlcyhoaXN0b3J5LmxvY2F0aW9uLnBhdGhuYW1lKTtcblxuICAgICAgY29uc3QgbmV4dFByb3BzID0gYXdhaXQgbmV4dCgpO1xuXG4gICAgICBjb25zdCBSb3V0ZXIgPSBjcmVhdGVSb3V0ZUNvbXBvbmVudChyb3V0ZXIpO1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgLi4ubmV4dFByb3BzLFxuICAgICAgICBtYXRjaGVkUm91dGVzLFxuICAgICAgICByb3V0ZXIsXG4gICAgICAgIGFwcDogPFJvdXRlcj57bmV4dFByb3BzLmFwcH08L1JvdXRlcj4sXG4gICAgICB9O1xuICAgIH07XG4gIH07XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQU9lLFNBQVNBLFdBQVQsQ0FBa0NDLE9BQWxDLEVBS1o7RUFDRCxNQUFNQyxvQkFBb0IsR0FDeEJDLE1BRDJCLElBRzNCLFNBQVNDLE1BQVQsQ0FBZ0I7SUFBRUM7RUFBRixDQUFoQixFQUE2RDtJQUMzRCxNQUFNQyxXQUFXLEdBQUdMLE9BQU8sQ0FBQ00sY0FBUixFQUFwQjtJQUVBLG9CQUNFLG1CQUFDLHFCQUFEO01BQ0UsTUFBTSxFQUFFSixNQURWO01BRUUsV0FBVyxFQUFFRyxXQUZmO01BR0UsUUFBUSxFQUFFTCxPQUFPLENBQUNPO0lBSHBCLFdBS0dILFFBTEgsQ0FERjtFQVNELENBZkg7O0VBaUJBLE9BQU8sVUFBaUNJLElBQWpDLEVBQXlEO0lBQzlELE9BQU8sWUFBWTtNQUNqQixNQUFNQyxPQUFPLEdBQUcsSUFBQUMsNkJBQUEsR0FBaEI7TUFDQSxNQUFNUixNQUFNLEdBQUdGLE9BQU8sQ0FBQ1csWUFBUixDQUFxQkYsT0FBckIsQ0FBZjtNQUNBLE1BQU1HLGFBQWEsR0FBR1YsTUFBTSxDQUFDVyxnQkFBUCxDQUF3QkosT0FBTyxDQUFDSyxRQUFSLENBQWlCQyxRQUF6QyxDQUF0QjtNQUVBLE1BQU1DLFNBQVMsR0FBRyxNQUFNUixJQUFJLEVBQTVCO01BRUEsTUFBTUwsTUFBTSxHQUFHRixvQkFBb0IsQ0FBQ0MsTUFBRCxDQUFuQztNQUNBLE9BQU8sRUFDTCxHQUFHYyxTQURFO1FBRUxKLGFBRks7UUFHTFYsTUFISztRQUlMZSxHQUFHLGVBQUUsbUJBQUMsTUFBRCxjQUFTRCxTQUFTLENBQUNDLEdBQW5CO01BSkEsQ0FBUDtJQU1ELENBZEQ7RUFlRCxDQWhCRDtBQWlCRCJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@anansi/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.10.0",
|
|
4
4
|
"description": "React 18 Framework",
|
|
5
5
|
"homepage": "https://github.com/ntucker/anansi/tree/master/packages/core#readme",
|
|
6
6
|
"repository": {
|
|
@@ -65,29 +65,30 @@
|
|
|
65
65
|
"browser"
|
|
66
66
|
],
|
|
67
67
|
"devDependencies": {
|
|
68
|
-
"@anansi/babel-preset": "^3.2.
|
|
68
|
+
"@anansi/babel-preset": "^3.2.4",
|
|
69
69
|
"@anansi/browserslist-config": "1.3.3",
|
|
70
|
-
"@anansi/webpack-config": "^11.6.
|
|
70
|
+
"@anansi/webpack-config": "^11.6.4",
|
|
71
71
|
"@babel/cli": "7.17.10",
|
|
72
72
|
"@babel/core": "7.18.2",
|
|
73
|
+
"@types/compression": "^1.7.2",
|
|
73
74
|
"@types/source-map-support": "^0.5.4",
|
|
74
75
|
"@types/tmp": "^0.2.3",
|
|
75
76
|
"@types/webpack-hot-middleware": "^2.25.6",
|
|
76
|
-
"jest": "28.1.
|
|
77
|
+
"jest": "28.1.1",
|
|
77
78
|
"rimraf": "^3.0.0",
|
|
78
79
|
"webpack": "^5.72.1",
|
|
79
80
|
"webpack-cli": "^4.9.2"
|
|
80
81
|
},
|
|
81
82
|
"dependencies": {
|
|
82
|
-
"@anansi/router": "^0.
|
|
83
|
+
"@anansi/router": "^0.6.0",
|
|
83
84
|
"@babel/runtime": "^7.10.5",
|
|
84
|
-
"@rest-hooks/ssr": "^0.
|
|
85
|
+
"@rest-hooks/ssr": "^0.2.0",
|
|
85
86
|
"chalk": "^4.0.0",
|
|
87
|
+
"compression": "^1.7.4",
|
|
86
88
|
"cross-fetch": "^3.1.5",
|
|
87
|
-
"fs-
|
|
89
|
+
"fs-require": "^1.4.0",
|
|
88
90
|
"history": "^5.3.0",
|
|
89
91
|
"http-proxy-middleware": "^2.0.6",
|
|
90
|
-
"import-fresh": "^3.3.0",
|
|
91
92
|
"memfs": "^3.4.1",
|
|
92
93
|
"ora": "^5.0.0",
|
|
93
94
|
"redux": "^4.1.2",
|
|
@@ -7,13 +7,12 @@ import webpack, { MultiCompiler } from 'webpack';
|
|
|
7
7
|
import { createFsFromVolume, Volume } from 'memfs';
|
|
8
8
|
import { Server, IncomingMessage, ServerResponse } from 'http';
|
|
9
9
|
import type { NextFunction } from 'express';
|
|
10
|
-
import { patchRequire } from 'fs-monkey';
|
|
11
10
|
import tmp from 'tmp';
|
|
12
11
|
import sourceMapSupport from 'source-map-support';
|
|
13
12
|
import { ufs } from 'unionfs';
|
|
14
13
|
import WebpackDevServer from 'webpack-dev-server';
|
|
15
|
-
import importFresh from 'import-fresh';
|
|
16
14
|
import logging from 'webpack/lib/logging/runtime';
|
|
15
|
+
import { createFsRequire } from 'fs-require';
|
|
17
16
|
|
|
18
17
|
import 'cross-fetch/polyfill';
|
|
19
18
|
import { BoundRender } from './types';
|
|
@@ -47,7 +46,7 @@ export default function startDevServer(
|
|
|
47
46
|
const fs = createFsFromVolume(volume);
|
|
48
47
|
ufs.use(diskFs).use(fs as any);
|
|
49
48
|
|
|
50
|
-
|
|
49
|
+
const fsRequire = createFsRequire(ufs);
|
|
51
50
|
const readFile = promisify(ufs.readFile);
|
|
52
51
|
let server: Server | undefined;
|
|
53
52
|
|
|
@@ -122,12 +121,12 @@ export default function startDevServer(
|
|
|
122
121
|
};
|
|
123
122
|
}
|
|
124
123
|
|
|
125
|
-
|
|
124
|
+
let initRender:
|
|
126
125
|
| { args: Parameters<BoundRender>; resolve: () => void }[]
|
|
127
126
|
| undefined = [];
|
|
128
127
|
let render: BoundRender = (...args) =>
|
|
129
128
|
new Promise(resolve => {
|
|
130
|
-
initRender
|
|
129
|
+
initRender?.push({ args, resolve });
|
|
131
130
|
});
|
|
132
131
|
|
|
133
132
|
function importRender(stats: webpack.Stats[]) {
|
|
@@ -147,19 +146,19 @@ export default function startDevServer(
|
|
|
147
146
|
// ASSETS
|
|
148
147
|
const clientManifest = clientStats.toJson();
|
|
149
148
|
|
|
149
|
+
const serverEntry = getServerBundle(serverStats);
|
|
150
|
+
// reload modules
|
|
151
|
+
// TODO: should we just reset entire cache each time? then we could avoid needing one output
|
|
152
|
+
delete fsRequire.cache[fsRequire.resolve(serverEntry)];
|
|
153
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
154
|
+
render = (fsRequire(serverEntry) as any).default.bind(
|
|
155
|
+
undefined,
|
|
156
|
+
clientManifest,
|
|
157
|
+
);
|
|
150
158
|
// SERVER SIDE ENTRYPOINT
|
|
151
159
|
if (Array.isArray(initRender)) {
|
|
152
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
153
|
-
render = (require(getServerBundle(serverStats)) as any).default.bind(
|
|
154
|
-
undefined,
|
|
155
|
-
clientManifest,
|
|
156
|
-
);
|
|
157
160
|
initRender.forEach(init => render(...init.args).then(init.resolve));
|
|
158
|
-
|
|
159
|
-
render = (importFresh(getServerBundle(serverStats)) as any).default.bind(
|
|
160
|
-
undefined,
|
|
161
|
-
clientManifest,
|
|
162
|
-
);
|
|
161
|
+
initRender = undefined;
|
|
163
162
|
}
|
|
164
163
|
}
|
|
165
164
|
|
package/src/spouts/router.tsx
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Route, RouteProvider, RouteController } from '@anansi/router';
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import { createBrowserHistory } from 'history';
|
|
4
|
+
import type { Update } from 'history';
|
|
4
5
|
|
|
5
6
|
import type { ResolveProps, CreateRouter } from './types';
|
|
6
7
|
|
|
@@ -10,6 +11,7 @@ export default function routerSpout<ResolveWith>(options: {
|
|
|
10
11
|
resolveWith?: any;
|
|
11
12
|
useResolveWith: () => ResolveWith;
|
|
12
13
|
createRouter: CreateRouter<ResolveWith>;
|
|
14
|
+
onChange?: (update: Update, callback: () => void | undefined) => void;
|
|
13
15
|
}) {
|
|
14
16
|
const createRouteComponent = (
|
|
15
17
|
router: RouteController<Route<ResolveWith, any>>,
|
|
@@ -18,7 +20,11 @@ export default function routerSpout<ResolveWith>(options: {
|
|
|
18
20
|
const resolveWith = options.useResolveWith();
|
|
19
21
|
|
|
20
22
|
return (
|
|
21
|
-
<RouteProvider
|
|
23
|
+
<RouteProvider
|
|
24
|
+
router={router}
|
|
25
|
+
resolveWith={resolveWith}
|
|
26
|
+
onChange={options.onChange}
|
|
27
|
+
>
|
|
22
28
|
{children}
|
|
23
29
|
</RouteProvider>
|
|
24
30
|
);
|