@tramvai/module-render 1.104.2 → 1.105.6

package/lib/browser.js

@@ -13,6 +13,29 @@ import { useRoute, useUrl } from '@tramvai/module-router';
 import { useIsomorphicLayoutEffect } from '@tinkoff/react-hooks';
 import { composeLayoutOptions, createLayout } from '@tinkoff/layout-factory';
 
+class RootComponent extends PureComponent {
+    render() {
+        const { LayoutComponent, PageComponent, HeaderComponent, FooterComponent } = this.props;
+        return (jsx(LayoutComponent, Object.assign({ Header: HeaderComponent, Footer: FooterComponent }, { children: jsx(PageComponent, {}, void 0) }), void 0));
+    }
+}
+const Root = ({ pageService }) => {
+    const { config } = useRoute();
+    const { pageComponent } = config;
+    let PageComponent = pageService.getComponent(pageComponent);
+    if (!PageComponent) {
+        // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
+        PageComponent = () => {
+            throw new Error(`Page component '${pageComponent}' not found`);
+        };
+    }
+    // Get components for current page, otherwise use a defaults
+    const LayoutComponent = pageService.resolveComponentFromConfig('layout');
+    const HeaderComponent = pageService.resolveComponentFromConfig('header');
+    const FooterComponent = pageService.resolveComponentFromConfig('footer');
+    return (jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent }, void 0));
+};
+
 function serializeError(error) {
     return {
         ...error,
@@ -30,7 +53,7 @@ const initialState = null;
 const PageErrorStore = createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
 
 const PageErrorBoundary = (props) => {
-    const { children, fallback } = props;
+    const { children, pageService } = props;
     const url = useUrl();
     const serializedError = useStore(PageErrorStore);
     const error = useMemo(() => {
@@ -38,34 +61,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 });
+    const fallback = pageService.resolveComponentFromConfig('errorBoundary');
     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 (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 }) => {
-    const { config } = useRoute();
-    const { pageComponent } = config;
-    let PageComponent = pageService.getComponent(pageComponent);
-    if (!PageComponent) {
-        // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
-        PageComponent = () => {
-            throw new Error(`Page component '${pageComponent}' not found`);
-        };
-    }
-    // Get components for current page, otherwise use a defaults
-    const LayoutComponent = pageService.resolveComponentFromConfig('layout');
-    const HeaderComponent = pageService.resolveComponentFromConfig('header');
-    const FooterComponent = pageService.resolveComponentFromConfig('footer');
-    const ErrorBoundaryComponent = pageService.resolveComponentFromConfig('errorBoundary');
-    return (jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }, void 0));
-};
 
 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));
+    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));
 }
 
 let hydrateRoot;

package/lib/react/pageErrorBoundary.d.ts

@@ -0,0 +1,5 @@
+import type { PropsWithChildren } from 'react';
+import type { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+export declare const PageErrorBoundary: (props: PropsWithChildren<{
+    pageService: typeof PAGE_SERVICE_TOKEN;
+}>) => JSX.Element;

package/lib/server.es.js

@@ -403,7 +403,7 @@ if (process.env.NODE_ENV === 'production') {
         return Promise.resolve(stats);
     };
 }
-const fetchWebpackStats = async ({ modern, }) => {
+const fetchWebpackStats = async ({ modern, } = {}) => {
     return fetchStats(modern);
 };
 
@@ -615,6 +615,29 @@ const htmlPageSchemaFactory = ({ htmlAttrs, }) => {
     ];
 };
 
+class RootComponent extends PureComponent {
+    render() {
+        const { LayoutComponent, PageComponent, HeaderComponent, FooterComponent } = this.props;
+        return (jsx(LayoutComponent, Object.assign({ Header: HeaderComponent, Footer: FooterComponent }, { children: jsx(PageComponent, {}, void 0) }), void 0));
+    }
+}
+const Root = ({ pageService }) => {
+    const { config } = useRoute();
+    const { pageComponent } = config;
+    let PageComponent = pageService.getComponent(pageComponent);
+    if (!PageComponent) {
+        // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
+        PageComponent = () => {
+            throw new Error(`Page component '${pageComponent}' not found`);
+        };
+    }
+    // Get components for current page, otherwise use a defaults
+    const LayoutComponent = pageService.resolveComponentFromConfig('layout');
+    const HeaderComponent = pageService.resolveComponentFromConfig('header');
+    const FooterComponent = pageService.resolveComponentFromConfig('footer');
+    return (jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent }, void 0));
+};
+
 function serializeError(error) {
     return {
         ...error,
@@ -632,7 +655,7 @@ const initialState = null;
 const PageErrorStore = createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
 
 const PageErrorBoundary = (props) => {
-    const { children, fallback } = props;
+    const { children, pageService } = props;
     const url = useUrl();
     const serializedError = useStore(PageErrorStore);
     const error = useMemo(() => {
@@ -640,34 +663,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 });
+    const fallback = pageService.resolveComponentFromConfig('errorBoundary');
     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 (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 }) => {
-    const { config } = useRoute();
-    const { pageComponent } = config;
-    let PageComponent = pageService.getComponent(pageComponent);
-    if (!PageComponent) {
-        // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
-        PageComponent = () => {
-            throw new Error(`Page component '${pageComponent}' not found`);
-        };
-    }
-    // Get components for current page, otherwise use a defaults
-    const LayoutComponent = pageService.resolveComponentFromConfig('layout');
-    const HeaderComponent = pageService.resolveComponentFromConfig('header');
-    const FooterComponent = pageService.resolveComponentFromConfig('footer');
-    const ErrorBoundaryComponent = pageService.resolveComponentFromConfig('errorBoundary');
-    return (jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }, void 0));
-};
 
 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));
+    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));
 }
 
 class ReactRenderServer {

package/lib/server.js

@@ -439,7 +439,7 @@ if (process.env.NODE_ENV === 'production') {
         return Promise.resolve(stats);
     };
 }
-const fetchWebpackStats = async ({ modern, }) => {
+const fetchWebpackStats = async ({ modern, } = {}) => {
     return fetchStats(modern);
 };
 
@@ -651,6 +651,29 @@ const htmlPageSchemaFactory = ({ htmlAttrs, }) => {
     ];
 };
 
+class RootComponent extends react.PureComponent {
+    render() {
+        const { LayoutComponent, PageComponent, HeaderComponent, FooterComponent } = this.props;
+        return (jsxRuntime.jsx(LayoutComponent, Object.assign({ Header: HeaderComponent, Footer: FooterComponent }, { children: jsxRuntime.jsx(PageComponent, {}, void 0) }), void 0));
+    }
+}
+const Root = ({ pageService }) => {
+    const { config } = moduleRouter.useRoute();
+    const { pageComponent } = config;
+    let PageComponent = pageService.getComponent(pageComponent);
+    if (!PageComponent) {
+        // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
+        PageComponent = () => {
+            throw new Error(`Page component '${pageComponent}' not found`);
+        };
+    }
+    // Get components for current page, otherwise use a defaults
+    const LayoutComponent = pageService.resolveComponentFromConfig('layout');
+    const HeaderComponent = pageService.resolveComponentFromConfig('header');
+    const FooterComponent = pageService.resolveComponentFromConfig('footer');
+    return (jsxRuntime.jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent }, void 0));
+};
+
 function serializeError(error) {
     return {
         ...error,
@@ -668,7 +691,7 @@ const initialState = null;
 const PageErrorStore = state.createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
 
 const PageErrorBoundary = (props) => {
-    const { children, fallback } = props;
+    const { children, pageService } = props;
     const url = moduleRouter.useUrl();
     const serializedError = state.useStore(PageErrorStore);
     const error = react.useMemo(() => {
@@ -676,34 +699,12 @@ const PageErrorBoundary = (props) => {
     }, [serializedError]);
     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 });
+    const fallback = pageService.resolveComponentFromConfig('errorBoundary');
     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 {
-    render() {
-        const { LayoutComponent, PageComponent, HeaderComponent, FooterComponent, ErrorBoundaryComponent, } = this.props;
-        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 }) => {
-    const { config } = moduleRouter.useRoute();
-    const { pageComponent } = config;
-    let PageComponent = pageService.getComponent(pageComponent);
-    if (!PageComponent) {
-        // eslint-disable-next-line react-perf/jsx-no-new-function-as-prop
-        PageComponent = () => {
-            throw new Error(`Page component '${pageComponent}' not found`);
-        };
-    }
-    // Get components for current page, otherwise use a defaults
-    const LayoutComponent = pageService.resolveComponentFromConfig('layout');
-    const HeaderComponent = pageService.resolveComponentFromConfig('header');
-    const FooterComponent = pageService.resolveComponentFromConfig('footer');
-    const ErrorBoundaryComponent = pageService.resolveComponentFromConfig('errorBoundary');
-    return (jsxRuntime.jsx(RootComponent, { HeaderComponent: HeaderComponent, FooterComponent: FooterComponent, LayoutComponent: LayoutComponent, PageComponent: PageComponent, ErrorBoundaryComponent: ErrorBoundaryComponent }, void 0));
-};
 
 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));
+    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));
 }
 
 class ReactRenderServer {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "1.104.2",
+  "version": "1.105.6",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -24,13 +24,13 @@
     "@tinkoff/htmlpagebuilder": "0.4.23",
     "@tinkoff/layout-factory": "0.2.30",
     "@tinkoff/url": "0.7.38",
-    "@tinkoff/user-agent": "0.3.353",
-    "@tramvai/module-client-hints": "1.104.2",
-    "@tramvai/module-router": "1.104.2",
-    "@tramvai/react": "1.104.2",
+    "@tinkoff/user-agent": "0.3.360",
+    "@tramvai/module-client-hints": "1.105.6",
+    "@tramvai/module-router": "1.105.6",
+    "@tramvai/react": "1.105.6",
     "@tramvai/safe-strings": "0.4.4",
-    "@tramvai/tokens-render": "1.104.2",
-    "@tramvai/experiments": "1.104.2",
+    "@tramvai/tokens-render": "1.105.6",
+    "@tramvai/experiments": "1.105.6",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
@@ -38,14 +38,14 @@
     "@tinkoff/dippy": "0.7.41",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/react-hooks": "0.0.26",
-    "@tramvai/cli": "1.104.2",
-    "@tramvai/core": "1.104.2",
-    "@tramvai/module-common": "1.104.2",
-    "@tramvai/state": "1.104.2",
-    "@tramvai/test-helpers": "1.104.2",
-    "@tramvai/tokens-common": "1.104.2",
-    "@tramvai/tokens-router": "1.104.2",
-    "@tramvai/tokens-server-private": "1.104.2",
+    "@tramvai/cli": "1.105.6",
+    "@tramvai/core": "1.105.6",
+    "@tramvai/module-common": "1.105.6",
+    "@tramvai/state": "1.105.6",
+    "@tramvai/test-helpers": "1.105.6",
+    "@tramvai/tokens-common": "1.105.6",
+    "@tramvai/tokens-router": "1.105.6",
+    "@tramvai/tokens-server-private": "1.105.6",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.14.0",