@tramvai/module-client-hints 2.153.3 → 2.155.0

package/lib/browser/loadHighEntropyClientHints.inline.d.ts

@@ -0,0 +1,2 @@
+export declare function loadHighEntropyClientHints(): void;
+//# sourceMappingURL=loadHighEntropyClientHints.inline.d.ts.map

package/lib/browser/loadHighEntropyClientHints.inline.es.js

@@ -0,0 +1,18 @@
+function loadHighEntropyClientHints() {
+    if (window.navigator.userAgentData !== undefined) {
+        window.navigator.userAgentData
+            .getHighEntropyValues([
+            'architecture',
+            'bitness',
+            'model',
+            'platformVersion',
+            'fullVersionList',
+        ])
+            .then((result) => {
+            window.__TRAMVAI_USER_AGENT_DATA = result;
+        })
+            .catch(() => { });
+    }
+}
+
+export { loadHighEntropyClientHints };

package/lib/browser/loadHighEntropyClientHints.inline.js

@@ -0,0 +1,22 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function loadHighEntropyClientHints() {
+    if (window.navigator.userAgentData !== undefined) {
+        window.navigator.userAgentData
+            .getHighEntropyValues([
+            'architecture',
+            'bitness',
+            'model',
+            'platformVersion',
+            'fullVersionList',
+        ])
+            .then((result) => {
+            window.__TRAMVAI_USER_AGENT_DATA = result;
+        })
+            .catch(() => { });
+    }
+}
+
+exports.loadHighEntropyClientHints = loadHighEntropyClientHints;

package/lib/browser/loadUserAgent.browser.js

@@ -1,16 +1,19 @@
 import { parse, parseClientHintsUserAgentData } from '@tinkoff/user-agent';
 
 const getFromUserAgentData = () => {
+    var _a;
     try {
-        // @ts-expect-error. We are handling error here, that's why we can force TS
-        const { brands, mobile, platform } = window.navigator.userAgentData;
+        const values = (_a = window.__TRAMVAI_USER_AGENT_DATA) !== null && _a !== void 0 ? _a : window.navigator.userAgentData;
+        if (values === undefined) {
+            return null;
+        }
         // chrome User-Agent emulation doesn't sync with `navigator.userAgentData`,
         // and `navigator.userAgentData` return incorrect object for Safari User-Agents instead of `undefined`
         // example of this problem with Playwright tests - https://github.com/microsoft/playwright/issues/14361
-        if (brands && brands.length === 0 && platform === '') {
+        if (values.brands && values.brands.length === 0 && values.platform === '') {
             return null;
         }
-        return parseClientHintsUserAgentData({ brands, mobile, platform });
+        return parseClientHintsUserAgentData(values);
     }
     catch (error) {
         return null;

package/lib/modules/csr/browser.d.ts

@@ -1,3 +1,9 @@
+/// <reference types="user-agent-data-types" />
+declare global {
+    interface Window {
+        __TRAMVAI_USER_AGENT_DATA?: UADataValues;
+    }
+}
 export declare const ClientHintsCSRModule: import("@tinkoff/dippy/lib/modules/module.h").ModuleClass & Partial<import("@tinkoff/dippy/lib/modules/module.h").ModuleSecretParameters> & {
     [x: string]: (...args: any[]) => import("@tinkoff/dippy").ModuleType;
 };

package/lib/modules/csr/server.es.js

@@ -1,9 +1,21 @@
-import { declareModule } from '@tinkoff/dippy';
+import { declareModule, provide } from '@tinkoff/dippy';
+import { RENDER_SLOTS, ResourceType, ResourceSlot } from '@tramvai/tokens-render';
 import { serverProviders } from '../../shared/providers.server.es.js';
+import { loadHighEntropyClientHints } from '../../browser/loadHighEntropyClientHints.inline.es.js';
 
 const ClientHintsCSRModule = /* @__PURE__ */ declareModule({
     name: 'ClientHintsCSRModule',
-    providers: serverProviders,
+    providers: [
+        ...serverProviders,
+        provide({
+            provide: RENDER_SLOTS,
+            useValue: {
+                type: ResourceType.inlineScript,
+                slot: ResourceSlot.HEAD_PERFORMANCE,
+                payload: `(${loadHighEntropyClientHints.toString()})()`,
+            },
+        }),
+    ],
 });
 
 export { ClientHintsCSRModule };

package/lib/modules/csr/server.js

@@ -3,11 +3,23 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var dippy = require('@tinkoff/dippy');
+var tokensRender = require('@tramvai/tokens-render');
 var providers_server = require('../../shared/providers.server.js');
+var loadHighEntropyClientHints_inline = require('../../browser/loadHighEntropyClientHints.inline.js');
 
 const ClientHintsCSRModule = /* @__PURE__ */ dippy.declareModule({
     name: 'ClientHintsCSRModule',
-    providers: providers_server.serverProviders,
+    providers: [
+        ...providers_server.serverProviders,
+        dippy.provide({
+            provide: tokensRender.RENDER_SLOTS,
+            useValue: {
+                type: tokensRender.ResourceType.inlineScript,
+                slot: tokensRender.ResourceSlot.HEAD_PERFORMANCE,
+                payload: `(${loadHighEntropyClientHints_inline.loadHighEntropyClientHints.toString()})()`,
+            },
+        }),
+    ],
 });
 
 exports.ClientHintsCSRModule = ClientHintsCSRModule;

package/lib/shared/providers.browser.js

@@ -1,5 +1,5 @@
 import { provide } from '@tramvai/core';
-import { COMBINE_REDUCERS } from '@tramvai/tokens-common';
+import { COMBINE_REDUCERS, ENV_USED_TOKEN } from '@tramvai/tokens-common';
 import { UserAgentStore } from './stores/userAgent.browser.js';
 import { MediaStore } from './stores/media.browser.js';
 
@@ -9,6 +9,15 @@ const commonProviders = [
         multi: true,
         useValue: [UserAgentStore, MediaStore],
     }),
+    provide({
+        provide: ENV_USED_TOKEN,
+        useValue: [
+            {
+                key: 'TRAMVAI_FORCE_CLIENT_SIDE_RENDERING',
+                optional: true,
+            },
+        ],
+    }),
 ];
 
 export { commonProviders };

package/lib/shared/providers.es.js

@@ -1,5 +1,5 @@
 import { provide } from '@tramvai/core';
-import { COMBINE_REDUCERS } from '@tramvai/tokens-common';
+import { COMBINE_REDUCERS, ENV_USED_TOKEN } from '@tramvai/tokens-common';
 import { UserAgentStore } from './stores/userAgent.es.js';
 import { MediaStore } from './stores/media.es.js';
 
@@ -9,6 +9,15 @@ const commonProviders = [
         multi: true,
         useValue: [UserAgentStore, MediaStore],
     }),
+    provide({
+        provide: ENV_USED_TOKEN,
+        useValue: [
+            {
+                key: 'TRAMVAI_FORCE_CLIENT_SIDE_RENDERING',
+                optional: true,
+            },
+        ],
+    }),
 ];
 
 export { commonProviders };

package/lib/shared/providers.js

@@ -13,6 +13,15 @@ const commonProviders = [
         multi: true,
         useValue: [userAgent.UserAgentStore, media.MediaStore],
     }),
+    core.provide({
+        provide: tokensCommon.ENV_USED_TOKEN,
+        useValue: [
+            {
+                key: 'TRAMVAI_FORCE_CLIENT_SIDE_RENDERING',
+                optional: true,
+            },
+        ],
+    }),
 ];
 
 exports.commonProviders = commonProviders;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-client-hints",
-  "version": "2.153.3",
+  "version": "2.155.0",
   "description": "",
   "main": "lib/server.js",
   "module": "lib/server.es.js",
@@ -19,21 +19,22 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@tinkoff/user-agent": "0.4.444",
+    "@tinkoff/user-agent": "0.4.447",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/env-validators": "0.1.6",
     "@tramvai/safe-strings": "0.5.12",
-    "@tramvai/module-metrics": "2.153.3",
-    "@tramvai/tokens-child-app": "2.153.3",
-    "@tramvai/tokens-common": "2.153.3",
-    "@tramvai/tokens-cookie": "2.153.3",
+    "@tramvai/module-metrics": "2.155.0",
+    "@tramvai/tokens-child-app": "2.155.0",
+    "@tramvai/tokens-common": "2.155.0",
+    "@tramvai/tokens-cookie": "2.155.0",
+    "@tramvai/tokens-render": "2.155.0",
     "user-agent-data-types": "^0.3.1"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.8.16",
     "@tinkoff/logger": "0.10.67",
-    "@tramvai/core": "2.153.3",
-    "@tramvai/state": "2.153.3",
+    "@tramvai/core": "2.155.0",
+    "@tramvai/state": "2.155.0",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "tslib": "^2.4.0"