@tramvai/module-render 2.87.0 → 2.90.0

package/lib/server/PageBuilder.d.ts

@@ -11,7 +11,8 @@ export declare class PageBuilder {
     private modern;
     private renderFlowAfter;
     private log;
-    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, }: {
+    private fetchWebpackStats;
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, }: {
         renderSlots: any;
         pageService: any;
         resourcesRegistry: any;
@@ -23,6 +24,7 @@ export declare class PageBuilder {
         modern: any;
         renderFlowAfter: any;
         logger: any;
+        fetchWebpackStats: any;
     });
     flow(): Promise<string>;
     dehydrateState(): void;

package/lib/server/PageBuilder.es.js

@@ -7,7 +7,6 @@ import { bundleResource } from './blocks/bundleResource/bundleResource.es.js';
 import { polyfillResources } from './blocks/polyfill.es.js';
 import { addPreloadForCriticalJS } from './blocks/preload/preloadBlock.es.js';
 import { formatAttributes } from './utils.es.js';
-import { fetchWebpackStats } from './blocks/utils/fetchWebpackStats.es.js';
 
 /* eslint-disable sort-class-members/sort-class-members */
 const mapResourcesToSlots = (resources) => resources.reduce((acc, resource) => {
@@ -21,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, }) {
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, }) {
         this.htmlAttrs = htmlAttrs;
         this.renderSlots = flatten(renderSlots || []);
         this.pageService = pageService;
@@ -33,9 +32,10 @@ class PageBuilder {
         this.modern = modern;
         this.renderFlowAfter = renderFlowAfter || [];
         this.log = logger('page-builder');
+        this.fetchWebpackStats = fetchWebpackStats;
     }
     async flow() {
-        const stats = await fetchWebpackStats({ modern: this.modern });
+        const stats = await this.fetchWebpackStats({ modern: this.modern });
         const extractor = new ChunkExtractor({ stats, entrypoints: [] });
         // first we render the application, because we need to extract information about the data used by the components
         await this.renderApp(extractor);
@@ -59,10 +59,17 @@ class PageBuilder {
     async fetchChunksInfo(extractor) {
         const { modern } = this;
         const { bundle, pageComponent } = this.pageService.getConfig();
-        this.resourcesRegistry.register(await bundleResource({ bundle, modern, extractor, pageComponent }));
+        this.resourcesRegistry.register(await bundleResource({
+            bundle,
+            modern,
+            extractor,
+            pageComponent,
+            fetchWebpackStats: this.fetchWebpackStats,
+        }));
         this.resourcesRegistry.register(await polyfillResources({
             condition: this.polyfillCondition,
             modern,
+            fetchWebpackStats: this.fetchWebpackStats,
         }));
     }
     preloadBlock() {

package/lib/server/PageBuilder.js

@@ -11,7 +11,6 @@ var bundleResource = require('./blocks/bundleResource/bundleResource.js');
 var polyfill = require('./blocks/polyfill.js');
 var preloadBlock = require('./blocks/preload/preloadBlock.js');
 var utils = require('./utils.js');
-var fetchWebpackStats = require('./blocks/utils/fetchWebpackStats.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -29,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, }) {
+    constructor({ renderSlots, pageService, resourcesRegistry, context, reactRender, htmlPageSchema, polyfillCondition, htmlAttrs, modern, renderFlowAfter, logger, fetchWebpackStats, }) {
         this.htmlAttrs = htmlAttrs;
         this.renderSlots = flatten__default["default"](renderSlots || []);
         this.pageService = pageService;
@@ -41,9 +40,10 @@ class PageBuilder {
         this.modern = modern;
         this.renderFlowAfter = renderFlowAfter || [];
         this.log = logger('page-builder');
+        this.fetchWebpackStats = fetchWebpackStats;
     }
     async flow() {
-        const stats = await fetchWebpackStats.fetchWebpackStats({ modern: this.modern });
+        const stats = await this.fetchWebpackStats({ modern: this.modern });
         const extractor = new server.ChunkExtractor({ stats, entrypoints: [] });
         // first we render the application, because we need to extract information about the data used by the components
         await this.renderApp(extractor);
@@ -67,10 +67,17 @@ class PageBuilder {
     async fetchChunksInfo(extractor) {
         const { modern } = this;
         const { bundle, pageComponent } = this.pageService.getConfig();
-        this.resourcesRegistry.register(await bundleResource.bundleResource({ bundle, modern, extractor, pageComponent }));
+        this.resourcesRegistry.register(await bundleResource.bundleResource({
+            bundle,
+            modern,
+            extractor,
+            pageComponent,
+            fetchWebpackStats: this.fetchWebpackStats,
+        }));
         this.resourcesRegistry.register(await polyfill.polyfillResources({
             condition: this.polyfillCondition,
             modern,
+            fetchWebpackStats: this.fetchWebpackStats,
         }));
     }
     preloadBlock() {

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

@@ -1,8 +1,9 @@
 import type { ChunkExtractor } from '@loadable/server';
-import type { PageResource } from '@tramvai/tokens-render';
-export declare const bundleResource: ({ bundle, modern, extractor, pageComponent, }: {
+import type { PageResource, FETCH_WEBPACK_STATS_TOKEN } from '@tramvai/tokens-render';
+export declare const bundleResource: ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, }: {
     bundle: string;
     modern: boolean;
     extractor: ChunkExtractor;
     pageComponent?: string;
+    fetchWebpackStats: typeof FETCH_WEBPACK_STATS_TOKEN;
 }) => Promise<PageResource[]>;

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

@@ -4,9 +4,8 @@ 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 { fetchWebpackStats } from '../utils/fetchWebpackStats.es.js';
 
-const bundleResource = async ({ bundle, modern, extractor, pageComponent, }) => {
+const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, }) => {
     // for file-system pages preload page chunk against bundle chunk
     const chunkNameFromBundle = isFileSystemPageComponent(pageComponent)
         ? fileSystemPageToWebpackChunkName(pageComponent)

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

@@ -8,19 +8,18 @@ var tokensRender = require('@tramvai/tokens-render');
 var experiments = require('@tramvai/experiments');
 var performance = require('../../constants/performance.js');
 var flushFiles = require('../utils/flushFiles.js');
-var fetchWebpackStats = require('../utils/fetchWebpackStats.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var has__default = /*#__PURE__*/_interopDefaultLegacy(has);
 var last__default = /*#__PURE__*/_interopDefaultLegacy(last);
 
-const bundleResource = async ({ bundle, modern, extractor, pageComponent, }) => {
+const bundleResource = async ({ bundle, modern, extractor, pageComponent, fetchWebpackStats, }) => {
     // 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.fetchWebpackStats({ modern });
+    const webpackStats = await fetchWebpackStats({ modern });
     const { publicPath, assetsByChunkName } = webpackStats;
     const bundles = has__default["default"]('common-chunk', assetsByChunkName)
         ? ['common-chunk', chunkNameFromBundle]

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

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

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

@@ -1,8 +1,7 @@
 import { ResourceType, ResourceSlot } from '@tramvai/tokens-render';
-import { fetchWebpackStats } from './utils/fetchWebpackStats.es.js';
 import { flushFiles } from './utils/flushFiles.es.js';
 
-const polyfillResources = async ({ condition, modern, }) => {
+const polyfillResources = async ({ condition, modern, fetchWebpackStats, }) => {
     const webpackStats = await fetchWebpackStats({ modern });
     const { publicPath } = webpackStats;
     // получает файл полифилла из stats.json\stats.modern.json.

package/lib/server/blocks/polyfill.js

@@ -3,11 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tokensRender = require('@tramvai/tokens-render');
-var fetchWebpackStats = require('./utils/fetchWebpackStats.js');
 var flushFiles = require('./utils/flushFiles.js');
 
-const polyfillResources = async ({ condition, modern, }) => {
-    const webpackStats = await fetchWebpackStats.fetchWebpackStats({ modern });
+const polyfillResources = async ({ condition, modern, fetchWebpackStats, }) => {
+    const webpackStats = await fetchWebpackStats({ modern });
     const { publicPath } = webpackStats;
     // получает файл полифилла из stats.json\stats.modern.json.
     // В зависимости от версии браузера будет использован полифилл из legacy или modern сборки,

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

@@ -1,12 +1,2 @@
-export type WebpackStats = {
-    assetsByChunkName: Record<string, string[]>;
-    namedChunkGroups?: Record<string, {
-        name: string;
-        chunks: string[];
-    }>;
-    publicPath: string;
-    [key: string]: any;
-};
-export declare const fetchWebpackStats: ({ modern, }?: {
-    modern?: boolean;
-}) => Promise<WebpackStats>;
+import type { FETCH_WEBPACK_STATS_TOKEN } from '@tramvai/tokens-render';
+export declare const fetchWebpackStats: typeof FETCH_WEBPACK_STATS_TOKEN;

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

@@ -28,7 +28,11 @@ if (process.env.NODE_ENV === 'development') {
 if (process.env.NODE_ENV === 'test') {
     fetchStats = () => {
         // mock for unit-testing as there is no real static return something just to make server render work
-        return Promise.resolve({ publicPath: 'http://localhost:4000/', assetsByChunkName: {} });
+        return Promise.resolve({
+            publicPath: 'http://localhost:4000/',
+            assetsByChunkName: {},
+            entrypoints: {},
+        });
     };
 }
 if (process.env.NODE_ENV === 'production') {
@@ -81,7 +85,7 @@ if (process.env.NODE_ENV === 'production') {
         return Promise.resolve(stats);
     };
 }
-const fetchWebpackStats = async ({ modern, } = {}) => {
+const fetchWebpackStats = async ({ modern } = {}) => {
     return fetchStats(modern);
 };
 

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

@@ -55,7 +55,11 @@ if (process.env.NODE_ENV === 'development') {
 if (process.env.NODE_ENV === 'test') {
     fetchStats = () => {
         // mock for unit-testing as there is no real static return something just to make server render work
-        return Promise.resolve({ publicPath: 'http://localhost:4000/', assetsByChunkName: {} });
+        return Promise.resolve({
+            publicPath: 'http://localhost:4000/',
+            assetsByChunkName: {},
+            entrypoints: {},
+        });
     };
 }
 if (process.env.NODE_ENV === 'production') {
@@ -108,7 +112,7 @@ if (process.env.NODE_ENV === 'production') {
         return Promise.resolve(stats);
     };
 }
-const fetchWebpackStats = async ({ modern, } = {}) => {
+const fetchWebpackStats = async ({ modern } = {}) => {
     return fetchStats(modern);
 };
 

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

@@ -1,4 +1,4 @@
-import type { WebpackStats } from './fetchWebpackStats';
+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, }?: {

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, CUSTOM_RENDER, EXTEND_RENDER, REACT_SERVER_RENDER_MODE, ResourceType } from '@tramvai/tokens-render';
+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';
 export * from '@tramvai/tokens-render';
 import { Scope } from '@tinkoff/dippy';
 import { satisfies } from '@tinkoff/user-agent';
@@ -19,6 +19,7 @@ import { ReactRenderServer } from './server/ReactRenderServer.es.js';
 export { ReactRenderServer } from './server/ReactRenderServer.es.js';
 import { LayoutModule } from './shared/LayoutModule.es.js';
 import { providers } from './shared/providers.es.js';
+import { fetchWebpackStats } from './server/blocks/utils/fetchWebpackStats.es.js';
 
 var RenderModule_1;
 const REQUEST_TTL = 5 * 60 * 1000;
@@ -193,6 +194,7 @@ Page Error Boundary will be rendered for the client`,
                     modern: MODERN_SATISFIES_TOKEN,
                     renderFlowAfter: { token: RENDER_FLOW_AFTER_TOKEN, optional: true },
                     logger: LOGGER_TOKEN,
+                    fetchWebpackStats: FETCH_WEBPACK_STATS_TOKEN,
                 },
             }),
             provide({
@@ -274,6 +276,10 @@ Page Error Boundary will be rendered for the client`,
                     createCache: CREATE_CACHE_TOKEN,
                 },
             }),
+            provide({
+                provide: FETCH_WEBPACK_STATS_TOKEN,
+                useValue: fetchWebpackStats,
+            }),
         ],
     })
 ], RenderModule);

package/lib/server.js

@@ -20,6 +20,7 @@ var htmlPageSchema = require('./server/htmlPageSchema.js');
 var ReactRenderServer = require('./server/ReactRenderServer.js');
 var LayoutModule = require('./shared/LayoutModule.js');
 var providers = require('./shared/providers.js');
+var fetchWebpackStats = require('./server/blocks/utils/fetchWebpackStats.js');
 
 var RenderModule_1;
 const REQUEST_TTL = 5 * 60 * 1000;
@@ -194,6 +195,7 @@ Page Error Boundary will be rendered for the client`,
                     modern: tokensRender.MODERN_SATISFIES_TOKEN,
                     renderFlowAfter: { token: tokensRender.RENDER_FLOW_AFTER_TOKEN, optional: true },
                     logger: tokensCommon.LOGGER_TOKEN,
+                    fetchWebpackStats: tokensRender.FETCH_WEBPACK_STATS_TOKEN,
                 },
             }),
             core.provide({
@@ -275,6 +277,10 @@ Page Error Boundary will be rendered for the client`,
                     createCache: tokensCommon.CREATE_CACHE_TOKEN,
                 },
             }),
+            core.provide({
+                provide: tokensRender.FETCH_WEBPACK_STATS_TOKEN,
+                useValue: fetchWebpackStats.fetchWebpackStats,
+            }),
         ],
     })
 ], exports.RenderModule);

package/package.json

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

package/tests.js

@@ -20,33 +20,13 @@ require('@tinkoff/utils/object/has');
 require('@tinkoff/utils/array/last');
 require('@tramvai/experiments');
 require('@tinkoff/utils/array/uniq');
-var path = require('path');
 require('@tinkoff/utils/array/each');
 require('@tinkoff/utils/object/path');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return n;
-}
-
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var toArray__default = /*#__PURE__*/_interopDefaultLegacy(toArray);
-var path__namespace = /*#__PURE__*/_interopNamespace(path);
 
 class ResourcesRegistry {
     constructor({ resourceInliner }) {
@@ -90,64 +70,6 @@ const RESOURCE_INLINER = dippy.createToken('resourceInliner');
  */
 dippy.createToken('resourcesRegistryCache');
 
-const requireFunc = 
-// @ts-ignore
-typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require;
-
-let appConfig;
-try {
-    appConfig = require('@tramvai/cli/lib/external/config').appConfig;
-}
-catch (e) { }
-if (process.env.NODE_ENV === 'development') ;
-if (process.env.NODE_ENV === 'test') ;
-if (process.env.NODE_ENV === 'production') {
-    const SEARCH_PATHS = [process.cwd(), __dirname];
-    const webpackStats = (fileName) => {
-        let stats;
-        for (const dir of SEARCH_PATHS) {
-            try {
-                const statsPath = path__namespace.resolve(dir, fileName);
-                stats = requireFunc(statsPath);
-                break;
-            }
-            catch (e) {
-                // ignore errors as this function is used to load stats for several optional destinations
-                // and these destinations may not have stats file
-            }
-        }
-        if (!stats) {
-            return;
-        }
-        if (!process.env.ASSETS_PREFIX) {
-            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"');
-            }
-            throw new Error('Required env variable "ASSETS_PREFIX" is not set');
-        }
-        return {
-            ...stats,
-            publicPath: process.env.ASSETS_PREFIX,
-        };
-    };
-    const statsLegacy = webpackStats('stats.json');
-    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
-`);
-    }
-}
-
 const formatAttributes = (htmlAttrs, target) => {
     if (!htmlAttrs) {
         return '';