@anansi/core 0.16.7 → 0.16.8
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 +10 -0
- package/dist/{src_spouts_restHooks_provider_tsx.chunk.js → 2.chunk.js} +4 -4
- package/dist/client.js +13 -2784
- package/dist/server.js +64 -2911
- package/lib/spouts/DocumentComponent.d.ts.map +1 -1
- package/lib/spouts/DocumentComponent.js +2 -4
- package/lib/spouts/document.server.d.ts.map +1 -1
- package/lib/spouts/document.server.js +6 -3
- package/package.json +4 -4
- package/src/spouts/DocumentComponent.tsx +1 -5
- package/src/spouts/document.server.tsx +9 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocumentComponent.d.ts","sourceRoot":"","sources":["../../src/spouts/DocumentComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACtD,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,CAAC;AAEF,iBAAwB,QAAQ,CAAC,EAC/B,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,KAAK,EACL,OAAO,EACP,UAAU,GACX,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"DocumentComponent.d.ts","sourceRoot":"","sources":["../../src/spouts/DocumentComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACtD,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,CAAC;AAEF,iBAAwB,QAAQ,CAAC,EAC/B,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,EACR,KAAK,EACL,OAAO,EACP,UAAU,GACX,EAAE,KAAK,eAyCP;kBApDuB,QAAQ;;;;;;;;eAAR,QAAQ"}
|
|
@@ -20,9 +20,7 @@ export default function Document({
|
|
|
20
20
|
const policy = {
|
|
21
21
|
...csPolicy
|
|
22
22
|
};
|
|
23
|
-
if (nonce
|
|
24
|
-
// nonces negate 'unsafe-inline' so do not add it in development to keep things easier
|
|
25
|
-
process.env.NODE_ENV === 'production') {
|
|
23
|
+
if (nonce) {
|
|
26
24
|
if (typeof policy['script-src'] === 'string') {
|
|
27
25
|
policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];
|
|
28
26
|
} else {
|
|
@@ -63,4 +61,4 @@ Document.defaultProps = {
|
|
|
63
61
|
rootId: 'anansi-root',
|
|
64
62
|
scripts: null
|
|
65
63
|
};
|
|
66
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJidWlsZFBvbGljeSIsIkRvY3VtZW50IiwiYXNzZXRzIiwiaGVhZCIsImNoaWxkcmVuIiwidGl0bGUiLCJyb290SWQiLCJjaGFyU2V0IiwiY3NQb2xpY3kiLCJub25jZSIsInNjcmlwdHMiLCJleHRyYVN0eWxlIiwiY3NwTWV0YSIsInBvbGljeSIsIl9qc3giLCJodHRwRXF1aXYiLCJjb250ZW50IiwibWFwIiwiYXNzZXQiLCJpIiwiUmVhY3QiLCJjcmVhdGVFbGVtZW50Iiwia2V5IiwicmVsIiwiaWQiLCJmaWx0ZXIiLCJocmVmIiwiZW5kc1dpdGgiLCJzcmMiLCJhc3luYyIsImRlZmF1bHRQcm9wcyIsIkZyYWdtZW50IiwibmFtZSIsIl9wcm9jZXNzJGVudiRXRUJQQUNLXyIsInByb2Nlc3MiLCJlbnYiLCJXRUJQQUNLX1BVQkxJQ19QQVRIIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Nwb3V0cy9Eb2N1bWVudENvbXBvbmVudC50c3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBQb2xpY3kgfSBmcm9tICcuL2NzcC5qcyc7XG5pbXBvcnQgeyBidWlsZFBvbGljeSB9IGZyb20gJy4vY3NwLmpzJztcblxudHlwZSBQcm9wcyA9IHtcbiAgY2hpbGRyZW46IFJlYWN0LlJlYWN0Tm9kZTtcbiAgYXNzZXRzOiB7IGhyZWY6IHN0cmluZzsgYXM/OiBzdHJpbmc7IHJlbD86IHN0cmluZyB9W107XG4gIGhlYWQ6IFJlYWN0LlJlYWN0Tm9kZTtcbiAgZXh0cmFTdHlsZTogUmVhY3QuUmVhY3ROb2RlO1xuICBzY3JpcHRzOiBSZWFjdC5SZWFjdE5vZGU7XG4gIHRpdGxlOiBzdHJpbmc7XG4gIHJvb3RJZDogc3RyaW5nO1xuICBjaGFyU2V0OiBzdHJpbmc7XG4gIGNzUG9saWN5PzogUG9saWN5O1xuICBub25jZT86IHN0cmluZyB8IHVuZGVmaW5lZDtcbn07XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIERvY3VtZW50KHtcbiAgYXNzZXRzLFxuICBoZWFkLFxuICBjaGlsZHJlbixcbiAgdGl0bGUsXG4gIHJvb3RJZCxcbiAgY2hhclNldCxcbiAgY3NQb2xpY3ksXG4gIG5vbmNlLFxuICBzY3JpcHRzLFxuICBleHRyYVN0eWxlLFxufTogUHJvcHMpIHtcbiAgbGV0IGNzcE1ldGE6IG51bGwgfCBSZWFjdC5SZWFjdE5vZGUgPSBudWxsO1xuICBpZiAoY3NQb2xpY3kpIHtcbiAgICAvLyBhZGQgbm9uY2UgdG8gcG9saWN5XG4gICAgY29uc3QgcG9saWN5ID0ge1xuICAgICAgLi4uY3NQb2xpY3ksXG4gICAgfTtcbiAgICBpZiAobm9uY2UpIHtcbiAgICAgIGlmICh0eXBlb2YgcG9saWN5WydzY3JpcHQtc3JjJ10gPT09ICdzdHJpbmcnKSB7XG4gICAgICAgIHBvbGljeVsnc2NyaXB0LXNyYyddID0gW3BvbGljeVsnc2NyaXB0LXNyYyddLCBgJ25vbmNlLSR7bm9uY2V9J2BdO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcG9saWN5WydzY3JpcHQtc3JjJ10gPSBbLi4ucG9saWN5WydzY3JpcHQtc3JjJ10sIGAnbm9uY2UtJHtub25jZX0nYF07XG4gICAgICB9XG4gICAgfVxuICAgIGNzcE1ldGEgPSAoXG4gICAgICA8bWV0YSBodHRwRXF1aXY9XCJDb250ZW50LVNlY3VyaXR5LVBvbGljeVwiIGNvbnRlbnQ9e2J1aWxkUG9saWN5KHBvbGljeSl9IC8+XG4gICAgKTtcbiAgfVxuICByZXR1cm4gKFxuICAgIDxodG1sPlxuICAgICAgPGhlYWQ+XG4gICAgICAgIDxtZXRhIGNoYXJTZXQ9e2NoYXJTZXR9IC8+XG4gICAgICAgIHtjc3BNZXRhfVxuICAgICAgICB7aGVhZH1cbiAgICAgICAge2V4dHJhU3R5bGV9XG4gICAgICAgIHthc3NldHMubWFwKChhc3NldCwgaSkgPT4gKFxuICAgICAgICAgIDxsaW5rIGtleT17aX0gcmVsPVwicHJlbG9hZFwiIHsuLi5hc3NldH0gLz5cbiAgICAgICAgKSl9XG4gICAgICAgIDx0aXRsZT57dGl0bGV9PC90aXRsZT5cbiAgICAgIDwvaGVhZD5cbiAgICAgIDxib2R5PlxuICAgICAgICA8ZGl2IGlkPXtyb290SWR9PntjaGlsZHJlbn08L2Rpdj5cbiAgICAgICAge3NjcmlwdHN9XG4gICAgICAgIHthc3NldHNcbiAgICAgICAgICAuZmlsdGVyKCh7IGhyZWYgfSkgPT4gaHJlZi5lbmRzV2l0aCgnLmpzJykpXG4gICAgICAgICAgLm1hcCgoeyBocmVmIH0sIGkpID0+IChcbiAgICAgICAgICAgIDxzY3JpcHQga2V5PXtpfSBzcmM9e2hyZWZ9IGFzeW5jIC8+XG4gICAgICAgICAgKSl9XG4gICAgICA8L2JvZHk+XG4gICAgPC9odG1sPlxuICApO1xufVxuRG9jdW1lbnQuZGVmYXVsdFByb3BzID0ge1xuICBoZWFkOiAoXG4gICAgPD5cbiAgICAgIDxtZXRhIG5hbWU9XCJ2aWV3cG9ydFwiIGNvbnRlbnQ9XCJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MVwiIC8+XG4gICAgICA8bGlua1xuICAgICAgICByZWw9XCJzaG9ydGN1dCBpY29uXCJcbiAgICAgICAgaHJlZj17YCR7cHJvY2Vzcy5lbnYuV0VCUEFDS19QVUJMSUNfUEFUSCA/PyAnLyd9ZmF2aWNvbi5pY29gfVxuICAgICAgLz5cbiAgICA8Lz5cbiAgKSxcbiAgY2hhclNldDogJ3V0Zi04JyxcbiAgcm9vdElkOiAnYW5hbnNpLXJvb3QnLFxuICBzY3JpcHRzOiBudWxsLFxufTtcbiJdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsU0FBU0EsV0FBVyxRQUFRLFVBQVU7QUFldEMsZUFBZSxTQUFTQyxRQUFRQSxDQUFDO0VBQy9CQyxNQUFNO0VBQ05DLElBQUk7RUFDSkMsUUFBUTtFQUNSQyxLQUFLO0VBQ0xDLE1BQU07RUFDTkMsT0FBTztFQUNQQyxRQUFRO0VBQ1JDLEtBQUs7RUFDTEMsT0FBTztFQUNQQztBQUNLLENBQUMsRUFBRTtFQUNSLElBQUlDLE9BQStCLEdBQUcsSUFBSTtFQUMxQyxJQUFJSixRQUFRLEVBQUU7SUFDWjtJQUNBLE1BQU1LLE1BQU0sR0FBRztNQUNiLEdBQUdMO0lBQ0wsQ0FBQztJQUNELElBQUlDLEtBQUssRUFBRTtNQUNULElBQUksT0FBT0ksTUFBTSxDQUFDLFlBQVksQ0FBQyxLQUFLLFFBQVEsRUFBRTtRQUM1Q0EsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUNBLE1BQU0sQ0FBQyxZQUFZLENBQUMsRUFBRyxVQUFTSixLQUFNLEdBQUUsQ0FBQztNQUNuRSxDQUFDLE1BQU07UUFDTEksTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsR0FBR0EsTUFBTSxDQUFDLFlBQVksQ0FBQyxFQUFHLFVBQVNKLEtBQU0sR0FBRSxDQUFDO01BQ3RFO0lBQ0Y7SUFDQUcsT0FBTyxnQkFDTEUsSUFBQTtNQUFNQyxTQUFTLEVBQUMseUJBQXlCO01BQUNDLE9BQU8sRUFBRWhCLFdBQVcsQ0FBQ2EsTUFBTTtJQUFFLEVBQ3hFO0VBQ0g7RUFDQSxvQkFDRUMsSUFBQSxrQ0FDRUEsSUFBQSxrQ0FDRUEsSUFBQTtJQUFNUCxPQUFPLEVBQUVBO0VBQVEsRUFBRyxFQUN6QkssT0FBTyxFQUNQVCxJQUFJLEVBQ0pRLFVBQVUsRUFDVlQsTUFBTSxDQUFDZSxHQUFHLENBQUMsQ0FBQ0MsS0FBSyxFQUFFQyxDQUFDLGtCQUNuQkMsS0FBQSxDQUFBQyxhQUFBO0lBQU1DLEdBQUcsRUFBRUgsQ0FBRTtJQUFDSSxHQUFHLEVBQUMsU0FBUztJQUFBLEdBQUtMO0VBQUssRUFDdEMsQ0FBQyxlQUNGSixJQUFBLHNCQUFRVCxLQUFLLENBQVMsQ0FDakIsZUFDUFMsSUFBQSxrQ0FDRUEsSUFBQTtJQUFLVSxFQUFFLEVBQUVsQjtFQUFPLFdBQUVGLFFBQVEsQ0FBTyxFQUNoQ00sT0FBTyxFQUNQUixNQUFNLENBQ0p1QixNQUFNLENBQUMsQ0FBQztJQUFFQztFQUFLLENBQUMsS0FBS0EsSUFBSSxDQUFDQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FDMUNWLEdBQUcsQ0FBQyxDQUFDO0lBQUVTO0VBQUssQ0FBQyxFQUFFUCxDQUFDLGtCQUNmTCxJQUFBO0lBQWdCYyxHQUFHLEVBQUVGLElBQUs7SUFBQ0csS0FBSztFQUFBLEdBQW5CVixDQUFDLENBQ2YsQ0FBQyxDQUNDLENBQ0Y7QUFFWDtBQUNBbEIsUUFBUSxDQUFDNkIsWUFBWSxHQUFHO0VBQ3RCM0IsSUFBSSxlQUNGaUIsS0FBQSxDQUFBQyxhQUFBLENBQUFELEtBQUEsQ0FBQVcsUUFBQSxxQkFDRWpCLElBQUE7SUFBTWtCLElBQUksRUFBQyxVQUFVO0lBQUNoQixPQUFPLEVBQUM7RUFBcUMsRUFBRyxlQUN0RUYsSUFBQTtJQUNFUyxHQUFHLEVBQUMsZUFBZTtJQUNuQkcsSUFBSSxFQUFHLElBQUFPLHFCQUFBLEdBQUVDLE9BQU8sQ0FBQ0MsR0FBRyxDQUFDQyxtQkFBbUIsWUFBQUgscUJBQUEsR0FBSSxHQUFJO0VBQWEsRUFDN0QsQ0FFTDtFQUNEMUIsT0FBTyxFQUFFLE9BQU87RUFDaEJELE1BQU0sRUFBRSxhQUFhO0VBQ3JCSSxPQUFPLEVBQUU7QUFDWCxDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.server.d.ts","sourceRoot":"","sources":["../../src/spouts/document.server.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"document.server.d.ts","sourceRoot":"","sources":["../../src/spouts/document.server.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,KAAK,UAAU,GAAG;IAChB,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;CAChC,CAAC;AAEF,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;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,CAAC,CA6E5E"}
|
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import Document from './DocumentComponent.js';
|
|
3
3
|
export default function DocumentSpout(options) {
|
|
4
4
|
return next => async props => {
|
|
5
|
-
var _props$clientManifest, _props$clientManifest2, _props$clientManifest3, _props$clientManifest4, _props$clientManifest5, _nextProps$title;
|
|
5
|
+
var _props$clientManifest, _props$clientManifest2, _props$clientManifest3, _props$clientManifest4, _props$clientManifest5, _props$req, _nextProps$title;
|
|
6
6
|
const nextProps = await next(props);
|
|
7
7
|
const publicPath = props.clientManifest.publicPath;
|
|
8
8
|
if (Object.keys((_props$clientManifest = (_props$clientManifest2 = props.clientManifest) == null ? void 0 : _props$clientManifest2.entrypoints) != null ? _props$clientManifest : {}).length < 1 || publicPath === undefined) throw new Error('Manifest missing entries needed');
|
|
@@ -36,6 +36,9 @@ export default function DocumentSpout(options) {
|
|
|
36
36
|
} : {
|
|
37
37
|
href: asset
|
|
38
38
|
});
|
|
39
|
+
const nonce =
|
|
40
|
+
// nonces negate 'unsafe-inline' so do not add it in development to keep things easier
|
|
41
|
+
props.nonce && (process.env.NODE_ENV === 'production' || ((_props$req = props.req) == null ? void 0 : _props$req.protocol) !== 'http') ? props.nonce : undefined;
|
|
39
42
|
return {
|
|
40
43
|
...nextProps,
|
|
41
44
|
app: /*#__PURE__*/React.createElement(Document, {
|
|
@@ -44,7 +47,7 @@ export default function DocumentSpout(options) {
|
|
|
44
47
|
title: (_nextProps$title = nextProps.title) != null ? _nextProps$title : options.title,
|
|
45
48
|
assets: assets,
|
|
46
49
|
rootId: options.rootId,
|
|
47
|
-
nonce:
|
|
50
|
+
nonce: nonce,
|
|
48
51
|
csPolicy: options.csPolicy,
|
|
49
52
|
scripts: nextProps.scripts
|
|
50
53
|
}, nextProps.app)
|
|
@@ -57,4 +60,4 @@ function childrenAssets(chunk) {
|
|
|
57
60
|
return (_c$assets = c.assets) != null ? _c$assets : [];
|
|
58
61
|
})) : [];
|
|
59
62
|
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["React","Document","DocumentSpout","options","next","props","_props$clientManifest","_props$clientManifest2","_props$clientManifest3","_props$clientManifest4","_props$clientManifest5","_props$req","_nextProps$title","nextProps","publicPath","clientManifest","Object","keys","entrypoints","length","undefined","Error","assetMap","assets","map","name","assetList","values","forEach","entrypoint","_entrypoint$assets","push","Set","namedChunkGroups","filter","matchedRoutes","some","route","includes","flatMap","chunk","_chunk$assets","childrenAssets","asset","endsWith","href","rel","as","nonce","process","env","NODE_ENV","req","protocol","app","createElement","extraStyle","title","rootId","csPolicy","scripts","children","preload","c","_c$assets"],"sources":["../../src/spouts/document.server.tsx"],"sourcesContent":["import type { Route } from '@anansi/router';\nimport { Request } from 'express';\nimport React from 'react';\nimport { StatsChunkGroup } from 'webpack';\n\nimport type { Policy } from './csp.js';\nimport Document from './DocumentComponent.js';\nimport type { ServerSpout } from './types.js';\n\ntype NeededNext = {\n  matchedRoutes: Route<any>[];\n  title?: string;\n  scripts?: React.ReactNode[];\n  extraStyle?: React.ReactNode[];\n};\n\nexport default function DocumentSpout(options: {\n  head?: React.ReactNode;\n  title: string;\n  rootId?: string;\n  charSet?: string;\n  csPolicy?: Policy;\n}): ServerSpout<Record<string, unknown>, Record<string, unknown>, NeededNext> {\n  return next => async props => {\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    const nonce =\n      // nonces negate 'unsafe-inline' so do not add it in development to keep things easier\n      props.nonce &&\n      (process.env.NODE_ENV === 'production' ||\n        (props.req as Request)?.protocol !== 'http')\n        ? props.nonce\n        : undefined;\n\n    return {\n      ...nextProps,\n      app: (\n        <Document\n          {...options}\n          extraStyle={nextProps.extraStyle}\n          title={nextProps.title ?? options.title}\n          assets={assets}\n          rootId={options.rootId}\n          nonce={nonce}\n          csPolicy={options.csPolicy}\n          scripts={nextProps.scripts}\n        >\n          {nextProps.app}\n        </Document>\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"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@anansi/core",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.8",
|
|
4
4
|
"description": "React 18 Framework",
|
|
5
5
|
"homepage": "https://github.com/ntucker/anansi/tree/master/packages/core#readme",
|
|
6
6
|
"repository": {
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"devDependencies": {
|
|
69
69
|
"@anansi/babel-preset": "3.4.2",
|
|
70
70
|
"@anansi/browserslist-config": "1.4.1",
|
|
71
|
-
"@anansi/webpack-config": "14.2.
|
|
71
|
+
"@anansi/webpack-config": "14.2.1",
|
|
72
72
|
"@babel/cli": "7.21.0",
|
|
73
73
|
"@babel/core": "7.21.0",
|
|
74
74
|
"@types/compression": "1.7.2",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"webpack-cli": "5.0.1"
|
|
82
82
|
},
|
|
83
83
|
"dependencies": {
|
|
84
|
-
"@anansi/router": "^0.7.
|
|
84
|
+
"@anansi/router": "^0.7.17",
|
|
85
85
|
"@babel/runtime": "^7.17.0",
|
|
86
86
|
"@rest-hooks/ssr": "^0.7.9",
|
|
87
87
|
"chalk": "^4.1.2",
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
"build": "yarn run build:lib && yarn build:scripts && yarn run build:bundle",
|
|
139
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
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=
|
|
141
|
+
"build:bundle": "BROWSERSLIST_ENV=node12 webpack --mode=none --target=node && echo '{\"type\":\"commonjs\"}' > dist/package.json",
|
|
142
142
|
"build:clean": "rimraf lib dist ts3.4 legacy *.tsbuildinfo",
|
|
143
143
|
"prepack": "yarn build"
|
|
144
144
|
}
|
|
@@ -32,11 +32,7 @@ export default function Document({
|
|
|
32
32
|
const policy = {
|
|
33
33
|
...csPolicy,
|
|
34
34
|
};
|
|
35
|
-
if (
|
|
36
|
-
nonce &&
|
|
37
|
-
// nonces negate 'unsafe-inline' so do not add it in development to keep things easier
|
|
38
|
-
process.env.NODE_ENV === 'production'
|
|
39
|
-
) {
|
|
35
|
+
if (nonce) {
|
|
40
36
|
if (typeof policy['script-src'] === 'string') {
|
|
41
37
|
policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];
|
|
42
38
|
} else {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Route } from '@anansi/router';
|
|
2
|
+
import { Request } from 'express';
|
|
2
3
|
import React from 'react';
|
|
3
4
|
import { StatsChunkGroup } from 'webpack';
|
|
4
5
|
|
|
@@ -70,6 +71,13 @@ export default function DocumentSpout(options: {
|
|
|
70
71
|
? { href: asset, as: 'script' }
|
|
71
72
|
: { href: asset },
|
|
72
73
|
);
|
|
74
|
+
const nonce =
|
|
75
|
+
// nonces negate 'unsafe-inline' so do not add it in development to keep things easier
|
|
76
|
+
props.nonce &&
|
|
77
|
+
(process.env.NODE_ENV === 'production' ||
|
|
78
|
+
(props.req as Request)?.protocol !== 'http')
|
|
79
|
+
? props.nonce
|
|
80
|
+
: undefined;
|
|
73
81
|
|
|
74
82
|
return {
|
|
75
83
|
...nextProps,
|
|
@@ -80,7 +88,7 @@ export default function DocumentSpout(options: {
|
|
|
80
88
|
title={nextProps.title ?? options.title}
|
|
81
89
|
assets={assets}
|
|
82
90
|
rootId={options.rootId}
|
|
83
|
-
nonce={
|
|
91
|
+
nonce={nonce}
|
|
84
92
|
csPolicy={options.csPolicy}
|
|
85
93
|
scripts={nextProps.scripts}
|
|
86
94
|
>
|