@tramvai/module-render 4.38.0 → 4.39.0

package/lib/resourcesInliner/resourcesInliner.d.ts

@@ -13,12 +13,14 @@ export declare class ResourcesInliner implements ResourcesInlinerType {
     private resourcesRegistryCache;
     private log;
     private runningRequests;
+    private assetsPrefix;
     private scheduleFileLoad;
     private scheduleFileSizeLoad;
-    constructor({ resourcesRegistryCache, resourceInlineThreshold, logger }: {
+    constructor({ resourcesRegistryCache, resourceInlineThreshold, logger, assetsPrefixFactory }: {
         resourcesRegistryCache: any;
         resourceInlineThreshold: any;
         logger: any;
+        assetsPrefixFactory: any;
     });
     private getFilesCache;
     shouldAddResource(resource: PageResource): boolean;

package/lib/resourcesInliner/resourcesInliner.es.js

@@ -7,10 +7,6 @@ import { processFile } from './fileProcessor.es.js';
 
 const INTERNAL_CACHE_SIZE = 50;
 const TRAMVAI_CLI_ASSETS_PREFIX = `${process.env.TRAMVAI_CLI_ASSETS_PREFIX}`;
-const ASSETS_PREFIX = process.env.NODE_ENV === 'development' &&
-    (process.env.ASSETS_PREFIX === 'static' || !process.env.ASSETS_PREFIX)
-    ? TRAMVAI_CLI_ASSETS_PREFIX
-    : process.env.ASSETS_PREFIX;
 const getInlineType = (type) => {
     switch (type) {
         case ResourceType.style:
@@ -21,13 +17,13 @@ const getInlineType = (type) => {
             return type;
     }
 };
-const getResourceUrl = (resource) => {
+const getResourceUrl = (resource, assetsPrefix) => {
     if (isEmpty(resource.payload) || !isAbsoluteUrl(resource.payload)) {
         return undefined;
     }
     let result = resource.payload.startsWith('//') ? `https:${resource.payload}` : resource.payload;
-    if (process.env.TRAMVAI_CLI_COMMAND === 'static' && result.startsWith(ASSETS_PREFIX)) {
-        result = result.replace(ASSETS_PREFIX, TRAMVAI_CLI_ASSETS_PREFIX);
+    if (process.env.TRAMVAI_CLI_COMMAND === 'static' && result.startsWith(assetsPrefix)) {
+        result = result.replace(assetsPrefix, TRAMVAI_CLI_ASSETS_PREFIX);
     }
     return result;
 };
@@ -35,11 +31,11 @@ const removeSourceMapFromString = (file) => {
     return file.replace(/(\n\/\/# sourceMappingURL=.*)/g, '');
 };
 class ResourcesInliner {
-    constructor({ resourcesRegistryCache, resourceInlineThreshold, logger }) {
+    constructor({ resourcesRegistryCache, resourceInlineThreshold, logger, assetsPrefixFactory }) {
         this.internalFilesCache = new Map();
         this.runningRequests = new Set();
         this.scheduleFileLoad = async (resource, resourceInlineThreshold) => {
-            const url = getResourceUrl(resource);
+            const url = getResourceUrl(resource, this.assetsPrefix);
             const requestKey = `file${url}`;
             const filesCache = this.getFilesCache(url);
             const result = filesCache.get(url);
@@ -73,7 +69,7 @@ class ResourcesInliner {
             }
         };
         this.scheduleFileSizeLoad = async (resource, resourceInlineThreshold, waitForFileLoad) => {
-            const url = getResourceUrl(resource);
+            const url = getResourceUrl(resource, this.assetsPrefix);
             const requestKey = `size${url}`;
             const result = this.resourcesRegistryCache.sizeCache.get(url);
             if (result) {
@@ -112,9 +108,14 @@ class ResourcesInliner {
         this.resourcesRegistryCache = resourcesRegistryCache;
         this.resourceInlineThreshold = resourceInlineThreshold;
         this.log = logger('resources-inliner');
+        const assetsPrefix = assetsPrefixFactory();
+        this.assetsPrefix =
+            process.env.NODE_ENV === 'development' && (assetsPrefix === 'static' || !assetsPrefix)
+                ? TRAMVAI_CLI_ASSETS_PREFIX
+                : assetsPrefix;
     }
     getFilesCache(url) {
-        if (url.startsWith(ASSETS_PREFIX) ||
+        if (url.startsWith(this.assetsPrefix) ||
             // reverse logic for `static` command in `getResourceUrl` method
             (process.env.TRAMVAI_CLI_COMMAND === 'static' && url.startsWith(TRAMVAI_CLI_ASSETS_PREFIX))) {
             // internal resources are resources generated by the current app itself
@@ -130,7 +131,7 @@ class ResourcesInliner {
             // only checking preload-links
             return true;
         }
-        const url = getResourceUrl(resource);
+        const url = getResourceUrl(resource, this.assetsPrefix);
         if (isUndefined(url)) {
             // if url is undefined that file is not in cache
             return true;
@@ -148,7 +149,7 @@ class ResourcesInliner {
         if (isUndefined(resourceInlineThreshold)) {
             return false;
         }
-        const url = getResourceUrl(resource);
+        const url = getResourceUrl(resource, this.assetsPrefix);
         if (isUndefined(url) || this.resourcesRegistryCache.disabledUrlsCache.has(url)) {
             return false;
         }
@@ -181,7 +182,7 @@ class ResourcesInliner {
         return true;
     }
     inlineResource(resource) {
-        const url = getResourceUrl(resource);
+        const url = getResourceUrl(resource, this.assetsPrefix);
         if (isUndefined(url)) {
             // usually, it should not happen but anyway check it for safety
             return [resource];
@@ -221,7 +222,7 @@ class ResourcesInliner {
         return result;
     }
     async prefetchResource(resource) {
-        const url = getResourceUrl(resource);
+        const url = getResourceUrl(resource, this.assetsPrefix);
         const resourceInlineThreshold = this.resourceInlineThreshold.threshold;
         if (isUndefined(url) ||
             isUndefined(resourceInlineThreshold) ||

package/lib/resourcesInliner/resourcesInliner.js

@@ -16,10 +16,6 @@ var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
 
 const INTERNAL_CACHE_SIZE = 50;
 const TRAMVAI_CLI_ASSETS_PREFIX = `${process.env.TRAMVAI_CLI_ASSETS_PREFIX}`;
-const ASSETS_PREFIX = process.env.NODE_ENV === 'development' &&
-    (process.env.ASSETS_PREFIX === 'static' || !process.env.ASSETS_PREFIX)
-    ? TRAMVAI_CLI_ASSETS_PREFIX
-    : process.env.ASSETS_PREFIX;
 const getInlineType = (type) => {
     switch (type) {
         case tokensRender.ResourceType.style:
@@ -30,13 +26,13 @@ const getInlineType = (type) => {
             return type;
     }
 };
-const getResourceUrl = (resource) => {
+const getResourceUrl = (resource, assetsPrefix) => {
     if (isEmpty__default["default"](resource.payload) || !url.isAbsoluteUrl(resource.payload)) {
         return undefined;
     }
     let result = resource.payload.startsWith('//') ? `https:${resource.payload}` : resource.payload;
-    if (process.env.TRAMVAI_CLI_COMMAND === 'static' && result.startsWith(ASSETS_PREFIX)) {
-        result = result.replace(ASSETS_PREFIX, TRAMVAI_CLI_ASSETS_PREFIX);
+    if (process.env.TRAMVAI_CLI_COMMAND === 'static' && result.startsWith(assetsPrefix)) {
+        result = result.replace(assetsPrefix, TRAMVAI_CLI_ASSETS_PREFIX);
     }
     return result;
 };
@@ -44,11 +40,11 @@ const removeSourceMapFromString = (file) => {
     return file.replace(/(\n\/\/# sourceMappingURL=.*)/g, '');
 };
 class ResourcesInliner {
-    constructor({ resourcesRegistryCache, resourceInlineThreshold, logger }) {
+    constructor({ resourcesRegistryCache, resourceInlineThreshold, logger, assetsPrefixFactory }) {
         this.internalFilesCache = new Map();
         this.runningRequests = new Set();
         this.scheduleFileLoad = async (resource, resourceInlineThreshold) => {
-            const url = getResourceUrl(resource);
+            const url = getResourceUrl(resource, this.assetsPrefix);
             const requestKey = `file${url}`;
             const filesCache = this.getFilesCache(url);
             const result = filesCache.get(url);
@@ -82,7 +78,7 @@ class ResourcesInliner {
             }
         };
         this.scheduleFileSizeLoad = async (resource, resourceInlineThreshold, waitForFileLoad) => {
-            const url = getResourceUrl(resource);
+            const url = getResourceUrl(resource, this.assetsPrefix);
             const requestKey = `size${url}`;
             const result = this.resourcesRegistryCache.sizeCache.get(url);
             if (result) {
@@ -121,9 +117,14 @@ class ResourcesInliner {
         this.resourcesRegistryCache = resourcesRegistryCache;
         this.resourceInlineThreshold = resourceInlineThreshold;
         this.log = logger('resources-inliner');
+        const assetsPrefix = assetsPrefixFactory();
+        this.assetsPrefix =
+            process.env.NODE_ENV === 'development' && (assetsPrefix === 'static' || !assetsPrefix)
+                ? TRAMVAI_CLI_ASSETS_PREFIX
+                : assetsPrefix;
     }
     getFilesCache(url) {
-        if (url.startsWith(ASSETS_PREFIX) ||
+        if (url.startsWith(this.assetsPrefix) ||
             // reverse logic for `static` command in `getResourceUrl` method
             (process.env.TRAMVAI_CLI_COMMAND === 'static' && url.startsWith(TRAMVAI_CLI_ASSETS_PREFIX))) {
             // internal resources are resources generated by the current app itself
@@ -139,7 +140,7 @@ class ResourcesInliner {
             // only checking preload-links
             return true;
         }
-        const url = getResourceUrl(resource);
+        const url = getResourceUrl(resource, this.assetsPrefix);
         if (isUndefined__default["default"](url)) {
             // if url is undefined that file is not in cache
             return true;
@@ -157,7 +158,7 @@ class ResourcesInliner {
         if (isUndefined__default["default"](resourceInlineThreshold)) {
             return false;
         }
-        const url = getResourceUrl(resource);
+        const url = getResourceUrl(resource, this.assetsPrefix);
         if (isUndefined__default["default"](url) || this.resourcesRegistryCache.disabledUrlsCache.has(url)) {
             return false;
         }
@@ -190,7 +191,7 @@ class ResourcesInliner {
         return true;
     }
     inlineResource(resource) {
-        const url = getResourceUrl(resource);
+        const url = getResourceUrl(resource, this.assetsPrefix);
         if (isUndefined__default["default"](url)) {
             // usually, it should not happen but anyway check it for safety
             return [resource];
@@ -230,7 +231,7 @@ class ResourcesInliner {
         return result;
     }
     async prefetchResource(resource) {
-        const url = getResourceUrl(resource);
+        const url = getResourceUrl(resource, this.assetsPrefix);
         const resourceInlineThreshold = this.resourceInlineThreshold.threshold;
         if (isUndefined__default["default"](url) ||
             isUndefined__default["default"](resourceInlineThreshold) ||

package/lib/server/PageBuilder.d.ts

@@ -15,7 +15,8 @@ export declare class PageBuilder {
     private fetchWebpackStats;
     private di;
     private renderMode;
-    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, di, renderMode, }: {
+    private assetsPrefixFactory;
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, di, renderMode, assetsPrefixFactory, }: {
         renderSlots: any;
         pageService: any;
         resourcesRegistry: any;
@@ -30,6 +31,7 @@ export declare class PageBuilder {
         fetchWebpackStats: any;
         di: any;
         renderMode: any;
+        assetsPrefixFactory: any;
     });
     flow(): Promise<string>;
     dehydrateState(): void;

package/lib/server/PageBuilder.es.js

@@ -20,7 +20,7 @@ const mapResourcesToSlots = (resources) => resources.reduce((acc, resource) => {
     return acc;
 }, {});
 class PageBuilder {
-    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, di, renderMode, }) {
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, di, renderMode, assetsPrefixFactory, }) {
         this.htmlAttrs = htmlAttrs;
         this.renderSlots = flatten(renderSlots || []);
         this.pageService = pageService;
@@ -35,6 +35,7 @@ class PageBuilder {
         this.fetchWebpackStats = fetchWebpackStats;
         this.di = di;
         this.renderMode = renderMode;
+        this.assetsPrefixFactory = assetsPrefixFactory;
     }
     async flow() {
         const stats = await this.fetchWebpackStats({ modern: this.modern });
@@ -84,6 +85,7 @@ class PageBuilder {
             pageComponent,
             fetchWebpackStats: this.fetchWebpackStats,
             renderMode: this.renderMode,
+            assetsPrefixFactory: this.assetsPrefixFactory,
         }));
         this.resourcesRegistry.register(await polyfillResources({
             condition: this.polyfillCondition,

package/lib/server/PageBuilder.js

@@ -28,7 +28,7 @@ const mapResourcesToSlots = (resources) => resources.reduce((acc, resource) => {
     return acc;
 }, {});
 class PageBuilder {
-    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, di, renderMode, }) {
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, di, renderMode, assetsPrefixFactory, }) {
         this.htmlAttrs = htmlAttrs;
         this.renderSlots = flatten__default["default"](renderSlots || []);
         this.pageService = pageService;
@@ -43,6 +43,7 @@ class PageBuilder {
         this.fetchWebpackStats = fetchWebpackStats;
         this.di = di;
         this.renderMode = renderMode;
+        this.assetsPrefixFactory = assetsPrefixFactory;
     }
     async flow() {
         const stats = await this.fetchWebpackStats({ modern: this.modern });
@@ -92,6 +93,7 @@ class PageBuilder {
             pageComponent,
             fetchWebpackStats: this.fetchWebpackStats,
             renderMode: this.renderMode,
+            assetsPrefixFactory: this.assetsPrefixFactory,
         }));
         this.resourcesRegistry.register(await polyfill.polyfillResources({
             condition: this.polyfillCondition,

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

@@ -1,11 +1,13 @@
 import type { ChunkExtractor } from '@loadable/server';
-import type { PageResource, FETCH_WEBPACK_STATS_TOKEN, REACT_SERVER_RENDER_MODE } from '@tramvai/tokens-render';
-export declare const bundleResource: ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, renderMode, }: {
+import type { PageResource, FETCH_WEBPACK_STATS_TOKEN, REACT_SERVER_RENDER_MODE, ASSETS_PREFIX_TOKEN } from '@tramvai/tokens-render';
+import type { ExtractDependencyType } from '@tinkoff/dippy';
+export declare const bundleResource: ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, renderMode, assetsPrefixFactory, }: {
     bundle: string;
     modern: boolean;
     extractor: ChunkExtractor;
     pageComponent?: string;
     fetchWebpackStats: typeof FETCH_WEBPACK_STATS_TOKEN;
     renderMode: typeof REACT_SERVER_RENDER_MODE | null;
+    assetsPrefixFactory: ExtractDependencyType<typeof ASSETS_PREFIX_TOKEN>;
 }) => Promise<PageResource[]>;
 //# sourceMappingURL=bundleResource.d.ts.map

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

@@ -20,7 +20,7 @@ try {
 catch (e) {
     // do nothing
 }
-const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, renderMode, }) => {
+const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, renderMode, assetsPrefixFactory, }) => {
     // for file-system pages preload page chunk against bundle chunk
     const chunkNameFromBundle = isFileSystemPageComponent(pageComponent)
         ? fileSystemPageToWebpackChunkName(pageComponent)
@@ -37,12 +37,12 @@ const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchW
     const { scripts, styles } = flushFiles([...bundles, ...lazyChunks, ...criticalChunks, 'platform'], webpackStats);
     const genHref = (href) => `${publicPath}${href}`;
     const result = [];
-    if (process.env.NODE_ENV === 'production' ||
-        (process.env.ASSETS_PREFIX && process.env.ASSETS_PREFIX !== 'static')) {
+    const assetsPrefix = assetsPrefixFactory();
+    if (process.env.NODE_ENV === 'production' || (assetsPrefix && assetsPrefix !== 'static')) {
         result.push({
             type: ResourceType.inlineScript,
             slot: ResourceSlot.HEAD_CORE_SCRIPTS,
-            payload: `window.ap = ${`"${process.env.ASSETS_PREFIX}"`};`,
+            payload: `window.ap = ${`"${assetsPrefix}"`};`,
         });
     }
     // defer scripts is not suitable for React streaming, we need to ability to run them as early as possible

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

@@ -29,7 +29,7 @@ try {
 catch (e) {
     // do nothing
 }
-const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, renderMode, }) => {
+const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, renderMode, assetsPrefixFactory, }) => {
     // for file-system pages preload page chunk against bundle chunk
     const chunkNameFromBundle = experiments.isFileSystemPageComponent(pageComponent)
         ? experiments.fileSystemPageToWebpackChunkName(pageComponent)
@@ -46,12 +46,12 @@ const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchW
     const { scripts, styles } = flushFiles.flushFiles([...bundles, ...lazyChunks, ...criticalChunks, 'platform'], webpackStats);
     const genHref = (href) => `${publicPath}${href}`;
     const result = [];
-    if (process.env.NODE_ENV === 'production' ||
-        (process.env.ASSETS_PREFIX && process.env.ASSETS_PREFIX !== 'static')) {
+    const assetsPrefix = assetsPrefixFactory();
+    if (process.env.NODE_ENV === 'production' || (assetsPrefix && assetsPrefix !== 'static')) {
         result.push({
             type: tokensRender.ResourceType.inlineScript,
             slot: tokensRender.ResourceSlot.HEAD_CORE_SCRIPTS,
-            payload: `window.ap = ${`"${process.env.ASSETS_PREFIX}"`};`,
+            payload: `window.ap = ${`"${assetsPrefix}"`};`,
         });
     }
     // defer scripts is not suitable for React streaming, we need to ability to run them as early as possible

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

@@ -1,3 +1,8 @@
-import type { FETCH_WEBPACK_STATS_TOKEN } from '@tramvai/tokens-render';
-export declare const fetchWebpackStats: typeof FETCH_WEBPACK_STATS_TOKEN;
+import type { FETCH_WEBPACK_STATS_TOKEN, ASSETS_PREFIX_TOKEN } from '@tramvai/tokens-render';
+import type { ExtractDependencyType } from '@tinkoff/dippy';
+type Deps = {
+    assetsPrefixFactory: ExtractDependencyType<typeof ASSETS_PREFIX_TOKEN>;
+};
+export declare const fetchWebpackStats: ({ assetsPrefixFactory }: Deps) => typeof FETCH_WEBPACK_STATS_TOKEN;
+export {};
 //# sourceMappingURL=fetchWebpackStats.d.ts.map

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

@@ -15,14 +15,15 @@ let fetchStats = async () => {
     throw new Error(`Unknown environment`);
 };
 if (process.env.NODE_ENV === 'development') {
-    fetchStats = async () => {
+    fetchStats = async (_, assetsPrefixFactory) => {
         const { modern: configModern, 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 stats = await request.json();
+        const assetsPrefix = assetsPrefixFactory();
         // static - популярная заглушка в env.development.js файлах, надо игнорировать, как было раньше
-        const hasAssetsPrefix = process.env.ASSETS_PREFIX && process.env.ASSETS_PREFIX !== 'static';
-        const publicPath = hasAssetsPrefix ? process.env.ASSETS_PREFIX : stats.publicPath;
+        const hasAssetsPrefix = assetsPrefix && assetsPrefix !== 'static';
+        const publicPath = hasAssetsPrefix ? assetsPrefix : stats.publicPath;
         return {
             ...stats,
             publicPath,
@@ -41,7 +42,7 @@ if (process.env.NODE_ENV === 'test') {
 }
 if (process.env.NODE_ENV === 'production') {
     const SEARCH_PATHS = [process.cwd(), __dirname];
-    const webpackStats = (fileName) => {
+    const webpackStats = (fileName, assetsPrefix) => {
         let stats;
         for (const dir of SEARCH_PATHS) {
             try {
@@ -57,7 +58,7 @@ if (process.env.NODE_ENV === 'production') {
         if (!stats) {
             return;
         }
-        if (!process.env.ASSETS_PREFIX) {
+        if (!assetsPrefix) {
             if (process.env.STATIC_PREFIX) {
                 throw new Error('Required env variable "ASSETS_PREFIX" is not set. Instead of using "STATIC_PREFIX" env please define "ASSETS_PREFIX: STATIC_PREFIX + /compiled"');
             }
@@ -65,32 +66,41 @@ if (process.env.NODE_ENV === 'production') {
         }
         return {
             ...stats,
-            publicPath: process.env.ASSETS_PREFIX,
+            publicPath: assetsPrefix,
         };
     };
-    const statsLegacy = webpackStats('stats.json');
-    const statsModern = webpackStats('stats.modern.json') || statsLegacy;
-    if (!statsLegacy) {
-        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
-    - 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
-`);
-    }
-    fetchStats = (modern) => {
-        const stats = modern ? statsModern : statsLegacy;
+    const statsCache = {};
+    fetchStats = (modern, assetsPrefixFactory) => {
+        const assetsPrefix = assetsPrefixFactory();
+        const legacyStatsKey = `${assetsPrefix}legacy`;
+        const modernStatsKey = `${assetsPrefix}modern`;
+        if (!statsCache[legacyStatsKey]) {
+            statsCache[legacyStatsKey] = webpackStats('stats.json', assetsPrefix);
+        }
+        if (!statsCache[modernStatsKey]) {
+            statsCache[modernStatsKey] =
+                webpackStats('stats.modern.json', assetsPrefix) || statsCache[legacyStatsKey];
+        }
+        if (!statsCache[legacyStatsKey]) {
+            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
+      - 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];
         return Promise.resolve(stats);
     };
 }
-const fetchWebpackStats = async ({ modern } = {}) => {
-    return fetchStats(modern);
+const fetchWebpackStats = ({ assetsPrefixFactory }) => async ({ modern } = {}) => {
+    return fetchStats(modern, assetsPrefixFactory);
 };
 
 export { fetchWebpackStats };

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

@@ -42,14 +42,15 @@ let fetchStats = async () => {
     throw new Error(`Unknown environment`);
 };
 if (process.env.NODE_ENV === 'development') {
-    fetchStats = async () => {
+    fetchStats = async (_, assetsPrefixFactory) => {
         const { modern: configModern, 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 stats = await request.json();
+        const assetsPrefix = assetsPrefixFactory();
         // static - популярная заглушка в env.development.js файлах, надо игнорировать, как было раньше
-        const hasAssetsPrefix = process.env.ASSETS_PREFIX && process.env.ASSETS_PREFIX !== 'static';
-        const publicPath = hasAssetsPrefix ? process.env.ASSETS_PREFIX : stats.publicPath;
+        const hasAssetsPrefix = assetsPrefix && assetsPrefix !== 'static';
+        const publicPath = hasAssetsPrefix ? assetsPrefix : stats.publicPath;
         return {
             ...stats,
             publicPath,
@@ -68,7 +69,7 @@ if (process.env.NODE_ENV === 'test') {
 }
 if (process.env.NODE_ENV === 'production') {
     const SEARCH_PATHS = [process.cwd(), __dirname];
-    const webpackStats = (fileName) => {
+    const webpackStats = (fileName, assetsPrefix) => {
         let stats;
         for (const dir of SEARCH_PATHS) {
             try {
@@ -84,7 +85,7 @@ if (process.env.NODE_ENV === 'production') {
         if (!stats) {
             return;
         }
-        if (!process.env.ASSETS_PREFIX) {
+        if (!assetsPrefix) {
             if (process.env.STATIC_PREFIX) {
                 throw new Error('Required env variable "ASSETS_PREFIX" is not set. Instead of using "STATIC_PREFIX" env please define "ASSETS_PREFIX: STATIC_PREFIX + /compiled"');
             }
@@ -92,32 +93,41 @@ if (process.env.NODE_ENV === 'production') {
         }
         return {
             ...stats,
-            publicPath: process.env.ASSETS_PREFIX,
+            publicPath: assetsPrefix,
         };
     };
-    const statsLegacy = webpackStats('stats.json');
-    const statsModern = webpackStats('stats.modern.json') || statsLegacy;
-    if (!statsLegacy) {
-        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
-    - 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
-`);
-    }
-    fetchStats = (modern) => {
-        const stats = modern ? statsModern : statsLegacy;
+    const statsCache = {};
+    fetchStats = (modern, assetsPrefixFactory) => {
+        const assetsPrefix = assetsPrefixFactory();
+        const legacyStatsKey = `${assetsPrefix}legacy`;
+        const modernStatsKey = `${assetsPrefix}modern`;
+        if (!statsCache[legacyStatsKey]) {
+            statsCache[legacyStatsKey] = webpackStats('stats.json', assetsPrefix);
+        }
+        if (!statsCache[modernStatsKey]) {
+            statsCache[modernStatsKey] =
+                webpackStats('stats.modern.json', assetsPrefix) || statsCache[legacyStatsKey];
+        }
+        if (!statsCache[legacyStatsKey]) {
+            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
+      - 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];
         return Promise.resolve(stats);
     };
 }
-const fetchWebpackStats = async ({ modern } = {}) => {
-    return fetchStats(modern);
+const fetchWebpackStats = ({ assetsPrefixFactory }) => async ({ modern } = {}) => {
+    return fetchStats(modern, assetsPrefixFactory);
 };
 
 exports.fetchWebpackStats = fetchWebpackStats;

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, 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, 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 } from '@tramvai/tokens-render';
+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';
 export * from '@tramvai/tokens-render';
 import { Scope, optional } from '@tinkoff/dippy';
 import { satisfies } from '@tinkoff/user-agent';
@@ -23,6 +23,7 @@ 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;
 /**
@@ -102,6 +103,7 @@ RenderModule = RenderModule_1 = __decorate([
                     resourcesRegistryCache: RESOURCES_REGISTRY_CACHE,
                     resourceInlineThreshold: { token: RESOURCE_INLINE_OPTIONS, optional: true },
                     logger: LOGGER_TOKEN,
+                    assetsPrefixFactory: ASSETS_PREFIX_TOKEN,
                 },
             }),
             provide({
@@ -226,6 +228,7 @@ Page Error Boundary will be rendered for the client`,
                     fetchWebpackStats: FETCH_WEBPACK_STATS_TOKEN,
                     di: DI_TOKEN,
                     renderMode: optional(REACT_SERVER_RENDER_MODE),
+                    assetsPrefixFactory: ASSETS_PREFIX_TOKEN,
                 },
             }),
             provide({
@@ -321,9 +324,27 @@ Page Error Boundary will be rendered for the client`,
                     createCache: CREATE_CACHE_TOKEN,
                 },
             }),
+            provide({
+                provide: ASSETS_PREFIX_TOKEN,
+                useFactory: ({ defaultAssetsPrefix }) => {
+                    return () => defaultAssetsPrefix;
+                },
+                deps: {
+                    defaultAssetsPrefix: DEFAULT_ASSETS_PREFIX_TOKEN,
+                },
+            }),
+            provide({
+                provide: DEFAULT_ASSETS_PREFIX_TOKEN,
+                useValue: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : null,
+            }),
             provide({
                 provide: FETCH_WEBPACK_STATS_TOKEN,
-                useValue: fetchWebpackStats,
+                useFactory: (deps) => {
+                    return fetchWebpackStats(deps);
+                },
+                deps: {
+                    assetsPrefixFactory: ASSETS_PREFIX_TOKEN,
+                },
             }),
             provide({
                 provide: BACK_FORWARD_CACHE_ENABLED,

package/lib/server.js

@@ -24,6 +24,7 @@ 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;
 /**
@@ -103,6 +104,7 @@ exports.RenderModule = RenderModule_1 = tslib.__decorate([
                     resourcesRegistryCache: tokens.RESOURCES_REGISTRY_CACHE,
                     resourceInlineThreshold: { token: tokensRender.RESOURCE_INLINE_OPTIONS, optional: true },
                     logger: tokensCommon.LOGGER_TOKEN,
+                    assetsPrefixFactory: tokensRender.ASSETS_PREFIX_TOKEN,
                 },
             }),
             core.provide({
@@ -227,6 +229,7 @@ Page Error Boundary will be rendered for the client`,
                     fetchWebpackStats: tokensRender.FETCH_WEBPACK_STATS_TOKEN,
                     di: core.DI_TOKEN,
                     renderMode: dippy.optional(tokensRender.REACT_SERVER_RENDER_MODE),
+                    assetsPrefixFactory: tokensRender.ASSETS_PREFIX_TOKEN,
                 },
             }),
             core.provide({
@@ -322,9 +325,27 @@ Page Error Boundary will be rendered for the client`,
                     createCache: tokensCommon.CREATE_CACHE_TOKEN,
                 },
             }),
+            core.provide({
+                provide: tokensRender.ASSETS_PREFIX_TOKEN,
+                useFactory: ({ defaultAssetsPrefix }) => {
+                    return () => defaultAssetsPrefix;
+                },
+                deps: {
+                    defaultAssetsPrefix: tokensRender.DEFAULT_ASSETS_PREFIX_TOKEN,
+                },
+            }),
+            core.provide({
+                provide: tokensRender.DEFAULT_ASSETS_PREFIX_TOKEN,
+                useValue: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : null,
+            }),
             core.provide({
                 provide: tokensRender.FETCH_WEBPACK_STATS_TOKEN,
-                useValue: fetchWebpackStats.fetchWebpackStats,
+                useFactory: (deps) => {
+                    return fetchWebpackStats.fetchWebpackStats(deps);
+                },
+                deps: {
+                    assetsPrefixFactory: tokensRender.ASSETS_PREFIX_TOKEN,
+                },
             }),
             core.provide({
                 provide: tokensRender.BACK_FORWARD_CACHE_ENABLED,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "4.38.0",
+  "version": "4.39.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -26,15 +26,15 @@
     "@tinkoff/layout-factory": "0.5.1",
     "@tinkoff/errors": "0.5.1",
     "@tinkoff/url": "0.10.1",
-    "@tinkoff/user-agent": "0.6.124",
+    "@tinkoff/user-agent": "0.6.125",
     "@tinkoff/request-core": "^0.10.0",
     "@tinkoff/request-plugin-protocol-http": "^0.12.1",
-    "@tramvai/module-client-hints": "4.38.0",
-    "@tramvai/module-router": "4.38.0",
-    "@tramvai/react": "4.38.0",
+    "@tramvai/module-client-hints": "4.39.0",
+    "@tramvai/module-router": "4.39.0",
+    "@tramvai/react": "4.39.0",
     "@tramvai/safe-strings": "0.7.3",
-    "@tramvai/tokens-render": "4.38.0",
-    "@tramvai/experiments": "4.38.0",
+    "@tramvai/tokens-render": "4.39.0",
+    "@tramvai/experiments": "4.39.0",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
@@ -42,14 +42,14 @@
     "@tinkoff/dippy": "0.10.8",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/react-hooks": "0.3.1",
-    "@tramvai/cli": "4.38.0",
-    "@tramvai/core": "4.38.0",
-    "@tramvai/module-common": "4.38.0",
-    "@tramvai/state": "4.38.0",
-    "@tramvai/test-helpers": "4.38.0",
-    "@tramvai/tokens-common": "4.38.0",
-    "@tramvai/tokens-router": "4.38.0",
-    "@tramvai/tokens-server-private": "4.38.0",
+    "@tramvai/cli": "4.39.0",
+    "@tramvai/core": "4.39.0",
+    "@tramvai/module-common": "4.39.0",
+    "@tramvai/state": "4.39.0",
+    "@tramvai/test-helpers": "4.39.0",
+    "@tramvai/tokens-common": "4.39.0",
+    "@tramvai/tokens-router": "4.39.0",
+    "@tramvai/tokens-server-private": "4.39.0",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.14.0",

package/tests.js

@@ -78,11 +78,7 @@ const agent = {
 };
 requestFactory__default["default"]([httpPlugin__default["default"]({ agent })]);
 
-const TRAMVAI_CLI_ASSETS_PREFIX = `${process.env.TRAMVAI_CLI_ASSETS_PREFIX}`;
-process.env.NODE_ENV === 'development' &&
-    (process.env.ASSETS_PREFIX === 'static' || !process.env.ASSETS_PREFIX)
-    ? TRAMVAI_CLI_ASSETS_PREFIX
-    : process.env.ASSETS_PREFIX;
+`${process.env.TRAMVAI_CLI_ASSETS_PREFIX}`;
 
 /**
  * @description