@tramvai/module-page-render-mode 6.64.1 → 6.65.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/staticPages/backgroundFetchService.d.ts +1 -1
  2. package/lib/staticPages/backgroundFetchService.es.js +4 -5
  3. package/lib/staticPages/backgroundFetchService.js +5 -10
  4. package/package.json +14 -18
package/lib/staticPages/backgroundFetchService.d.ts CHANGED
@@ -20,7 +20,7 @@ export declare class BackgroundFetchService {
20
20
  }): Promise<void | {
21
21
  body: string;
22
22
  headers: {
23
- [k: string]: string[];
23
+ [k: string]: any;
24
24
  };
25
25
  status: number;
26
26
  }>;
package/lib/staticPages/backgroundFetchService.es.js CHANGED
@@ -1,4 +1,3 @@
1
- import fetch from 'node-fetch';
2
1
  import { format } from '@tinkoff/url';
3
2
 
4
3
  const userAgentByDeviceType = {
@@ -38,12 +37,11 @@ class BackgroundFetchService {
38
37
  'User-Agent': userAgentByDeviceType[`${deviceType}`],
39
38
  'X-Tramvai-Static-Page-Revalidate': 'true',
40
39
  },
41
- timeout: 10000,
40
+ signal: AbortSignal.timeout(10000),
42
41
  })
43
42
  .then(async (response) => {
44
43
  const body = await response.text();
45
- const headers = response.headers.raw();
46
- const { status } = response;
44
+ const { headers, status } = response;
47
45
  this.log.debug({
48
46
  event: status >= 500 ? 'background-fetch-5xx' : 'background-fetch-success',
49
47
  status,
@@ -51,7 +49,8 @@ class BackgroundFetchService {
51
49
  });
52
50
  return {
53
51
  body,
54
- headers,
52
+ // @ts-ignore outdated typings for headers in typescript
53
+ headers: Object.fromEntries(headers.entries()),
55
54
  status,
56
55
  };
57
56
  })
package/lib/staticPages/backgroundFetchService.js CHANGED
@@ -2,13 +2,8 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var fetch = require('node-fetch');
6
5
  var url = require('@tinkoff/url');
7
6
 
8
- function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
9
-
10
- var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
11
-
12
7
  const userAgentByDeviceType = {
13
8
  /** Chrome on Mobile */
14
9
  mobile: 'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3071.125 Mobile Safari/537.36',
@@ -41,17 +36,16 @@ class BackgroundFetchService {
41
36
  key,
42
37
  revalidateUrl,
43
38
  });
44
- return fetch__default["default"](revalidateUrl, {
39
+ return fetch(revalidateUrl, {
45
40
  headers: {
46
41
  'User-Agent': userAgentByDeviceType[`${deviceType}`],
47
42
  'X-Tramvai-Static-Page-Revalidate': 'true',
48
43
  },
49
- timeout: 10000,
44
+ signal: AbortSignal.timeout(10000),
50
45
  })
51
46
  .then(async (response) => {
52
47
  const body = await response.text();
53
- const headers = response.headers.raw();
54
- const { status } = response;
48
+ const { headers, status } = response;
55
49
  this.log.debug({
56
50
  event: status >= 500 ? 'background-fetch-5xx' : 'background-fetch-success',
57
51
  status,
@@ -59,7 +53,8 @@ class BackgroundFetchService {
59
53
  });
60
54
  return {
61
55
  body,
62
- headers,
56
+ // @ts-ignore outdated typings for headers in typescript
57
+ headers: Object.fromEntries(headers.entries()),
63
58
  status,
64
59
  };
65
60
  })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-page-render-mode",
3
- "version": "6.64.1",
3
+ "version": "6.65.0",
4
4
  "description": "Enable different rendering modes for pages",
5
5
  "main": "./lib/server.js",
6
6
  "module": "./lib/server.es.js",
@@ -24,29 +24,25 @@
24
24
  },
25
25
  "dependencies": {
26
26
  "@tinkoff/errors": "0.7.1",
27
- "@tinkoff/url": "0.12.1",
28
- "node-fetch": "^2.6.1"
27
+ "@tinkoff/url": "0.12.1"
29
28
  },
30
29
  "peerDependencies": {
31
30
  "@tinkoff/dippy": "0.12.3",
32
31
  "@tinkoff/utils": "^2.1.2",
33
- "@tramvai/core": "6.64.1",
34
- "@tramvai/module-client-hints": "6.64.1",
35
- "@tramvai/module-router": "6.64.1",
36
- "@tramvai/papi": "6.64.1",
37
- "@tramvai/react": "6.64.1",
38
- "@tramvai/tokens-common": "6.64.1",
39
- "@tramvai/tokens-core": "6.64.1",
40
- "@tramvai/tokens-metrics": "6.64.1",
41
- "@tramvai/tokens-render": "6.64.1",
42
- "@tramvai/tokens-router": "6.64.1",
43
- "@tramvai/tokens-server": "6.64.1",
44
- "@tramvai/tokens-server-private": "6.64.1",
32
+ "@tramvai/core": "6.65.0",
33
+ "@tramvai/module-client-hints": "6.65.0",
34
+ "@tramvai/module-router": "6.65.0",
35
+ "@tramvai/papi": "6.65.0",
36
+ "@tramvai/react": "6.65.0",
37
+ "@tramvai/tokens-common": "6.65.0",
38
+ "@tramvai/tokens-core": "6.65.0",
39
+ "@tramvai/tokens-metrics": "6.65.0",
40
+ "@tramvai/tokens-render": "6.65.0",
41
+ "@tramvai/tokens-router": "6.65.0",
42
+ "@tramvai/tokens-server": "6.65.0",
43
+ "@tramvai/tokens-server-private": "6.65.0",
45
44
  "prom-client": "^14.2.0",
46
45
  "react": ">=16.14.0",
47
46
  "tslib": "^2.4.0"
48
- },
49
- "devDependencies": {
50
- "@types/node-fetch": "^2.6.2"
51
47
  }
52
48
  }