@plurid/plurid-react-server 0.0.0-6 → 0.0.0-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.
Files changed (4) hide show
  1. package/distribution/index.es.js +2 -2
  2. package/distribution/index.js +2 -2
  3. package/distribution/objects/Server/index.d.ts +1 -1
  4. package/package.json +5 -5
package/distribution/index.es.js CHANGED
@@ -724,8 +724,9 @@ class PluridServer {
724
724
  renderApplication(isoMatch, preserveResult, matchedPlane) {
725
725
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
726
726
  return __awaiter(this, void 0, void 0, (function*() {
727
+ const globals = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.globals;
727
728
  const mergedHtmlLanguage = ((_a = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _a === void 0 ? void 0 : _a.htmlLanguage) || ((_b = this.template) === null || _b === void 0 ? void 0 : _b.htmlLanguage);
728
- const pluridMetastate = serverComputeMetastate(isoMatch, this.routes);
729
+ const pluridMetastate = serverComputeMetastate(isoMatch, this.routes, globals);
729
730
  const {content: content, styles: styles} = yield this.getContentAndStyles(isoMatch, pluridMetastate, preserveResult, matchedPlane);
730
731
  const stringedStyles = this.styles.reduce(((accumulator, style) => accumulator + style), "");
731
732
  const preserveStyles = ((_d = (_c = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _c === void 0 ? void 0 : _c.styles) === null || _d === void 0 ? void 0 : _d.join(" ")) || "";
@@ -741,7 +742,6 @@ class PluridServer {
741
742
  const mergedHeadScripts = [ ...headScripts, ...((_j = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _j === void 0 ? void 0 : _j.headScripts) || [] ];
742
743
  const bodyScripts = ((_k = this.template) === null || _k === void 0 ? void 0 : _k.bodyScripts) || [];
743
744
  const mergedBodyScripts = [ ...bodyScripts, ...((_l = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _l === void 0 ? void 0 : _l.bodyScripts) || [] ];
744
- const globals = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.globals;
745
745
  const renderer = new PluridRenderer({
746
746
  htmlLanguage: mergedHtmlLanguage,
747
747
  head: head,
package/distribution/index.js CHANGED
@@ -776,8 +776,9 @@ class PluridServer {
776
776
  renderApplication(isoMatch, preserveResult, matchedPlane) {
777
777
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
778
778
  return __awaiter(this, void 0, void 0, (function*() {
779
+ const globals = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.globals;
779
780
  const mergedHtmlLanguage = ((_a = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _a === void 0 ? void 0 : _a.htmlLanguage) || ((_b = this.template) === null || _b === void 0 ? void 0 : _b.htmlLanguage);
780
- const pluridMetastate = pluridReact.serverComputeMetastate(isoMatch, this.routes);
781
+ const pluridMetastate = pluridReact.serverComputeMetastate(isoMatch, this.routes, globals);
781
782
  const {content: content, styles: styles} = yield this.getContentAndStyles(isoMatch, pluridMetastate, preserveResult, matchedPlane);
782
783
  const stringedStyles = this.styles.reduce(((accumulator, style) => accumulator + style), "");
783
784
  const preserveStyles = ((_d = (_c = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _c === void 0 ? void 0 : _c.styles) === null || _d === void 0 ? void 0 : _d.join(" ")) || "";
@@ -793,7 +794,6 @@ class PluridServer {
793
794
  const mergedHeadScripts = [ ...headScripts, ...((_j = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _j === void 0 ? void 0 : _j.headScripts) || [] ];
794
795
  const bodyScripts = ((_k = this.template) === null || _k === void 0 ? void 0 : _k.bodyScripts) || [];
795
796
  const mergedBodyScripts = [ ...bodyScripts, ...((_l = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _l === void 0 ? void 0 : _l.bodyScripts) || [] ];
796
- const globals = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.globals;
797
797
  const renderer = new PluridRenderer({
798
798
  htmlLanguage: mergedHtmlLanguage,
799
799
  head: head,
package/distribution/objects/Server/index.d.ts CHANGED
@@ -25,7 +25,7 @@ declare class PluridServer {
25
25
  private isoMatcher;
26
26
  constructor(configuration: PluridServerConfiguration);
27
27
  static analysis(pluridServer: PluridServer): {
28
- routes: PluridRoute<PluridReactComponent<any, import("@plurid/plurid-data").PluridPlaneComponentProperty | import("@plurid/plurid-data").PluridRouteComponentProperty>>[];
28
+ routes: PluridRoute<PluridReactComponent<any, import("@plurid/plurid-data").PluridPlaneComponentProperty | import("@plurid/plurid-data").PluridRouteComponentProperty>, any>[];
29
29
  options: PluridServerOptions;
30
30
  };
31
31
  start(port?: string | number): Server;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@plurid/plurid-react-server",
3
- "version": "0.0.0-6",
3
+ "version": "0.0.0-7",
4
4
  "description": "React implementation of Plurid to view and explore the web in three dimensions with server-side rendering",
5
5
  "keywords": [
6
6
  "plurid",
@@ -79,13 +79,13 @@
79
79
  "@babel/core": "^7.17.9",
80
80
  "@plurid/elementql": "^0.0.0-1",
81
81
  "@plurid/elementql-client-react": "^0.0.0-1",
82
- "@plurid/plurid-data": "0.0.0-12",
83
- "@plurid/plurid-engine": "0.0.0-10",
82
+ "@plurid/plurid-data": "0.0.0-13",
83
+ "@plurid/plurid-engine": "0.0.0-11",
84
84
  "@plurid/plurid-functions": "0.0.0-22",
85
85
  "@plurid/plurid-functions-react": "0.0.0-5",
86
86
  "@plurid/plurid-icons-react": "0.0.0-3",
87
87
  "@plurid/plurid-pubsub": "0.0.0-6",
88
- "@plurid/plurid-react": "0.0.0-18",
88
+ "@plurid/plurid-react": "0.0.0-19",
89
89
  "@plurid/plurid-themes": "0.0.0-2",
90
90
  "@plurid/plurid-ui-components-react": "0.0.0-11",
91
91
  "@plurid/plurid-ui-state-react": "0.0.0-2",
@@ -115,7 +115,7 @@
115
115
  "react": "^18.0.0",
116
116
  "react-dom": "^18.0.0",
117
117
  "react-helmet-async": "^1.3.0",
118
- "react-redux": "^7.2.8",
118
+ "react-redux": "^8.0.0",
119
119
  "redux": "^4.1.2",
120
120
  "redux-thunk": "^2.4.1",
121
121
  "rollup": "^2.70.2",