@tramvai/module-render 5.10.0 → 5.14.10

package/lib/browser.js

@@ -23,7 +23,7 @@ let RenderModule = RenderModule_1 = class RenderModule {
         if (typeof mode === 'string' || typeof useStrictMode === 'boolean') {
             providers.push({
                 provide: USE_REACT_STRICT_MODE,
-                useValue: useStrictMode !== null && useStrictMode !== void 0 ? useStrictMode : mode === 'strict',
+                useValue: useStrictMode ?? mode === 'strict',
             });
         }
         return {

package/lib/client/index.browser.js

@@ -19,7 +19,7 @@ function rendering({ logger, consumerContext, customRender, extendRender, di, us
             di,
         });
         const container = () => document.querySelector('.application');
-        const executeRendererCallbacks = (renderErr) => rendererCallback === null || rendererCallback === void 0 ? void 0 : rendererCallback.forEach((cb) => {
+        const executeRendererCallbacks = (renderErr) => rendererCallback?.forEach((cb) => {
             try {
                 cb(renderErr);
             }

package/lib/client/renderer.browser.js

@@ -38,13 +38,12 @@ const renderer = ({ element, container, callback, log, renderMode }) => {
         const hydrateRootFn = () => startTransition(() => {
             hydrateRoot(container(), wrappedElement, {
                 onRecoverableError: (error, errorInfo) => {
-                    var _a, _b;
-                    const match = ((_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : '').match(reactMinifiedErrorRegex);
-                    const key = (_b = match === null || match === void 0 ? void 0 : match[1]) !== null && _b !== void 0 ? _b : error === null || error === void 0 ? void 0 : error.message;
+                    const match = (error?.message ?? '').match(reactMinifiedErrorRegex);
+                    const key = match?.[1] ?? error?.message;
                     // deduplicate by error type - too much noise otherwise
                     if (!allErrors.has(key)) {
                         // also too long stack traces are not very helpful but heavy for log collection
-                        if (typeof (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack) === 'string') {
+                        if (typeof errorInfo?.componentStack === 'string') {
                             // eslint-disable-next-line no-param-reassign
                             errorInfo.componentStack = shortenErrorStackTrace(errorInfo.componentStack);
                         }

package/lib/react/index.browser.js

@@ -6,7 +6,7 @@ import { Root } from './root.browser.js';
 
 function renderReact({ di }, context) {
     const initialState = di.get({ token: INITIAL_APP_STATE_TOKEN, optional: true });
-    return (jsx(Provider, { context: context, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.stores, children: jsx(DIContext.Provider, { value: di, children: jsx(Root, {}) }) }));
+    return (jsx(Provider, { context: context, serverState: initialState?.stores, children: jsx(DIContext.Provider, { value: di, children: jsx(Root, {}) }) }));
 }
 
 export { renderReact };

package/lib/react/index.es.js

@@ -6,7 +6,7 @@ import { Root } from './root.es.js';
 
 function renderReact({ di }, context) {
     const initialState = di.get({ token: INITIAL_APP_STATE_TOKEN, optional: true });
-    return (jsx(Provider, { context: context, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.stores, children: jsx(DIContext.Provider, { value: di, children: jsx(Root, {}) }) }));
+    return (jsx(Provider, { context: context, serverState: initialState?.stores, children: jsx(DIContext.Provider, { value: di, children: jsx(Root, {}) }) }));
 }
 
 export { renderReact };

package/lib/react/index.js

@@ -10,7 +10,7 @@ var root = require('./root.js');
 
 function renderReact({ di }, context) {
     const initialState = di.get({ token: tokensCommon.INITIAL_APP_STATE_TOKEN, optional: true });
-    return (jsxRuntime.jsx(state.Provider, { context: context, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.stores, children: jsxRuntime.jsx(react.DIContext.Provider, { value: di, children: jsxRuntime.jsx(root.Root, {}) }) }));
+    return (jsxRuntime.jsx(state.Provider, { context: context, serverState: initialState?.stores, children: jsxRuntime.jsx(react.DIContext.Provider, { value: di, children: jsxRuntime.jsx(root.Root, {}) }) }));
 }
 
 exports.renderReact = renderReact;

package/lib/resourcesInliner/externalFilesHelper.es.js

@@ -14,7 +14,6 @@ const agent = {
 const request = requestFactory([httpPlugin({ agent })]);
 const thirtySeconds = 1000 * 30;
 const getFileContentLength = async (url) => {
-    var _a;
     const response = request({
         url,
         httpMethod: 'HEAD',
@@ -22,7 +21,7 @@ const getFileContentLength = async (url) => {
         headers: { 'x-tramvai-service-name': 'RESOURCE_INLINER' },
     });
     await response;
-    return (_a = getHeaders(response)['content-length']) !== null && _a !== void 0 ? _a : undefined;
+    return getHeaders(response)['content-length'] ?? undefined;
 };
 const getFile = async (url) => {
     const fileResponse = await request({
@@ -30,7 +29,7 @@ const getFile = async (url) => {
         timeout: thirtySeconds,
         headers: { 'x-tramvai-service-name': 'RESOURCE_INLINER' },
     });
-    return fileResponse !== null && fileResponse !== void 0 ? fileResponse : undefined;
+    return fileResponse ?? undefined;
 };
 
 export { getFile, getFileContentLength };

package/lib/resourcesInliner/externalFilesHelper.js

@@ -25,7 +25,6 @@ const agent = {
 const request = requestFactory__default["default"]([httpPlugin__default["default"]({ agent })]);
 const thirtySeconds = 1000 * 30;
 const getFileContentLength = async (url) => {
-    var _a;
     const response = request({
         url,
         httpMethod: 'HEAD',
@@ -33,7 +32,7 @@ const getFileContentLength = async (url) => {
         headers: { 'x-tramvai-service-name': 'RESOURCE_INLINER' },
     });
     await response;
-    return (_a = httpPlugin.getHeaders(response)['content-length']) !== null && _a !== void 0 ? _a : undefined;
+    return httpPlugin.getHeaders(response)['content-length'] ?? undefined;
 };
 const getFile = async (url) => {
     const fileResponse = await request({
@@ -41,7 +40,7 @@ const getFile = async (url) => {
         timeout: thirtySeconds,
         headers: { 'x-tramvai-service-name': 'RESOURCE_INLINER' },
     });
-    return fileResponse !== null && fileResponse !== void 0 ? fileResponse : undefined;
+    return fileResponse ?? undefined;
 };
 
 exports.getFile = getFile;

package/lib/resourcesInliner/resourcesInliner.es.js

@@ -175,8 +175,7 @@ class ResourcesInliner {
     }
     // method for filtering resources that can be inlined in HTML-page
     canInline(resource) {
-        var _a;
-        if (!(((_a = this.resourceInlineThreshold) === null || _a === void 0 ? void 0 : _a.types) || []).includes(resource.type)) {
+        if (!(this.resourceInlineThreshold?.types || []).includes(resource.type)) {
             return false;
         }
         return true;

package/lib/resourcesInliner/resourcesInliner.js

@@ -184,8 +184,7 @@ class ResourcesInliner {
     }
     // method for filtering resources that can be inlined in HTML-page
     canInline(resource) {
-        var _a;
-        if (!(((_a = this.resourceInlineThreshold) === null || _a === void 0 ? void 0 : _a.types) || []).includes(resource.type)) {
+        if (!(this.resourceInlineThreshold?.types || []).includes(resource.type)) {
             return false;
         }
         return true;

package/lib/server/ReactRenderServer.es.js

@@ -78,11 +78,10 @@ class ReactRenderServer {
         this.deferredActions = deferredActions;
     }
     render({ extractor, stats, }) {
-        var _a;
         let renderResult = renderReact({ di: this.di }, this.context);
         each((render) => {
             renderResult = render(renderResult);
-        }, (_a = this.extendRender) !== null && _a !== void 0 ? _a : []);
+        }, this.extendRender ?? []);
         renderResult = extractor.collectChunks(renderResult);
         if (this.customRender) {
             return this.customRender(renderResult);

package/lib/server/ReactRenderServer.js

@@ -86,11 +86,10 @@ class ReactRenderServer {
         this.deferredActions = deferredActions;
     }
     render({ extractor, stats, }) {
-        var _a;
         let renderResult = index.renderReact({ di: this.di }, this.context);
         each__default["default"]((render) => {
             renderResult = render(renderResult);
-        }, (_a = this.extendRender) !== null && _a !== void 0 ? _a : []);
+        }, this.extendRender ?? []);
         renderResult = extractor.collectChunks(renderResult);
         if (this.customRender) {
             return this.customRender(renderResult);

package/lib/server/blocks/utils/flushFiles.es.js

@@ -19,7 +19,7 @@ const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, } = {})
     const { assetsByChunkName, namedChunkGroups, chunks: allChunks } = webpackStats;
     const resolvedChunks = [];
     for (const chunk of chunks) {
-        if (!ignoreDependencies && (namedChunkGroups === null || namedChunkGroups === void 0 ? void 0 : namedChunkGroups[chunk])) {
+        if (!ignoreDependencies && namedChunkGroups?.[chunk]) {
             resolvedChunks.push(...namedChunkGroups[chunk].chunks);
         }
         else {
@@ -30,7 +30,7 @@ const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, } = {})
         let assetFiles = assetsByChunkName[chunk];
         if (!assetFiles && allChunks) {
             const chunkById = allChunks.find((c) => c.id === chunk);
-            assetFiles = chunkById === null || chunkById === void 0 ? void 0 : chunkById.files;
+            assetFiles = chunkById?.files;
         }
         return assetFiles;
     }));

package/lib/server/blocks/utils/flushFiles.js

@@ -28,7 +28,7 @@ const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, } = {})
     const { assetsByChunkName, namedChunkGroups, chunks: allChunks } = webpackStats;
     const resolvedChunks = [];
     for (const chunk of chunks) {
-        if (!ignoreDependencies && (namedChunkGroups === null || namedChunkGroups === void 0 ? void 0 : namedChunkGroups[chunk])) {
+        if (!ignoreDependencies && namedChunkGroups?.[chunk]) {
             resolvedChunks.push(...namedChunkGroups[chunk].chunks);
         }
         else {
@@ -39,7 +39,7 @@ const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, } = {})
         let assetFiles = assetsByChunkName[chunk];
         if (!assetFiles && allChunks) {
             const chunkById = allChunks.find((c) => c.id === chunk);
-            assetFiles = chunkById === null || chunkById === void 0 ? void 0 : chunkById.files;
+            assetFiles = chunkById?.files;
         }
         return assetFiles;
     }));

package/lib/server.es.js

@@ -23,7 +23,6 @@ import { LayoutModule } from './shared/LayoutModule.es.js';
 import { providers } from './shared/providers.es.js';
 import { fetchWebpackStats } from './server/blocks/utils/fetchWebpackStats.es.js';
 
-var _a;
 var RenderModule_1;
 const REQUEST_TTL = 5 * 60 * 1000;
 /**
@@ -338,7 +337,7 @@ Page Error Boundary will be rendered for the client`,
             }),
             provide({
                 provide: DEFAULT_ASSETS_PREFIX_TOKEN,
-                useValue: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : null,
+                useValue: process.env.ASSETS_PREFIX ?? null,
             }),
             provide({
                 provide: FETCH_WEBPACK_STATS_TOKEN,

package/lib/server.js

@@ -24,7 +24,6 @@ var LayoutModule = require('./shared/LayoutModule.js');
 var providers = require('./shared/providers.js');
 var fetchWebpackStats = require('./server/blocks/utils/fetchWebpackStats.js');
 
-var _a;
 var RenderModule_1;
 const REQUEST_TTL = 5 * 60 * 1000;
 /**
@@ -339,7 +338,7 @@ Page Error Boundary will be rendered for the client`,
             }),
             core.provide({
                 provide: tokensRender.DEFAULT_ASSETS_PREFIX_TOKEN,
-                useValue: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : null,
+                useValue: process.env.ASSETS_PREFIX ?? null,
             }),
             core.provide({
                 provide: tokensRender.FETCH_WEBPACK_STATS_TOKEN,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "5.10.0",
+  "version": "5.14.10",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -26,15 +26,15 @@
     "@tinkoff/layout-factory": "0.6.2",
     "@tinkoff/errors": "0.6.2",
     "@tinkoff/url": "0.11.2",
-    "@tinkoff/user-agent": "0.7.27",
+    "@tinkoff/user-agent": "0.7.47",
     "@tinkoff/request-core": "^0.10.0",
     "@tinkoff/request-plugin-protocol-http": "^0.12.1",
-    "@tramvai/module-client-hints": "5.10.0",
-    "@tramvai/module-router": "5.10.0",
-    "@tramvai/react": "5.10.0",
-    "@tramvai/safe-strings": "0.8.3",
-    "@tramvai/tokens-render": "5.10.0",
-    "@tramvai/experiments": "5.10.0",
+    "@tramvai/module-client-hints": "5.14.10",
+    "@tramvai/module-router": "5.14.10",
+    "@tramvai/react": "5.14.10",
+    "@tramvai/safe-strings": "0.8.4",
+    "@tramvai/tokens-render": "5.14.10",
+    "@tramvai/experiments": "5.14.10",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
@@ -42,14 +42,14 @@
     "@tinkoff/dippy": "0.11.3",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/react-hooks": "0.4.2",
-    "@tramvai/cli": "5.10.0",
-    "@tramvai/core": "5.10.0",
-    "@tramvai/module-common": "5.10.0",
-    "@tramvai/state": "5.10.0",
-    "@tramvai/test-helpers": "5.10.0",
-    "@tramvai/tokens-common": "5.10.0",
-    "@tramvai/tokens-router": "5.10.0",
-    "@tramvai/tokens-server-private": "5.10.0",
+    "@tramvai/cli": "5.14.10",
+    "@tramvai/core": "5.14.10",
+    "@tramvai/module-common": "5.14.10",
+    "@tramvai/state": "5.14.10",
+    "@tramvai/test-helpers": "5.14.10",
+    "@tramvai/tokens-common": "5.14.10",
+    "@tramvai/tokens-router": "5.14.10",
+    "@tramvai/tokens-server-private": "5.14.10",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.14.0",

package/tests.js

@@ -157,7 +157,6 @@ const htmlPageSchemaFactory = ({ htmlAttrs, }) => {
 };
 
 const testPageResources = (options) => {
-    var _a;
     const { modules, providers = [] } = options;
     const { di, runLine } = testHelpers.getDiWrapper({
         di: options.di,
@@ -209,7 +208,7 @@ const testPageResources = (options) => {
             }),
         ],
     });
-    const renderSlots = flatten__default["default"]((_a = di.get({ token: tokensRender.RENDER_SLOTS, optional: true })) !== null && _a !== void 0 ? _a : []);
+    const renderSlots = flatten__default["default"](di.get({ token: tokensRender.RENDER_SLOTS, optional: true }) ?? []);
     const resourcesRegistry = di.get(tokensRender.RESOURCES_REGISTRY);
     const render = () => {
         const rawHtml = htmlpagebuilder.buildPage({