@anansi/core 0.16.5 → 0.16.7
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 +19 -0
- package/dist/client.js +2985 -266
- package/dist/package.json +1 -0
- package/dist/server.js +3197 -488
- package/dist/src_spouts_restHooks_provider_tsx.chunk.js +20 -0
- package/lib/floodSpouts.js +4 -8
- package/lib/index.d.ts +8 -8
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +7 -18
- package/lib/index.server.d.ts +10 -10
- package/lib/index.server.d.ts.map +1 -1
- package/lib/index.server.js +9 -22
- package/lib/laySpouts.d.ts +2 -2
- package/lib/laySpouts.d.ts.map +1 -1
- package/lib/laySpouts.js +6 -11
- package/lib/scripts/getProxyMiddlewares.js +1 -1
- package/lib/scripts/getWebpackConfig.d.ts +3 -0
- package/lib/scripts/getWebpackConfig.d.ts.map +1 -0
- package/lib/scripts/getWebpackConfig.js +22 -0
- package/lib/scripts/index.d.ts +2 -2
- package/lib/scripts/index.d.ts.map +1 -1
- package/lib/scripts/index.js +3 -3
- package/lib/scripts/package.json +1 -0
- package/lib/scripts/serve.d.ts +1 -1
- package/lib/scripts/serve.d.ts.map +1 -1
- package/lib/scripts/serve.js +8 -6
- package/lib/scripts/startDevserver.d.ts +1 -1
- package/lib/scripts/startDevserver.d.ts.map +1 -1
- package/lib/scripts/startDevserver.js +4 -6
- package/lib/spouts/DocumentComponent.d.ts +1 -1
- package/lib/spouts/DocumentComponent.d.ts.map +1 -1
- package/lib/spouts/DocumentComponent.js +13 -18
- package/lib/spouts/antd.server.d.ts +1 -1
- package/lib/spouts/antd.server.d.ts.map +1 -1
- package/lib/spouts/antd.server.js +8 -14
- package/lib/spouts/app.js +2 -7
- package/lib/spouts/app.server.d.ts +1 -1
- package/lib/spouts/app.server.d.ts.map +1 -1
- package/lib/spouts/app.server.js +2 -7
- package/lib/spouts/csp.js +2 -6
- package/lib/spouts/document.d.ts +1 -1
- package/lib/spouts/document.d.ts.map +1 -1
- package/lib/spouts/document.js +2 -6
- package/lib/spouts/document.server.d.ts +2 -2
- package/lib/spouts/document.server.d.ts.map +1 -1
- package/lib/spouts/document.server.js +5 -10
- package/lib/spouts/json.d.ts +1 -1
- package/lib/spouts/json.d.ts.map +1 -1
- package/lib/spouts/json.js +2 -6
- package/lib/spouts/json.server.d.ts +1 -1
- package/lib/spouts/json.server.d.ts.map +1 -1
- package/lib/spouts/json.server.js +6 -12
- package/lib/spouts/prefetch.server.d.ts +1 -1
- package/lib/spouts/prefetch.server.d.ts.map +1 -1
- package/lib/spouts/prefetch.server.js +2 -6
- package/lib/spouts/restHooks.d.ts +1 -1
- package/lib/spouts/restHooks.d.ts.map +1 -1
- package/lib/spouts/restHooks.js +6 -12
- package/lib/spouts/restHooks.provider.js +2 -7
- package/lib/spouts/restHooks.server.d.ts +1 -1
- package/lib/spouts/restHooks.server.d.ts.map +1 -1
- package/lib/spouts/restHooks.server.js +7 -13
- package/lib/spouts/router.d.ts +1 -1
- package/lib/spouts/router.d.ts.map +1 -1
- package/lib/spouts/router.js +9 -14
- package/lib/spouts/router.server.d.ts +1 -1
- package/lib/spouts/router.server.d.ts.map +1 -1
- package/lib/spouts/router.server.js +9 -14
- package/lib/spouts/types.js +1 -3
- package/package.json +15 -12
- package/src/index.server.ts +10 -10
- package/src/index.ts +8 -8
- package/src/laySpouts.tsx +2 -2
- package/src/scripts/getWebpackConfig.ts +22 -0
- package/src/scripts/index.ts +2 -2
- package/src/scripts/package.json +1 -0
- package/src/scripts/serve.ts +15 -12
- package/src/scripts/startDevserver.ts +5 -8
- package/src/spouts/DocumentComponent.tsx +2 -2
- package/src/spouts/antd.server.tsx +1 -1
- package/src/spouts/app.server.tsx +1 -1
- package/src/spouts/document.server.tsx +3 -3
- package/src/spouts/document.tsx +1 -2
- package/src/spouts/json.server.tsx +1 -1
- package/src/spouts/json.tsx +1 -1
- package/src/spouts/prefetch.server.tsx +1 -1
- package/src/spouts/restHooks.server.tsx +1 -1
- package/src/spouts/restHooks.tsx +2 -2
- package/src/spouts/router.server.tsx +1 -1
- package/src/spouts/router.tsx +1 -1
- package/dist/client.js.map +0 -1
- package/dist/server.js.map +0 -1
|
@@ -1,12 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
5
|
-
exports.__esModule = true;
|
|
6
|
-
exports.default = JSONSpout;
|
|
7
|
-
var _jsx2 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
|
|
8
|
-
var _react = _interopRequireWildcard(require("react"));
|
|
9
|
-
function JSONSpout({
|
|
1
|
+
import _jsx from "@babel/runtime/helpers/jsx";
|
|
2
|
+
import React, { Suspense } from 'react';
|
|
3
|
+
export default function JSONSpout({
|
|
10
4
|
id = 'anansi-json'
|
|
11
5
|
} = {}) {
|
|
12
6
|
return next => async props => {
|
|
@@ -19,7 +13,7 @@ function JSONSpout({
|
|
|
19
13
|
const data = useData();
|
|
20
14
|
try {
|
|
21
15
|
const encoded = JSON.stringify(data);
|
|
22
|
-
return /*#__PURE__*/(
|
|
16
|
+
return /*#__PURE__*/_jsx("script", {
|
|
23
17
|
id: globalId,
|
|
24
18
|
type: "application/json",
|
|
25
19
|
dangerouslySetInnerHTML: {
|
|
@@ -34,7 +28,7 @@ function JSONSpout({
|
|
|
34
28
|
return null;
|
|
35
29
|
}
|
|
36
30
|
};
|
|
37
|
-
scripts.push( /*#__PURE__*/(
|
|
31
|
+
scripts.push( /*#__PURE__*/_jsx(Suspense, {}, globalId, /*#__PURE__*/_jsx(Script, {})));
|
|
38
32
|
});
|
|
39
33
|
return {
|
|
40
34
|
...nextProps,
|
|
@@ -42,4 +36,4 @@ function JSONSpout({
|
|
|
42
36
|
};
|
|
43
37
|
};
|
|
44
38
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSZWFjdCIsIlN1c3BlbnNlIiwiSlNPTlNwb3V0IiwiaWQiLCJuZXh0IiwicHJvcHMiLCJfbmV4dFByb3BzJHNjcmlwdHMiLCJfbmV4dFByb3BzJGluaXREYXRhIiwibmV4dFByb3BzIiwic2NyaXB0cyIsIk9iamVjdCIsImVudHJpZXMiLCJpbml0RGF0YSIsImZvckVhY2giLCJrZXkiLCJ1c2VEYXRhIiwiZ2xvYmFsSWQiLCJTY3JpcHQiLCJkYXRhIiwiZW5jb2RlZCIsIkpTT04iLCJzdHJpbmdpZnkiLCJfanN4IiwidHlwZSIsImRhbmdlcm91c2x5U2V0SW5uZXJIVE1MIiwiX19odG1sIiwibm9uY2UiLCJlIiwiY29uc29sZSIsImVycm9yIiwicHVzaCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvanNvbi5zZXJ2ZXIudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBSZWFjdCwgeyBTdXNwZW5zZSB9IGZyb20gJ3JlYWN0JztcblxuaW1wb3J0IHR5cGUgeyBTZXJ2ZXJTcG91dCB9IGZyb20gJy4vdHlwZXMuanMnO1xuXG50eXBlIE5lZWRlZE5leHQgPSB7XG4gIGluaXREYXRhPzogUmVjb3JkPHN0cmluZywgKCkgPT4gdW5rbm93bj47XG4gIHNjcmlwdHM/OiBSZWFjdC5SZWFjdE5vZGVbXTtcbn07XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIEpTT05TcG91dCh7XG4gIGlkID0gJ2FuYW5zaS1qc29uJyxcbn06IHsgaWQ/OiBzdHJpbmcgfSA9IHt9KTogU2VydmVyU3BvdXQ8XG4gIFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuICBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPixcbiAgTmVlZGVkTmV4dFxuPiB7XG4gIHJldHVybiBuZXh0ID0+IGFzeW5jIHByb3BzID0+IHtcbiAgICBjb25zdCBuZXh0UHJvcHMgPSBhd2FpdCBuZXh0KHByb3BzKTtcblxuICAgIGNvbnN0IHNjcmlwdHM6IFJlYWN0LlJlYWN0Tm9kZVtdID0gbmV4dFByb3BzLnNjcmlwdHMgPz8gW107XG5cbiAgICBPYmplY3QuZW50cmllcyhuZXh0UHJvcHMuaW5pdERhdGEgPz8ge30pLmZvckVhY2goKFtrZXksIHVzZURhdGFdKSA9PiB7XG4gICAgICBjb25zdCBnbG9iYWxJZCA9IGAke2lkfS4ke2tleX1gO1xuICAgICAgY29uc3QgU2NyaXB0ID0gKCkgPT4ge1xuICAgICAgICBjb25zdCBkYXRhOiBhbnkgPSB1c2VEYXRhKCk7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgY29uc3QgZW5jb2RlZCA9IEpTT04uc3RyaW5naWZ5KGRhdGEpO1xuICAgICAgICAgIHJldHVybiAoXG4gICAgICAgICAgICA8c2NyaXB0XG4gICAgICAgICAgICAgIGlkPXtnbG9iYWxJZH1cbiAgICAgICAgICAgICAgdHlwZT1cImFwcGxpY2F0aW9uL2pzb25cIlxuICAgICAgICAgICAgICBkYW5nZXJvdXNseVNldElubmVySFRNTD17e1xuICAgICAgICAgICAgICAgIF9faHRtbDogZW5jb2RlZCxcbiAgICAgICAgICAgICAgfX1cbiAgICAgICAgICAgICAgbm9uY2U9e3Byb3BzLm5vbmNlfVxuICAgICAgICAgICAgLz5cbiAgICAgICAgICApO1xuICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgLy8gVE9ETzogVXNlIHVuaWZpZWQgbG9nZ2luZ1xuICAgICAgICAgIGNvbnNvbGUuZXJyb3IoYEVycm9yIHNlcmlhbGl6aW5nIGpzb24gZm9yICR7a2V5fWApO1xuICAgICAgICAgIGNvbnNvbGUuZXJyb3IoZSk7XG4gICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cbiAgICAgIH07XG4gICAgICBzY3JpcHRzLnB1c2goXG4gICAgICAgIDxTdXNwZW5zZSBrZXk9e2dsb2JhbElkfT5cbiAgICAgICAgICA8U2NyaXB0IC8+XG4gICAgICAgIDwvU3VzcGVuc2U+LFxuICAgICAgKTtcbiAgICB9KTtcblxuICAgIHJldHVybiB7XG4gICAgICAuLi5uZXh0UHJvcHMsXG4gICAgICBzY3JpcHRzLFxuICAgIH07XG4gIH07XG59XG4iXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPQSxLQUFLLElBQUlDLFFBQVEsUUFBUSxPQUFPO0FBU3ZDLGVBQWUsU0FBU0MsU0FBU0EsQ0FBQztFQUNoQ0MsRUFBRSxHQUFHO0FBQ1UsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUlyQjtFQUNBLE9BQU9DLElBQUksSUFBSSxNQUFNQyxLQUFLLElBQUk7SUFBQSxJQUFBQyxrQkFBQSxFQUFBQyxtQkFBQTtJQUM1QixNQUFNQyxTQUFTLEdBQUcsTUFBTUosSUFBSSxDQUFDQyxLQUFLLENBQUM7SUFFbkMsTUFBTUksT0FBMEIsSUFBQUgsa0JBQUEsR0FBR0UsU0FBUyxDQUFDQyxPQUFPLFlBQUFILGtCQUFBLEdBQUksRUFBRTtJQUUxREksTUFBTSxDQUFDQyxPQUFPLEVBQUFKLG1CQUFBLEdBQUNDLFNBQVMsQ0FBQ0ksUUFBUSxZQUFBTCxtQkFBQSxHQUFJLENBQUMsQ0FBQyxDQUFDLENBQUNNLE9BQU8sQ0FBQyxDQUFDLENBQUNDLEdBQUcsRUFBRUMsT0FBTyxDQUFDLEtBQUs7TUFDbkUsTUFBTUMsUUFBUSxHQUFJLEdBQUViLEVBQUcsSUFBR1csR0FBSSxFQUFDO01BQy9CLE1BQU1HLE1BQU0sR0FBR0EsQ0FBQSxLQUFNO1FBQ25CLE1BQU1DLElBQVMsR0FBR0gsT0FBTyxFQUFFO1FBQzNCLElBQUk7VUFDRixNQUFNSSxPQUFPLEdBQUdDLElBQUksQ0FBQ0MsU0FBUyxDQUFDSCxJQUFJLENBQUM7VUFDcEMsb0JBQ0VJLElBQUE7WUFDRW5CLEVBQUUsRUFBRWEsUUFBUztZQUNiTyxJQUFJLEVBQUMsa0JBQWtCO1lBQ3ZCQyx1QkFBdUIsRUFBRTtjQUN2QkMsTUFBTSxFQUFFTjtZQUNWLENBQUU7WUFDRk8sS0FBSyxFQUFFckIsS0FBSyxDQUFDcUI7VUFBTSxFQUNuQjtRQUVOLENBQUMsQ0FBQyxPQUFPQyxDQUFDLEVBQUU7VUFDVjtVQUNBQyxPQUFPLENBQUNDLEtBQUssQ0FBRSw4QkFBNkJmLEdBQUksRUFBQyxDQUFDO1VBQ2xEYyxPQUFPLENBQUNDLEtBQUssQ0FBQ0YsQ0FBQyxDQUFDO1VBQ2hCLE9BQU8sSUFBSTtRQUNiO01BQ0YsQ0FBQztNQUNEbEIsT0FBTyxDQUFDcUIsSUFBSSxlQUNWUixJQUFBLENBQUNyQixRQUFRLE1BQU1lLFFBQVEsZUFDckJNLElBQUEsQ0FBQ0wsTUFBTSxLQUFHLENBQ0QsQ0FDWjtJQUNILENBQUMsQ0FBQztJQUVGLE9BQU87TUFDTCxHQUFHVCxTQUFTO01BQ1pDO0lBQ0YsQ0FBQztFQUNILENBQUM7QUFDSCJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefetch.server.d.ts","sourceRoot":"","sources":["../../src/spouts/prefetch.server.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"prefetch.server.d.ts","sourceRoot":"","sources":["../../src/spouts/prefetch.server.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5D,KAAK,WAAW,CAAC,SAAS,IAAI;IAC5B,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;CACnC,GAAG,YAAY,CAAC;AAEjB,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,0LA6B/D"}
|
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.__esModule = true;
|
|
4
|
-
exports.default = prefetchSpout;
|
|
5
|
-
function prefetchSpout(field) {
|
|
1
|
+
export default function prefetchSpout(field) {
|
|
6
2
|
return function (next) {
|
|
7
3
|
return async props => {
|
|
8
4
|
const nextProps = await next(props);
|
|
@@ -21,4 +17,4 @@ function prefetchSpout(field) {
|
|
|
21
17
|
};
|
|
22
18
|
};
|
|
23
19
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJwcmVmZXRjaFNwb3V0IiwiZmllbGQiLCJuZXh0IiwicHJvcHMiLCJuZXh0UHJvcHMiLCJ0b0ZldGNoIiwibWF0Y2hlZFJvdXRlcyIsImZvckVhY2giLCJyb3V0ZSIsInJlc29sdmVEYXRhIiwicHVzaCIsIlByb21pc2UiLCJhbGwiLCJlIiwiY29uc29sZSIsImVycm9yIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy9wcmVmZXRjaC5zZXJ2ZXIudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJvdXRlIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuXG5pbXBvcnQgdHlwZSB7IFJlc29sdmVQcm9wcywgU2VydmVyUHJvcHMgfSBmcm9tICcuL3R5cGVzLmpzJztcblxudHlwZSBOZWVkZWRQcm9wczxSb3V0ZVdpdGg+ID0ge1xuICBtYXRjaGVkUm91dGVzOiBSb3V0ZTxSb3V0ZVdpdGg+W107XG59ICYgUmVzb2x2ZVByb3BzO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBwcmVmZXRjaFNwb3V0PEYgZXh0ZW5kcyBzdHJpbmc+KGZpZWxkOiBGKSB7XG4gIHJldHVybiBmdW5jdGlvbiA8XG4gICAgUm91dGVXaXRoLFxuICAgIE4gZXh0ZW5kcyBOZWVkZWRQcm9wczxSb3V0ZVdpdGg+LFxuICAgIEkgZXh0ZW5kcyBTZXJ2ZXJQcm9wcyxcbiAgPihcbiAgICBuZXh0OiAocHJvcHM6IEkpID0+IFByb21pc2U8XG4gICAgICB7XG4gICAgICAgIFtLIGluIEZdOiBSb3V0ZVdpdGg7XG4gICAgICB9ICYgTlxuICAgID4sXG4gICkge1xuICAgIHJldHVybiBhc3luYyAocHJvcHM6IEkpID0+IHtcbiAgICAgIGNvbnN0IG5leHRQcm9wcyA9IGF3YWl0IG5leHQocHJvcHMpO1xuXG4gICAgICB0cnkge1xuICAgICAgICBjb25zdCB0b0ZldGNoOiBQcm9taXNlPHVua25vd24+W10gPSBbXTtcbiAgICAgICAgbmV4dFByb3BzLm1hdGNoZWRSb3V0ZXMuZm9yRWFjaChyb3V0ZSA9PiB7XG4gICAgICAgICAgaWYgKHR5cGVvZiByb3V0ZS5yZXNvbHZlRGF0YSA9PT0gJ2Z1bmN0aW9uJykge1xuICAgICAgICAgICAgdG9GZXRjaC5wdXNoKHJvdXRlLnJlc29sdmVEYXRhKG5leHRQcm9wc1tmaWVsZF0sIHJvdXRlKSk7XG4gICAgICAgICAgfVxuICAgICAgICB9KTtcbiAgICAgICAgYXdhaXQgUHJvbWlzZS5hbGwodG9GZXRjaCk7XG4gICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgIGNvbnNvbGUuZXJyb3IoZSk7XG4gICAgICB9XG4gICAgICByZXR1cm4gbmV4dFByb3BzO1xuICAgIH07XG4gIH07XG59XG4iXSwibWFwcGluZ3MiOiJBQVFBLGVBQWUsU0FBU0EsYUFBYUEsQ0FBbUJDLEtBQVEsRUFBRTtFQUNoRSxPQUFPLFVBS0xDLElBSUMsRUFDRDtJQUNBLE9BQU8sTUFBT0MsS0FBUSxJQUFLO01BQ3pCLE1BQU1DLFNBQVMsR0FBRyxNQUFNRixJQUFJLENBQUNDLEtBQUssQ0FBQztNQUVuQyxJQUFJO1FBQ0YsTUFBTUUsT0FBMkIsR0FBRyxFQUFFO1FBQ3RDRCxTQUFTLENBQUNFLGFBQWEsQ0FBQ0MsT0FBTyxDQUFDQyxLQUFLLElBQUk7VUFDdkMsSUFBSSxPQUFPQSxLQUFLLENBQUNDLFdBQVcsS0FBSyxVQUFVLEVBQUU7WUFDM0NKLE9BQU8sQ0FBQ0ssSUFBSSxDQUFDRixLQUFLLENBQUNDLFdBQVcsQ0FBQ0wsU0FBUyxDQUFDSCxLQUFLLENBQUMsRUFBRU8sS0FBSyxDQUFDLENBQUM7VUFDMUQ7UUFDRixDQUFDLENBQUM7UUFDRixNQUFNRyxPQUFPLENBQUNDLEdBQUcsQ0FBQ1AsT0FBTyxDQUFDO01BQzVCLENBQUMsQ0FBQyxPQUFPUSxDQUFDLEVBQUU7UUFDVkMsT0FBTyxDQUFDQyxLQUFLLENBQUNGLENBQUMsQ0FBQztNQUNsQjtNQUNBLE9BQU9ULFNBQVM7SUFDbEIsQ0FBQztFQUNILENBQUM7QUFDSCJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restHooks.d.ts","sourceRoot":"","sources":["../../src/spouts/restHooks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"restHooks.d.ts","sourceRoot":"","sources":["../../src/spouts/restHooks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,OAAO,EAAE,CAAC;CAC1B,GACL,WAAW,CAAC;IAAE,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC,CAuBhE"}
|
package/lib/spouts/restHooks.js
CHANGED
|
@@ -1,17 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
exports.__esModule = true;
|
|
5
|
-
exports.default = restHooksSpout;
|
|
6
|
-
var _jsx2 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
|
|
7
|
-
var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
|
|
8
|
-
var _react = _interopRequireDefault(require("react"));
|
|
9
|
-
function restHooksSpout(options = {}) {
|
|
1
|
+
import _jsx from "@babel/runtime/helpers/jsx";
|
|
2
|
+
import React from "react";
|
|
3
|
+
export default function restHooksSpout(options = {}) {
|
|
10
4
|
return next => async props => {
|
|
11
5
|
const nextProps = await next(props);
|
|
12
6
|
const [data, {
|
|
13
7
|
CacheProvider
|
|
14
|
-
}] = await Promise.all([props.getInitialData('resthooks'),
|
|
8
|
+
}] = await Promise.all([props.getInitialData('resthooks'), import('./restHooks.provider.js')]);
|
|
15
9
|
if (process.env.NODE_ENV !== 'production' && !data) {
|
|
16
10
|
console.error('Rest Hooks init data not found');
|
|
17
11
|
} else if (!data) {
|
|
@@ -19,11 +13,11 @@ function restHooksSpout(options = {}) {
|
|
|
19
13
|
}
|
|
20
14
|
return {
|
|
21
15
|
...nextProps,
|
|
22
|
-
app: /*#__PURE__*/(
|
|
16
|
+
app: /*#__PURE__*/_jsx(CacheProvider, {
|
|
23
17
|
initialState: data,
|
|
24
18
|
managers: options == null ? void 0 : options.getManagers == null ? void 0 : options.getManagers()
|
|
25
19
|
}, void 0, nextProps.app)
|
|
26
20
|
};
|
|
27
21
|
};
|
|
28
22
|
}
|
|
29
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJyZXN0SG9va3NTcG91dCIsIm9wdGlvbnMiLCJuZXh0IiwicHJvcHMiLCJuZXh0UHJvcHMiLCJkYXRhIiwiQ2FjaGVQcm92aWRlciIsIlByb21pc2UiLCJhbGwiLCJnZXRJbml0aWFsRGF0YSIsInByb2Nlc3MiLCJlbnYiLCJOT0RFX0VOViIsImNvbnNvbGUiLCJlcnJvciIsImluZm8iLCJhcHAiLCJfanN4IiwiaW5pdGlhbFN0YXRlIiwibWFuYWdlcnMiLCJnZXRNYW5hZ2VycyJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvcmVzdEhvb2tzLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyB0eXBlIE1hbmFnZXIgfSBmcm9tICdAcmVzdC1ob29rcy9yZWFjdCc7XG5cbmltcG9ydCB0eXBlIHsgQ2xpZW50U3BvdXQgfSBmcm9tICcuL3R5cGVzLmpzJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVzdEhvb2tzU3BvdXQoXG4gIG9wdGlvbnM6IHtcbiAgICBnZXRNYW5hZ2Vycz86ICgpID0+IE1hbmFnZXJbXTtcbiAgfSA9IHt9LFxuKTogQ2xpZW50U3BvdXQ8eyBnZXRJbml0aWFsRGF0YTogKGtleTogc3RyaW5nKSA9PiBQcm9taXNlPGFueT4gfT4ge1xuICByZXR1cm4gbmV4dCA9PiBhc3luYyBwcm9wcyA9PiB7XG4gICAgY29uc3QgbmV4dFByb3BzID0gYXdhaXQgbmV4dChwcm9wcyk7XG4gICAgY29uc3QgW2RhdGEsIHsgQ2FjaGVQcm92aWRlciB9XSA9IGF3YWl0IFByb21pc2UuYWxsKFtcbiAgICAgIHByb3BzLmdldEluaXRpYWxEYXRhKCdyZXN0aG9va3MnKSxcbiAgICAgIGltcG9ydCgnLi9yZXN0SG9va3MucHJvdmlkZXIuanMnKSxcbiAgICBdKTtcblxuICAgIGlmIChwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Byb2R1Y3Rpb24nICYmICFkYXRhKSB7XG4gICAgICBjb25zb2xlLmVycm9yKCdSZXN0IEhvb2tzIGluaXQgZGF0YSBub3QgZm91bmQnKTtcbiAgICB9IGVsc2UgaWYgKCFkYXRhKSB7XG4gICAgICBjb25zb2xlLmluZm8oJ1Jlc3QgSG9va3MgaW5pdCBtaXNzaW5nJyk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHtcbiAgICAgIC4uLm5leHRQcm9wcyxcbiAgICAgIGFwcDogKFxuICAgICAgICA8Q2FjaGVQcm92aWRlciBpbml0aWFsU3RhdGU9e2RhdGF9IG1hbmFnZXJzPXtvcHRpb25zPy5nZXRNYW5hZ2Vycz8uKCl9PlxuICAgICAgICAgIHtuZXh0UHJvcHMuYXBwfVxuICAgICAgICA8L0NhY2hlUHJvdmlkZXI+XG4gICAgICApLFxuICAgIH07XG4gIH07XG59XG4iXSwibWFwcGluZ3MiOiI7O0FBSUEsZUFBZSxTQUFTQSxjQUFjQSxDQUNwQ0MsT0FFQyxHQUFHLENBQUMsQ0FBQyxFQUMwRDtFQUNoRSxPQUFPQyxJQUFJLElBQUksTUFBTUMsS0FBSyxJQUFJO0lBQzVCLE1BQU1DLFNBQVMsR0FBRyxNQUFNRixJQUFJLENBQUNDLEtBQUssQ0FBQztJQUNuQyxNQUFNLENBQUNFLElBQUksRUFBRTtNQUFFQztJQUFjLENBQUMsQ0FBQyxHQUFHLE1BQU1DLE9BQU8sQ0FBQ0MsR0FBRyxDQUFDLENBQ2xETCxLQUFLLENBQUNNLGNBQWMsQ0FBQyxXQUFXLENBQUMsRUFDakMsTUFBTSxDQUFDLHlCQUF5QixDQUFDLENBQ2xDLENBQUM7SUFFRixJQUFJQyxPQUFPLENBQUNDLEdBQUcsQ0FBQ0MsUUFBUSxLQUFLLFlBQVksSUFBSSxDQUFDUCxJQUFJLEVBQUU7TUFDbERRLE9BQU8sQ0FBQ0MsS0FBSyxDQUFDLGdDQUFnQyxDQUFDO0lBQ2pELENBQUMsTUFBTSxJQUFJLENBQUNULElBQUksRUFBRTtNQUNoQlEsT0FBTyxDQUFDRSxJQUFJLENBQUMseUJBQXlCLENBQUM7SUFDekM7SUFFQSxPQUFPO01BQ0wsR0FBR1gsU0FBUztNQUNaWSxHQUFHLGVBQ0RDLElBQUEsQ0FBQ1gsYUFBYTtRQUFDWSxZQUFZLEVBQUViLElBQUs7UUFBQ2MsUUFBUSxFQUFFbEIsT0FBTyxvQkFBUEEsT0FBTyxDQUFFbUIsV0FBVyxvQkFBcEJuQixPQUFPLENBQUVtQixXQUFXO01BQUssV0FDbkVoQixTQUFTLENBQUNZLEdBQUc7SUFHcEIsQ0FBQztFQUNILENBQUM7QUFDSCJ9
|
|
@@ -1,7 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.__esModule = true;
|
|
4
|
-
exports.CacheProvider = void 0;
|
|
5
|
-
var _react = require("@rest-hooks/react");
|
|
6
|
-
exports.CacheProvider = _react.CacheProvider;
|
|
7
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy9yZXN0SG9va3MucHJvdmlkZXIudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB7IENhY2hlUHJvdmlkZXIgfSBmcm9tICdAcmVzdC1ob29rcy9yZWFjdCc7XG4iXSwibWFwcGluZ3MiOiI7Ozs7QUFBQTtBQUFrRCJ9
|
|
1
|
+
export { CacheProvider } from '@rest-hooks/react';
|
|
2
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJDYWNoZVByb3ZpZGVyIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy9yZXN0SG9va3MucHJvdmlkZXIudHN4Il0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB7IENhY2hlUHJvdmlkZXIgfSBmcm9tICdAcmVzdC1ob29rcy9yZWFjdCc7XG4iXSwibWFwcGluZ3MiOiJBQUFBLFNBQVNBLGFBQWEsUUFBUSxtQkFBbUIifQ==
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { type Controller, type Manager, type State } from '@rest-hooks/react';
|
|
3
3
|
import type { Store } from 'redux';
|
|
4
|
-
import type { ServerSpout } from './types';
|
|
4
|
+
import type { ServerSpout } from './types.js';
|
|
5
5
|
export default function restHooksSpout(options?: {
|
|
6
6
|
getManagers?: () => Manager[];
|
|
7
7
|
}): ServerSpout<Record<string, unknown>, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restHooks.server.d.ts","sourceRoot":"","sources":["../../src/spouts/restHooks.server.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"restHooks.server.d.ts","sourceRoot":"","sources":["../../src/spouts/restHooks.server.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,OAAO,EAAE,CAAC;CAC1B,GACL,WAAW,CACZ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvB;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;CAAE,EAC7D;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,CAAA;CAAE,CAC1E,CA0BA"}
|
|
@@ -1,18 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
exports.__esModule = true;
|
|
5
|
-
exports.default = restHooksSpout;
|
|
6
|
-
var _jsx2 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
|
|
7
|
-
var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
|
|
8
|
-
var _react = _interopRequireDefault(require("react"));
|
|
9
|
-
function restHooksSpout(options = {}) {
|
|
1
|
+
import _jsx from "@babel/runtime/helpers/jsx";
|
|
2
|
+
import React from "react";
|
|
3
|
+
export default function restHooksSpout(options = {}) {
|
|
10
4
|
return next => async props => {
|
|
11
5
|
var _options$getManagers;
|
|
12
|
-
const managers = (_options$getManagers = options == null ? void 0 : options.getManagers == null ? void 0 : options.getManagers()) != null ? _options$getManagers : [new (await
|
|
6
|
+
const managers = (_options$getManagers = options == null ? void 0 : options.getManagers == null ? void 0 : options.getManagers()) != null ? _options$getManagers : [new (await import('@rest-hooks/react')).NetworkManager()];
|
|
13
7
|
const {
|
|
14
8
|
createPersistedStore
|
|
15
|
-
} = await
|
|
9
|
+
} = await import('@rest-hooks/ssr');
|
|
16
10
|
const [ServerCacheProvider, useReadyCacheState, controller, store] = createPersistedStore(managers);
|
|
17
11
|
const nextProps = await next({
|
|
18
12
|
...props,
|
|
@@ -25,11 +19,11 @@ function restHooksSpout(options = {}) {
|
|
|
25
19
|
...nextProps.initData,
|
|
26
20
|
resthooks: useReadyCacheState
|
|
27
21
|
},
|
|
28
|
-
app: /*#__PURE__*/(
|
|
22
|
+
app: /*#__PURE__*/_jsx(ServerCacheProvider, {}, void 0, nextProps.app),
|
|
29
23
|
// TODO: figure out how to only inject in next and not have to also put here
|
|
30
24
|
controller,
|
|
31
25
|
store
|
|
32
26
|
};
|
|
33
27
|
};
|
|
34
28
|
}
|
|
35
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJyZXN0SG9va3NTcG91dCIsIm9wdGlvbnMiLCJuZXh0IiwicHJvcHMiLCJfb3B0aW9ucyRnZXRNYW5hZ2VycyIsIm1hbmFnZXJzIiwiZ2V0TWFuYWdlcnMiLCJOZXR3b3JrTWFuYWdlciIsImNyZWF0ZVBlcnNpc3RlZFN0b3JlIiwiU2VydmVyQ2FjaGVQcm92aWRlciIsInVzZVJlYWR5Q2FjaGVTdGF0ZSIsImNvbnRyb2xsZXIiLCJzdG9yZSIsIm5leHRQcm9wcyIsImluaXREYXRhIiwicmVzdGhvb2tzIiwiYXBwIiwiX2pzeCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvcmVzdEhvb2tzLnNlcnZlci50c3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdHlwZSBDb250cm9sbGVyLCB0eXBlIE1hbmFnZXIsIHR5cGUgU3RhdGUgfSBmcm9tICdAcmVzdC1ob29rcy9yZWFjdCc7XG5pbXBvcnQgdHlwZSB7IFN0b3JlIH0gZnJvbSAncmVkdXgnO1xuXG5pbXBvcnQgdHlwZSB7IFNlcnZlclNwb3V0IH0gZnJvbSAnLi90eXBlcy5qcyc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHJlc3RIb29rc1Nwb3V0KFxuICBvcHRpb25zOiB7XG4gICAgZ2V0TWFuYWdlcnM/OiAoKSA9PiBNYW5hZ2VyW107XG4gIH0gPSB7fSxcbik6IFNlcnZlclNwb3V0PFxuICBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPixcbiAgeyBjb250cm9sbGVyOiBDb250cm9sbGVyIH0gJiB7IHN0b3JlOiBTdG9yZTxTdGF0ZTx1bmtub3duPj4gfSxcbiAgeyBpbml0RGF0YT86IFJlY29yZDxzdHJpbmcsICgpID0+IHVua25vd24+OyBzY3JpcHRzPzogUmVhY3QuUmVhY3ROb2RlW10gfVxuPiB7XG4gIHJldHVybiBuZXh0ID0+IGFzeW5jIHByb3BzID0+IHtcbiAgICBjb25zdCBtYW5hZ2VycyA9IG9wdGlvbnM/LmdldE1hbmFnZXJzPy4oKSA/PyBbXG4gICAgICBuZXcgKGF3YWl0IGltcG9ydCgnQHJlc3QtaG9va3MvcmVhY3QnKSkuTmV0d29ya01hbmFnZXIoKSxcbiAgICBdO1xuICAgIGNvbnN0IHsgY3JlYXRlUGVyc2lzdGVkU3RvcmUgfSA9IGF3YWl0IGltcG9ydCgnQHJlc3QtaG9va3Mvc3NyJyk7XG4gICAgY29uc3QgW1NlcnZlckNhY2hlUHJvdmlkZXIsIHVzZVJlYWR5Q2FjaGVTdGF0ZSwgY29udHJvbGxlciwgc3RvcmVdID1cbiAgICAgIGNyZWF0ZVBlcnNpc3RlZFN0b3JlKG1hbmFnZXJzKTtcblxuICAgIGNvbnN0IG5leHRQcm9wcyA9IGF3YWl0IG5leHQoe1xuICAgICAgLi4ucHJvcHMsXG4gICAgICBjb250cm9sbGVyLFxuICAgICAgc3RvcmUsXG4gICAgfSk7XG4gICAgcmV0dXJuIHtcbiAgICAgIC4uLm5leHRQcm9wcyxcbiAgICAgIGluaXREYXRhOiB7XG4gICAgICAgIC4uLm5leHRQcm9wcy5pbml0RGF0YSxcbiAgICAgICAgcmVzdGhvb2tzOiB1c2VSZWFkeUNhY2hlU3RhdGUsXG4gICAgICB9LFxuICAgICAgYXBwOiA8U2VydmVyQ2FjaGVQcm92aWRlcj57bmV4dFByb3BzLmFwcH08L1NlcnZlckNhY2hlUHJvdmlkZXI+LFxuICAgICAgLy8gVE9ETzogZmlndXJlIG91dCBob3cgdG8gb25seSBpbmplY3QgaW4gbmV4dCBhbmQgbm90IGhhdmUgdG8gYWxzbyBwdXQgaGVyZVxuICAgICAgY29udHJvbGxlcixcbiAgICAgIHN0b3JlLFxuICAgIH07XG4gIH07XG59XG4iXSwibWFwcGluZ3MiOiI7O0FBS0EsZUFBZSxTQUFTQSxjQUFjQSxDQUNwQ0MsT0FFQyxHQUFHLENBQUMsQ0FBQyxFQUtOO0VBQ0EsT0FBT0MsSUFBSSxJQUFJLE1BQU1DLEtBQUssSUFBSTtJQUFBLElBQUFDLG9CQUFBO0lBQzVCLE1BQU1DLFFBQVEsSUFBQUQsb0JBQUEsR0FBR0gsT0FBTyxvQkFBUEEsT0FBTyxDQUFFSyxXQUFXLG9CQUFwQkwsT0FBTyxDQUFFSyxXQUFXLEVBQUksWUFBQUYsb0JBQUEsR0FBSSxDQUMzQyxJQUFJLENBQUMsTUFBTSxNQUFNLENBQUMsbUJBQW1CLENBQUMsRUFBRUcsY0FBYyxFQUFFLENBQ3pEO0lBQ0QsTUFBTTtNQUFFQztJQUFxQixDQUFDLEdBQUcsTUFBTSxNQUFNLENBQUMsaUJBQWlCLENBQUM7SUFDaEUsTUFBTSxDQUFDQyxtQkFBbUIsRUFBRUMsa0JBQWtCLEVBQUVDLFVBQVUsRUFBRUMsS0FBSyxDQUFDLEdBQ2hFSixvQkFBb0IsQ0FBQ0gsUUFBUSxDQUFDO0lBRWhDLE1BQU1RLFNBQVMsR0FBRyxNQUFNWCxJQUFJLENBQUM7TUFDM0IsR0FBR0MsS0FBSztNQUNSUSxVQUFVO01BQ1ZDO0lBQ0YsQ0FBQyxDQUFDO0lBQ0YsT0FBTztNQUNMLEdBQUdDLFNBQVM7TUFDWkMsUUFBUSxFQUFFO1FBQ1IsR0FBR0QsU0FBUyxDQUFDQyxRQUFRO1FBQ3JCQyxTQUFTLEVBQUVMO01BQ2IsQ0FBQztNQUNETSxHQUFHLGVBQUVDLElBQUEsQ0FBQ1IsbUJBQW1CLGNBQUVJLFNBQVMsQ0FBQ0csR0FBRyxDQUF1QjtNQUMvRDtNQUNBTCxVQUFVO01BQ1ZDO0lBQ0YsQ0FBQztFQUNILENBQUM7QUFDSCJ9
|
package/lib/spouts/router.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Route, RouteController } from '@anansi/router';
|
|
2
2
|
import type { Update } from 'history';
|
|
3
|
-
import type { CreateRouter, ClientSpout } from './types';
|
|
3
|
+
import type { CreateRouter, ClientSpout } from './types.js';
|
|
4
4
|
export default function routerSpout<ResolveWith>(options: {
|
|
5
5
|
resolveWith?: any;
|
|
6
6
|
useResolveWith: () => ResolveWith;
|
|
@@ -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;AAEvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,
|
|
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;AAEvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5D,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,GAAG,WAAW,CACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvB;IACE,aAAa,EAAE,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC;CAC1C,GAAG;IACF,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;CAClD,CACF,CAiCA"}
|
package/lib/spouts/router.js
CHANGED
|
@@ -1,25 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
var _jsx2 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
|
|
7
|
-
var _router = require("@anansi/router");
|
|
8
|
-
var _history = require("history");
|
|
9
|
-
var _react = _interopRequireDefault(require("react"));
|
|
10
|
-
function routerSpout(options) {
|
|
1
|
+
import _jsx from "@babel/runtime/helpers/jsx";
|
|
2
|
+
import { RouteProvider } from '@anansi/router';
|
|
3
|
+
import { createBrowserHistory } from 'history';
|
|
4
|
+
import React from 'react';
|
|
5
|
+
export default function routerSpout(options) {
|
|
11
6
|
const createRouteComponent = router => function Router({
|
|
12
7
|
children
|
|
13
8
|
}) {
|
|
14
9
|
const resolveWith = options.useResolveWith();
|
|
15
|
-
return /*#__PURE__*/(
|
|
10
|
+
return /*#__PURE__*/_jsx(RouteProvider, {
|
|
16
11
|
router: router,
|
|
17
12
|
resolveWith: resolveWith,
|
|
18
13
|
onChange: options.onChange
|
|
19
14
|
}, void 0, children);
|
|
20
15
|
};
|
|
21
16
|
return next => async props => {
|
|
22
|
-
const history =
|
|
17
|
+
const history = createBrowserHistory();
|
|
23
18
|
const router = options.createRouter(history);
|
|
24
19
|
const matchedRoutes = router.getMatchedRoutes(history.location.pathname);
|
|
25
20
|
const nextProps = await next({
|
|
@@ -32,8 +27,8 @@ function routerSpout(options) {
|
|
|
32
27
|
...nextProps,
|
|
33
28
|
matchedRoutes,
|
|
34
29
|
router,
|
|
35
|
-
app: /*#__PURE__*/(
|
|
30
|
+
app: /*#__PURE__*/_jsx(Router, {}, void 0, nextProps.app)
|
|
36
31
|
};
|
|
37
32
|
};
|
|
38
33
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSb3V0ZVByb3ZpZGVyIiwiY3JlYXRlQnJvd3Nlckhpc3RvcnkiLCJSZWFjdCIsInJvdXRlclNwb3V0Iiwib3B0aW9ucyIsImNyZWF0ZVJvdXRlQ29tcG9uZW50Iiwicm91dGVyIiwiUm91dGVyIiwiY2hpbGRyZW4iLCJyZXNvbHZlV2l0aCIsInVzZVJlc29sdmVXaXRoIiwiX2pzeCIsIm9uQ2hhbmdlIiwibmV4dCIsInByb3BzIiwiaGlzdG9yeSIsImNyZWF0ZVJvdXRlciIsIm1hdGNoZWRSb3V0ZXMiLCJnZXRNYXRjaGVkUm91dGVzIiwibG9jYXRpb24iLCJwYXRobmFtZSIsIm5leHRQcm9wcyIsImFwcCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvcm91dGVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZSwgUm91dGVQcm92aWRlciwgUm91dGVDb250cm9sbGVyIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuaW1wb3J0IHsgY3JlYXRlQnJvd3Nlckhpc3RvcnkgfSBmcm9tICdoaXN0b3J5JztcbmltcG9ydCB0eXBlIHsgVXBkYXRlIH0gZnJvbSAnaGlzdG9yeSc7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuXG5pbXBvcnQgdHlwZSB7IENyZWF0ZVJvdXRlciwgQ2xpZW50U3BvdXQgfSBmcm9tICcuL3R5cGVzLmpzJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcm91dGVyU3BvdXQ8UmVzb2x2ZVdpdGg+KG9wdGlvbnM6IHtcbiAgcmVzb2x2ZVdpdGg/OiBhbnk7XG4gIHVzZVJlc29sdmVXaXRoOiAoKSA9PiBSZXNvbHZlV2l0aDtcbiAgY3JlYXRlUm91dGVyOiBDcmVhdGVSb3V0ZXI8UmVzb2x2ZVdpdGg+O1xuICBvbkNoYW5nZT86ICh1cGRhdGU6IFVwZGF0ZSwgY2FsbGJhY2s6ICgpID0+IHZvaWQgfCB1bmRlZmluZWQpID0+IHZvaWQ7XG59KTogQ2xpZW50U3BvdXQ8XG4gIFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuICB7XG4gICAgbWF0Y2hlZFJvdXRlczogUm91dGU8UmVzb2x2ZVdpdGgsIGFueT5bXTtcbiAgfSAmIHtcbiAgICByb3V0ZXI6IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxSZXNvbHZlV2l0aCwgYW55Pj47XG4gIH1cbj4ge1xuICBjb25zdCBjcmVhdGVSb3V0ZUNvbXBvbmVudCA9IChcbiAgICByb3V0ZXI6IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxSZXNvbHZlV2l0aCwgYW55Pj4sXG4gICkgPT5cbiAgICBmdW5jdGlvbiBSb3V0ZXIoeyBjaGlsZHJlbiB9OiB7IGNoaWxkcmVuOiBSZWFjdC5SZWFjdE5vZGUgfSkge1xuICAgICAgY29uc3QgcmVzb2x2ZVdpdGggPSBvcHRpb25zLnVzZVJlc29sdmVXaXRoKCk7XG5cbiAgICAgIHJldHVybiAoXG4gICAgICAgIDxSb3V0ZVByb3ZpZGVyXG4gICAgICAgICAgcm91dGVyPXtyb3V0ZXJ9XG4gICAgICAgICAgcmVzb2x2ZVdpdGg9e3Jlc29sdmVXaXRofVxuICAgICAgICAgIG9uQ2hhbmdlPXtvcHRpb25zLm9uQ2hhbmdlfVxuICAgICAgICA+XG4gICAgICAgICAge2NoaWxkcmVufVxuICAgICAgICA8L1JvdXRlUHJvdmlkZXI+XG4gICAgICApO1xuICAgIH07XG5cbiAgcmV0dXJuIG5leHQgPT4gYXN5bmMgcHJvcHMgPT4ge1xuICAgIGNvbnN0IGhpc3RvcnkgPSBjcmVhdGVCcm93c2VySGlzdG9yeSgpO1xuICAgIGNvbnN0IHJvdXRlciA9IG9wdGlvbnMuY3JlYXRlUm91dGVyKGhpc3RvcnkpO1xuICAgIGNvbnN0IG1hdGNoZWRSb3V0ZXMgPSByb3V0ZXIuZ2V0TWF0Y2hlZFJvdXRlcyhoaXN0b3J5LmxvY2F0aW9uLnBhdGhuYW1lKTtcblxuICAgIGNvbnN0IG5leHRQcm9wcyA9IGF3YWl0IG5leHQoeyAuLi5wcm9wcywgbWF0Y2hlZFJvdXRlcywgcm91dGVyIH0pO1xuXG4gICAgY29uc3QgUm91dGVyID0gY3JlYXRlUm91dGVDb21wb25lbnQocm91dGVyKTtcbiAgICByZXR1cm4ge1xuICAgICAgLi4ubmV4dFByb3BzLFxuICAgICAgbWF0Y2hlZFJvdXRlcyxcbiAgICAgIHJvdXRlcixcbiAgICAgIGFwcDogPFJvdXRlcj57bmV4dFByb3BzLmFwcH08L1JvdXRlcj4sXG4gICAgfTtcbiAgfTtcbn1cbiJdLCJtYXBwaW5ncyI6IjtBQUFBLFNBQWdCQSxhQUFhLFFBQXlCLGdCQUFnQjtBQUN0RSxTQUFTQyxvQkFBb0IsUUFBUSxTQUFTO0FBRTlDLE9BQU9DLEtBQUssTUFBTSxPQUFPO0FBSXpCLGVBQWUsU0FBU0MsV0FBV0EsQ0FBY0MsT0FLaEQsRUFPQztFQUNBLE1BQU1DLG9CQUFvQixHQUN4QkMsTUFBZ0QsSUFFaEQsU0FBU0MsTUFBTUEsQ0FBQztJQUFFQztFQUF3QyxDQUFDLEVBQUU7SUFDM0QsTUFBTUMsV0FBVyxHQUFHTCxPQUFPLENBQUNNLGNBQWMsRUFBRTtJQUU1QyxvQkFDRUMsSUFBQSxDQUFDWCxhQUFhO01BQ1pNLE1BQU0sRUFBRUEsTUFBTztNQUNmRyxXQUFXLEVBQUVBLFdBQVk7TUFDekJHLFFBQVEsRUFBRVIsT0FBTyxDQUFDUTtJQUFTLFdBRTFCSixRQUFRLENBQ0s7RUFFcEIsQ0FBQztFQUVILE9BQU9LLElBQUksSUFBSSxNQUFNQyxLQUFLLElBQUk7SUFDNUIsTUFBTUMsT0FBTyxHQUFHZCxvQkFBb0IsRUFBRTtJQUN0QyxNQUFNSyxNQUFNLEdBQUdGLE9BQU8sQ0FBQ1ksWUFBWSxDQUFDRCxPQUFPLENBQUM7SUFDNUMsTUFBTUUsYUFBYSxHQUFHWCxNQUFNLENBQUNZLGdCQUFnQixDQUFDSCxPQUFPLENBQUNJLFFBQVEsQ0FBQ0MsUUFBUSxDQUFDO0lBRXhFLE1BQU1DLFNBQVMsR0FBRyxNQUFNUixJQUFJLENBQUM7TUFBRSxHQUFHQyxLQUFLO01BQUVHLGFBQWE7TUFBRVg7SUFBTyxDQUFDLENBQUM7SUFFakUsTUFBTUMsTUFBTSxHQUFHRixvQkFBb0IsQ0FBQ0MsTUFBTSxDQUFDO0lBQzNDLE9BQU87TUFDTCxHQUFHZSxTQUFTO01BQ1pKLGFBQWE7TUFDYlgsTUFBTTtNQUNOZ0IsR0FBRyxlQUFFWCxJQUFBLENBQUNKLE1BQU0sY0FBRWMsU0FBUyxDQUFDQyxHQUFHO0lBQzdCLENBQUM7RUFDSCxDQUFDO0FBQ0gifQ==
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Route, RouteController } from '@anansi/router';
|
|
2
|
-
import type { CreateRouter, ServerSpout } from './types';
|
|
2
|
+
import type { CreateRouter, ServerSpout } from './types.js';
|
|
3
3
|
export default function routerSpout<ResolveWith>(options: {
|
|
4
4
|
resolveWith?: any;
|
|
5
5
|
useResolveWith: () => ResolveWith;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.server.d.ts","sourceRoot":"","sources":["../../src/spouts/router.server.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIvE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"router.server.d.ts","sourceRoot":"","sources":["../../src/spouts/router.server.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIvE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5D,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;CACzC,GAAG,WAAW,CACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvB;IACE,aAAa,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;CACrC,GAAG;IACF,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;CAClD,CACF,CAqCA"}
|
|
@@ -1,25 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
var _jsx2 = _interopRequireDefault(require("@babel/runtime/helpers/jsx"));
|
|
7
|
-
var _router = require("@anansi/router");
|
|
8
|
-
var _history = require("history");
|
|
9
|
-
var _react = _interopRequireDefault(require("react"));
|
|
10
|
-
function routerSpout(options) {
|
|
1
|
+
import _jsx from "@babel/runtime/helpers/jsx";
|
|
2
|
+
import { RouteProvider } from '@anansi/router';
|
|
3
|
+
import { createMemoryHistory } from 'history';
|
|
4
|
+
import React from 'react';
|
|
5
|
+
export default function routerSpout(options) {
|
|
11
6
|
const createRouteComponent = router => function Router({
|
|
12
7
|
children
|
|
13
8
|
}) {
|
|
14
9
|
const resolveWith = options.useResolveWith();
|
|
15
|
-
return /*#__PURE__*/(
|
|
10
|
+
return /*#__PURE__*/_jsx(RouteProvider, {
|
|
16
11
|
router: router,
|
|
17
12
|
resolveWith: resolveWith
|
|
18
13
|
}, void 0, children);
|
|
19
14
|
};
|
|
20
15
|
return next => async props => {
|
|
21
16
|
const url = props.req.url || '';
|
|
22
|
-
const router = options.createRouter(
|
|
17
|
+
const router = options.createRouter(createMemoryHistory({
|
|
23
18
|
initialEntries: [url]
|
|
24
19
|
}));
|
|
25
20
|
const matchedRoutes = router.getMatchedRoutes(url);
|
|
@@ -31,11 +26,11 @@ function routerSpout(options) {
|
|
|
31
26
|
const Router = createRouteComponent(router);
|
|
32
27
|
return {
|
|
33
28
|
...nextProps,
|
|
34
|
-
app: /*#__PURE__*/(
|
|
29
|
+
app: /*#__PURE__*/_jsx(Router, {}, void 0, nextProps.app),
|
|
35
30
|
// TODO: figure out how to only inject in next and not have to also put here
|
|
36
31
|
matchedRoutes,
|
|
37
32
|
router
|
|
38
33
|
};
|
|
39
34
|
};
|
|
40
35
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSb3V0ZVByb3ZpZGVyIiwiY3JlYXRlTWVtb3J5SGlzdG9yeSIsIlJlYWN0Iiwicm91dGVyU3BvdXQiLCJvcHRpb25zIiwiY3JlYXRlUm91dGVDb21wb25lbnQiLCJyb3V0ZXIiLCJSb3V0ZXIiLCJjaGlsZHJlbiIsInJlc29sdmVXaXRoIiwidXNlUmVzb2x2ZVdpdGgiLCJfanN4IiwibmV4dCIsInByb3BzIiwidXJsIiwicmVxIiwiY3JlYXRlUm91dGVyIiwiaW5pdGlhbEVudHJpZXMiLCJtYXRjaGVkUm91dGVzIiwiZ2V0TWF0Y2hlZFJvdXRlcyIsIm5leHRQcm9wcyIsImFwcCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcG91dHMvcm91dGVyLnNlcnZlci50c3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUm91dGUsIFJvdXRlUHJvdmlkZXIsIFJvdXRlQ29udHJvbGxlciB9IGZyb20gJ0BhbmFuc2kvcm91dGVyJztcbmltcG9ydCB7IGNyZWF0ZU1lbW9yeUhpc3RvcnkgfSBmcm9tICdoaXN0b3J5JztcbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5cbmltcG9ydCB0eXBlIHsgQ3JlYXRlUm91dGVyLCBTZXJ2ZXJTcG91dCB9IGZyb20gJy4vdHlwZXMuanMnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiByb3V0ZXJTcG91dDxSZXNvbHZlV2l0aD4ob3B0aW9uczoge1xuICByZXNvbHZlV2l0aD86IGFueTtcbiAgdXNlUmVzb2x2ZVdpdGg6ICgpID0+IFJlc29sdmVXaXRoO1xuICBjcmVhdGVSb3V0ZXI6IENyZWF0ZVJvdXRlcjxSZXNvbHZlV2l0aD47XG59KTogU2VydmVyU3BvdXQ8XG4gIFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuICB7XG4gICAgbWF0Y2hlZFJvdXRlczogUm91dGU8UmVzb2x2ZVdpdGg+W107XG4gIH0gJiB7XG4gICAgcm91dGVyOiBSb3V0ZUNvbnRyb2xsZXI8Um91dGU8UmVzb2x2ZVdpdGgsIGFueT4+O1xuICB9XG4+IHtcbiAgY29uc3QgY3JlYXRlUm91dGVDb21wb25lbnQgPSAoXG4gICAgcm91dGVyOiBSb3V0ZUNvbnRyb2xsZXI8Um91dGU8UmVzb2x2ZVdpdGgsIGFueT4+LFxuICApID0+XG4gICAgZnVuY3Rpb24gUm91dGVyKHsgY2hpbGRyZW4gfTogeyBjaGlsZHJlbjogUmVhY3QuUmVhY3ROb2RlIH0pIHtcbiAgICAgIGNvbnN0IHJlc29sdmVXaXRoID0gb3B0aW9ucy51c2VSZXNvbHZlV2l0aCgpO1xuXG4gICAgICByZXR1cm4gKFxuICAgICAgICA8Um91dGVQcm92aWRlciByb3V0ZXI9e3JvdXRlcn0gcmVzb2x2ZVdpdGg9e3Jlc29sdmVXaXRofT5cbiAgICAgICAgICB7Y2hpbGRyZW59XG4gICAgICAgIDwvUm91dGVQcm92aWRlcj5cbiAgICAgICk7XG4gICAgfTtcblxuICByZXR1cm4gbmV4dCA9PiBhc3luYyBwcm9wcyA9PiB7XG4gICAgY29uc3QgdXJsID0gcHJvcHMucmVxLnVybCB8fCAnJztcbiAgICBjb25zdCByb3V0ZXIgPSBvcHRpb25zLmNyZWF0ZVJvdXRlcihcbiAgICAgIGNyZWF0ZU1lbW9yeUhpc3RvcnkoeyBpbml0aWFsRW50cmllczogW3VybF0gfSksXG4gICAgKTtcbiAgICBjb25zdCBtYXRjaGVkUm91dGVzOiBSb3V0ZTxSZXNvbHZlV2l0aD5bXSA9IHJvdXRlci5nZXRNYXRjaGVkUm91dGVzKHVybCk7XG5cbiAgICBjb25zdCBuZXh0UHJvcHMgPSBhd2FpdCBuZXh0KHtcbiAgICAgIC4uLnByb3BzLFxuICAgICAgbWF0Y2hlZFJvdXRlcyxcbiAgICAgIHJvdXRlcixcbiAgICB9KTtcblxuICAgIGNvbnN0IFJvdXRlciA9IGNyZWF0ZVJvdXRlQ29tcG9uZW50KHJvdXRlcik7XG5cbiAgICByZXR1cm4ge1xuICAgICAgLi4ubmV4dFByb3BzLFxuICAgICAgYXBwOiA8Um91dGVyPntuZXh0UHJvcHMuYXBwfTwvUm91dGVyPixcbiAgICAgIC8vIFRPRE86IGZpZ3VyZSBvdXQgaG93IHRvIG9ubHkgaW5qZWN0IGluIG5leHQgYW5kIG5vdCBoYXZlIHRvIGFsc28gcHV0IGhlcmVcbiAgICAgIG1hdGNoZWRSb3V0ZXMsXG4gICAgICByb3V0ZXIsXG4gICAgfTtcbiAgfTtcbn1cbiJdLCJtYXBwaW5ncyI6IjtBQUFBLFNBQWdCQSxhQUFhLFFBQXlCLGdCQUFnQjtBQUN0RSxTQUFTQyxtQkFBbUIsUUFBUSxTQUFTO0FBQzdDLE9BQU9DLEtBQUssTUFBTSxPQUFPO0FBSXpCLGVBQWUsU0FBU0MsV0FBV0EsQ0FBY0MsT0FJaEQsRUFPQztFQUNBLE1BQU1DLG9CQUFvQixHQUN4QkMsTUFBZ0QsSUFFaEQsU0FBU0MsTUFBTUEsQ0FBQztJQUFFQztFQUF3QyxDQUFDLEVBQUU7SUFDM0QsTUFBTUMsV0FBVyxHQUFHTCxPQUFPLENBQUNNLGNBQWMsRUFBRTtJQUU1QyxvQkFDRUMsSUFBQSxDQUFDWCxhQUFhO01BQUNNLE1BQU0sRUFBRUEsTUFBTztNQUFDRyxXQUFXLEVBQUVBO0lBQVksV0FDckRELFFBQVEsQ0FDSztFQUVwQixDQUFDO0VBRUgsT0FBT0ksSUFBSSxJQUFJLE1BQU1DLEtBQUssSUFBSTtJQUM1QixNQUFNQyxHQUFHLEdBQUdELEtBQUssQ0FBQ0UsR0FBRyxDQUFDRCxHQUFHLElBQUksRUFBRTtJQUMvQixNQUFNUixNQUFNLEdBQUdGLE9BQU8sQ0FBQ1ksWUFBWSxDQUNqQ2YsbUJBQW1CLENBQUM7TUFBRWdCLGNBQWMsRUFBRSxDQUFDSCxHQUFHO0lBQUUsQ0FBQyxDQUFDLENBQy9DO0lBQ0QsTUFBTUksYUFBbUMsR0FBR1osTUFBTSxDQUFDYSxnQkFBZ0IsQ0FBQ0wsR0FBRyxDQUFDO0lBRXhFLE1BQU1NLFNBQVMsR0FBRyxNQUFNUixJQUFJLENBQUM7TUFDM0IsR0FBR0MsS0FBSztNQUNSSyxhQUFhO01BQ2JaO0lBQ0YsQ0FBQyxDQUFDO0lBRUYsTUFBTUMsTUFBTSxHQUFHRixvQkFBb0IsQ0FBQ0MsTUFBTSxDQUFDO0lBRTNDLE9BQU87TUFDTCxHQUFHYyxTQUFTO01BQ1pDLEdBQUcsZUFBRVYsSUFBQSxDQUFDSixNQUFNLGNBQUVhLFNBQVMsQ0FBQ0MsR0FBRyxDQUFVO01BQ3JDO01BQ0FILGFBQWE7TUFDYlo7SUFDRixDQUFDO0VBQ0gsQ0FBQztBQUNIIn0=
|
package/lib/spouts/types.js
CHANGED
|
@@ -1,4 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.__esModule = true;
|
|
1
|
+
export {};
|
|
4
2
|
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy90eXBlcy50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZSwgUm91dGVDb250cm9sbGVyIH0gZnJvbSAnQGFuYW5zaS9yb3V0ZXInO1xuaW1wb3J0IHsgUmVxdWVzdCwgUmVzcG9uc2UgfSBmcm9tICdleHByZXNzJztcbmltcG9ydCB7IEhpc3RvcnkgfSBmcm9tICdoaXN0b3J5JztcbmltcG9ydCB7IEluY29taW5nTWVzc2FnZSwgU2VydmVyUmVzcG9uc2UgfSBmcm9tICdodHRwJztcbmltcG9ydCB0eXBlIHsgU3RhdHNDb21waWxhdGlvbiB9IGZyb20gJ3dlYnBhY2snO1xuXG4vKiBWYXJpYWJsZXMgZnJvbSB0aGUgcmVuZGVyaW5nIGNhbGwgKi9cbmV4cG9ydCB0eXBlIFNlcnZlclByb3BzID0ge1xuICByZXE6IFJlcXVlc3QgfCBJbmNvbWluZ01lc3NhZ2U7XG4gIHJlczogUmVzcG9uc2UgfCBTZXJ2ZXJSZXNwb25zZTtcbiAgY2xpZW50TWFuaWZlc3Q6IFN0YXRzQ29tcGlsYXRpb247XG4gIG5vbmNlOiBzdHJpbmc7XG59O1xuXG4vKiBCYXNlbGluZSBleHBlY3RhdGlvbnMgb2YgcmV0dXJuIHZhbHVlICovXG5leHBvcnQgdHlwZSBSZXNvbHZlUHJvcHMgPSB7XG4gIGFwcDogSlNYLkVsZW1lbnQ7XG59O1xuXG5leHBvcnQgdHlwZSBDcmVhdGVSb3V0ZXI8VD4gPSAoXG4gIGhpc3Rvcnk6IEhpc3RvcnksXG4pID0+IFJvdXRlQ29udHJvbGxlcjxSb3V0ZTxULCBhbnk+PjtcblxuLyogU3BvdXRzIGFyZSBtaWRkbGV3YXJlIGZvciBBbmFuc2kgKi9cbmV4cG9ydCB0eXBlIFNlcnZlclNwb3V0PFxuICBOZWVkZWRQcm9wcyBleHRlbmRzIFJlY29yZDxzdHJpbmcsIHVua25vd24+ID0gUmVjb3JkPHN0cmluZywgdW5rbm93bj4sXG4gIFByb3ZpZGVkUHJvcHMgZXh0ZW5kcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPiA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuICBOZWVkZWROZXh0IGV4dGVuZHMgUmVjb3JkPHN0cmluZywgdW5rbm93bj4gPSBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPixcbj4gPSA8TiBleHRlbmRzIE5lZWRlZE5leHQgJiBSZXNvbHZlUHJvcHMsIEkgZXh0ZW5kcyBTZXJ2ZXJQcm9wcz4oXG4gIG5leHQ6IChwcm9wczogSSAmIFByb3ZpZGVkUHJvcHMpID0+IFByb21pc2U8Tj4sXG4pID0+IChwcm9wczogTmVlZGVkUHJvcHMgJiBJKSA9PiBQcm9taXNlPE4gJiBQcm92aWRlZFByb3BzPjtcblxuLyogU3BvdXRzIGFyZSBtaWRkbGV3YXJlIGZvciBBbmFuc2kgKi9cbmV4cG9ydCB0eXBlIENsaWVudFNwb3V0PFxuICBOZWVkZWRQcm9wcyBleHRlbmRzIFJlY29yZDxzdHJpbmcsIHVua25vd24+ID0gUmVjb3JkPHN0cmluZywgdW5rbm93bj4sXG4gIFByb3ZpZGVkUHJvcHMgZXh0ZW5kcyBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPiA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuICBOZWVkZWROZXh0IGV4dGVuZHMgUmVjb3JkPHN0cmluZywgdW5rbm93bj4gPSBSZWNvcmQ8c3RyaW5nLCB1bmtub3duPixcbj4gPSA8TiBleHRlbmRzIE5lZWRlZE5leHQgJiBSZXNvbHZlUHJvcHMsIEk+KFxuICBuZXh0OiAocHJvcHM6IEkgJiBQcm92aWRlZFByb3BzKSA9PiBQcm9taXNlPE4+LFxuKSA9PiAocHJvcHM6IE5lZWRlZFByb3BzICYgSSkgPT4gUHJvbWlzZTxOICYgUHJvdmlkZWRQcm9wcz47XG4iXSwibWFwcGluZ3MiOiIifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@anansi/core",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.7",
|
|
4
4
|
"description": "React 18 Framework",
|
|
5
5
|
"homepage": "https://github.com/ntucker/anansi/tree/master/packages/core#readme",
|
|
6
6
|
"repository": {
|
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
"module": "lib/index.js",
|
|
32
32
|
"types": "lib/index.d.ts"
|
|
33
33
|
},
|
|
34
|
+
"type": "module",
|
|
34
35
|
"module": "lib/index.js",
|
|
35
36
|
"types": "lib/index.d.ts",
|
|
36
37
|
"exports": {
|
|
@@ -47,7 +48,7 @@
|
|
|
47
48
|
"./server": {
|
|
48
49
|
"types": "./lib/index.server.d.ts",
|
|
49
50
|
"require": "./dist/server.js",
|
|
50
|
-
"default": "./
|
|
51
|
+
"default": "./dist/server.js"
|
|
51
52
|
},
|
|
52
53
|
"./scripts": {
|
|
53
54
|
"types": "./lib/scripts/index.d.ts",
|
|
@@ -65,27 +66,28 @@
|
|
|
65
66
|
"browser"
|
|
66
67
|
],
|
|
67
68
|
"devDependencies": {
|
|
68
|
-
"@anansi/babel-preset": "3.4.
|
|
69
|
+
"@anansi/babel-preset": "3.4.2",
|
|
69
70
|
"@anansi/browserslist-config": "1.4.1",
|
|
70
|
-
"@anansi/webpack-config": "14.
|
|
71
|
-
"@babel/cli": "7.
|
|
72
|
-
"@babel/core": "7.
|
|
71
|
+
"@anansi/webpack-config": "14.2.0",
|
|
72
|
+
"@babel/cli": "7.21.0",
|
|
73
|
+
"@babel/core": "7.21.0",
|
|
73
74
|
"@types/compression": "1.7.2",
|
|
74
75
|
"@types/source-map-support": "0.5.6",
|
|
75
76
|
"@types/tmp": "0.2.3",
|
|
76
77
|
"@types/webpack-hot-middleware": "2.25.6",
|
|
77
|
-
"jest": "29.4.
|
|
78
|
+
"jest": "29.4.3",
|
|
78
79
|
"rimraf": "4.1.2",
|
|
79
80
|
"webpack": "5.75.0",
|
|
80
81
|
"webpack-cli": "5.0.1"
|
|
81
82
|
},
|
|
82
83
|
"dependencies": {
|
|
83
|
-
"@anansi/router": "^0.7.
|
|
84
|
+
"@anansi/router": "^0.7.16",
|
|
84
85
|
"@babel/runtime": "^7.17.0",
|
|
85
|
-
"@rest-hooks/ssr": "^0.7.
|
|
86
|
+
"@rest-hooks/ssr": "^0.7.9",
|
|
86
87
|
"chalk": "^4.1.2",
|
|
87
88
|
"compression": "^1.7.4",
|
|
88
89
|
"cross-fetch": "^3.1.5",
|
|
90
|
+
"enhanced-resolve": "^5.12.0",
|
|
89
91
|
"fs-require": "^1.6.0",
|
|
90
92
|
"history": "^5.3.0",
|
|
91
93
|
"http-proxy-middleware": "^2.0.6",
|
|
@@ -133,9 +135,10 @@
|
|
|
133
135
|
"dev": "yarn run build:lib -w & yarn run build:bundle -w && fg",
|
|
134
136
|
"test": "jest",
|
|
135
137
|
"test:type": "tsc",
|
|
136
|
-
"build": "yarn run build:lib && yarn run build:bundle",
|
|
137
|
-
"build:lib": "NODE_ENV=production BROWSERSLIST_ENV='2020' babel --root-mode upward src --out-dir lib --source-maps inline --extensions '.ts,.tsx,.js' --ignore '**/__tests__/**' --ignore '**/*.d.ts'",
|
|
138
|
-
"build:
|
|
138
|
+
"build": "yarn run build:lib && yarn build:scripts && yarn run build:bundle",
|
|
139
|
+
"build:lib": "NODE_ENV=production BROWSERSLIST_ENV='2020' babel --root-mode upward src --out-dir lib --source-maps inline --extensions '.ts,.tsx,.cts,.js' --ignore '**/__tests__/**' --ignore '**/*.d.ts'",
|
|
140
|
+
"build:scripts": "NODE_ENV=production BROWSERSLIST_ENV='node12' babel --root-mode upward src/scripts --out-dir lib/scripts --source-maps inline --extensions '.ts,.tsx,.cts,.js' --ignore '**/__tests__/**' --ignore '**/*.d.ts' && echo '{\"type\":\"commonjs\"}' > lib/scripts/package.json",
|
|
141
|
+
"build:bundle": "BROWSERSLIST_ENV=node12 webpack --mode=development --target=node && echo '{\"type\":\"commonjs\"}' > dist/package.json",
|
|
139
142
|
"build:clean": "rimraf lib dist ts3.4 legacy *.tsbuildinfo",
|
|
140
143
|
"prepack": "yarn build"
|
|
141
144
|
}
|
package/src/index.server.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export { default as laySpouts } from './laySpouts';
|
|
2
|
-
export { default as documentSpout } from './spouts/document.server';
|
|
3
|
-
export { default as restHooksSpout } from './spouts/restHooks.server';
|
|
4
|
-
export { default as antdSpout } from './spouts/antd.server';
|
|
5
|
-
export { default as routerSpout } from './spouts/router.server';
|
|
6
|
-
export { default as prefetchSpout } from './spouts/prefetch.server';
|
|
7
|
-
export { default as JSONSpout } from './spouts/json.server';
|
|
8
|
-
export { default as appSpout } from './spouts/app.server';
|
|
9
|
-
export type { ServerProps } from './spouts/types';
|
|
10
|
-
export type { ServerSpout as Spout } from './spouts/types';
|
|
1
|
+
export { default as laySpouts } from './laySpouts.js';
|
|
2
|
+
export { default as documentSpout } from './spouts/document.server.js';
|
|
3
|
+
export { default as restHooksSpout } from './spouts/restHooks.server.js';
|
|
4
|
+
export { default as antdSpout } from './spouts/antd.server.js';
|
|
5
|
+
export { default as routerSpout } from './spouts/router.server.js';
|
|
6
|
+
export { default as prefetchSpout } from './spouts/prefetch.server.js';
|
|
7
|
+
export { default as JSONSpout } from './spouts/json.server.js';
|
|
8
|
+
export { default as appSpout } from './spouts/app.server.js';
|
|
9
|
+
export type { ServerProps } from './spouts/types.js';
|
|
10
|
+
export type { ServerSpout as Spout } from './spouts/types.js';
|
package/src/index.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export { default as floodSpouts } from './floodSpouts';
|
|
2
|
-
export { default as documentSpout } from './spouts/document';
|
|
3
|
-
export { default as restHooksSpout } from './spouts/restHooks';
|
|
4
|
-
export { default as routerSpout } from './spouts/router';
|
|
5
|
-
export { default as JSONSpout } from './spouts/json';
|
|
6
|
-
export { default as appSpout } from './spouts/app';
|
|
7
|
-
export type { ServerProps } from './spouts/types';
|
|
8
|
-
export type { ClientSpout as Spout } from './spouts/types';
|
|
1
|
+
export { default as floodSpouts } from './floodSpouts.js';
|
|
2
|
+
export { default as documentSpout } from './spouts/document.js';
|
|
3
|
+
export { default as restHooksSpout } from './spouts/restHooks.js';
|
|
4
|
+
export { default as routerSpout } from './spouts/router.js';
|
|
5
|
+
export { default as JSONSpout } from './spouts/json.js';
|
|
6
|
+
export { default as appSpout } from './spouts/app.js';
|
|
7
|
+
export type { ServerProps } from './spouts/types.js';
|
|
8
|
+
export type { ClientSpout as Spout } from './spouts/types.js';
|
package/src/laySpouts.tsx
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import crypto from 'crypto';
|
|
2
2
|
import { renderToPipeableStream as reactRender } from 'react-dom/server';
|
|
3
3
|
|
|
4
|
-
import { Render } from './scripts/types';
|
|
5
|
-
import { ServerProps } from './spouts/types';
|
|
4
|
+
import type { Render } from './scripts/types.js';
|
|
5
|
+
import type { ServerProps } from './spouts/types.js';
|
|
6
6
|
|
|
7
7
|
export default function laySpouts(
|
|
8
8
|
spouts: (props: ServerProps) => Promise<{
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { create as createResolve } from 'enhanced-resolve';
|
|
2
|
+
import webpack from 'webpack';
|
|
3
|
+
|
|
4
|
+
const resolve = createResolve.sync({
|
|
5
|
+
modules: ['.'],
|
|
6
|
+
// or resolve.create.sync
|
|
7
|
+
extensions: ['.js', '.cjs', '.mjs'],
|
|
8
|
+
// see more options below
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
export function getWebpackConfig(): (
|
|
12
|
+
env: any,
|
|
13
|
+
argv: any,
|
|
14
|
+
) => webpack.Configuration {
|
|
15
|
+
const configPath = resolve({}, process.cwd(), 'webpack.config');
|
|
16
|
+
if (!configPath) {
|
|
17
|
+
throw new Error('Cannot find webpack.config in ' + process.cwd());
|
|
18
|
+
}
|
|
19
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
20
|
+
const webpackConfig = require(configPath);
|
|
21
|
+
return webpackConfig;
|
|
22
|
+
}
|
package/src/scripts/index.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { default as serve } from './serve';
|
|
2
|
-
export { default as devServe } from './startDevserver';
|
|
1
|
+
export { default as serve } from './serve.js';
|
|
2
|
+
export { default as devServe } from './startDevserver.js';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"type":"commonjs"}
|
package/src/scripts/serve.ts
CHANGED
|
@@ -11,11 +11,12 @@ import { Server, IncomingMessage, ServerResponse } from 'http';
|
|
|
11
11
|
import ora from 'ora';
|
|
12
12
|
import path from 'path';
|
|
13
13
|
import { promisify } from 'util';
|
|
14
|
-
import webpack
|
|
14
|
+
import webpack from 'webpack';
|
|
15
15
|
|
|
16
|
-
import 'cross-fetch/polyfill';
|
|
17
|
-
import getProxyMiddlewares from './getProxyMiddlewares';
|
|
18
|
-
import {
|
|
16
|
+
import 'cross-fetch/dist/node-polyfill';
|
|
17
|
+
import getProxyMiddlewares from './getProxyMiddlewares.js';
|
|
18
|
+
import { getWebpackConfig } from './getWebpackConfig.js';
|
|
19
|
+
import { Render } from './types.js';
|
|
19
20
|
|
|
20
21
|
// run directly from node
|
|
21
22
|
if (require.main === module) {
|
|
@@ -36,14 +37,7 @@ export default function serve(
|
|
|
36
37
|
|
|
37
38
|
const loader = ora('Initializing').start();
|
|
38
39
|
|
|
39
|
-
const webpackConfig
|
|
40
|
-
env: any,
|
|
41
|
-
argv: any,
|
|
42
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
43
|
-
) => webpack.Configuration = require(require.resolve(
|
|
44
|
-
// TODO: use normal resolution algorithm to find webpack file
|
|
45
|
-
path.join(process.cwd(), 'webpack.config'),
|
|
46
|
-
));
|
|
40
|
+
const webpackConfig = getWebpackConfig();
|
|
47
41
|
|
|
48
42
|
const manifestPath = getManifestPathFromWebpackconfig(
|
|
49
43
|
webpackConfig({}, { mode: 'production' }),
|
|
@@ -141,6 +135,15 @@ export default function serve(
|
|
|
141
135
|
entrypoint,
|
|
142
136
|
)).default;
|
|
143
137
|
|
|
138
|
+
if (typeof render !== 'function') {
|
|
139
|
+
throw new Error(
|
|
140
|
+
`default export of ${path.join(
|
|
141
|
+
process.cwd(),
|
|
142
|
+
entrypoint,
|
|
143
|
+
)} is not a function`,
|
|
144
|
+
);
|
|
145
|
+
}
|
|
146
|
+
|
|
144
147
|
wrappingApp.get(
|
|
145
148
|
'/*',
|
|
146
149
|
handleErrors(async function (req: any, res: any) {
|