@tramvai/module-render 5.49.1 → 6.59.0

package/lib/server/blocks/bundleResource/bundleResource.es.js

@@ -4,6 +4,7 @@ import { ResourceType, ResourceSlot } from '@tramvai/tokens-render';
 import { isFileSystemPageComponent, fileSystemPageToWebpackChunkName } from '@tramvai/experiments';
 import { PRELOAD_JS } from '../../constants/performance.es.js';
 import { flushFiles } from '../utils/flushFiles.es.js';
+import { fetchWebpackRuntime } from '../utils/fetchWebpackRuntime.es.js';
 
 const asyncScriptAttrs = {
     defer: null,
@@ -20,13 +21,13 @@ try {
 catch (e) {
     // do nothing
 }
-const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, renderMode, assetsPrefixFactory, }) => {
+const bundleResource = async ({ bundle, extractor, pageComponent, fetchWebpackStats, inlineWebpackRuntime, renderMode, assetsPrefixFactory, }) => {
     // for file-system pages preload page chunk against bundle chunk
     const chunkNameFromBundle = isFileSystemPageComponent(pageComponent)
         ? fileSystemPageToWebpackChunkName(pageComponent)
         : last(bundle.split('/'));
-    const webpackStats = await fetchWebpackStats({ modern });
-    const { publicPath, assetsByChunkName } = webpackStats;
+    const webpackStats = await fetchWebpackStats();
+    const { publicPath, assetsByChunkName, integrities = {} } = webpackStats;
     const bundles = has('common-chunk', assetsByChunkName)
         ? ['common-chunk', chunkNameFromBundle]
         : [chunkNameFromBundle];
@@ -34,7 +35,9 @@ const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchW
     const { scripts: baseScripts } = flushFiles(['vendor'], webpackStats, {
         ignoreDependencies: true,
     });
-    const { scripts, styles } = flushFiles([...bundles, ...lazyChunks, ...criticalChunks, 'platform'], webpackStats);
+    const { scripts, styles } = flushFiles([...bundles, ...lazyChunks, ...criticalChunks, 'platform'], webpackStats, {
+        exclude: ['runtime'],
+    });
     const genHref = (href) => `${publicPath}${href}`;
     const result = [];
     const assetsPrefix = assetsPrefixFactory();
@@ -45,34 +48,66 @@ const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchW
             payload: `window.ap = ${`"${assetsPrefix}"`};`,
         });
     }
+    const { scripts: webpackRuntimeScript } = flushFiles(['runtime'], webpackStats);
+    // If webpack runtime is presented is always single chunk
+    const webpackRuntimeScriptName = webpackRuntimeScript[0];
+    if (webpackRuntimeScriptName) {
+        if (inlineWebpackRuntime) {
+            const webpackRuntime = await fetchWebpackRuntime(genHref(webpackRuntimeScriptName));
+            result.push({
+                type: ResourceType.inlineScript,
+                slot: ResourceSlot.HEAD_WEBPACK_RUNTIME,
+                payload: webpackRuntime,
+                attrs: {
+                    id: 'webpack-runtime',
+                },
+            });
+        }
+        else {
+            result.push({
+                type: ResourceType.script,
+                slot: ResourceSlot.HEAD_WEBPACK_RUNTIME,
+                payload: genHref(webpackRuntimeScriptName),
+                attrs: {
+                    'data-critical': 'true',
+                    ...(integrities[webpackRuntimeScriptName]
+                        ? { integrity: integrities[webpackRuntimeScriptName] }
+                        : {}),
+                },
+            });
+        }
+    }
     // defer scripts is not suitable for React streaming, we need to ability to run them as early as possible
     // https://github.com/reactwg/react-18/discussions/114
     const scriptTypeAttr = renderMode === 'streaming' ? asyncScriptAttrs : deferScriptAttrs;
-    styles.map((style) => result.push({
+    styles.forEach((style) => result.push({
         type: ResourceType.style,
         slot: ResourceSlot.HEAD_CORE_STYLES,
         payload: genHref(style),
         attrs: {
+            ...(integrities[style] ? { integrity: integrities[style] } : {}),
             'data-critical': 'true',
             // looks like we don't need this scripts preload at all, but also it is official recommendation for streaming
             // https://github.com/reactwg/react-18/discussions/114
             onload: renderMode === 'streaming' ? null : `${PRELOAD_JS}()`,
         },
     }));
-    baseScripts.map((script) => result.push({
+    baseScripts.forEach((script) => result.push({
         type: ResourceType.script,
         slot: ResourceSlot.HEAD_CORE_SCRIPTS,
         payload: genHref(script),
         attrs: {
+            ...(integrities[script] ? { integrity: integrities[script] } : {}),
             'data-critical': 'true',
             ...scriptTypeAttr,
         },
     }));
-    scripts.map((script) => result.push({
+    scripts.forEach((script) => result.push({
         type: ResourceType.script,
         slot: ResourceSlot.HEAD_CORE_SCRIPTS,
         payload: genHref(script),
         attrs: {
+            ...(integrities[script] ? { integrity: integrities[script] } : {}),
             'data-critical': 'true',
             ...scriptTypeAttr,
         },

package/lib/server/blocks/bundleResource/bundleResource.js

@@ -8,6 +8,7 @@ var tokensRender = require('@tramvai/tokens-render');
 var experiments = require('@tramvai/experiments');
 var performance = require('../../constants/performance.js');
 var flushFiles = require('../utils/flushFiles.js');
+var fetchWebpackRuntime = require('../utils/fetchWebpackRuntime.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -29,13 +30,13 @@ try {
 catch (e) {
     // do nothing
 }
-const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, renderMode, assetsPrefixFactory, }) => {
+const bundleResource = async ({ bundle, extractor, pageComponent, fetchWebpackStats, inlineWebpackRuntime, renderMode, assetsPrefixFactory, }) => {
     // for file-system pages preload page chunk against bundle chunk
     const chunkNameFromBundle = experiments.isFileSystemPageComponent(pageComponent)
         ? experiments.fileSystemPageToWebpackChunkName(pageComponent)
         : last__default["default"](bundle.split('/'));
-    const webpackStats = await fetchWebpackStats({ modern });
-    const { publicPath, assetsByChunkName } = webpackStats;
+    const webpackStats = await fetchWebpackStats();
+    const { publicPath, assetsByChunkName, integrities = {} } = webpackStats;
     const bundles = has__default["default"]('common-chunk', assetsByChunkName)
         ? ['common-chunk', chunkNameFromBundle]
         : [chunkNameFromBundle];
@@ -43,7 +44,9 @@ const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchW
     const { scripts: baseScripts } = flushFiles.flushFiles(['vendor'], webpackStats, {
         ignoreDependencies: true,
     });
-    const { scripts, styles } = flushFiles.flushFiles([...bundles, ...lazyChunks, ...criticalChunks, 'platform'], webpackStats);
+    const { scripts, styles } = flushFiles.flushFiles([...bundles, ...lazyChunks, ...criticalChunks, 'platform'], webpackStats, {
+        exclude: ['runtime'],
+    });
     const genHref = (href) => `${publicPath}${href}`;
     const result = [];
     const assetsPrefix = assetsPrefixFactory();
@@ -54,34 +57,66 @@ const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchW
             payload: `window.ap = ${`"${assetsPrefix}"`};`,
         });
     }
+    const { scripts: webpackRuntimeScript } = flushFiles.flushFiles(['runtime'], webpackStats);
+    // If webpack runtime is presented is always single chunk
+    const webpackRuntimeScriptName = webpackRuntimeScript[0];
+    if (webpackRuntimeScriptName) {
+        if (inlineWebpackRuntime) {
+            const webpackRuntime = await fetchWebpackRuntime.fetchWebpackRuntime(genHref(webpackRuntimeScriptName));
+            result.push({
+                type: tokensRender.ResourceType.inlineScript,
+                slot: tokensRender.ResourceSlot.HEAD_WEBPACK_RUNTIME,
+                payload: webpackRuntime,
+                attrs: {
+                    id: 'webpack-runtime',
+                },
+            });
+        }
+        else {
+            result.push({
+                type: tokensRender.ResourceType.script,
+                slot: tokensRender.ResourceSlot.HEAD_WEBPACK_RUNTIME,
+                payload: genHref(webpackRuntimeScriptName),
+                attrs: {
+                    'data-critical': 'true',
+                    ...(integrities[webpackRuntimeScriptName]
+                        ? { integrity: integrities[webpackRuntimeScriptName] }
+                        : {}),
+                },
+            });
+        }
+    }
     // defer scripts is not suitable for React streaming, we need to ability to run them as early as possible
     // https://github.com/reactwg/react-18/discussions/114
     const scriptTypeAttr = renderMode === 'streaming' ? asyncScriptAttrs : deferScriptAttrs;
-    styles.map((style) => result.push({
+    styles.forEach((style) => result.push({
         type: tokensRender.ResourceType.style,
         slot: tokensRender.ResourceSlot.HEAD_CORE_STYLES,
         payload: genHref(style),
         attrs: {
+            ...(integrities[style] ? { integrity: integrities[style] } : {}),
             'data-critical': 'true',
             // looks like we don't need this scripts preload at all, but also it is official recommendation for streaming
             // https://github.com/reactwg/react-18/discussions/114
             onload: renderMode === 'streaming' ? null : `${performance.PRELOAD_JS}()`,
         },
     }));
-    baseScripts.map((script) => result.push({
+    baseScripts.forEach((script) => result.push({
         type: tokensRender.ResourceType.script,
         slot: tokensRender.ResourceSlot.HEAD_CORE_SCRIPTS,
         payload: genHref(script),
         attrs: {
+            ...(integrities[script] ? { integrity: integrities[script] } : {}),
             'data-critical': 'true',
             ...scriptTypeAttr,
         },
     }));
-    scripts.map((script) => result.push({
+    scripts.forEach((script) => result.push({
         type: tokensRender.ResourceType.script,
         slot: tokensRender.ResourceSlot.HEAD_CORE_SCRIPTS,
         payload: genHref(script),
         attrs: {
+            ...(integrities[script] ? { integrity: integrities[script] } : {}),
             'data-critical': 'true',
             ...scriptTypeAttr,
         },

package/lib/server/blocks/polyfill.d.ts

@@ -1,7 +1,6 @@
 import type { PageResource, FETCH_WEBPACK_STATS_TOKEN, REACT_SERVER_RENDER_MODE } from '@tramvai/tokens-render';
-export declare const polyfillResources: ({ condition, modern, fetchWebpackStats, renderMode, }: {
+export declare const polyfillResources: ({ condition, fetchWebpackStats, renderMode, }: {
     condition: string;
-    modern: boolean;
     fetchWebpackStats: typeof FETCH_WEBPACK_STATS_TOKEN;
     renderMode: typeof REACT_SERVER_RENDER_MODE;
 }) => Promise<PageResource[]>;

package/lib/server/blocks/polyfill.es.js

@@ -1,15 +1,16 @@
 import { ResourceType, ResourceSlot } from '@tramvai/tokens-render';
 import { flushFiles } from './utils/flushFiles.es.js';
 
-const polyfillResources = async ({ condition, modern, fetchWebpackStats, renderMode, }) => {
-    const webpackStats = await fetchWebpackStats({ modern });
+const polyfillResources = async ({ condition, fetchWebpackStats, renderMode, }) => {
+    const webpackStats = await fetchWebpackStats();
     const { publicPath, polyfillCondition } = webpackStats;
-    // получает файл полифилла из stats.json\stats.modern.json.
-    // В зависимости от версии браузера будет использован полифилл из legacy или modern сборки,
-    // т.к. полифиллы для них могут отличаться на основании преобразований `@babel/preset-env`
+    // получает файл полифилла из stats.json.
     const { scripts: polyfillScripts } = flushFiles(['polyfill'], webpackStats, {
         ignoreDependencies: true,
     });
+    const { scripts: modernPolyfillScripts } = flushFiles(['modern.polyfill'], webpackStats, {
+        ignoreDependencies: true,
+    });
     const genHref = (href) => `${publicPath}${href}`;
     const result = [];
     polyfillScripts.forEach((script) => {
@@ -30,10 +31,21 @@ const polyfillResources = async ({ condition, modern, fetchWebpackStats, renderM
   } catch (e) {
     con = true;
   }
-  if (con) { document.write('<script${renderMode === 'streaming' ? '' : ' defer="defer"'} charset="utf-8" data-critical="true" crossorigin="anonymous" src="${href}"><\\/script>')}
+  if (con) { window.TRAMVAI_POLLYFILL_LOADED = true;
+  document.write('<script${renderMode === 'streaming' ? '' : ' defer="defer"'} charset="utf-8" data-critical="true" crossorigin="anonymous" src="${href}"><\\/script>')}
 })()`,
         });
     });
+    modernPolyfillScripts.forEach((script) => {
+        result.push({
+            type: ResourceType.script,
+            payload: genHref(script),
+            attrs: {
+                id: 'modern-polyfills',
+            },
+            slot: ResourceSlot.HEAD_POLYFILLS,
+        });
+    });
     return result;
 };
 

package/lib/server/blocks/polyfill.js

@@ -5,15 +5,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tokensRender = require('@tramvai/tokens-render');
 var flushFiles = require('./utils/flushFiles.js');
 
-const polyfillResources = async ({ condition, modern, fetchWebpackStats, renderMode, }) => {
-    const webpackStats = await fetchWebpackStats({ modern });
+const polyfillResources = async ({ condition, fetchWebpackStats, renderMode, }) => {
+    const webpackStats = await fetchWebpackStats();
     const { publicPath, polyfillCondition } = webpackStats;
-    // получает файл полифилла из stats.json\stats.modern.json.
-    // В зависимости от версии браузера будет использован полифилл из legacy или modern сборки,
-    // т.к. полифиллы для них могут отличаться на основании преобразований `@babel/preset-env`
+    // получает файл полифилла из stats.json.
     const { scripts: polyfillScripts } = flushFiles.flushFiles(['polyfill'], webpackStats, {
         ignoreDependencies: true,
     });
+    const { scripts: modernPolyfillScripts } = flushFiles.flushFiles(['modern.polyfill'], webpackStats, {
+        ignoreDependencies: true,
+    });
     const genHref = (href) => `${publicPath}${href}`;
     const result = [];
     polyfillScripts.forEach((script) => {
@@ -34,10 +35,21 @@ const polyfillResources = async ({ condition, modern, fetchWebpackStats, renderM
   } catch (e) {
     con = true;
   }
-  if (con) { document.write('<script${renderMode === 'streaming' ? '' : ' defer="defer"'} charset="utf-8" data-critical="true" crossorigin="anonymous" src="${href}"><\\/script>')}
+  if (con) { window.TRAMVAI_POLLYFILL_LOADED = true;
+  document.write('<script${renderMode === 'streaming' ? '' : ' defer="defer"'} charset="utf-8" data-critical="true" crossorigin="anonymous" src="${href}"><\\/script>')}
 })()`,
         });
     });
+    modernPolyfillScripts.forEach((script) => {
+        result.push({
+            type: tokensRender.ResourceType.script,
+            payload: genHref(script),
+            attrs: {
+                id: 'modern-polyfills',
+            },
+            slot: tokensRender.ResourceSlot.HEAD_POLYFILLS,
+        });
+    });
     return result;
 };
 

package/lib/server/blocks/utils/fetchWebpackRuntime.d.ts

@@ -0,0 +1,2 @@
+export declare const fetchWebpackRuntime: (webpackRuntimeURL: string) => Promise<any>;
+//# sourceMappingURL=fetchWebpackRuntime.d.ts.map

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

@@ -0,0 +1,16 @@
+import fetch from 'node-fetch';
+
+let runtimeCode;
+const fetchWebpackRuntime = async (webpackRuntimeURL) => {
+    if (runtimeCode) {
+        return runtimeCode;
+    }
+    const response = await fetch(webpackRuntimeURL);
+    if (!response.ok) {
+        throw new Error('Failed to request webpack runtime!');
+    }
+    runtimeCode = await response.text();
+    return runtimeCode;
+};
+
+export { fetchWebpackRuntime };

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

@@ -0,0 +1,24 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var fetch = require('node-fetch');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
+
+let runtimeCode;
+const fetchWebpackRuntime = async (webpackRuntimeURL) => {
+    if (runtimeCode) {
+        return runtimeCode;
+    }
+    const response = await fetch__default["default"](webpackRuntimeURL);
+    if (!response.ok) {
+        throw new Error('Failed to request webpack runtime!');
+    }
+    runtimeCode = await response.text();
+    return runtimeCode;
+};
+
+exports.fetchWebpackRuntime = fetchWebpackRuntime;

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

@@ -4,6 +4,8 @@ import { requireFunc } from './requireFunc.es.js';
 
 let appConfig;
 try {
+    // appConfig = require('virtual:tramvai/config').appConfig;
+    // eslint-disable-next-line import/extensions, import/no-unresolved
     appConfig = require('@tramvai/cli/lib/external/config').appConfig;
 }
 catch (e) {
@@ -16,10 +18,10 @@ let fetchStats = async () => {
     throw new Error(`Unknown environment`);
 };
 if (process.env.NODE_ENV === 'development') {
-    fetchStats = async (_, assetsPrefixFactory) => {
-        const { modern: configModern, staticHost, staticPort, output, httpProtocol } = appConfig;
+    fetchStats = async (assetsPrefixFactory) => {
+        const { staticHost, staticPort, output, httpProtocol } = appConfig;
         const getUrl = (filename) => `${httpProtocol}://${staticHost}:${staticPort}/${output.client}/${filename}`;
-        const request = await fetch(getUrl(configModern ? 'stats.modern.json' : 'stats.json'));
+        const request = await fetch(getUrl('stats.json'));
         const stats = await request.json();
         const assetsPrefix = assetsPrefixFactory();
         // static - популярная заглушка в env.development.js файлах, надо игнорировать, как было раньше
@@ -38,6 +40,7 @@ if (process.env.NODE_ENV === 'test') {
             publicPath: 'http://localhost:4000/',
             assetsByChunkName: {},
             entrypoints: {},
+            integrities: {},
         });
     };
 }
@@ -71,37 +74,32 @@ if (process.env.NODE_ENV === 'production') {
         };
     };
     const statsCache = {};
-    fetchStats = (modern, assetsPrefixFactory) => {
+    fetchStats = (assetsPrefixFactory) => {
         const assetsPrefix = assetsPrefixFactory();
-        const legacyStatsKey = `${assetsPrefix}legacy`;
-        const modernStatsKey = `${assetsPrefix}modern`;
-        if (!statsCache[legacyStatsKey]) {
-            statsCache[legacyStatsKey] = webpackStats('stats.json', assetsPrefix);
+        const statsKey = `${assetsPrefix}legacy`;
+        if (!statsCache[statsKey]) {
+            statsCache[statsKey] = webpackStats('stats.json', assetsPrefix);
         }
-        if (!statsCache[modernStatsKey]) {
-            statsCache[modernStatsKey] =
-                webpackStats('stats.modern.json', assetsPrefix) || statsCache[legacyStatsKey];
-        }
-        if (!statsCache[legacyStatsKey]) {
+        if (!statsCache[statsKey]) {
             throw new Error(`Cannot find stats.json.
     It should be placed in one of the next places:
       ${SEARCH_PATHS.join('\n\t')}
     In case it happens on deployment:
       - In case you are using two independent jobs for building app
         - Either do not split build command by two independent jobs and use one common job with "tramvai build" command without --buildType
-        - Or copy stats.json (and stats.modern.json if present) file from client build output to server output by yourself in your CI
+        - Or copy stats.json file from client build output to server output by yourself in your CI
       - Otherwise report issue to tramvai team
     In case it happens locally:
       - prefer to use command "tramvai start-prod" to test prod-build locally
       - copy stats.json next to built server.js file
   `);
         }
-        const stats = modern ? statsCache[modernStatsKey] : statsCache[legacyStatsKey];
+        const stats = statsCache[statsKey];
         return Promise.resolve(stats);
     };
 }
-const fetchWebpackStats = ({ assetsPrefixFactory }) => async ({ modern } = {}) => {
-    return fetchStats(modern, assetsPrefixFactory);
+const fetchWebpackStats = ({ assetsPrefixFactory }) => async () => {
+    return fetchStats(assetsPrefixFactory);
 };
 
 export { fetchWebpackStats };

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

@@ -31,6 +31,8 @@ var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 
 let appConfig;
 try {
+    // appConfig = require('virtual:tramvai/config').appConfig;
+    // eslint-disable-next-line import/extensions, import/no-unresolved
     appConfig = require('@tramvai/cli/lib/external/config').appConfig;
 }
 catch (e) {
@@ -43,10 +45,10 @@ let fetchStats = async () => {
     throw new Error(`Unknown environment`);
 };
 if (process.env.NODE_ENV === 'development') {
-    fetchStats = async (_, assetsPrefixFactory) => {
-        const { modern: configModern, staticHost, staticPort, output, httpProtocol } = appConfig;
+    fetchStats = async (assetsPrefixFactory) => {
+        const { staticHost, staticPort, output, httpProtocol } = appConfig;
         const getUrl = (filename) => `${httpProtocol}://${staticHost}:${staticPort}/${output.client}/${filename}`;
-        const request = await fetch__default["default"](getUrl(configModern ? 'stats.modern.json' : 'stats.json'));
+        const request = await fetch__default["default"](getUrl('stats.json'));
         const stats = await request.json();
         const assetsPrefix = assetsPrefixFactory();
         // static - популярная заглушка в env.development.js файлах, надо игнорировать, как было раньше
@@ -65,6 +67,7 @@ if (process.env.NODE_ENV === 'test') {
             publicPath: 'http://localhost:4000/',
             assetsByChunkName: {},
             entrypoints: {},
+            integrities: {},
         });
     };
 }
@@ -98,37 +101,32 @@ if (process.env.NODE_ENV === 'production') {
         };
     };
     const statsCache = {};
-    fetchStats = (modern, assetsPrefixFactory) => {
+    fetchStats = (assetsPrefixFactory) => {
         const assetsPrefix = assetsPrefixFactory();
-        const legacyStatsKey = `${assetsPrefix}legacy`;
-        const modernStatsKey = `${assetsPrefix}modern`;
-        if (!statsCache[legacyStatsKey]) {
-            statsCache[legacyStatsKey] = webpackStats('stats.json', assetsPrefix);
+        const statsKey = `${assetsPrefix}legacy`;
+        if (!statsCache[statsKey]) {
+            statsCache[statsKey] = webpackStats('stats.json', assetsPrefix);
         }
-        if (!statsCache[modernStatsKey]) {
-            statsCache[modernStatsKey] =
-                webpackStats('stats.modern.json', assetsPrefix) || statsCache[legacyStatsKey];
-        }
-        if (!statsCache[legacyStatsKey]) {
+        if (!statsCache[statsKey]) {
             throw new Error(`Cannot find stats.json.
     It should be placed in one of the next places:
       ${SEARCH_PATHS.join('\n\t')}
     In case it happens on deployment:
       - In case you are using two independent jobs for building app
         - Either do not split build command by two independent jobs and use one common job with "tramvai build" command without --buildType
-        - Or copy stats.json (and stats.modern.json if present) file from client build output to server output by yourself in your CI
+        - Or copy stats.json file from client build output to server output by yourself in your CI
       - Otherwise report issue to tramvai team
     In case it happens locally:
       - prefer to use command "tramvai start-prod" to test prod-build locally
       - copy stats.json next to built server.js file
   `);
         }
-        const stats = modern ? statsCache[modernStatsKey] : statsCache[legacyStatsKey];
+        const stats = statsCache[statsKey];
         return Promise.resolve(stats);
     };
 }
-const fetchWebpackStats = ({ assetsPrefixFactory }) => async ({ modern } = {}) => {
-    return fetchStats(modern, assetsPrefixFactory);
+const fetchWebpackStats = ({ assetsPrefixFactory }) => async () => {
+    return fetchStats(assetsPrefixFactory);
 };
 
 exports.fetchWebpackStats = fetchWebpackStats;

package/lib/server/blocks/utils/flushFiles.d.ts

@@ -1,8 +1,9 @@
 import type { WebpackStats } from '@tramvai/tokens-render';
 export declare const isJs: (file: string) => boolean;
 export declare const isCss: (file: string) => boolean;
-export declare const flushFiles: (chunks: string[], webpackStats: WebpackStats, { ignoreDependencies, }?: {
+export declare const flushFiles: (chunks: string[], webpackStats: WebpackStats, { ignoreDependencies, exclude, }?: {
     ignoreDependencies?: boolean;
+    exclude?: string[];
 }) => {
     scripts: string[];
     styles: string[];

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

@@ -11,7 +11,7 @@ const getFilesByType = (files) => {
         styles,
     };
 };
-const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, } = {}) => {
+const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, exclude, } = {}) => {
     // при использовании namedChunkGroups во все entry-файлы как зависимость попадает runtimeChunk
     // что при повторных вызовах flushChunks вызовет дублирование подключения manifest.js
     // из-за чего приложение может запускаться несколько раз
@@ -26,7 +26,10 @@ const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, } = {})
             resolvedChunks.push(chunk);
         }
     }
-    const files = flatten(uniq(resolvedChunks).map((chunk) => {
+    const filteredChunks = exclude
+        ? resolvedChunks.filter((chunk) => !exclude.includes(chunk))
+        : resolvedChunks;
+    const files = flatten(uniq(filteredChunks).map((chunk) => {
         let assetFiles = assetsByChunkName[chunk];
         if (!assetFiles && allChunks) {
             const chunkById = allChunks.find((c) => c.id === chunk);

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

@@ -20,7 +20,7 @@ const getFilesByType = (files) => {
         styles,
     };
 };
-const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, } = {}) => {
+const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, exclude, } = {}) => {
     // при использовании namedChunkGroups во все entry-файлы как зависимость попадает runtimeChunk
     // что при повторных вызовах flushChunks вызовет дублирование подключения manifest.js
     // из-за чего приложение может запускаться несколько раз
@@ -35,7 +35,10 @@ const flushFiles = (chunks, webpackStats, { ignoreDependencies = false, } = {})
             resolvedChunks.push(chunk);
         }
     }
-    const files = flatten__default["default"](uniq__default["default"](resolvedChunks).map((chunk) => {
+    const filteredChunks = exclude
+        ? resolvedChunks.filter((chunk) => !exclude.includes(chunk))
+        : resolvedChunks;
+    const files = flatten__default["default"](uniq__default["default"](filteredChunks).map((chunk) => {
         let assetFiles = assetsByChunkName[chunk];
         if (!assetFiles && allChunks) {
             const chunkById = allChunks.find((c) => c.id === chunk);

package/lib/server/constants/slots.d.ts

@@ -1,6 +1,7 @@
 export declare const REACT_RENDER = "react:render";
 export declare const HEAD_PERFORMANCE = "head:performance";
 export declare const HEAD_META = "head:meta";
+export declare const HEAD_WEBPACK_RUNTIME = "head:webpack-runtime";
 export declare const HEAD_POLYFILLS = "head:polyfills";
 export declare const HEAD_CORE_STYLES = "head:core-styles";
 export declare const HEAD_CORE_SCRIPTS = "head:core-scripts";

package/lib/server/htmlPageSchema.es.js

@@ -2,7 +2,7 @@ import { staticRender, dynamicRender } from '@tinkoff/htmlpagebuilder';
 import { ResourceSlot } from '@tramvai/tokens-render';
 import { formatAttributes } from './utils.es.js';
 
-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, } = 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, } = ResourceSlot;
 const htmlPageSchemaFactory = ({ htmlAttrs, }) => {
     return [
         staticRender('<!DOCTYPE html>'),
@@ -12,6 +12,7 @@ const htmlPageSchemaFactory = ({ htmlAttrs, }) => {
         dynamicRender(HEAD_META),
         dynamicRender(HEAD_PERFORMANCE),
         dynamicRender(HEAD_CORE_STYLES),
+        dynamicRender(HEAD_WEBPACK_RUNTIME),
         dynamicRender(HEAD_POLYFILLS),
         dynamicRender(HEAD_DYNAMIC_SCRIPTS),
         dynamicRender(HEAD_CORE_SCRIPTS),

package/lib/server/htmlPageSchema.js

@@ -6,7 +6,7 @@ var htmlpagebuilder = require('@tinkoff/htmlpagebuilder');
 var tokensRender = require('@tramvai/tokens-render');
 var utils = require('./utils.js');
 
-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>'),
@@ -16,6 +16,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),