@tramvai/module-render 1.71.0 → 1.72.2

package/lib/server/PageBuilder.d.ts

@@ -8,9 +8,8 @@ export declare class PageBuilder {
     private reactRender;
     private htmlAttrs;
     private polyfillCondition;
-    private userAgent;
     private modern;
-    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, userAgent, htmlAttrs, }: {
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, }: {
         renderSlots: any;
         pageService: any;
         resourcesRegistry: any;
@@ -18,8 +17,8 @@ export declare class PageBuilder {
         reactRender: any;
         htmlPageSchema: any;
         polyfillCondition: any;
-        userAgent: any;
         htmlAttrs: any;
+        modern: any;
     });
     flow(): Promise<string>;
     dehydrateState(): void;

package/lib/server.es.js

@@ -11,19 +11,19 @@ import { createToken, Scope } from '@tinkoff/dippy';
 import { WEB_APP_AFTER_INIT_TOKEN } from '@tramvai/tokens-server';
 import { useDi, ERROR_BOUNDARY_TOKEN, ERROR_BOUNDARY_FALLBACK_COMPONENT_TOKEN, UniversalErrorBoundary, DIContext, ROOT_ERROR_BOUNDARY_COMPONENT_TOKEN } from '@tramvai/react';
 import { resolve, isAbsoluteUrl as isAbsoluteUrl$1, parse } from '@tinkoff/url';
+import { satisfies } from '@tinkoff/user-agent';
 import isUndefined from '@tinkoff/utils/is/undefined';
 import isEmpty from '@tinkoff/utils/is/empty';
 import fetch from 'node-fetch';
 import startsWith from '@tinkoff/utils/string/startsWith';
 import toArray from '@tinkoff/utils/array/toArray';
 import flatten from '@tinkoff/utils/array/flatten';
-import { satisfies } from '@tinkoff/user-agent';
 import { buildPage, staticRender, dynamicRender } from '@tinkoff/htmlpagebuilder';
 import { safeDehydrate } from '@tramvai/safe-strings';
 import { ChunkExtractor } from '@loadable/server';
 import has from '@tinkoff/utils/object/has';
 import last from '@tinkoff/utils/array/last';
-import { isFileSystemPageComponent } from '@tramvai/experiments';
+import { isFileSystemPageComponent, fileSystemPageToWebpackChunkName } from '@tramvai/experiments';
 import uniq from '@tinkoff/utils/array/uniq';
 import * as path from 'path';
 import each from '@tinkoff/utils/array/each';
@@ -393,15 +393,15 @@ const fetchWebpackStats = async ({ modern, } = {}) => {
 };
 
 const bundleResource = async ({ bundle, modern, extractor, pageComponent, }) => {
-    // file-system pages can work without bundle chunk
+    // for file-system pages preload page chunk against bundle chunk
     const chunkNameFromBundle = isFileSystemPageComponent(pageComponent)
-        ? null
+        ? fileSystemPageToWebpackChunkName(pageComponent)
         : last(bundle.split('/'));
     const webpackStats = await fetchWebpackStats({ modern });
     const { publicPath, assetsByChunkName } = webpackStats;
-    const bundles = (has('common-chunk', assetsByChunkName)
+    const bundles = has('common-chunk', assetsByChunkName)
         ? ['common-chunk', chunkNameFromBundle]
-        : [chunkNameFromBundle]).filter(Boolean);
+        : [chunkNameFromBundle];
     const lazyChunks = extractor.getMainAssets().map((entry) => entry.chunk);
     const { scripts: baseScripts } = flushFiles(['vendor'], webpackStats, {
         ignoreDependencies: true,
@@ -510,7 +510,7 @@ const mapResourcesToSlots = (resources) => resources.reduce((acc, resource) => {
     return acc;
 }, {});
 class PageBuilder {
-    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, userAgent, htmlAttrs, }) {
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, }) {
         this.htmlAttrs = htmlAttrs;
         this.renderSlots = flatten(renderSlots || []);
         this.pageService = pageService;
@@ -519,8 +519,7 @@ class PageBuilder {
         this.reactRender = reactRender;
         this.htmlPageSchema = htmlPageSchema;
         this.polyfillCondition = polyfillCondition;
-        this.userAgent = userAgent;
-        this.modern = satisfies(this.userAgent, null, { env: 'modern' });
+        this.modern = modern;
     }
     async flow() {
         const stats = await fetchWebpackStats({ modern: this.modern });
@@ -825,8 +824,8 @@ RenderModule = RenderModule_1 = __decorate([
                     htmlPageSchema: 'htmlPageSchema',
                     renderSlots: { token: RENDER_SLOTS, optional: true },
                     polyfillCondition: POLYFILL_CONDITION,
-                    userAgent: USER_AGENT_TOKEN,
                     htmlAttrs: HTML_ATTRS,
+                    modern: 'modernSatisfies',
                 },
             }),
             provide({
@@ -912,6 +911,33 @@ RenderModule = RenderModule_1 = __decorate([
                     logger: LOGGER_TOKEN,
                 },
             }),
+            provide({
+                provide: 'modernSatisfies',
+                useFactory: ({ requestManager, userAgent, cache }) => {
+                    const reqUserAgent = requestManager.getHeader('user-agent');
+                    if (cache.has(reqUserAgent)) {
+                        return cache.get(reqUserAgent);
+                    }
+                    const result = satisfies(userAgent, null, { env: 'modern' });
+                    cache.set(reqUserAgent, result);
+                    return result;
+                },
+                deps: {
+                    requestManager: REQUEST_MANAGER_TOKEN,
+                    userAgent: USER_AGENT_TOKEN,
+                    cache: 'modernSatisfiesLruCache',
+                },
+            }),
+            provide({
+                provide: 'modernSatisfiesLruCache',
+                scope: Scope.SINGLETON,
+                useFactory: ({ createCache }) => {
+                    return createCache('modernSatisfies', { max: 50 });
+                },
+                deps: {
+                    createCache: CREATE_CACHE_TOKEN,
+                },
+            }),
         ],
     })
 ], RenderModule);

package/lib/server.js

@@ -14,13 +14,13 @@ var dippy = require('@tinkoff/dippy');
 var tokensServer = require('@tramvai/tokens-server');
 var react = require('@tramvai/react');
 var url = require('@tinkoff/url');
+var userAgent = require('@tinkoff/user-agent');
 var isUndefined = require('@tinkoff/utils/is/undefined');
 var isEmpty = require('@tinkoff/utils/is/empty');
 var fetch = require('node-fetch');
 var startsWith = require('@tinkoff/utils/string/startsWith');
 var toArray = require('@tinkoff/utils/array/toArray');
 var flatten = require('@tinkoff/utils/array/flatten');
-var userAgent = require('@tinkoff/user-agent');
 var htmlpagebuilder = require('@tinkoff/htmlpagebuilder');
 var safeStrings = require('@tramvai/safe-strings');
 var server = require('@loadable/server');
@@ -430,15 +430,15 @@ const fetchWebpackStats = async ({ modern, } = {}) => {
 };
 
 const bundleResource = async ({ bundle, modern, extractor, pageComponent, }) => {
-    // file-system pages can work without bundle chunk
+    // for file-system pages preload page chunk against bundle chunk
     const chunkNameFromBundle = experiments.isFileSystemPageComponent(pageComponent)
-        ? null
+        ? experiments.fileSystemPageToWebpackChunkName(pageComponent)
         : last__default["default"](bundle.split('/'));
     const webpackStats = await fetchWebpackStats({ modern });
     const { publicPath, assetsByChunkName } = webpackStats;
-    const bundles = (has__default["default"]('common-chunk', assetsByChunkName)
+    const bundles = has__default["default"]('common-chunk', assetsByChunkName)
         ? ['common-chunk', chunkNameFromBundle]
-        : [chunkNameFromBundle]).filter(Boolean);
+        : [chunkNameFromBundle];
     const lazyChunks = extractor.getMainAssets().map((entry) => entry.chunk);
     const { scripts: baseScripts } = flushFiles(['vendor'], webpackStats, {
         ignoreDependencies: true,
@@ -547,7 +547,7 @@ const mapResourcesToSlots = (resources) => resources.reduce((acc, resource) => {
     return acc;
 }, {});
 class PageBuilder {
-    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, userAgent: userAgent$1, htmlAttrs, }) {
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, }) {
         this.htmlAttrs = htmlAttrs;
         this.renderSlots = flatten__default["default"](renderSlots || []);
         this.pageService = pageService;
@@ -556,8 +556,7 @@ class PageBuilder {
         this.reactRender = reactRender;
         this.htmlPageSchema = htmlPageSchema;
         this.polyfillCondition = polyfillCondition;
-        this.userAgent = userAgent$1;
-        this.modern = userAgent.satisfies(this.userAgent, null, { env: 'modern' });
+        this.modern = modern;
     }
     async flow() {
         const stats = await fetchWebpackStats({ modern: this.modern });
@@ -862,8 +861,8 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                     htmlPageSchema: 'htmlPageSchema',
                     renderSlots: { token: tokensRender.RENDER_SLOTS, optional: true },
                     polyfillCondition: tokensRender.POLYFILL_CONDITION,
-                    userAgent: moduleClientHints.USER_AGENT_TOKEN,
                     htmlAttrs: tokensRender.HTML_ATTRS,
+                    modern: 'modernSatisfies',
                 },
             }),
             core.provide({
@@ -949,6 +948,33 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                     logger: moduleCommon.LOGGER_TOKEN,
                 },
             }),
+            core.provide({
+                provide: 'modernSatisfies',
+                useFactory: ({ requestManager, userAgent: userAgent$1, cache }) => {
+                    const reqUserAgent = requestManager.getHeader('user-agent');
+                    if (cache.has(reqUserAgent)) {
+                        return cache.get(reqUserAgent);
+                    }
+                    const result = userAgent.satisfies(userAgent$1, null, { env: 'modern' });
+                    cache.set(reqUserAgent, result);
+                    return result;
+                },
+                deps: {
+                    requestManager: moduleCommon.REQUEST_MANAGER_TOKEN,
+                    userAgent: moduleClientHints.USER_AGENT_TOKEN,
+                    cache: 'modernSatisfiesLruCache',
+                },
+            }),
+            core.provide({
+                provide: 'modernSatisfiesLruCache',
+                scope: dippy.Scope.SINGLETON,
+                useFactory: ({ createCache }) => {
+                    return createCache('modernSatisfies', { max: 50 });
+                },
+                deps: {
+                    createCache: moduleCommon.CREATE_CACHE_TOKEN,
+                },
+            }),
         ],
     })
 ], exports.RenderModule);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "1.71.0",
+  "version": "1.72.2",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -24,27 +24,27 @@
     "@tinkoff/htmlpagebuilder": "0.4.22",
     "@tinkoff/layout-factory": "0.2.28",
     "@tinkoff/url": "0.7.37",
-    "@tinkoff/user-agent": "0.3.262",
-    "@tramvai/module-client-hints": "1.71.0",
-    "@tramvai/module-router": "1.71.0",
-    "@tramvai/react": "1.71.0",
+    "@tinkoff/user-agent": "0.3.266",
+    "@tramvai/module-client-hints": "1.72.2",
+    "@tramvai/module-router": "1.72.2",
+    "@tramvai/react": "1.72.2",
     "@tramvai/safe-strings": "0.4.3",
-    "@tramvai/tokens-render": "1.71.0",
-    "@tramvai/experiments": "1.71.0",
+    "@tramvai/tokens-render": "1.72.2",
+    "@tramvai/experiments": "1.72.2",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.38",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.71.0",
-    "@tramvai/core": "1.71.0",
-    "@tramvai/module-common": "1.71.0",
-    "@tramvai/state": "1.71.0",
-    "@tramvai/test-helpers": "1.71.0",
-    "@tramvai/tokens-common": "1.71.0",
-    "@tramvai/tokens-router": "1.71.0",
-    "@tramvai/tokens-server": "1.71.0",
+    "@tramvai/cli": "1.72.2",
+    "@tramvai/core": "1.72.2",
+    "@tramvai/module-common": "1.72.2",
+    "@tramvai/state": "1.72.2",
+    "@tramvai/test-helpers": "1.72.2",
+    "@tramvai/tokens-common": "1.72.2",
+    "@tramvai/tokens-router": "1.72.2",
+    "@tramvai/tokens-server": "1.72.2",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.8.0",