@tramvai/module-render 2.100.0 → 2.101.1

package/lib/server.es.js

@@ -3,7 +3,7 @@ import { Module, provide, commandLineListTokens, DI_TOKEN } from '@tramvai/core'
 import { CREATE_CACHE_TOKEN, LOGGER_TOKEN, REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_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, RENDER_SLOTS, POLYFILL_CONDITION, HTML_ATTRS, MODERN_SATISFIES_TOKEN, RENDER_FLOW_AFTER_TOKEN, FETCH_WEBPACK_STATS_TOKEN, CUSTOM_RENDER, EXTEND_RENDER, REACT_SERVER_RENDER_MODE, ResourceType } from '@tramvai/tokens-render';
+import { RESOURCES_REGISTRY, RESOURCE_INLINE_OPTIONS, BACK_FORWARD_CACHE_ENABLED, RENDER_SLOTS, POLYFILL_CONDITION, HTML_ATTRS, MODERN_SATISFIES_TOKEN, RENDER_FLOW_AFTER_TOKEN, FETCH_WEBPACK_STATS_TOKEN, CUSTOM_RENDER, EXTEND_RENDER, REACT_SERVER_RENDER_MODE, ResourceType } from '@tramvai/tokens-render';
 export * from '@tramvai/tokens-render';
 import { Scope } from '@tinkoff/dippy';
 import { satisfies } from '@tinkoff/user-agent';
@@ -78,7 +78,7 @@ RenderModule = RenderModule_1 = __decorate([
             }),
             provide({
                 provide: commandLineListTokens.generatePage,
-                useFactory: ({ htmlBuilder, logger, requestManager, responseManager, context, pageService, }) => {
+                useFactory: ({ htmlBuilder, logger, requestManager, responseManager, context, bfcacheEnabled, pageService, }) => {
                     const log = logger('module-render');
                     // eslint-disable-next-line max-statements
                     return async function render() {
@@ -166,7 +166,7 @@ Page Error Boundary will be rendered for the client`,
                         // TODO Заменить после выкатки на прод и прохода всех тестов на cache-control = no-cache,no-store,max-age=0,must-revalidate
                         responseManager.setHeader('expires', '0');
                         responseManager.setHeader('pragma', 'no-cache');
-                        responseManager.setHeader('cache-control', 'no-cache, no-store, must-revalidate');
+                        responseManager.setHeader('cache-control', `${bfcacheEnabled ? '' : 'no-store, '}no-cache, must-revalidate`);
                         responseManager.setBody(html);
                     };
                 },
@@ -177,6 +177,7 @@ Page Error Boundary will be rendered for the client`,
                     htmlBuilder: 'htmlBuilder',
                     context: CONTEXT_TOKEN,
                     pageService: PAGE_SERVICE_TOKEN,
+                    bfcacheEnabled: BACK_FORWARD_CACHE_ENABLED,
                 },
                 multi: true,
             }),
@@ -286,6 +287,10 @@ Page Error Boundary will be rendered for the client`,
                 provide: FETCH_WEBPACK_STATS_TOKEN,
                 useValue: fetchWebpackStats,
             }),
+            provide({
+                provide: BACK_FORWARD_CACHE_ENABLED,
+                useValue: true,
+            }),
         ],
     })
 ], RenderModule);

package/lib/server.js

@@ -79,7 +79,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
             }),
             core.provide({
                 provide: core.commandLineListTokens.generatePage,
-                useFactory: ({ htmlBuilder, logger, requestManager, responseManager, context, pageService, }) => {
+                useFactory: ({ htmlBuilder, logger, requestManager, responseManager, context, bfcacheEnabled, pageService, }) => {
                     const log = logger('module-render');
                     // eslint-disable-next-line max-statements
                     return async function render() {
@@ -167,7 +167,7 @@ Page Error Boundary will be rendered for the client`,
                         // TODO Заменить после выкатки на прод и прохода всех тестов на cache-control = no-cache,no-store,max-age=0,must-revalidate
                         responseManager.setHeader('expires', '0');
                         responseManager.setHeader('pragma', 'no-cache');
-                        responseManager.setHeader('cache-control', 'no-cache, no-store, must-revalidate');
+                        responseManager.setHeader('cache-control', `${bfcacheEnabled ? '' : 'no-store, '}no-cache, must-revalidate`);
                         responseManager.setBody(html);
                     };
                 },
@@ -178,6 +178,7 @@ Page Error Boundary will be rendered for the client`,
                     htmlBuilder: 'htmlBuilder',
                     context: tokensCommon.CONTEXT_TOKEN,
                     pageService: tokensRouter.PAGE_SERVICE_TOKEN,
+                    bfcacheEnabled: tokensRender.BACK_FORWARD_CACHE_ENABLED,
                 },
                 multi: true,
             }),
@@ -287,6 +288,10 @@ Page Error Boundary will be rendered for the client`,
                 provide: tokensRender.FETCH_WEBPACK_STATS_TOKEN,
                 useValue: fetchWebpackStats.fetchWebpackStats,
             }),
+            core.provide({
+                provide: tokensRender.BACK_FORWARD_CACHE_ENABLED,
+                useValue: true,
+            }),
         ],
     })
 ], exports.RenderModule);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "2.100.0",
+  "version": "2.101.1",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -26,14 +26,13 @@
     "@tinkoff/layout-factory": "0.3.8",
     "@tinkoff/errors": "0.3.8",
     "@tinkoff/url": "0.8.6",
-    "@tinkoff/user-agent": "0.4.283",
-    "@tramvai/module-client-hints": "2.100.0",
-    "@tramvai/module-page-render-mode": "2.100.0",
-    "@tramvai/module-router": "2.100.0",
-    "@tramvai/react": "2.100.0",
+    "@tinkoff/user-agent": "0.4.285",
+    "@tramvai/module-client-hints": "2.101.1",
+    "@tramvai/module-router": "2.101.1",
+    "@tramvai/react": "2.101.1",
     "@tramvai/safe-strings": "0.5.9",
-    "@tramvai/tokens-render": "2.100.0",
-    "@tramvai/experiments": "2.100.0",
+    "@tramvai/tokens-render": "2.101.1",
+    "@tramvai/experiments": "2.101.1",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
@@ -41,14 +40,14 @@
     "@tinkoff/dippy": "0.8.15",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/react-hooks": "0.1.6",
-    "@tramvai/cli": "2.100.0",
-    "@tramvai/core": "2.100.0",
-    "@tramvai/module-common": "2.100.0",
-    "@tramvai/state": "2.100.0",
-    "@tramvai/test-helpers": "2.100.0",
-    "@tramvai/tokens-common": "2.100.0",
-    "@tramvai/tokens-router": "2.100.0",
-    "@tramvai/tokens-server-private": "2.100.0",
+    "@tramvai/cli": "2.101.1",
+    "@tramvai/core": "2.101.1",
+    "@tramvai/module-common": "2.101.1",
+    "@tramvai/state": "2.101.1",
+    "@tramvai/test-helpers": "2.101.1",
+    "@tramvai/tokens-common": "2.101.1",
+    "@tramvai/tokens-router": "2.101.1",
+    "@tramvai/tokens-server-private": "2.101.1",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.14.0",