@tramvai/module-render 1.85.0 → 1.89.1

package/lib/browser.js

@@ -1,17 +1,17 @@
 import { __decorate } from 'tslib';
 import { Module, provide, commandLineListTokens, DI_TOKEN } from '@tramvai/core';
-import { STORE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/module-common';
+import { COMBINE_REDUCERS, STORE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN, INITIAL_APP_STATE_TOKEN } from '@tramvai/tokens-common';
 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';
 export * from '@tramvai/tokens-render';
 import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import each from '@tinkoff/utils/array/each';
-import React, { PureComponent, useMemo, createElement, StrictMode } from 'react';
+import { PureComponent, useMemo, createElement, StrictMode } from 'react';
+import { jsx } from 'react/jsx-runtime';
 import { createEvent, createReducer, useStore, Provider } from '@tramvai/state';
 import { useDi, ERROR_BOUNDARY_TOKEN, ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, UniversalErrorBoundary, DIContext } from '@tramvai/react';
 import { useRoute, useUrl } from '@tramvai/module-router';
 import { useIsomorphicLayoutEffect } from '@tinkoff/react-hooks';
 import { composeLayoutOptions, createLayout } from '@tinkoff/layout-factory';
-import { COMBINE_REDUCERS } from '@tramvai/tokens-common';
 
 function serializeError(error) {
     return {
@@ -38,14 +38,12 @@ const PageErrorBoundary = (props) => {
     }, [serializedError]);
     const errorHandlers = useDi({ token: ERROR_BOUNDARY_TOKEN, optional: true });
     const fallbackFromDi = useDi({ token: ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, optional: true });
-    return (React.createElement(UniversalErrorBoundary, { url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, children));
+    return (jsx(UniversalErrorBoundary, Object.assign({ url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, { children: children }), void 0));
 };
 class RootComponent extends PureComponent {
     render() {
         const { LayoutComponent, PageComponent, HeaderComponent, FooterComponent, ErrorBoundaryComponent, } = this.props;
-        return (React.createElement(LayoutComponent, { Header: HeaderComponent, Footer: FooterComponent },
-            React.createElement(PageErrorBoundary, { fallback: ErrorBoundaryComponent },
-                React.createElement(PageComponent, null))));
+        return (jsx(LayoutComponent, Object.assign({ Header: HeaderComponent, Footer: FooterComponent }, { children: jsx(PageErrorBoundary, Object.assign({ fallback: ErrorBoundaryComponent }, { children: jsx(PageComponent, {}, void 0) }), void 0) }), void 0));
     }
 }
 const Root = ({ pageService }) => {
@@ -63,26 +61,28 @@ const Root = ({ pageService }) => {
     const HeaderComponent = pageService.resolveComponentFromConfig('header');
     const FooterComponent = pageService.resolveComponentFromConfig('footer');
     const ErrorBoundaryComponent = pageService.resolveComponentFromConfig('errorBoundary');
-    return (React.createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }));
+    return (jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }, void 0));
 };
 
-function renderReact({ pageService, di }, context) {
-    return (React.createElement(Provider, { context: context },
-        React.createElement(DIContext.Provider, { value: di },
-            React.createElement(Root, { pageService: pageService }))));
+function renderReact({ pageService, di, initialState }, context) {
+    return (jsx(Provider, Object.assign({ context: context, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.stores }, { children: jsx(DIContext.Provider, Object.assign({ value: di }, { children: jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0));
 }
 
-const ExecuteRenderCallback = ({ children, callback }) => {
+let hydrateRoot;
+try {
+    // eslint-disable-next-line import/no-unresolved, import/extensions
+    hydrateRoot = require('react-dom/client').hydrateRoot;
+}
+catch { }
+const ExecuteRenderCallback = ({ children, callback, }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     useIsomorphicLayoutEffect(callback, []);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return children;
 };
 const renderer = ({ element, container, callback, log }) => {
-    if (process.env.__TRAMVAI_CONCURRENT_FEATURES) {
+    if (process.env.__TRAMVAI_CONCURRENT_FEATURES !== 'false' && typeof hydrateRoot === 'function') {
         const wrappedElement = createElement(ExecuteRenderCallback, { callback }, element);
-        // eslint-disable-next-line import/no-unresolved, import/extensions
-        const { hydrateRoot } = require('react-dom/client');
         return hydrateRoot(container, wrappedElement, {
             onRecoverableError: (error) => {
                 log.error({
@@ -96,9 +96,9 @@ const renderer = ({ element, container, callback, log }) => {
     return hydrate(element, container, callback);
 };
 
-function rendering({ pageService, log, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, }) {
+function rendering({ pageService, log, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, initialState, }) {
     return new Promise((resolve, reject) => {
-        let renderResult = renderReact({ pageService, di }, consumerContext);
+        let renderResult = renderReact({ pageService, di, initialState }, consumerContext);
         if (extendRender) {
             each((render) => {
                 renderResult = render(renderResult);
@@ -252,6 +252,7 @@ RenderModule = RenderModule_1 = __decorate([
                     consumerContext: CONTEXT_TOKEN,
                     di: DI_TOKEN,
                     useStrictMode: USE_REACT_STRICT_MODE,
+                    initialState: INITIAL_APP_STATE_TOKEN,
                 },
                 multi: true,
             }),

package/lib/client/index.d.ts

@@ -1,6 +1,7 @@
 import type { EXTEND_RENDER, RENDERER_CALLBACK, USE_REACT_STRICT_MODE } from '@tramvai/tokens-render';
 import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
-export declare function rendering({ pageService, log, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, }: {
+import type { INITIAL_APP_STATE_TOKEN } from '@tramvai/tokens-common';
+export declare function rendering({ pageService, log, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, initialState, }: {
     pageService: typeof PAGE_SERVICE_TOKEN;
     log: any;
     consumerContext: any;
@@ -9,4 +10,5 @@ export declare function rendering({ pageService, log, consumerContext, customRen
     di: any;
     useStrictMode: typeof USE_REACT_STRICT_MODE;
     rendererCallback?: typeof RENDERER_CALLBACK;
+    initialState?: typeof INITIAL_APP_STATE_TOKEN;
 }): Promise<void>;

package/lib/react/index.d.ts

@@ -1,4 +1,5 @@
-export declare function renderReact({ pageService, di }: {
+export declare function renderReact({ pageService, di, initialState }: {
     pageService: any;
     di: any;
+    initialState: any;
 }, context: any): JSX.Element;

package/lib/server.es.js

@@ -1,5 +1,5 @@
 import { __decorate } from 'tslib';
-import React, { PureComponent, useMemo, createElement } from 'react';
+import { PureComponent, useMemo, createElement } from 'react';
 import { renderToString } from 'react-dom/server';
 import { Module, provide, commandLineListTokens, DI_TOKEN } from '@tramvai/core';
 import { CREATE_CACHE_TOKEN, LOGGER_TOKEN, REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/module-common';
@@ -29,6 +29,7 @@ import * as path from 'path';
 import each from '@tinkoff/utils/array/each';
 import path$1 from '@tinkoff/utils/object/path';
 import { o as onload } from './server_inline.inline.es.js';
+import { jsx } from 'react/jsx-runtime';
 import { createEvent, createReducer, useStore, Provider } from '@tramvai/state';
 import { useRoute, useUrl } from '@tramvai/module-router';
 import { composeLayoutOptions, createLayout } from '@tinkoff/layout-factory';
@@ -625,14 +626,12 @@ const PageErrorBoundary = (props) => {
     }, [serializedError]);
     const errorHandlers = useDi({ token: ERROR_BOUNDARY_TOKEN, optional: true });
     const fallbackFromDi = useDi({ token: ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, optional: true });
-    return (React.createElement(UniversalErrorBoundary, { url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, children));
+    return (jsx(UniversalErrorBoundary, Object.assign({ url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, { children: children }), void 0));
 };
 class RootComponent extends PureComponent {
     render() {
         const { LayoutComponent, PageComponent, HeaderComponent, FooterComponent, ErrorBoundaryComponent, } = this.props;
-        return (React.createElement(LayoutComponent, { Header: HeaderComponent, Footer: FooterComponent },
-            React.createElement(PageErrorBoundary, { fallback: ErrorBoundaryComponent },
-                React.createElement(PageComponent, null))));
+        return (jsx(LayoutComponent, Object.assign({ Header: HeaderComponent, Footer: FooterComponent }, { children: jsx(PageErrorBoundary, Object.assign({ fallback: ErrorBoundaryComponent }, { children: jsx(PageComponent, {}, void 0) }), void 0) }), void 0));
     }
 }
 const Root = ({ pageService }) => {
@@ -650,13 +649,11 @@ const Root = ({ pageService }) => {
     const HeaderComponent = pageService.resolveComponentFromConfig('header');
     const FooterComponent = pageService.resolveComponentFromConfig('footer');
     const ErrorBoundaryComponent = pageService.resolveComponentFromConfig('errorBoundary');
-    return (React.createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }));
+    return (jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }, void 0));
 };
 
-function renderReact({ pageService, di }, context) {
-    return (React.createElement(Provider, { context: context },
-        React.createElement(DIContext.Provider, { value: di },
-            React.createElement(Root, { pageService: pageService }))));
+function renderReact({ pageService, di, initialState }, context) {
+    return (jsx(Provider, Object.assign({ context: context, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.stores }, { children: jsx(DIContext.Provider, Object.assign({ value: di }, { children: jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0));
 }
 
 class ReactRenderServer {
@@ -669,7 +666,7 @@ class ReactRenderServer {
     }
     render(extractor) {
         var _a;
-        let renderResult = renderReact({ pageService: this.pageService, di: this.di }, this.context);
+        let renderResult = renderReact({ pageService: this.pageService, di: this.di, initialState: null }, this.context);
         each((render) => {
             renderResult = render(renderResult);
         }, (_a = this.extendRender) !== null && _a !== void 0 ? _a : []);

package/lib/server.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var React = require('react');
+var react = require('react');
 var server$1 = require('react-dom/server');
 var core = require('@tramvai/core');
 var moduleCommon = require('@tramvai/module-common');
@@ -12,7 +12,7 @@ var moduleClientHints = require('@tramvai/module-client-hints');
 var tokensRender = require('@tramvai/tokens-render');
 var dippy = require('@tinkoff/dippy');
 var tokensServerPrivate = require('@tramvai/tokens-server-private');
-var react = require('@tramvai/react');
+var react$1 = require('@tramvai/react');
 var url = require('@tinkoff/url');
 var userAgent = require('@tinkoff/user-agent');
 var isUndefined = require('@tinkoff/utils/is/undefined');
@@ -32,6 +32,7 @@ var path = require('path');
 var each = require('@tinkoff/utils/array/each');
 var path$1 = require('@tinkoff/utils/object/path');
 var inline_inline = require('./server_inline.inline.js');
+var jsxRuntime = require('react/jsx-runtime');
 var state = require('@tramvai/state');
 var moduleRouter = require('@tramvai/module-router');
 var layoutFactory = require('@tinkoff/layout-factory');
@@ -57,7 +58,6 @@ function _interopNamespace(e) {
     return n;
 }
 
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var isUndefined__default = /*#__PURE__*/_interopDefaultLegacy(isUndefined);
 var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
 var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
@@ -657,19 +657,17 @@ const PageErrorBoundary = (props) => {
     const { children, fallback } = props;
     const url = moduleRouter.useUrl();
     const serializedError = state.useStore(PageErrorStore);
-    const error = React.useMemo(() => {
+    const error = react.useMemo(() => {
         return serializedError && deserializeError(serializedError);
     }, [serializedError]);
-    const errorHandlers = react.useDi({ token: react.ERROR_BOUNDARY_TOKEN, optional: true });
-    const fallbackFromDi = react.useDi({ token: react.ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, optional: true });
-    return (React__default["default"].createElement(react.UniversalErrorBoundary, { url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, children));
+    const errorHandlers = react$1.useDi({ token: react$1.ERROR_BOUNDARY_TOKEN, optional: true });
+    const fallbackFromDi = react$1.useDi({ token: react$1.ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, optional: true });
+    return (jsxRuntime.jsx(react$1.UniversalErrorBoundary, Object.assign({ url: url, error: error, errorHandlers: errorHandlers, fallback: fallback, fallbackFromDi: fallbackFromDi }, { children: children }), void 0));
 };
-class RootComponent extends React.PureComponent {
+class RootComponent extends react.PureComponent {
     render() {
         const { LayoutComponent, PageComponent, HeaderComponent, FooterComponent, ErrorBoundaryComponent, } = this.props;
-        return (React__default["default"].createElement(LayoutComponent, { Header: HeaderComponent, Footer: FooterComponent },
-            React__default["default"].createElement(PageErrorBoundary, { fallback: ErrorBoundaryComponent },
-                React__default["default"].createElement(PageComponent, null))));
+        return (jsxRuntime.jsx(LayoutComponent, Object.assign({ Header: HeaderComponent, Footer: FooterComponent }, { children: jsxRuntime.jsx(PageErrorBoundary, Object.assign({ fallback: ErrorBoundaryComponent }, { children: jsxRuntime.jsx(PageComponent, {}, void 0) }), void 0) }), void 0));
     }
 }
 const Root = ({ pageService }) => {
@@ -687,13 +685,11 @@ const Root = ({ pageService }) => {
     const HeaderComponent = pageService.resolveComponentFromConfig('header');
     const FooterComponent = pageService.resolveComponentFromConfig('footer');
     const ErrorBoundaryComponent = pageService.resolveComponentFromConfig('errorBoundary');
-    return (React__default["default"].createElement(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }));
+    return (jsxRuntime.jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }, void 0));
 };
 
-function renderReact({ pageService, di }, context) {
-    return (React__default["default"].createElement(state.Provider, { context: context },
-        React__default["default"].createElement(react.DIContext.Provider, { value: di },
-            React__default["default"].createElement(Root, { pageService: pageService }))));
+function renderReact({ pageService, di, initialState }, context) {
+    return (jsxRuntime.jsx(state.Provider, Object.assign({ context: context, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.stores }, { children: jsxRuntime.jsx(react$1.DIContext.Provider, Object.assign({ value: di }, { children: jsxRuntime.jsx(Root, { pageService: pageService }, void 0) }), void 0) }), void 0));
 }
 
 class ReactRenderServer {
@@ -706,7 +702,7 @@ class ReactRenderServer {
     }
     render(extractor) {
         var _a;
-        let renderResult = renderReact({ pageService: this.pageService, di: this.di }, this.context);
+        let renderResult = renderReact({ pageService: this.pageService, di: this.di, initialState: null }, this.context);
         each__default["default"]((render) => {
             renderResult = render(renderResult);
         }, (_a = this.extendRender) !== null && _a !== void 0 ? _a : []);
@@ -932,7 +928,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                         let body;
                         try {
                             log.info({ event: 'render-root-boundary' });
-                            body = server$1.renderToString(React.createElement(RootErrorBoundary, { error, url: url.parse(request.url) }));
+                            body = server$1.renderToString(react.createElement(RootErrorBoundary, { error, url: url.parse(request.url) }));
                             reply.status(error.httpStatus || error.status || 500);
                             reply.header('Content-Type', 'text/html; charset=utf-8');
                             reply.header('Content-Length', Buffer.byteLength(body, 'utf8'));
@@ -945,7 +941,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                     };
                 },
                 deps: {
-                    RootErrorBoundary: { token: react.ROOT_ERROR_BOUNDARY_COMPONENT_TOKEN, optional: true },
+                    RootErrorBoundary: { token: react$1.ROOT_ERROR_BOUNDARY_COMPONENT_TOKEN, optional: true },
                     logger: moduleCommon.LOGGER_TOKEN,
                 },
             }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "1.85.0",
+  "version": "1.89.1",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -24,13 +24,13 @@
     "@tinkoff/htmlpagebuilder": "0.4.22",
     "@tinkoff/layout-factory": "0.2.28",
     "@tinkoff/url": "0.7.37",
-    "@tinkoff/user-agent": "0.3.290",
-    "@tramvai/module-client-hints": "1.85.0",
-    "@tramvai/module-router": "1.85.0",
-    "@tramvai/react": "1.85.0",
+    "@tinkoff/user-agent": "0.3.300",
+    "@tramvai/module-client-hints": "1.89.1",
+    "@tramvai/module-router": "1.89.1",
+    "@tramvai/react": "1.89.1",
     "@tramvai/safe-strings": "0.4.3",
-    "@tramvai/tokens-render": "1.85.0",
-    "@tramvai/experiments": "1.85.0",
+    "@tramvai/tokens-render": "1.89.1",
+    "@tramvai/experiments": "1.89.1",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
@@ -38,14 +38,14 @@
     "@tinkoff/dippy": "0.7.39",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/react-hooks": "0.0.24",
-    "@tramvai/cli": "1.85.0",
-    "@tramvai/core": "1.85.0",
-    "@tramvai/module-common": "1.85.0",
-    "@tramvai/state": "1.85.0",
-    "@tramvai/test-helpers": "1.85.0",
-    "@tramvai/tokens-common": "1.85.0",
-    "@tramvai/tokens-router": "1.85.0",
-    "@tramvai/tokens-server-private": "1.85.0",
+    "@tramvai/cli": "1.89.1",
+    "@tramvai/core": "1.89.1",
+    "@tramvai/module-common": "1.89.1",
+    "@tramvai/state": "1.89.1",
+    "@tramvai/test-helpers": "1.89.1",
+    "@tramvai/tokens-common": "1.89.1",
+    "@tramvai/tokens-router": "1.89.1",
+    "@tramvai/tokens-server-private": "1.89.1",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.8.0",