@tramvai/module-render 3.4.5 → 3.5.0

package/lib/browser.js

@@ -1,7 +1,7 @@
 import { __decorate } from 'tslib';
 import { Module, provide, commandLineListTokens, DI_TOKEN, optional } from '@tramvai/core';
 import { STORE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/tokens-common';
-import { RESOURCES_REGISTRY, CUSTOM_RENDER, EXTEND_RENDER, RENDERER_CALLBACK, USE_REACT_STRICT_MODE, REACT_SERVER_RENDER_MODE, RENDER_MODE, MODERN_SATISFIES_TOKEN } from '@tramvai/tokens-render';
+import { RESOURCES_REGISTRY, CUSTOM_RENDER, EXTEND_RENDER, RENDERER_CALLBACK, USE_REACT_STRICT_MODE, REACT_SERVER_RENDER_MODE, DEFAULT_ERROR_BOUNDARY_COMPONENT, RENDER_MODE, MODERN_SATISFIES_TOKEN } from '@tramvai/tokens-render';
 export * from '@tramvai/tokens-render';
 import { beforeResolveHooksToken, PageErrorStore, setPageErrorEvent } from '@tramvai/module-router';
 export { PageErrorStore, setPageErrorEvent } from '@tramvai/module-router';
@@ -81,6 +81,7 @@ RenderModule = RenderModule_1 = __decorate([
                     di: DI_TOKEN,
                     useStrictMode: USE_REACT_STRICT_MODE,
                     renderMode: optional(REACT_SERVER_RENDER_MODE),
+                    defaultErrorBoundary: optional(DEFAULT_ERROR_BOUNDARY_COMPONENT),
                 },
                 multi: true,
             }),

package/lib/client/RootClientComponent.browser.js

@@ -0,0 +1,34 @@
+import { jsx } from 'react/jsx-runtime';
+import { createElement, StrictMode } from 'react';
+import { UniversalErrorBoundary } from '@tramvai/react';
+import each from '@tinkoff/utils/array/each';
+import { renderReact } from '../react/index.browser.js';
+
+const createRootElement = ({ extendRender, di, consumerContext, }) => {
+    let element = renderReact({ di }, consumerContext);
+    if (extendRender) {
+        each((render) => {
+            element = render(element);
+        }, extendRender);
+    }
+    return element;
+};
+const RootClientComponent = ({ extendRender, useStrictMode, di, consumerContext, }) => {
+    let element = createRootElement({ di, consumerContext, extendRender });
+    if (useStrictMode) {
+        element = createElement(StrictMode, null, element);
+    }
+    return element;
+};
+const RootClientComponentWithBoundary = ({ defaultErrorBoundary, di, consumerContext, extendRender, customRender, useStrictMode, }) => {
+    const rootClientComponentProps = {
+        di,
+        consumerContext,
+        extendRender,
+        customRender,
+        useStrictMode,
+    };
+    return (jsx(UniversalErrorBoundary, { fallback: defaultErrorBoundary, children: jsx(RootClientComponent, { ...rootClientComponentProps }) }));
+};
+
+export { createRootElement, RootClientComponentWithBoundary as default };

package/lib/client/RootClientComponent.d.ts

@@ -0,0 +1,14 @@
+import type { ExtractDependencyType } from '@tinkoff/dippy';
+import type { DEFAULT_ERROR_BOUNDARY_COMPONENT, EXTEND_RENDER, USE_REACT_STRICT_MODE } from '@tramvai/tokens-render';
+type RootClientComponentProps = {
+    consumerContext: any;
+    extendRender?: ExtractDependencyType<typeof EXTEND_RENDER>;
+    customRender?: any;
+    di: any;
+    useStrictMode: ExtractDependencyType<typeof USE_REACT_STRICT_MODE>;
+    defaultErrorBoundary?: ExtractDependencyType<typeof DEFAULT_ERROR_BOUNDARY_COMPONENT>;
+};
+export declare const createRootElement: ({ extendRender, di, consumerContext, }: Pick<RootClientComponentProps, 'di' | 'extendRender' | 'consumerContext'>) => import("react/jsx-runtime").JSX.Element;
+declare const RootClientComponentWithBoundary: ({ defaultErrorBoundary, di, consumerContext, extendRender, customRender, useStrictMode, }: RootClientComponentProps) => import("react/jsx-runtime").JSX.Element;
+export default RootClientComponentWithBoundary;
+//# sourceMappingURL=RootClientComponent.d.ts.map

package/lib/client/index.browser.js

@@ -1,23 +1,23 @@
-import each from '@tinkoff/utils/array/each';
-import { createElement, StrictMode } from 'react';
-import { renderReact } from '../react/index.browser.js';
+import { createElement } from 'react';
 import { renderer } from './renderer.browser.js';
+import RootClientComponentWithBoundary, { createRootElement } from './RootClientComponent.browser.js';
 
-function rendering({ logger, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, renderMode, }) {
+function rendering({ logger, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, renderMode, defaultErrorBoundary, }) {
     const log = logger('module-render');
     return new Promise((resolve, reject) => {
-        let renderResult = renderReact({ di }, consumerContext);
-        if (extendRender) {
-            each((render) => {
-                renderResult = render(renderResult);
-            }, extendRender);
-        }
         if (customRender) {
-            return customRender(renderResult);
-        }
-        if (useStrictMode) {
-            renderResult = createElement(StrictMode, null, renderResult);
+            // Provide possibility of customRender for root JSX.Element
+            // Can be useful in case of custom render function on client or to replace hydration
+            return customRender(createRootElement({ extendRender, di, consumerContext }));
         }
+        const renderResult = createElement(RootClientComponentWithBoundary, {
+            defaultErrorBoundary,
+            extendRender,
+            customRender,
+            useStrictMode,
+            consumerContext,
+            di,
+        });
         const container = document.querySelector('.application');
         const executeRendererCallbacks = (renderErr) => rendererCallback === null || rendererCallback === void 0 ? void 0 : rendererCallback.forEach((cb) => {
             try {

package/lib/client/index.d.ts

@@ -1,6 +1,6 @@
-import type { EXTEND_RENDER, REACT_SERVER_RENDER_MODE, RENDERER_CALLBACK, USE_REACT_STRICT_MODE } from '@tramvai/tokens-render';
+import type { EXTEND_RENDER, REACT_SERVER_RENDER_MODE, RENDERER_CALLBACK, USE_REACT_STRICT_MODE, DEFAULT_ERROR_BOUNDARY_COMPONENT } from '@tramvai/tokens-render';
 import type { ExtractDependencyType } from '@tinkoff/dippy';
-export declare function rendering({ logger, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, renderMode, }: {
+export declare function rendering({ logger, consumerContext, customRender, extendRender, di, useStrictMode, rendererCallback, renderMode, defaultErrorBoundary, }: {
     logger: any;
     consumerContext: any;
     extendRender?: ExtractDependencyType<typeof EXTEND_RENDER>;
@@ -9,5 +9,6 @@ export declare function rendering({ logger, consumerContext, customRender, exten
     useStrictMode: ExtractDependencyType<typeof USE_REACT_STRICT_MODE>;
     rendererCallback?: ExtractDependencyType<typeof RENDERER_CALLBACK>;
     renderMode?: ExtractDependencyType<typeof REACT_SERVER_RENDER_MODE>;
+    defaultErrorBoundary?: ExtractDependencyType<typeof DEFAULT_ERROR_BOUNDARY_COMPONENT>;
 }): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "3.4.5",
+  "version": "3.5.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -26,13 +26,13 @@
     "@tinkoff/layout-factory": "0.4.1",
     "@tinkoff/errors": "0.4.1",
     "@tinkoff/url": "0.9.1",
-    "@tinkoff/user-agent": "0.5.16",
-    "@tramvai/module-client-hints": "3.4.5",
-    "@tramvai/module-router": "3.4.5",
-    "@tramvai/react": "3.4.5",
+    "@tinkoff/user-agent": "0.5.18",
+    "@tramvai/module-client-hints": "3.5.0",
+    "@tramvai/module-router": "3.5.0",
+    "@tramvai/react": "3.5.0",
     "@tramvai/safe-strings": "0.6.1",
-    "@tramvai/tokens-render": "3.4.5",
-    "@tramvai/experiments": "3.4.5",
+    "@tramvai/tokens-render": "3.5.0",
+    "@tramvai/experiments": "3.5.0",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
@@ -40,14 +40,14 @@
     "@tinkoff/dippy": "0.9.1",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/react-hooks": "0.2.1",
-    "@tramvai/cli": "3.4.5",
-    "@tramvai/core": "3.4.5",
-    "@tramvai/module-common": "3.4.5",
-    "@tramvai/state": "3.4.5",
-    "@tramvai/test-helpers": "3.4.5",
-    "@tramvai/tokens-common": "3.4.5",
-    "@tramvai/tokens-router": "3.4.5",
-    "@tramvai/tokens-server-private": "3.4.5",
+    "@tramvai/cli": "3.5.0",
+    "@tramvai/core": "3.5.0",
+    "@tramvai/module-common": "3.5.0",
+    "@tramvai/state": "3.5.0",
+    "@tramvai/test-helpers": "3.5.0",
+    "@tramvai/tokens-common": "3.5.0",
+    "@tramvai/tokens-router": "3.5.0",
+    "@tramvai/tokens-server-private": "3.5.0",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.14.0",