@tramvai/module-render 1.105.6 → 1.109.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.
Files changed (6) hide show
  1. package/lib/browser.js +6 -6
  2. package/lib/client/index.d.ts +1 -3
  3. package/lib/react/index.d.ts +1 -2
  4. package/lib/server.es.js +9 -8
  5. package/lib/server.js +9 -8
  6. package/package.json +15 -15
package/lib/browser.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { __decorate } from 'tslib';
2
2
  import { Module, provide, commandLineListTokens, DI_TOKEN } from '@tramvai/core';
3
- import { COMBINE_REDUCERS, STORE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN, INITIAL_APP_STATE_TOKEN } from '@tramvai/tokens-common';
3
+ import { COMBINE_REDUCERS, STORE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/tokens-common';
4
4
  import { DEFAULT_LAYOUT_COMPONENT, LAYOUT_OPTIONS, DEFAULT_FOOTER_COMPONENT, DEFAULT_HEADER_COMPONENT, TRAMVAI_RENDER_MODE, RESOURCES_REGISTRY, CUSTOM_RENDER, EXTEND_RENDER, RENDERER_CALLBACK, USE_REACT_STRICT_MODE, RENDER_MODE } from '@tramvai/tokens-render';
5
5
  export * from '@tramvai/tokens-render';
6
6
  import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
@@ -65,8 +65,9 @@ const PageErrorBoundary = (props) => {
65
65
  return (jsx(UniversalErrorBoundary, Object.assign({ url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, { children: children }), void 0));
66
66
  };
67
67
 
68
- function renderReact({ pageService, di, initialState }, context) {
69
- return (jsx(Provider, Object.assign({ context: context, serverState: initialState && context.getState() }, { children: jsx(DIContext.Provider, Object.assign({ value: di }, { children: jsx(PageErrorBoundary, Object.assign({ pageService: pageService }, { children: jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0) }), void 0));
68
+ function renderReact({ pageService, di }, context) {
69
+ const serverState = typeof window !== 'undefined' ? context.getState() : undefined;
70
+ return (jsx(Provider, Object.assign({ context: context, serverState: serverState }, { children: jsx(DIContext.Provider, Object.assign({ value: di }, { children: jsx(PageErrorBoundary, Object.assign({ pageService: pageService }, { children: jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0) }), void 0));
70
71
  }
71
72
 
72
73
  let hydrateRoot;
@@ -97,9 +98,9 @@ const renderer = ({ element, container, callback, log }) => {
97
98
  return hydrate(element, container, callback);
98
99
  };
99
100
 
100
- function rendering({ pageService, log, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, initialState, }) {
101
+ function rendering({ pageService, log, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, }) {
101
102
  return new Promise((resolve, reject) => {
102
- let renderResult = renderReact({ pageService, di, initialState }, consumerContext);
103
+ let renderResult = renderReact({ pageService, di }, consumerContext);
103
104
  if (extendRender) {
104
105
  each((render) => {
105
106
  renderResult = render(renderResult);
@@ -253,7 +254,6 @@ RenderModule = RenderModule_1 = __decorate([
253
254
  consumerContext: CONTEXT_TOKEN,
254
255
  di: DI_TOKEN,
255
256
  useStrictMode: USE_REACT_STRICT_MODE,
256
- initialState: INITIAL_APP_STATE_TOKEN,
257
257
  },
258
258
  multi: true,
259
259
  }),
package/lib/client/index.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import type { EXTEND_RENDER, RENDERER_CALLBACK, USE_REACT_STRICT_MODE } from '@tramvai/tokens-render';
2
2
  import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
3
- import type { INITIAL_APP_STATE_TOKEN } from '@tramvai/tokens-common';
4
- export declare function rendering({ pageService, log, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, initialState, }: {
3
+ export declare function rendering({ pageService, log, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, }: {
5
4
  pageService: typeof PAGE_SERVICE_TOKEN;
6
5
  log: any;
7
6
  consumerContext: any;
@@ -10,5 +9,4 @@ export declare function rendering({ pageService, log, consumerContext, customRen
10
9
  di: any;
11
10
  useStrictMode: typeof USE_REACT_STRICT_MODE;
12
11
  rendererCallback?: typeof RENDERER_CALLBACK;
13
- initialState?: typeof INITIAL_APP_STATE_TOKEN;
14
12
  }): Promise<void>;
package/lib/react/index.d.ts CHANGED
@@ -1,5 +1,4 @@
1
- export declare function renderReact({ pageService, di, initialState }: {
1
+ export declare function renderReact({ pageService, di }: {
2
2
  pageService: any;
3
3
  di: any;
4
- initialState: any;
5
4
  }, context: any): JSX.Element;
package/lib/server.es.js CHANGED
@@ -667,8 +667,9 @@ const PageErrorBoundary = (props) => {
667
667
  return (jsx(UniversalErrorBoundary, Object.assign({ url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, { children: children }), void 0));
668
668
  };
669
669
 
670
- function renderReact({ pageService, di, initialState }, context) {
671
- return (jsx(Provider, Object.assign({ context: context, serverState: initialState && context.getState() }, { children: jsx(DIContext.Provider, Object.assign({ value: di }, { children: jsx(PageErrorBoundary, Object.assign({ pageService: pageService }, { children: jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0) }), void 0));
670
+ function renderReact({ pageService, di }, context) {
671
+ const serverState = typeof window !== 'undefined' ? context.getState() : undefined;
672
+ return (jsx(Provider, Object.assign({ context: context, serverState: serverState }, { children: jsx(DIContext.Provider, Object.assign({ value: di }, { children: jsx(PageErrorBoundary, Object.assign({ pageService: pageService }, { children: jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0) }), void 0));
672
673
  }
673
674
 
674
675
  class ReactRenderServer {
@@ -681,7 +682,7 @@ class ReactRenderServer {
681
682
  }
682
683
  render(extractor) {
683
684
  var _a;
684
- let renderResult = renderReact({ pageService: this.pageService, di: this.di, initialState: null }, this.context);
685
+ let renderResult = renderReact({ pageService: this.pageService, di: this.di }, this.context);
685
686
  each((render) => {
686
687
  renderResult = render(renderResult);
687
688
  }, (_a = this.extendRender) !== null && _a !== void 0 ? _a : []);
@@ -769,10 +770,10 @@ RenderModule = RenderModule_1 = __decorate([
769
770
  useFactory: ({ createCache }) => {
770
771
  const thirtyMinutes = 1000 * 60 * 30;
771
772
  return {
772
- filesCache: createCache('memory', { max: 50, maxAge: thirtyMinutes }),
773
- sizeCache: createCache('memory', { max: 100, maxAge: thirtyMinutes }),
774
- requestsCache: createCache('memory', { max: 150, maxAge: 1000 * 60 * 5 }),
775
- disabledUrlsCache: createCache('memory', { max: 150, maxAge: 1000 * 60 * 5 }),
773
+ filesCache: createCache('memory', { max: 50, ttl: thirtyMinutes }),
774
+ sizeCache: createCache('memory', { max: 100, ttl: thirtyMinutes }),
775
+ requestsCache: createCache('memory', { max: 150, ttl: 1000 * 60 * 5 }),
776
+ disabledUrlsCache: createCache('memory', { max: 150, ttl: 1000 * 60 * 5 }),
776
777
  };
777
778
  },
778
779
  deps: {
@@ -946,7 +947,7 @@ RenderModule = RenderModule_1 = __decorate([
946
947
  provide: 'modernSatisfiesLruCache',
947
948
  scope: Scope.SINGLETON,
948
949
  useFactory: ({ createCache }) => {
949
- return createCache('modernSatisfies', { max: 50 });
950
+ return createCache('memory', { max: 50 });
950
951
  },
951
952
  deps: {
952
953
  createCache: CREATE_CACHE_TOKEN,
package/lib/server.js CHANGED
@@ -703,8 +703,9 @@ const PageErrorBoundary = (props) => {
703
703
  return (jsxRuntime.jsx(react$1.UniversalErrorBoundary, Object.assign({ url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, { children: children }), void 0));
704
704
  };
705
705
 
706
- function renderReact({ pageService, di, initialState }, context) {
707
- return (jsxRuntime.jsx(state.Provider, Object.assign({ context: context, serverState: initialState && context.getState() }, { children: jsxRuntime.jsx(react$1.DIContext.Provider, Object.assign({ value: di }, { children: jsxRuntime.jsx(PageErrorBoundary, Object.assign({ pageService: pageService }, { children: jsxRuntime.jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0) }), void 0));
706
+ function renderReact({ pageService, di }, context) {
707
+ const serverState = typeof window !== 'undefined' ? context.getState() : undefined;
708
+ return (jsxRuntime.jsx(state.Provider, Object.assign({ context: context, serverState: serverState }, { children: jsxRuntime.jsx(react$1.DIContext.Provider, Object.assign({ value: di }, { children: jsxRuntime.jsx(PageErrorBoundary, Object.assign({ pageService: pageService }, { children: jsxRuntime.jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0) }), void 0));
708
709
  }
709
710
 
710
711
  class ReactRenderServer {
@@ -717,7 +718,7 @@ class ReactRenderServer {
717
718
  }
718
719
  render(extractor) {
719
720
  var _a;
720
- let renderResult = renderReact({ pageService: this.pageService, di: this.di, initialState: null }, this.context);
721
+ let renderResult = renderReact({ pageService: this.pageService, di: this.di }, this.context);
721
722
  each__default["default"]((render) => {
722
723
  renderResult = render(renderResult);
723
724
  }, (_a = this.extendRender) !== null && _a !== void 0 ? _a : []);
@@ -805,10 +806,10 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
805
806
  useFactory: ({ createCache }) => {
806
807
  const thirtyMinutes = 1000 * 60 * 30;
807
808
  return {
808
- filesCache: createCache('memory', { max: 50, maxAge: thirtyMinutes }),
809
- sizeCache: createCache('memory', { max: 100, maxAge: thirtyMinutes }),
810
- requestsCache: createCache('memory', { max: 150, maxAge: 1000 * 60 * 5 }),
811
- disabledUrlsCache: createCache('memory', { max: 150, maxAge: 1000 * 60 * 5 }),
809
+ filesCache: createCache('memory', { max: 50, ttl: thirtyMinutes }),
810
+ sizeCache: createCache('memory', { max: 100, ttl: thirtyMinutes }),
811
+ requestsCache: createCache('memory', { max: 150, ttl: 1000 * 60 * 5 }),
812
+ disabledUrlsCache: createCache('memory', { max: 150, ttl: 1000 * 60 * 5 }),
812
813
  };
813
814
  },
814
815
  deps: {
@@ -982,7 +983,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
982
983
  provide: 'modernSatisfiesLruCache',
983
984
  scope: dippy.Scope.SINGLETON,
984
985
  useFactory: ({ createCache }) => {
985
- return createCache('modernSatisfies', { max: 50 });
986
+ return createCache('memory', { max: 50 });
986
987
  },
987
988
  deps: {
988
989
  createCache: moduleCommon.CREATE_CACHE_TOKEN,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-render",
3
- "version": "1.105.6",
3
+ "version": "1.109.0",
4
4
  "description": "",
5
5
  "browser": "lib/browser.js",
6
6
  "main": "lib/server.js",
@@ -24,13 +24,13 @@
24
24
  "@tinkoff/htmlpagebuilder": "0.4.23",
25
25
  "@tinkoff/layout-factory": "0.2.30",
26
26
  "@tinkoff/url": "0.7.38",
27
- "@tinkoff/user-agent": "0.3.360",
28
- "@tramvai/module-client-hints": "1.105.6",
29
- "@tramvai/module-router": "1.105.6",
30
- "@tramvai/react": "1.105.6",
27
+ "@tinkoff/user-agent": "0.3.373",
28
+ "@tramvai/module-client-hints": "1.109.0",
29
+ "@tramvai/module-router": "1.109.0",
30
+ "@tramvai/react": "1.109.0",
31
31
  "@tramvai/safe-strings": "0.4.4",
32
- "@tramvai/tokens-render": "1.105.6",
33
- "@tramvai/experiments": "1.105.6",
32
+ "@tramvai/tokens-render": "1.109.0",
33
+ "@tramvai/experiments": "1.109.0",
34
34
  "@types/loadable__server": "^5.12.6",
35
35
  "node-fetch": "^2.6.1"
36
36
  },
@@ -38,14 +38,14 @@
38
38
  "@tinkoff/dippy": "0.7.41",
39
39
  "@tinkoff/utils": "^2.1.2",
40
40
  "@tinkoff/react-hooks": "0.0.26",
41
- "@tramvai/cli": "1.105.6",
42
- "@tramvai/core": "1.105.6",
43
- "@tramvai/module-common": "1.105.6",
44
- "@tramvai/state": "1.105.6",
45
- "@tramvai/test-helpers": "1.105.6",
46
- "@tramvai/tokens-common": "1.105.6",
47
- "@tramvai/tokens-router": "1.105.6",
48
- "@tramvai/tokens-server-private": "1.105.6",
41
+ "@tramvai/cli": "1.109.0",
42
+ "@tramvai/core": "1.109.0",
43
+ "@tramvai/module-common": "1.109.0",
44
+ "@tramvai/state": "1.109.0",
45
+ "@tramvai/test-helpers": "1.109.0",
46
+ "@tramvai/tokens-common": "1.109.0",
47
+ "@tramvai/tokens-router": "1.109.0",
48
+ "@tramvai/tokens-server-private": "1.109.0",
49
49
  "express": "^4.17.1",
50
50
  "prop-types": "^15.6.2",
51
51
  "react": ">=16.14.0",