@tramvai/module-render 2.74.0 → 2.75.0

package/lib/browser.d.ts

@@ -1,5 +1,6 @@
+import { PageErrorStore, setPageErrorEvent } from '@tramvai/module-router';
 import type { RenderModuleConfig } from './shared/types';
-export * from './shared/pageErrorStore';
+export { PageErrorStore, setPageErrorEvent };
 export * from '@tramvai/tokens-render';
 export declare const DEFAULT_POLYFILL_CONDITION = "";
 export declare class RenderModule {

package/lib/browser.js

@@ -4,11 +4,11 @@ import { STORE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN } from '@tramvai/tokens-common
 import { 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 } from '@tramvai/tokens-router';
+import { PageErrorStore, setPageErrorEvent } from '@tramvai/module-router';
+export { PageErrorStore, setPageErrorEvent } from '@tramvai/module-router';
 import { rendering } from './client/index.browser.js';
 import { LayoutModule } from './shared/LayoutModule.browser.js';
 import { providers } from './shared/providers.browser.js';
-import { PageErrorStore, setPageErrorEvent } from './shared/pageErrorStore.browser.js';
-export { PageErrorStore, deserializeError, serializeError, setPageErrorEvent } from './shared/pageErrorStore.browser.js';
 
 var RenderModule_1;
 const DEFAULT_POLYFILL_CONDITION = '';

package/lib/react/pageErrorBoundary.browser.js

@@ -1,10 +1,9 @@
 import { jsx } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { useDi, ERROR_BOUNDARY_TOKEN, ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, UniversalErrorBoundary } from '@tramvai/react';
-import { useUrl } from '@tramvai/module-router';
+import { useUrl, PageErrorStore, deserializeError } from '@tramvai/module-router';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import { useStore } from '@tramvai/state';
-import { PageErrorStore, deserializeError } from '../shared/pageErrorStore.browser.js';
 
 const PageErrorBoundary = (props) => {
     const { children } = props;

package/lib/react/pageErrorBoundary.es.js

@@ -1,10 +1,9 @@
 import { jsx } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { useDi, ERROR_BOUNDARY_TOKEN, ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, UniversalErrorBoundary } from '@tramvai/react';
-import { useUrl } from '@tramvai/module-router';
+import { useUrl, PageErrorStore, deserializeError } from '@tramvai/module-router';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import { useStore } from '@tramvai/state';
-import { PageErrorStore, deserializeError } from '../shared/pageErrorStore.es.js';
 
 const PageErrorBoundary = (props) => {
     const { children } = props;

package/lib/react/pageErrorBoundary.js

@@ -8,15 +8,14 @@ var react = require('@tramvai/react');
 var moduleRouter = require('@tramvai/module-router');
 var tokensRouter = require('@tramvai/tokens-router');
 var state = require('@tramvai/state');
-var pageErrorStore = require('../shared/pageErrorStore.js');
 
 const PageErrorBoundary = (props) => {
     const { children } = props;
     const pageService = react.useDi(tokensRouter.PAGE_SERVICE_TOKEN);
     const url = moduleRouter.useUrl();
-    const serializedError = state.useStore(pageErrorStore.PageErrorStore);
+    const serializedError = state.useStore(moduleRouter.PageErrorStore);
     const error = react$1.useMemo(() => {
-        return serializedError && pageErrorStore.deserializeError(serializedError);
+        return serializedError && moduleRouter.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 });

package/lib/server.d.ts

@@ -1,5 +1,6 @@
+import { PageErrorStore, setPageErrorEvent } from '@tramvai/module-router';
 import type { RenderModuleConfig } from './shared/types';
-export * from './shared/pageErrorStore';
+export { PageErrorStore, setPageErrorEvent };
 export * from '@tramvai/tokens-render';
 export declare const DEFAULT_POLYFILL_CONDITION = "!window.Promise.prototype.finally || !window.URL || !window.URLSearchParams || !window.AbortController || !window.IntersectionObserver || !Object.fromEntries || !window.ResizeObserver";
 export declare class RenderModule {

package/lib/server.es.js

@@ -12,6 +12,8 @@ import { WEB_FASTIFY_APP_BEFORE_ERROR_TOKEN } from '@tramvai/tokens-server-priva
 import { ROOT_ERROR_BOUNDARY_COMPONENT_TOKEN } from '@tramvai/react';
 import { parse } from '@tinkoff/url';
 import { satisfies } from '@tinkoff/user-agent';
+import { setPageErrorEvent, PageErrorStore, deserializeError } from '@tramvai/module-router';
+export { PageErrorStore, setPageErrorEvent } from '@tramvai/module-router';
 import { ResourcesInliner } from './resourcesInliner/resourcesInliner.es.js';
 import { RESOURCE_INLINER, RESOURCES_REGISTRY_CACHE } from './resourcesInliner/tokens.es.js';
 import { ResourcesRegistry } from './resourcesRegistry/index.es.js';
@@ -21,8 +23,6 @@ import { ReactRenderServer } from './server/ReactRenderServer.es.js';
 export { ReactRenderServer } from './server/ReactRenderServer.es.js';
 import { LayoutModule } from './shared/LayoutModule.es.js';
 import { providers } from './shared/providers.es.js';
-import { setPageErrorEvent, PageErrorStore, deserializeError } from './shared/pageErrorStore.es.js';
-export { PageErrorStore, deserializeError, serializeError, setPageErrorEvent } from './shared/pageErrorStore.es.js';
 
 var RenderModule_1;
 const REQUEST_TTL = 5 * 60 * 1000;

package/lib/server.js

@@ -15,6 +15,7 @@ var tokensServerPrivate = require('@tramvai/tokens-server-private');
 var react$1 = require('@tramvai/react');
 var url = require('@tinkoff/url');
 var userAgent = require('@tinkoff/user-agent');
+var moduleRouter = require('@tramvai/module-router');
 var resourcesInliner = require('./resourcesInliner/resourcesInliner.js');
 var tokens = require('./resourcesInliner/tokens.js');
 var index = require('./resourcesRegistry/index.js');
@@ -23,7 +24,6 @@ var htmlPageSchema = require('./server/htmlPageSchema.js');
 var ReactRenderServer = require('./server/ReactRenderServer.js');
 var LayoutModule = require('./shared/LayoutModule.js');
 var providers = require('./shared/providers.js');
-var pageErrorStore = require('./shared/pageErrorStore.js');
 
 var RenderModule_1;
 const REQUEST_TTL = 5 * 60 * 1000;
@@ -92,7 +92,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                             // assuming that there was an error when rendering the page, try to render again with ErrorBoundary
                             try {
                                 log.info({ event: 'render-page-boundary-start' });
-                                context.dispatch(pageErrorStore.setPageErrorEvent(error));
+                                context.dispatch(moduleRouter.setPageErrorEvent(error));
                                 html = await htmlBuilder.flow();
                                 log.info({ event: 'render-page-boundary-success' });
                             }
@@ -103,7 +103,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                                 throw error;
                             }
                         }
-                        const pageRenderError = context.getState(pageErrorStore.PageErrorStore);
+                        const pageRenderError = context.getState(moduleRouter.PageErrorStore);
                         // log send-server-error only after successful Page Boundary render,
                         // otherwise this event will be logged in default error handler
                         if (pageRenderError) {
@@ -117,7 +117,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                                 log.error({
                                     event: 'send-server-error',
                                     message: 'Page render error, switch to page boundary',
-                                    error: pageErrorStore.deserializeError(pageRenderError),
+                                    error: moduleRouter.deserializeError(pageRenderError),
                                     requestInfo,
                                 });
                             }
@@ -286,11 +286,15 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
     })
 ], exports.RenderModule);
 
+Object.defineProperty(exports, 'PageErrorStore', {
+    enumerable: true,
+    get: function () { return moduleRouter.PageErrorStore; }
+});
+Object.defineProperty(exports, 'setPageErrorEvent', {
+    enumerable: true,
+    get: function () { return moduleRouter.setPageErrorEvent; }
+});
 exports.ReactRenderServer = ReactRenderServer.ReactRenderServer;
-exports.PageErrorStore = pageErrorStore.PageErrorStore;
-exports.deserializeError = pageErrorStore.deserializeError;
-exports.serializeError = pageErrorStore.serializeError;
-exports.setPageErrorEvent = pageErrorStore.setPageErrorEvent;
 exports.DEFAULT_POLYFILL_CONDITION = DEFAULT_POLYFILL_CONDITION;
 Object.keys(tokensRender).forEach(function (k) {
     if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {

package/lib/shared/providers.browser.js

@@ -1,7 +1,7 @@
 import { provide } from '@tramvai/core';
 import { COMBINE_REDUCERS } from '@tramvai/tokens-common';
 import { TRAMVAI_RENDER_MODE } from '@tramvai/tokens-render';
-import { PageErrorStore } from './pageErrorStore.browser.js';
+import { PageErrorStore } from '@tramvai/module-router';
 
 const providers = [
     provide({

package/lib/shared/providers.es.js

@@ -1,7 +1,7 @@
 import { provide } from '@tramvai/core';
 import { COMBINE_REDUCERS } from '@tramvai/tokens-common';
 import { TRAMVAI_RENDER_MODE } from '@tramvai/tokens-render';
-import { PageErrorStore } from './pageErrorStore.es.js';
+import { PageErrorStore } from '@tramvai/module-router';
 
 const providers = [
     provide({

package/lib/shared/providers.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensRender = require('@tramvai/tokens-render');
-var pageErrorStore = require('./pageErrorStore.js');
+var moduleRouter = require('@tramvai/module-router');
 
 const providers = [
     core.provide({
         provide: tokensCommon.COMBINE_REDUCERS,
         multi: true,
-        useValue: pageErrorStore.PageErrorStore,
+        useValue: moduleRouter.PageErrorStore,
     }),
     core.provide({
         provide: tokensRender.TRAMVAI_RENDER_MODE,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "2.74.0",
+  "version": "2.75.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -25,13 +25,13 @@
     "@tinkoff/htmlpagebuilder": "0.5.6",
     "@tinkoff/layout-factory": "0.3.7",
     "@tinkoff/url": "0.8.5",
-    "@tinkoff/user-agent": "0.4.186",
-    "@tramvai/module-client-hints": "2.74.0",
-    "@tramvai/module-router": "2.74.0",
-    "@tramvai/react": "2.74.0",
+    "@tinkoff/user-agent": "0.4.187",
+    "@tramvai/module-client-hints": "2.75.0",
+    "@tramvai/module-router": "2.75.0",
+    "@tramvai/react": "2.75.0",
     "@tramvai/safe-strings": "0.5.7",
-    "@tramvai/tokens-render": "2.74.0",
-    "@tramvai/experiments": "2.74.0",
+    "@tramvai/tokens-render": "2.75.0",
+    "@tramvai/experiments": "2.75.0",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
@@ -39,14 +39,14 @@
     "@tinkoff/dippy": "0.8.13",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/react-hooks": "0.1.5",
-    "@tramvai/cli": "2.74.0",
-    "@tramvai/core": "2.74.0",
-    "@tramvai/module-common": "2.74.0",
-    "@tramvai/state": "2.74.0",
-    "@tramvai/test-helpers": "2.74.0",
-    "@tramvai/tokens-common": "2.74.0",
-    "@tramvai/tokens-router": "2.74.0",
-    "@tramvai/tokens-server-private": "2.74.0",
+    "@tramvai/cli": "2.75.0",
+    "@tramvai/core": "2.75.0",
+    "@tramvai/module-common": "2.75.0",
+    "@tramvai/state": "2.75.0",
+    "@tramvai/test-helpers": "2.75.0",
+    "@tramvai/tokens-common": "2.75.0",
+    "@tramvai/tokens-router": "2.75.0",
+    "@tramvai/tokens-server-private": "2.75.0",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.14.0",

package/lib/shared/pageErrorStore.browser.js

@@ -1,19 +0,0 @@
-import { createEvent, createReducer } from '@tramvai/state';
-
-function serializeError(error) {
-    return {
-        ...error,
-        message: error.message,
-        stack: error.stack,
-    };
-}
-function deserializeError(serializedError) {
-    const error = new Error(serializedError.message);
-    Object.assign(error, serializedError);
-    return error;
-}
-const setPageErrorEvent = createEvent('setPageError');
-const initialState = null;
-const PageErrorStore = createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
-
-export { PageErrorStore, deserializeError, serializeError, setPageErrorEvent };

package/lib/shared/pageErrorStore.d.ts

@@ -1,14 +0,0 @@
-type AnyError = Error & {
-    [key: string]: any;
-};
-export interface SerializedError {
-    message: string;
-    stack?: string;
-    [key: string]: any;
-}
-export declare function serializeError(error: AnyError): SerializedError;
-export declare function deserializeError(serializedError: SerializedError): AnyError;
-export type IPageErrorStore = SerializedError | null;
-export declare const setPageErrorEvent: import("@tramvai/types-actions-state-context").EventCreator1<AnyError, AnyError>;
-export declare const PageErrorStore: import("@tramvai/state").Reducer<SerializedError, "pageError">;
-export {};

package/lib/shared/pageErrorStore.es.js

@@ -1,19 +0,0 @@
-import { createEvent, createReducer } from '@tramvai/state';
-
-function serializeError(error) {
-    return {
-        ...error,
-        message: error.message,
-        stack: error.stack,
-    };
-}
-function deserializeError(serializedError) {
-    const error = new Error(serializedError.message);
-    Object.assign(error, serializedError);
-    return error;
-}
-const setPageErrorEvent = createEvent('setPageError');
-const initialState = null;
-const PageErrorStore = createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
-
-export { PageErrorStore, deserializeError, serializeError, setPageErrorEvent };

package/lib/shared/pageErrorStore.js

@@ -1,26 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var state = require('@tramvai/state');
-
-function serializeError(error) {
-    return {
-        ...error,
-        message: error.message,
-        stack: error.stack,
-    };
-}
-function deserializeError(serializedError) {
-    const error = new Error(serializedError.message);
-    Object.assign(error, serializedError);
-    return error;
-}
-const setPageErrorEvent = state.createEvent('setPageError');
-const initialState = null;
-const PageErrorStore = state.createReducer('pageError', initialState).on(setPageErrorEvent, (state, error) => error && serializeError(error));
-
-exports.PageErrorStore = PageErrorStore;
-exports.deserializeError = deserializeError;
-exports.serializeError = serializeError;
-exports.setPageErrorEvent = setPageErrorEvent;