@tramvai/module-render 5.49.1 → 5.53.74

package/lib/server.es.js

@@ -2,15 +2,13 @@ import { __decorate } from 'tslib';
 import { Module, provide, commandLineListTokens, DI_TOKEN } from '@tramvai/core';
 import { CREATE_CACHE_TOKEN, LOGGER_TOKEN, REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, DEFERRED_ACTIONS_MAP_TOKEN } from '@tramvai/tokens-common';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
-import { ClientHintsModule, USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
-import { RESOURCES_REGISTRY, RESOURCE_INLINE_OPTIONS, ASSETS_PREFIX_TOKEN, BACK_FORWARD_CACHE_ENABLED, RENDER_SLOTS, POLYFILL_CONDITION, HTML_ATTRS, MODERN_SATISFIES_TOKEN, RENDER_FLOW_AFTER_TOKEN, FETCH_WEBPACK_STATS_TOKEN, REACT_SERVER_RENDER_MODE, CUSTOM_RENDER, EXTEND_RENDER, REACT_STREAMING_RENDER_TIMEOUT, ResourceType, DEFAULT_ASSETS_PREFIX_TOKEN } from '@tramvai/tokens-render';
+import { ClientHintsModule } from '@tramvai/module-client-hints';
+import { RESOURCES_REGISTRY, RESOURCE_INLINE_OPTIONS, ASSETS_PREFIX_TOKEN, BACK_FORWARD_CACHE_ENABLED, RENDER_SLOTS, POLYFILL_CONDITION, HTML_ATTRS, RENDER_FLOW_AFTER_TOKEN, FETCH_WEBPACK_STATS_TOKEN, INLINE_WEBPACK_RUNTIME, REACT_SERVER_RENDER_MODE, CUSTOM_RENDER, EXTEND_RENDER, REACT_STREAMING_RENDER_TIMEOUT, ResourceType, DEFAULT_ASSETS_PREFIX_TOKEN } from '@tramvai/tokens-render';
 export * from '@tramvai/tokens-render';
 import { Scope, optional } from '@tinkoff/dippy';
-import { satisfies } from '@tinkoff/user-agent';
 import { isRedirectFoundError } from '@tinkoff/errors';
 import { setPageErrorEvent, PageErrorStore, deserializeError } from '@tramvai/module-router';
 export { PageErrorStore, setPageErrorEvent } from '@tramvai/module-router';
-import { COOKIE_MANAGER_TOKEN } from '@tramvai/module-common';
 import { SERVER_RESPONSE_TASK_MANAGER, SERVER_RESPONSE_STREAM } from '@tramvai/tokens-server-private';
 import { ResourcesInliner } from './resourcesInliner/resourcesInliner.es.js';
 import { RESOURCE_INLINER, RESOURCES_REGISTRY_CACHE } from './resourcesInliner/tokens.es.js';
@@ -224,10 +222,10 @@ Page Error Boundary will be rendered for the client`,
                     renderSlots: { token: RENDER_SLOTS, optional: true },
                     polyfillCondition: POLYFILL_CONDITION,
                     htmlAttrs: HTML_ATTRS,
-                    modern: MODERN_SATISFIES_TOKEN,
                     renderFlowAfter: { token: RENDER_FLOW_AFTER_TOKEN, optional: true },
                     logger: LOGGER_TOKEN,
                     fetchWebpackStats: FETCH_WEBPACK_STATS_TOKEN,
+                    inlineWebpackRuntime: INLINE_WEBPACK_RUNTIME,
                     di: DI_TOKEN,
                     renderMode: optional(REACT_SERVER_RENDER_MODE),
                     assetsPrefixFactory: ASSETS_PREFIX_TOKEN,
@@ -294,38 +292,6 @@ Page Error Boundary will be rendered for the client`,
                     },
                 },
             }),
-            provide({
-                provide: MODERN_SATISFIES_TOKEN,
-                useFactory: ({ requestManager, userAgent, cache, cookieManager }) => {
-                    const reqUserAgent = requestManager.getHeader('user-agent');
-                    let result;
-                    if (cache.has(reqUserAgent)) {
-                        result = cache.get(reqUserAgent);
-                    }
-                    else {
-                        result = satisfies(userAgent, null, { env: 'modern' });
-                        cache.set(reqUserAgent, result);
-                    }
-                    cookieManager.set({ name: '_t_modern', value: JSON.stringify(result) });
-                    return result;
-                },
-                deps: {
-                    requestManager: REQUEST_MANAGER_TOKEN,
-                    userAgent: USER_AGENT_TOKEN,
-                    cache: 'modernSatisfiesMemoryCache',
-                    cookieManager: COOKIE_MANAGER_TOKEN,
-                },
-            }),
-            provide({
-                provide: 'modernSatisfiesMemoryCache',
-                scope: Scope.SINGLETON,
-                useFactory: ({ createCache }) => {
-                    return createCache('memory', { name: 'modern-satisfies', max: 200 });
-                },
-                deps: {
-                    createCache: CREATE_CACHE_TOKEN,
-                },
-            }),
             provide({
                 provide: ASSETS_PREFIX_TOKEN,
                 useFactory: ({ defaultAssetsPrefix }) => {
@@ -352,6 +318,10 @@ Page Error Boundary will be rendered for the client`,
                 provide: BACK_FORWARD_CACHE_ENABLED,
                 useValue: true,
             }),
+            provide({
+                provide: INLINE_WEBPACK_RUNTIME,
+                useValue: false,
+            }),
             provide({
                 provide: REACT_SERVER_RENDER_MODE,
                 useValue: 'sync',

package/lib/server.js

@@ -9,10 +9,8 @@ var tokensRouter = require('@tramvai/tokens-router');
 var moduleClientHints = require('@tramvai/module-client-hints');
 var tokensRender = require('@tramvai/tokens-render');
 var dippy = require('@tinkoff/dippy');
-var userAgent = require('@tinkoff/user-agent');
 var errors = require('@tinkoff/errors');
 var moduleRouter = require('@tramvai/module-router');
-var moduleCommon = require('@tramvai/module-common');
 var tokensServerPrivate = require('@tramvai/tokens-server-private');
 var resourcesInliner = require('./resourcesInliner/resourcesInliner.js');
 var tokens = require('./resourcesInliner/tokens.js');
@@ -225,10 +223,10 @@ Page Error Boundary will be rendered for the client`,
                     renderSlots: { token: tokensRender.RENDER_SLOTS, optional: true },
                     polyfillCondition: tokensRender.POLYFILL_CONDITION,
                     htmlAttrs: tokensRender.HTML_ATTRS,
-                    modern: tokensRender.MODERN_SATISFIES_TOKEN,
                     renderFlowAfter: { token: tokensRender.RENDER_FLOW_AFTER_TOKEN, optional: true },
                     logger: tokensCommon.LOGGER_TOKEN,
                     fetchWebpackStats: tokensRender.FETCH_WEBPACK_STATS_TOKEN,
+                    inlineWebpackRuntime: tokensRender.INLINE_WEBPACK_RUNTIME,
                     di: core.DI_TOKEN,
                     renderMode: dippy.optional(tokensRender.REACT_SERVER_RENDER_MODE),
                     assetsPrefixFactory: tokensRender.ASSETS_PREFIX_TOKEN,
@@ -295,38 +293,6 @@ Page Error Boundary will be rendered for the client`,
                     },
                 },
             }),
-            core.provide({
-                provide: tokensRender.MODERN_SATISFIES_TOKEN,
-                useFactory: ({ requestManager, userAgent: userAgent$1, cache, cookieManager }) => {
-                    const reqUserAgent = requestManager.getHeader('user-agent');
-                    let result;
-                    if (cache.has(reqUserAgent)) {
-                        result = cache.get(reqUserAgent);
-                    }
-                    else {
-                        result = userAgent.satisfies(userAgent$1, null, { env: 'modern' });
-                        cache.set(reqUserAgent, result);
-                    }
-                    cookieManager.set({ name: '_t_modern', value: JSON.stringify(result) });
-                    return result;
-                },
-                deps: {
-                    requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
-                    userAgent: moduleClientHints.USER_AGENT_TOKEN,
-                    cache: 'modernSatisfiesMemoryCache',
-                    cookieManager: moduleCommon.COOKIE_MANAGER_TOKEN,
-                },
-            }),
-            core.provide({
-                provide: 'modernSatisfiesMemoryCache',
-                scope: dippy.Scope.SINGLETON,
-                useFactory: ({ createCache }) => {
-                    return createCache('memory', { name: 'modern-satisfies', max: 200 });
-                },
-                deps: {
-                    createCache: tokensCommon.CREATE_CACHE_TOKEN,
-                },
-            }),
             core.provide({
                 provide: tokensRender.ASSETS_PREFIX_TOKEN,
                 useFactory: ({ defaultAssetsPrefix }) => {
@@ -353,6 +319,10 @@ Page Error Boundary will be rendered for the client`,
                 provide: tokensRender.BACK_FORWARD_CACHE_ENABLED,
                 useValue: true,
             }),
+            core.provide({
+                provide: tokensRender.INLINE_WEBPACK_RUNTIME,
+                useValue: false,
+            }),
             core.provide({
                 provide: tokensRender.REACT_SERVER_RENDER_MODE,
                 useValue: 'sync',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "5.49.1",
+  "version": "5.53.74",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -22,35 +22,35 @@
   },
   "dependencies": {
     "@loadable/server": "^5.15.0",
-    "@tinkoff/htmlpagebuilder": "0.8.3",
-    "@tinkoff/layout-factory": "0.6.3",
-    "@tinkoff/errors": "0.6.2",
-    "@tinkoff/url": "0.11.2",
-    "@tinkoff/user-agent": "0.7.115",
+    "@tinkoff/errors": "0.6.3",
+    "@tinkoff/htmlpagebuilder": "0.8.5",
+    "@tinkoff/layout-factory": "0.6.4",
     "@tinkoff/request-core": "^0.10.0",
     "@tinkoff/request-plugin-protocol-http": "^0.12.1",
-    "@tramvai/module-client-hints": "5.49.1",
-    "@tramvai/module-router": "5.49.1",
-    "@tramvai/react": "5.49.1",
+    "@tinkoff/url": "0.11.3",
+    "@tinkoff/user-agent": "0.7.198",
+    "@tramvai/experiments": "5.53.74",
+    "@tramvai/module-client-hints": "5.53.74",
+    "@tramvai/module-router": "5.53.74",
+    "@tramvai/react": "5.53.74",
     "@tramvai/safe-strings": "0.8.4",
-    "@tramvai/tokens-render": "5.49.1",
-    "@tramvai/experiments": "5.49.1",
+    "@tramvai/tokens-render": "5.53.74",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.11.4",
-    "@tinkoff/utils": "^2.1.2",
+    "@tinkoff/dippy": "0.11.5",
     "@tinkoff/react-hooks": "0.4.2",
-    "@tramvai/cli": "5.49.1",
-    "@tramvai/core": "5.49.1",
-    "@tramvai/module-common": "5.49.1",
-    "@tramvai/state": "5.49.1",
-    "@tramvai/test-helpers": "5.49.1",
-    "@tramvai/tokens-common": "5.49.1",
-    "@tramvai/tokens-router": "5.49.1",
-    "@tramvai/tokens-server-private": "5.49.1",
-    "express": "^4.17.1",
+    "@tinkoff/utils": "^2.1.2",
+    "@tramvai/cli": "5.53.74",
+    "@tramvai/core": "5.53.74",
+    "@tramvai/module-common": "5.53.74",
+    "@tramvai/state": "5.53.74",
+    "@tramvai/test-helpers": "5.53.74",
+    "@tramvai/tokens-common": "5.53.74",
+    "@tramvai/tokens-router": "5.53.74",
+    "@tramvai/tokens-server-private": "5.53.74",
+    "express": "^4.21.2",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "tslib": "^2.4.0"

package/tests.js

@@ -23,6 +23,7 @@ require('@tinkoff/utils/object/has');
 require('@tinkoff/utils/array/last');
 require('@tramvai/experiments');
 require('@tinkoff/utils/array/uniq');
+require('node-fetch');
 require('@tinkoff/utils/array/each');
 require('@tinkoff/utils/object/path');
 
@@ -128,7 +129,7 @@ const mapResourcesToSlots = (resources) => resources.reduce((acc, resource) => {
 }, {});
 /* eslint-enable sort-class-members/sort-class-members */
 
-const { REACT_RENDER, HEAD_CORE_SCRIPTS, HEAD_DYNAMIC_SCRIPTS, HEAD_META, HEAD_POLYFILLS, HEAD_CORE_STYLES, HEAD_PERFORMANCE, HEAD_ANALYTICS, BODY_START, BODY_END, HEAD_ICONS, BODY_TAIL_ANALYTICS, BODY_TAIL, } = tokensRender.ResourceSlot;
+const { REACT_RENDER, HEAD_CORE_SCRIPTS, HEAD_DYNAMIC_SCRIPTS, HEAD_META, HEAD_POLYFILLS, HEAD_WEBPACK_RUNTIME, HEAD_CORE_STYLES, HEAD_PERFORMANCE, HEAD_ANALYTICS, BODY_START, BODY_END, HEAD_ICONS, BODY_TAIL_ANALYTICS, BODY_TAIL, } = tokensRender.ResourceSlot;
 const htmlPageSchemaFactory = ({ htmlAttrs, }) => {
     return [
         htmlpagebuilder.staticRender('<!DOCTYPE html>'),
@@ -138,6 +139,7 @@ const htmlPageSchemaFactory = ({ htmlAttrs, }) => {
         htmlpagebuilder.dynamicRender(HEAD_META),
         htmlpagebuilder.dynamicRender(HEAD_PERFORMANCE),
         htmlpagebuilder.dynamicRender(HEAD_CORE_STYLES),
+        htmlpagebuilder.dynamicRender(HEAD_WEBPACK_RUNTIME),
         htmlpagebuilder.dynamicRender(HEAD_POLYFILLS),
         htmlpagebuilder.dynamicRender(HEAD_DYNAMIC_SCRIPTS),
         htmlpagebuilder.dynamicRender(HEAD_CORE_SCRIPTS),