@tramvai/module-render 2.94.7 → 2.94.9

package/lib/resourcesInliner/resourcesInliner.d.ts

@@ -3,6 +3,7 @@ export interface ResourcesInlinerType {
     shouldAddResource(resource: PageResource): boolean;
     shouldInline(resource: PageResource): boolean;
     inlineResource(resource: PageResource): PageResource[];
+    prefetchResource(resource: PageResource): Promise<void>;
 }
 export declare class ResourcesInliner implements ResourcesInlinerType {
     private resourceInlineThreshold?;
@@ -21,4 +22,5 @@ export declare class ResourcesInliner implements ResourcesInlinerType {
     shouldAddResource(resource: PageResource): boolean;
     shouldInline(resource: PageResource): boolean;
     inlineResource(resource: PageResource): PageResource[];
+    prefetchResource(resource: PageResource): Promise<void>;
 }

package/lib/resourcesInliner/resourcesInliner.es.js

@@ -6,9 +6,10 @@ import { getFile, getFileContentLength } from './externalFilesHelper.es.js';
 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)
-    ? `http://localhost:${process.env.PORT_STATIC}/dist/`
+    ? TRAMVAI_CLI_ASSETS_PREFIX
     : process.env.ASSETS_PREFIX;
 const getInlineType = (type) => {
     switch (type) {
@@ -24,7 +25,11 @@ const getResourceUrl = (resource) => {
     if (isEmpty(resource.payload) || !isAbsoluteUrl(resource.payload)) {
         return undefined;
     }
-    return resource.payload.startsWith('//') ? `https:${resource.payload}` : resource.payload;
+    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);
+    }
+    return result;
 };
 class ResourcesInliner {
     constructor({ resourcesRegistryCache, resourceInlineThreshold, logger }) {
@@ -64,7 +69,7 @@ class ResourcesInliner {
                 }
             }
         };
-        this.scheduleFileSizeLoad = async (resource, resourceInlineThreshold) => {
+        this.scheduleFileSizeLoad = async (resource, resourceInlineThreshold, waitForFileLoad) => {
             const url = getResourceUrl(resource);
             const requestKey = `size${url}`;
             const result = this.resourcesRegistryCache.sizeCache.get(url);
@@ -80,7 +85,10 @@ class ResourcesInliner {
                         this.resourcesRegistryCache.sizeCache.set(url, size);
                     }
                     if (size < resourceInlineThreshold) {
-                        this.scheduleFileLoad(resource, resourceInlineThreshold);
+                        const promise = this.scheduleFileLoad(resource, resourceInlineThreshold);
+                        if (waitForFileLoad) {
+                            await promise;
+                        }
                     }
                 }
                 catch (error) {
@@ -103,7 +111,9 @@ class ResourcesInliner {
         this.log = logger('resources-inliner');
     }
     getFilesCache(url) {
-        if (url.startsWith(ASSETS_PREFIX)) {
+        if (url.startsWith(ASSETS_PREFIX) ||
+            // 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
             // these kind of resources are pretty static and won't be changed while app is running
             // so we can cache it with bare Map and do not care about how to cleanup cache from outdated entries
@@ -200,6 +210,18 @@ class ResourcesInliner {
         }
         return result;
     }
+    async prefetchResource(resource) {
+        const url = getResourceUrl(resource);
+        const resourceInlineThreshold = this.resourceInlineThreshold.threshold;
+        if (isUndefined(url) ||
+            isUndefined(resourceInlineThreshold) ||
+            this.resourcesRegistryCache.disabledUrlsCache.has(url)) {
+            return;
+        }
+        if (!this.resourcesRegistryCache.sizeCache.has(url)) {
+            await this.scheduleFileSizeLoad(resource, resourceInlineThreshold, true);
+        }
+    }
 }
 
 export { ResourcesInliner };

package/lib/resourcesInliner/resourcesInliner.js

@@ -15,9 +15,10 @@ var isUndefined__default = /*#__PURE__*/_interopDefaultLegacy(isUndefined);
 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)
-    ? `http://localhost:${process.env.PORT_STATIC}/dist/`
+    ? TRAMVAI_CLI_ASSETS_PREFIX
     : process.env.ASSETS_PREFIX;
 const getInlineType = (type) => {
     switch (type) {
@@ -33,7 +34,11 @@ const getResourceUrl = (resource) => {
     if (isEmpty__default["default"](resource.payload) || !url.isAbsoluteUrl(resource.payload)) {
         return undefined;
     }
-    return resource.payload.startsWith('//') ? `https:${resource.payload}` : resource.payload;
+    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);
+    }
+    return result;
 };
 class ResourcesInliner {
     constructor({ resourcesRegistryCache, resourceInlineThreshold, logger }) {
@@ -73,7 +78,7 @@ class ResourcesInliner {
                 }
             }
         };
-        this.scheduleFileSizeLoad = async (resource, resourceInlineThreshold) => {
+        this.scheduleFileSizeLoad = async (resource, resourceInlineThreshold, waitForFileLoad) => {
             const url = getResourceUrl(resource);
             const requestKey = `size${url}`;
             const result = this.resourcesRegistryCache.sizeCache.get(url);
@@ -89,7 +94,10 @@ class ResourcesInliner {
                         this.resourcesRegistryCache.sizeCache.set(url, size);
                     }
                     if (size < resourceInlineThreshold) {
-                        this.scheduleFileLoad(resource, resourceInlineThreshold);
+                        const promise = this.scheduleFileLoad(resource, resourceInlineThreshold);
+                        if (waitForFileLoad) {
+                            await promise;
+                        }
                     }
                 }
                 catch (error) {
@@ -112,7 +120,9 @@ class ResourcesInliner {
         this.log = logger('resources-inliner');
     }
     getFilesCache(url) {
-        if (url.startsWith(ASSETS_PREFIX)) {
+        if (url.startsWith(ASSETS_PREFIX) ||
+            // 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
             // these kind of resources are pretty static and won't be changed while app is running
             // so we can cache it with bare Map and do not care about how to cleanup cache from outdated entries
@@ -209,6 +219,18 @@ class ResourcesInliner {
         }
         return result;
     }
+    async prefetchResource(resource) {
+        const url = getResourceUrl(resource);
+        const resourceInlineThreshold = this.resourceInlineThreshold.threshold;
+        if (isUndefined__default["default"](url) ||
+            isUndefined__default["default"](resourceInlineThreshold) ||
+            this.resourcesRegistryCache.disabledUrlsCache.has(url)) {
+            return;
+        }
+        if (!this.resourcesRegistryCache.sizeCache.has(url)) {
+            await this.scheduleFileSizeLoad(resource, resourceInlineThreshold, true);
+        }
+    }
 }
 
 exports.ResourcesInliner = ResourcesInliner;

package/lib/resourcesRegistry/index.d.ts

@@ -9,5 +9,6 @@ export declare class ResourcesRegistry implements ResourceRegistry {
     });
     register(resourceOrResources: PageResource | PageResource[]): void;
     getPageResources(): PageResource[];
+    prefetchInlinePageResources(): Promise<any>;
 }
 export {};

package/lib/resourcesRegistry/index.es.js

@@ -23,6 +23,12 @@ class ResourcesRegistry {
         }, [])
             .filter((resource) => this.resourceInliner.shouldAddResource(resource));
     }
+    prefetchInlinePageResources() {
+        const promises = Array.from(this.resources.values()).map((resource) => {
+            return this.resourceInliner.prefetchResource(resource);
+        });
+        return Promise.all(promises);
+    }
 }
 
 export { ResourcesRegistry };

package/lib/resourcesRegistry/index.js

@@ -31,6 +31,12 @@ class ResourcesRegistry {
         }, [])
             .filter((resource) => this.resourceInliner.shouldAddResource(resource));
     }
+    prefetchInlinePageResources() {
+        const promises = Array.from(this.resources.values()).map((resource) => {
+            return this.resourceInliner.prefetchResource(resource);
+        });
+        return Promise.all(promises);
+    }
 }
 
 exports.ResourcesRegistry = ResourcesRegistry;

package/lib/server/PageBuilder.es.js

@@ -45,6 +45,9 @@ class PageBuilder {
             this.log.warn({ event: 'render-flow-after-error', callback, error });
         })));
         this.dehydrateState();
+        if (process.env.TRAMVAI_CLI_COMMAND === 'static') {
+            await this.resourcesRegistry.prefetchInlinePageResources();
+        }
         this.preloadBlock();
         return this.generateHtml();
     }

package/lib/server/PageBuilder.js

@@ -53,6 +53,9 @@ class PageBuilder {
             this.log.warn({ event: 'render-flow-after-error', callback, error });
         })));
         this.dehydrateState();
+        if (process.env.TRAMVAI_CLI_COMMAND === 'static') {
+            await this.resourcesRegistry.prefetchInlinePageResources();
+        }
         this.preloadBlock();
         return this.generateHtml();
     }

package/package.json

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

package/tests.js

@@ -51,11 +51,18 @@ class ResourcesRegistry {
         }, [])
             .filter((resource) => this.resourceInliner.shouldAddResource(resource));
     }
+    prefetchInlinePageResources() {
+        const promises = Array.from(this.resources.values()).map((resource) => {
+            return this.resourceInliner.prefetchResource(resource);
+        });
+        return Promise.all(promises);
+    }
 }
 
+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)
-    ? `http://localhost:${process.env.PORT_STATIC}/dist/`
+    ? TRAMVAI_CLI_ASSETS_PREFIX
     : process.env.ASSETS_PREFIX;
 
 /**
@@ -171,6 +178,7 @@ const testPageResources = (options) => {
                     inlineResource() {
                         return [];
                     },
+                    async prefetchResource() { },
                 },
             }),
         ],