diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 05d515fc..8c6867b8 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -4,6 +4,8 @@ on:
branches:
- master
+permissions: write-all
+
jobs:
coverage:
runs-on: ubuntu-latest
diff --git a/docs/src/components/pages/Tokens/TokensContent/TokensContent.css b/docs/src/components/pages/Tokens/TokensContent/TokensContent.css
index 8aeebdb2..22c5c274 100644
--- a/docs/src/components/pages/Tokens/TokensContent/TokensContent.css
+++ b/docs/src/components/pages/Tokens/TokensContent/TokensContent.css
@@ -12,7 +12,7 @@
}
.tokens-content-item > div {
- overflow: auto;
+ overflow: visible;
}
.tokens-content-header > div:nth-child(1),
diff --git a/package.json b/package.json
index a0335319..05321533 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@vkontakte/vkui-tokens",
- "version": "4.39.0",
+ "version": "4.39.1",
"description": "Репозиторий, который содержит в себе дизайн-токены и другие инструменты объединенной дизайн-системы VKUI и Paradigm",
"license": "MIT",
"main": "utils/descriptions.js",
@@ -48,18 +48,19 @@
"@types/color": "3.0.3",
"@types/common-tags": "1.8.1",
"@types/fs-extra": "11.0.1",
+ "@types/lodash": "4.14.198",
"@types/node": "18.11.10",
"@types/react": "18.2.0",
- "@types/react-dom": "18.2.1",
+ "@types/react-dom": "18.2.7",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"@vkontakte/appearance": "https://github.com/VKCOM/Appearance#v10.1.4",
"@vkontakte/icons": "2.54.0",
"@vkontakte/prettier-config": "0.1.0",
"@vkontakte/vk-bridge": "2.11.1",
- "@vkontakte/vkjs": "0.32.2",
- "@vkontakte/vkui": "5.8.0",
- "babel-jest": "29.6.2",
+ "@vkontakte/vkjs": "1.1.0",
+ "@vkontakte/vkui": "5.8.1",
+ "babel-jest": "29.7.0",
"babel-loader": "9.1.2",
"clean-webpack-plugin": "4.0.0",
"clsx": "1.2.1",
diff --git a/src/build/__snapshots__/snapthots.test.ts.snap b/src/build/__snapshots__/snapthots.test.ts.snap
index d99775b9..8c941ca3 100644
--- a/src/build/__snapshots__/snapthots.test.ts.snap
+++ b/src/build/__snapshots__/snapthots.test.ts.snap
@@ -310620,6 +310620,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption1--font_weight",
"value": "var(--vkui--font_caption1--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption1--letter_spacing",
+ "value": "var(--vkui--font_caption1--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption1--line_height",
"value": "var(--vkui--font_caption1--line_height)",
@@ -310638,6 +310642,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption1--font_weight--regular",
"value": "var(--vkui--font_caption1--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption1--letter_spacing--regular",
+ "value": "var(--vkui--font_caption1--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption1--line_height--regular",
"value": "var(--vkui--font_caption1--line_height--regular, 14px)",
@@ -310658,6 +310666,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption1_caps--font_weight",
"value": "var(--vkui--font_caption1_caps--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption1_caps--letter_spacing",
+ "value": "var(--vkui--font_caption1_caps--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption1_caps--line_height",
"value": "var(--vkui--font_caption1_caps--line_height)",
@@ -310680,6 +310692,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption1_caps--font_weight--regular",
"value": "var(--vkui--font_caption1_caps--font_weight--regular, 600)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption1_caps--letter_spacing--regular",
+ "value": "var(--vkui--font_caption1_caps--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption1_caps--line_height--regular",
"value": "var(--vkui--font_caption1_caps--line_height--regular, 14px)",
@@ -310704,6 +310720,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption2--font_weight",
"value": "var(--vkui--font_caption2--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption2--letter_spacing",
+ "value": "var(--vkui--font_caption2--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption2--line_height",
"value": "var(--vkui--font_caption2--line_height)",
@@ -310722,6 +310742,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption2--font_weight--regular",
"value": "var(--vkui--font_caption2--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption2--letter_spacing--regular",
+ "value": "var(--vkui--font_caption2--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption2--line_height--regular",
"value": "var(--vkui--font_caption2--line_height--regular, 14px)",
@@ -310742,6 +310766,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption2_caps--font_weight",
"value": "var(--vkui--font_caption2_caps--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption2_caps--letter_spacing",
+ "value": "var(--vkui--font_caption2_caps--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption2_caps--line_height",
"value": "var(--vkui--font_caption2_caps--line_height)",
@@ -310764,6 +310792,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption2_caps--font_weight--regular",
"value": "var(--vkui--font_caption2_caps--font_weight--regular, 600)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption2_caps--letter_spacing--regular",
+ "value": "var(--vkui--font_caption2_caps--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption2_caps--line_height--regular",
"value": "var(--vkui--font_caption2_caps--line_height--regular, 14px)",
@@ -310788,6 +310820,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption3--font_weight",
"value": "var(--vkui--font_caption3--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption3--letter_spacing",
+ "value": "var(--vkui--font_caption3--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption3--line_height",
"value": "var(--vkui--font_caption3--line_height)",
@@ -310806,6 +310842,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption3--font_weight--regular",
"value": "var(--vkui--font_caption3--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption3--letter_spacing--regular",
+ "value": "var(--vkui--font_caption3--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption3--line_height--regular",
"value": "var(--vkui--font_caption3--line_height--regular, 12px)",
@@ -310826,6 +310866,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption3_caps--font_weight",
"value": "var(--vkui--font_caption3_caps--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption3_caps--letter_spacing",
+ "value": "var(--vkui--font_caption3_caps--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption3_caps--line_height",
"value": "var(--vkui--font_caption3_caps--line_height)",
@@ -310848,6 +310892,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_caption3_caps--font_weight--regular",
"value": "var(--vkui--font_caption3_caps--font_weight--regular, 600)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption3_caps--letter_spacing--regular",
+ "value": "var(--vkui--font_caption3_caps--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption3_caps--line_height--regular",
"value": "var(--vkui--font_caption3_caps--line_height--regular, 12px)",
@@ -310884,6 +310932,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_footnote--font_weight",
"value": "var(--vkui--font_footnote--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_footnote--letter_spacing",
+ "value": "var(--vkui--font_footnote--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_footnote--line_height",
"value": "var(--vkui--font_footnote--line_height)",
@@ -310902,6 +310954,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_footnote--font_weight--regular",
"value": "var(--vkui--font_footnote--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_footnote--letter_spacing--regular",
+ "value": "var(--vkui--font_footnote--letter_spacing--regular, 0.2px)",
+ },
"lineHeight": {
"name": "--vkui--font_footnote--line_height--regular",
"value": "var(--vkui--font_footnote--line_height--regular, 16px)",
@@ -310922,6 +310978,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_footnote_caps--font_weight",
"value": "var(--vkui--font_footnote_caps--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_footnote_caps--letter_spacing",
+ "value": "var(--vkui--font_footnote_caps--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_footnote_caps--line_height",
"value": "var(--vkui--font_footnote_caps--line_height)",
@@ -310944,6 +311004,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_footnote_caps--font_weight--regular",
"value": "var(--vkui--font_footnote_caps--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_footnote_caps--letter_spacing--regular",
+ "value": "var(--vkui--font_footnote_caps--letter_spacing--regular, 0.2px)",
+ },
"lineHeight": {
"name": "--vkui--font_footnote_caps--line_height--regular",
"value": "var(--vkui--font_footnote_caps--line_height--regular, 16px)",
@@ -310968,6 +311032,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_headline--font_weight",
"value": "var(--vkui--font_headline--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline--letter_spacing",
+ "value": "var(--vkui--font_headline--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_headline--line_height",
"value": "var(--vkui--font_headline--line_height)",
@@ -310978,6 +311046,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_headline--font_size--compact",
"value": "var(--vkui--font_headline--font_size--compact, 15px)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline--letter_spacing--compact",
+ "value": "var(--vkui--font_headline--letter_spacing--compact, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_headline--line_height--compact",
"value": "var(--vkui--font_headline--line_height--compact, 20px)",
@@ -310996,6 +311068,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_headline--font_weight--regular",
"value": "var(--vkui--font_headline--font_weight--regular, 500)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline--letter_spacing--regular",
+ "value": "var(--vkui--font_headline--letter_spacing--regular, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_headline--line_height--regular",
"value": "var(--vkui--font_headline--line_height--regular, 20px)",
@@ -311016,6 +311092,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_headline1--font_weight",
"value": "var(--vkui--font_headline1--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline1--letter_spacing",
+ "value": "var(--vkui--font_headline1--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_headline1--line_height",
"value": "var(--vkui--font_headline1--line_height)",
@@ -311026,6 +311106,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_headline1--font_size--compact",
"value": "var(--vkui--font_headline1--font_size--compact, 15px)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline1--letter_spacing--compact",
+ "value": "var(--vkui--font_headline1--letter_spacing--compact, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_headline1--line_height--compact",
"value": "var(--vkui--font_headline1--line_height--compact, 20px)",
@@ -311044,6 +311128,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_headline1--font_weight--regular",
"value": "var(--vkui--font_headline1--font_weight--regular, 500)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline1--letter_spacing--regular",
+ "value": "var(--vkui--font_headline1--letter_spacing--regular, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_headline1--line_height--regular",
"value": "var(--vkui--font_headline1--line_height--regular, 20px)",
@@ -311150,6 +311238,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_subhead--font_weight",
"value": "var(--vkui--font_subhead--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_subhead--letter_spacing",
+ "value": "var(--vkui--font_subhead--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_subhead--line_height",
"value": "var(--vkui--font_subhead--line_height)",
@@ -311160,6 +311252,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_subhead--font_size--compact",
"value": "var(--vkui--font_subhead--font_size--compact, 13px)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_subhead--letter_spacing--compact",
+ "value": "var(--vkui--font_subhead--letter_spacing--compact, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_subhead--line_height--compact",
"value": "var(--vkui--font_subhead--line_height--compact, 16px)",
@@ -311178,6 +311274,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_subhead--font_weight--regular",
"value": "var(--vkui--font_subhead--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_subhead--letter_spacing--regular",
+ "value": "var(--vkui--font_subhead--letter_spacing--regular, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_subhead--line_height--regular",
"value": "var(--vkui--font_subhead--line_height--regular, 18px)",
@@ -311198,6 +311298,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_text--font_weight",
"value": "var(--vkui--font_text--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_text--letter_spacing",
+ "value": "var(--vkui--font_text--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_text--line_height",
"value": "var(--vkui--font_text--line_height)",
@@ -311208,6 +311312,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_text--font_size--compact",
"value": "var(--vkui--font_text--font_size--compact, 15px)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_text--letter_spacing--compact",
+ "value": "var(--vkui--font_text--letter_spacing--compact, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_text--line_height--compact",
"value": "var(--vkui--font_text--line_height--compact, 20px)",
@@ -311226,6 +311334,10 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
"name": "--vkui--font_text--font_weight--regular",
"value": "var(--vkui--font_text--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_text--letter_spacing--regular",
+ "value": "var(--vkui--font_text--letter_spacing--regular, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_text--line_height--regular",
"value": "var(--vkui--font_text--line_height--regular, 20px)",
@@ -313689,6 +313801,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "12px",
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": "14px",
},
},
@@ -313697,6 +313810,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "12px",
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": "14px",
"textTransform": "uppercase",
},
@@ -313706,6 +313820,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "11px",
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": "14px",
},
},
@@ -313714,6 +313829,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "11px",
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": "14px",
"textTransform": "uppercase",
},
@@ -313723,6 +313839,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "9px",
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": "12px",
},
},
@@ -313731,6 +313848,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "9px",
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": "12px",
"textTransform": "uppercase",
},
@@ -313743,6 +313861,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "13px",
"fontWeight": 400,
+ "letterSpacing": "0.2px",
"lineHeight": "16px",
},
},
@@ -313751,6 +313870,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "13px",
"fontWeight": 400,
+ "letterSpacing": "0.2px",
"lineHeight": "16px",
"textTransform": "uppercase",
},
@@ -313758,24 +313878,28 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontHeadline": {
"compact": {
"fontSize": "15px",
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "16px",
"fontWeight": 500,
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
},
"fontHeadline1": {
"compact": {
"fontSize": "15px",
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "16px",
"fontWeight": 500,
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
},
@@ -313802,24 +313926,28 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"fontSubhead": {
"compact": {
"fontSize": "13px",
+ "letterSpacing": "0.15px",
"lineHeight": "16px",
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "14px",
"fontWeight": 400,
+ "letterSpacing": "0.15px",
"lineHeight": "18px",
},
},
"fontText": {
"compact": {
"fontSize": "15px",
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "16px",
"fontWeight": 400,
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
},
@@ -314955,6 +315083,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontFamily": "var(--vkui--font_caption1--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption1--font_size--regular, 12px)",
"fontWeight": "var(--vkui--font_caption1--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_caption1--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption1--line_height--regular, 14px)",
},
},
@@ -314963,6 +315092,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontFamily": "var(--vkui--font_caption1_caps--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption1_caps--font_size--regular, 12px)",
"fontWeight": "var(--vkui--font_caption1_caps--font_weight--regular, 600)",
+ "letterSpacing": "var(--vkui--font_caption1_caps--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption1_caps--line_height--regular, 14px)",
"textTransform": "var(--vkui--font_caption1_caps--text_transform--regular, uppercase)",
},
@@ -314972,6 +315102,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontFamily": "var(--vkui--font_caption2--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption2--font_size--regular, 11px)",
"fontWeight": "var(--vkui--font_caption2--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_caption2--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption2--line_height--regular, 14px)",
},
},
@@ -314980,6 +315111,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontFamily": "var(--vkui--font_caption2_caps--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption2_caps--font_size--regular, 11px)",
"fontWeight": "var(--vkui--font_caption2_caps--font_weight--regular, 600)",
+ "letterSpacing": "var(--vkui--font_caption2_caps--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption2_caps--line_height--regular, 14px)",
"textTransform": "var(--vkui--font_caption2_caps--text_transform--regular, uppercase)",
},
@@ -314989,6 +315121,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontFamily": "var(--vkui--font_caption3--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption3--font_size--regular, 9px)",
"fontWeight": "var(--vkui--font_caption3--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_caption3--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption3--line_height--regular, 12px)",
},
},
@@ -314997,6 +315130,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontFamily": "var(--vkui--font_caption3_caps--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption3_caps--font_size--regular, 9px)",
"fontWeight": "var(--vkui--font_caption3_caps--font_weight--regular, 600)",
+ "letterSpacing": "var(--vkui--font_caption3_caps--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption3_caps--line_height--regular, 12px)",
"textTransform": "var(--vkui--font_caption3_caps--text_transform--regular, uppercase)",
},
@@ -315009,6 +315143,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontFamily": "var(--vkui--font_footnote--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_footnote--font_size--regular, 13px)",
"fontWeight": "var(--vkui--font_footnote--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_footnote--letter_spacing--regular, 0.2px)",
"lineHeight": "var(--vkui--font_footnote--line_height--regular, 16px)",
},
},
@@ -315017,6 +315152,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontFamily": "var(--vkui--font_footnote_caps--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_footnote_caps--font_size--regular, 13px)",
"fontWeight": "var(--vkui--font_footnote_caps--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_footnote_caps--letter_spacing--regular, 0.2px)",
"lineHeight": "var(--vkui--font_footnote_caps--line_height--regular, 16px)",
"textTransform": "var(--vkui--font_footnote_caps--text_transform--regular, uppercase)",
},
@@ -315024,24 +315160,28 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontHeadline": {
"compact": {
"fontSize": "var(--vkui--font_headline--font_size--compact, 15px)",
+ "letterSpacing": "var(--vkui--font_headline--letter_spacing--compact, 0.15px)",
"lineHeight": "var(--vkui--font_headline--line_height--compact, 20px)",
},
"regular": {
"fontFamily": "var(--vkui--font_headline--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_headline--font_size--regular, 16px)",
"fontWeight": "var(--vkui--font_headline--font_weight--regular, 500)",
+ "letterSpacing": "var(--vkui--font_headline--letter_spacing--regular, 0.15px)",
"lineHeight": "var(--vkui--font_headline--line_height--regular, 20px)",
},
},
"fontHeadline1": {
"compact": {
"fontSize": "var(--vkui--font_headline1--font_size--compact, 15px)",
+ "letterSpacing": "var(--vkui--font_headline1--letter_spacing--compact, 0.15px)",
"lineHeight": "var(--vkui--font_headline1--line_height--compact, 20px)",
},
"regular": {
"fontFamily": "var(--vkui--font_headline1--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_headline1--font_size--regular, 16px)",
"fontWeight": "var(--vkui--font_headline1--font_weight--regular, 500)",
+ "letterSpacing": "var(--vkui--font_headline1--letter_spacing--regular, 0.15px)",
"lineHeight": "var(--vkui--font_headline1--line_height--regular, 20px)",
},
},
@@ -315068,24 +315208,28 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"fontSubhead": {
"compact": {
"fontSize": "var(--vkui--font_subhead--font_size--compact, 13px)",
+ "letterSpacing": "var(--vkui--font_subhead--letter_spacing--compact, 0.15px)",
"lineHeight": "var(--vkui--font_subhead--line_height--compact, 16px)",
},
"regular": {
"fontFamily": "var(--vkui--font_subhead--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_subhead--font_size--regular, 14px)",
"fontWeight": "var(--vkui--font_subhead--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_subhead--letter_spacing--regular, 0.15px)",
"lineHeight": "var(--vkui--font_subhead--line_height--regular, 18px)",
},
},
"fontText": {
"compact": {
"fontSize": "var(--vkui--font_text--font_size--compact, 15px)",
+ "letterSpacing": "var(--vkui--font_text--letter_spacing--compact, 0.15px)",
"lineHeight": "var(--vkui--font_text--line_height--compact, 20px)",
},
"regular": {
"fontFamily": "var(--vkui--font_text--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_text--font_size--regular, 16px)",
"fontWeight": "var(--vkui--font_text--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_text--letter_spacing--regular, 0.15px)",
"lineHeight": "var(--vkui--font_text--line_height--regular, 20px)",
},
},
@@ -316221,6 +316365,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 12,
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": 14,
},
},
@@ -316229,6 +316374,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 12,
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": 14,
"textTransform": "uppercase",
},
@@ -316238,6 +316384,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 11,
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": 14,
},
},
@@ -316246,6 +316393,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 11,
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": 14,
"textTransform": "uppercase",
},
@@ -316255,6 +316403,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 9,
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": 12,
},
},
@@ -316263,6 +316412,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 9,
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": 12,
"textTransform": "uppercase",
},
@@ -316275,6 +316425,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 13,
"fontWeight": 400,
+ "letterSpacing": "0.2px",
"lineHeight": 16,
},
},
@@ -316283,6 +316434,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 13,
"fontWeight": 400,
+ "letterSpacing": "0.2px",
"lineHeight": 16,
"textTransform": "uppercase",
},
@@ -316290,24 +316442,28 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontHeadline": {
"compact": {
"fontSize": 15,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 16,
"fontWeight": 500,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
},
"fontHeadline1": {
"compact": {
"fontSize": 15,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 16,
"fontWeight": 500,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
},
@@ -316334,24 +316490,28 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"fontSubhead": {
"compact": {
"fontSize": 13,
+ "letterSpacing": "0.15px",
"lineHeight": 16,
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 14,
"fontWeight": 400,
+ "letterSpacing": "0.15px",
"lineHeight": 18,
},
},
"fontText": {
"compact": {
"fontSize": 15,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 16,
"fontWeight": 400,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
},
@@ -318438,6 +318598,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption1--font_weight",
"value": "var(--vkui--font_caption1--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption1--letter_spacing",
+ "value": "var(--vkui--font_caption1--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption1--line_height",
"value": "var(--vkui--font_caption1--line_height)",
@@ -318456,6 +318620,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption1--font_weight--regular",
"value": "var(--vkui--font_caption1--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption1--letter_spacing--regular",
+ "value": "var(--vkui--font_caption1--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption1--line_height--regular",
"value": "var(--vkui--font_caption1--line_height--regular, 14px)",
@@ -318476,6 +318644,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption1_caps--font_weight",
"value": "var(--vkui--font_caption1_caps--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption1_caps--letter_spacing",
+ "value": "var(--vkui--font_caption1_caps--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption1_caps--line_height",
"value": "var(--vkui--font_caption1_caps--line_height)",
@@ -318498,6 +318670,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption1_caps--font_weight--regular",
"value": "var(--vkui--font_caption1_caps--font_weight--regular, 600)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption1_caps--letter_spacing--regular",
+ "value": "var(--vkui--font_caption1_caps--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption1_caps--line_height--regular",
"value": "var(--vkui--font_caption1_caps--line_height--regular, 14px)",
@@ -318522,6 +318698,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption2--font_weight",
"value": "var(--vkui--font_caption2--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption2--letter_spacing",
+ "value": "var(--vkui--font_caption2--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption2--line_height",
"value": "var(--vkui--font_caption2--line_height)",
@@ -318540,6 +318720,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption2--font_weight--regular",
"value": "var(--vkui--font_caption2--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption2--letter_spacing--regular",
+ "value": "var(--vkui--font_caption2--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption2--line_height--regular",
"value": "var(--vkui--font_caption2--line_height--regular, 14px)",
@@ -318560,6 +318744,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption2_caps--font_weight",
"value": "var(--vkui--font_caption2_caps--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption2_caps--letter_spacing",
+ "value": "var(--vkui--font_caption2_caps--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption2_caps--line_height",
"value": "var(--vkui--font_caption2_caps--line_height)",
@@ -318582,6 +318770,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption2_caps--font_weight--regular",
"value": "var(--vkui--font_caption2_caps--font_weight--regular, 600)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption2_caps--letter_spacing--regular",
+ "value": "var(--vkui--font_caption2_caps--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption2_caps--line_height--regular",
"value": "var(--vkui--font_caption2_caps--line_height--regular, 14px)",
@@ -318606,6 +318798,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption3--font_weight",
"value": "var(--vkui--font_caption3--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption3--letter_spacing",
+ "value": "var(--vkui--font_caption3--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption3--line_height",
"value": "var(--vkui--font_caption3--line_height)",
@@ -318624,6 +318820,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption3--font_weight--regular",
"value": "var(--vkui--font_caption3--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption3--letter_spacing--regular",
+ "value": "var(--vkui--font_caption3--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption3--line_height--regular",
"value": "var(--vkui--font_caption3--line_height--regular, 12px)",
@@ -318644,6 +318844,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption3_caps--font_weight",
"value": "var(--vkui--font_caption3_caps--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption3_caps--letter_spacing",
+ "value": "var(--vkui--font_caption3_caps--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_caption3_caps--line_height",
"value": "var(--vkui--font_caption3_caps--line_height)",
@@ -318666,6 +318870,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_caption3_caps--font_weight--regular",
"value": "var(--vkui--font_caption3_caps--font_weight--regular, 600)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_caption3_caps--letter_spacing--regular",
+ "value": "var(--vkui--font_caption3_caps--letter_spacing--regular, 0.3px)",
+ },
"lineHeight": {
"name": "--vkui--font_caption3_caps--line_height--regular",
"value": "var(--vkui--font_caption3_caps--line_height--regular, 12px)",
@@ -318702,6 +318910,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_footnote--font_weight",
"value": "var(--vkui--font_footnote--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_footnote--letter_spacing",
+ "value": "var(--vkui--font_footnote--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_footnote--line_height",
"value": "var(--vkui--font_footnote--line_height)",
@@ -318720,6 +318932,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_footnote--font_weight--regular",
"value": "var(--vkui--font_footnote--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_footnote--letter_spacing--regular",
+ "value": "var(--vkui--font_footnote--letter_spacing--regular, 0.2px)",
+ },
"lineHeight": {
"name": "--vkui--font_footnote--line_height--regular",
"value": "var(--vkui--font_footnote--line_height--regular, 16px)",
@@ -318740,6 +318956,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_footnote_caps--font_weight",
"value": "var(--vkui--font_footnote_caps--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_footnote_caps--letter_spacing",
+ "value": "var(--vkui--font_footnote_caps--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_footnote_caps--line_height",
"value": "var(--vkui--font_footnote_caps--line_height)",
@@ -318762,6 +318982,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_footnote_caps--font_weight--regular",
"value": "var(--vkui--font_footnote_caps--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_footnote_caps--letter_spacing--regular",
+ "value": "var(--vkui--font_footnote_caps--letter_spacing--regular, 0.2px)",
+ },
"lineHeight": {
"name": "--vkui--font_footnote_caps--line_height--regular",
"value": "var(--vkui--font_footnote_caps--line_height--regular, 16px)",
@@ -318786,6 +319010,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_headline--font_weight",
"value": "var(--vkui--font_headline--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline--letter_spacing",
+ "value": "var(--vkui--font_headline--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_headline--line_height",
"value": "var(--vkui--font_headline--line_height)",
@@ -318796,6 +319024,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_headline--font_size--compact",
"value": "var(--vkui--font_headline--font_size--compact, 15px)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline--letter_spacing--compact",
+ "value": "var(--vkui--font_headline--letter_spacing--compact, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_headline--line_height--compact",
"value": "var(--vkui--font_headline--line_height--compact, 20px)",
@@ -318814,6 +319046,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_headline--font_weight--regular",
"value": "var(--vkui--font_headline--font_weight--regular, 500)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline--letter_spacing--regular",
+ "value": "var(--vkui--font_headline--letter_spacing--regular, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_headline--line_height--regular",
"value": "var(--vkui--font_headline--line_height--regular, 20px)",
@@ -318834,6 +319070,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_headline1--font_weight",
"value": "var(--vkui--font_headline1--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline1--letter_spacing",
+ "value": "var(--vkui--font_headline1--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_headline1--line_height",
"value": "var(--vkui--font_headline1--line_height)",
@@ -318844,6 +319084,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_headline1--font_size--compact",
"value": "var(--vkui--font_headline1--font_size--compact, 15px)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline1--letter_spacing--compact",
+ "value": "var(--vkui--font_headline1--letter_spacing--compact, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_headline1--line_height--compact",
"value": "var(--vkui--font_headline1--line_height--compact, 20px)",
@@ -318862,6 +319106,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_headline1--font_weight--regular",
"value": "var(--vkui--font_headline1--font_weight--regular, 500)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_headline1--letter_spacing--regular",
+ "value": "var(--vkui--font_headline1--letter_spacing--regular, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_headline1--line_height--regular",
"value": "var(--vkui--font_headline1--line_height--regular, 20px)",
@@ -318968,6 +319216,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_subhead--font_weight",
"value": "var(--vkui--font_subhead--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_subhead--letter_spacing",
+ "value": "var(--vkui--font_subhead--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_subhead--line_height",
"value": "var(--vkui--font_subhead--line_height)",
@@ -318978,6 +319230,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_subhead--font_size--compact",
"value": "var(--vkui--font_subhead--font_size--compact, 13px)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_subhead--letter_spacing--compact",
+ "value": "var(--vkui--font_subhead--letter_spacing--compact, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_subhead--line_height--compact",
"value": "var(--vkui--font_subhead--line_height--compact, 16px)",
@@ -318996,6 +319252,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_subhead--font_weight--regular",
"value": "var(--vkui--font_subhead--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_subhead--letter_spacing--regular",
+ "value": "var(--vkui--font_subhead--letter_spacing--regular, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_subhead--line_height--regular",
"value": "var(--vkui--font_subhead--line_height--regular, 18px)",
@@ -319016,6 +319276,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_text--font_weight",
"value": "var(--vkui--font_text--font_weight)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_text--letter_spacing",
+ "value": "var(--vkui--font_text--letter_spacing)",
+ },
"lineHeight": {
"name": "--vkui--font_text--line_height",
"value": "var(--vkui--font_text--line_height)",
@@ -319026,6 +319290,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_text--font_size--compact",
"value": "var(--vkui--font_text--font_size--compact, 15px)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_text--letter_spacing--compact",
+ "value": "var(--vkui--font_text--letter_spacing--compact, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_text--line_height--compact",
"value": "var(--vkui--font_text--line_height--compact, 20px)",
@@ -319044,6 +319312,10 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
"name": "--vkui--font_text--font_weight--regular",
"value": "var(--vkui--font_text--font_weight--regular, 400)",
},
+ "letterSpacing": {
+ "name": "--vkui--font_text--letter_spacing--regular",
+ "value": "var(--vkui--font_text--letter_spacing--regular, 0.15px)",
+ },
"lineHeight": {
"name": "--vkui--font_text--line_height--regular",
"value": "var(--vkui--font_text--line_height--regular, 20px)",
@@ -321507,6 +321779,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "12px",
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": "14px",
},
},
@@ -321515,6 +321788,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "12px",
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": "14px",
"textTransform": "uppercase",
},
@@ -321524,6 +321798,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "11px",
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": "14px",
},
},
@@ -321532,6 +321807,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "11px",
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": "14px",
"textTransform": "uppercase",
},
@@ -321541,6 +321817,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "9px",
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": "12px",
},
},
@@ -321549,6 +321826,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "9px",
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": "12px",
"textTransform": "uppercase",
},
@@ -321561,6 +321839,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "13px",
"fontWeight": 400,
+ "letterSpacing": "0.2px",
"lineHeight": "16px",
},
},
@@ -321569,6 +321848,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "13px",
"fontWeight": 400,
+ "letterSpacing": "0.2px",
"lineHeight": "16px",
"textTransform": "uppercase",
},
@@ -321576,24 +321856,28 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontHeadline": {
"compact": {
"fontSize": "15px",
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "16px",
"fontWeight": 500,
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
},
"fontHeadline1": {
"compact": {
"fontSize": "15px",
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "16px",
"fontWeight": 500,
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
},
@@ -321620,24 +321904,28 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"fontSubhead": {
"compact": {
"fontSize": "13px",
+ "letterSpacing": "0.15px",
"lineHeight": "16px",
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "14px",
"fontWeight": 400,
+ "letterSpacing": "0.15px",
"lineHeight": "18px",
},
},
"fontText": {
"compact": {
"fontSize": "15px",
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": "16px",
"fontWeight": 400,
+ "letterSpacing": "0.15px",
"lineHeight": "20px",
},
},
@@ -322773,6 +323061,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontFamily": "var(--vkui--font_caption1--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption1--font_size--regular, 12px)",
"fontWeight": "var(--vkui--font_caption1--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_caption1--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption1--line_height--regular, 14px)",
},
},
@@ -322781,6 +323070,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontFamily": "var(--vkui--font_caption1_caps--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption1_caps--font_size--regular, 12px)",
"fontWeight": "var(--vkui--font_caption1_caps--font_weight--regular, 600)",
+ "letterSpacing": "var(--vkui--font_caption1_caps--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption1_caps--line_height--regular, 14px)",
"textTransform": "var(--vkui--font_caption1_caps--text_transform--regular, uppercase)",
},
@@ -322790,6 +323080,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontFamily": "var(--vkui--font_caption2--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption2--font_size--regular, 11px)",
"fontWeight": "var(--vkui--font_caption2--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_caption2--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption2--line_height--regular, 14px)",
},
},
@@ -322798,6 +323089,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontFamily": "var(--vkui--font_caption2_caps--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption2_caps--font_size--regular, 11px)",
"fontWeight": "var(--vkui--font_caption2_caps--font_weight--regular, 600)",
+ "letterSpacing": "var(--vkui--font_caption2_caps--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption2_caps--line_height--regular, 14px)",
"textTransform": "var(--vkui--font_caption2_caps--text_transform--regular, uppercase)",
},
@@ -322807,6 +323099,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontFamily": "var(--vkui--font_caption3--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption3--font_size--regular, 9px)",
"fontWeight": "var(--vkui--font_caption3--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_caption3--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption3--line_height--regular, 12px)",
},
},
@@ -322815,6 +323108,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontFamily": "var(--vkui--font_caption3_caps--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_caption3_caps--font_size--regular, 9px)",
"fontWeight": "var(--vkui--font_caption3_caps--font_weight--regular, 600)",
+ "letterSpacing": "var(--vkui--font_caption3_caps--letter_spacing--regular, 0.3px)",
"lineHeight": "var(--vkui--font_caption3_caps--line_height--regular, 12px)",
"textTransform": "var(--vkui--font_caption3_caps--text_transform--regular, uppercase)",
},
@@ -322827,6 +323121,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontFamily": "var(--vkui--font_footnote--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_footnote--font_size--regular, 13px)",
"fontWeight": "var(--vkui--font_footnote--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_footnote--letter_spacing--regular, 0.2px)",
"lineHeight": "var(--vkui--font_footnote--line_height--regular, 16px)",
},
},
@@ -322835,6 +323130,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontFamily": "var(--vkui--font_footnote_caps--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_footnote_caps--font_size--regular, 13px)",
"fontWeight": "var(--vkui--font_footnote_caps--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_footnote_caps--letter_spacing--regular, 0.2px)",
"lineHeight": "var(--vkui--font_footnote_caps--line_height--regular, 16px)",
"textTransform": "var(--vkui--font_footnote_caps--text_transform--regular, uppercase)",
},
@@ -322842,24 +323138,28 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontHeadline": {
"compact": {
"fontSize": "var(--vkui--font_headline--font_size--compact, 15px)",
+ "letterSpacing": "var(--vkui--font_headline--letter_spacing--compact, 0.15px)",
"lineHeight": "var(--vkui--font_headline--line_height--compact, 20px)",
},
"regular": {
"fontFamily": "var(--vkui--font_headline--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_headline--font_size--regular, 16px)",
"fontWeight": "var(--vkui--font_headline--font_weight--regular, 500)",
+ "letterSpacing": "var(--vkui--font_headline--letter_spacing--regular, 0.15px)",
"lineHeight": "var(--vkui--font_headline--line_height--regular, 20px)",
},
},
"fontHeadline1": {
"compact": {
"fontSize": "var(--vkui--font_headline1--font_size--compact, 15px)",
+ "letterSpacing": "var(--vkui--font_headline1--letter_spacing--compact, 0.15px)",
"lineHeight": "var(--vkui--font_headline1--line_height--compact, 20px)",
},
"regular": {
"fontFamily": "var(--vkui--font_headline1--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_headline1--font_size--regular, 16px)",
"fontWeight": "var(--vkui--font_headline1--font_weight--regular, 500)",
+ "letterSpacing": "var(--vkui--font_headline1--letter_spacing--regular, 0.15px)",
"lineHeight": "var(--vkui--font_headline1--line_height--regular, 20px)",
},
},
@@ -322886,24 +323186,28 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"fontSubhead": {
"compact": {
"fontSize": "var(--vkui--font_subhead--font_size--compact, 13px)",
+ "letterSpacing": "var(--vkui--font_subhead--letter_spacing--compact, 0.15px)",
"lineHeight": "var(--vkui--font_subhead--line_height--compact, 16px)",
},
"regular": {
"fontFamily": "var(--vkui--font_subhead--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_subhead--font_size--regular, 14px)",
"fontWeight": "var(--vkui--font_subhead--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_subhead--letter_spacing--regular, 0.15px)",
"lineHeight": "var(--vkui--font_subhead--line_height--regular, 18px)",
},
},
"fontText": {
"compact": {
"fontSize": "var(--vkui--font_text--font_size--compact, 15px)",
+ "letterSpacing": "var(--vkui--font_text--letter_spacing--compact, 0.15px)",
"lineHeight": "var(--vkui--font_text--line_height--compact, 20px)",
},
"regular": {
"fontFamily": "var(--vkui--font_text--font_family--regular, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontSize": "var(--vkui--font_text--font_size--regular, 16px)",
"fontWeight": "var(--vkui--font_text--font_weight--regular, 400)",
+ "letterSpacing": "var(--vkui--font_text--letter_spacing--regular, 0.15px)",
"lineHeight": "var(--vkui--font_text--line_height--regular, 20px)",
},
},
@@ -324039,6 +324343,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 12,
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": 14,
},
},
@@ -324047,6 +324352,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 12,
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": 14,
"textTransform": "uppercase",
},
@@ -324056,6 +324362,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 11,
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": 14,
},
},
@@ -324064,6 +324371,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 11,
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": 14,
"textTransform": "uppercase",
},
@@ -324073,6 +324381,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 9,
"fontWeight": 400,
+ "letterSpacing": "0.3px",
"lineHeight": 12,
},
},
@@ -324081,6 +324390,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 9,
"fontWeight": 600,
+ "letterSpacing": "0.3px",
"lineHeight": 12,
"textTransform": "uppercase",
},
@@ -324093,6 +324403,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 13,
"fontWeight": 400,
+ "letterSpacing": "0.2px",
"lineHeight": 16,
},
},
@@ -324101,6 +324412,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 13,
"fontWeight": 400,
+ "letterSpacing": "0.2px",
"lineHeight": 16,
"textTransform": "uppercase",
},
@@ -324108,24 +324420,28 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontHeadline": {
"compact": {
"fontSize": 15,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 16,
"fontWeight": 500,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
},
"fontHeadline1": {
"compact": {
"fontSize": 15,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 16,
"fontWeight": 500,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
},
@@ -324152,24 +324468,28 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"fontSubhead": {
"compact": {
"fontSize": 13,
+ "letterSpacing": "0.15px",
"lineHeight": 16,
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 14,
"fontWeight": 400,
+ "letterSpacing": "0.15px",
"lineHeight": 18,
},
},
"fontText": {
"compact": {
"fontSize": 15,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
"regular": {
"fontFamily": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontSize": 16,
"fontWeight": 400,
+ "letterSpacing": "0.15px",
"lineHeight": 20,
},
},
diff --git a/src/interfaces/general/tools/utils.ts b/src/interfaces/general/tools/utils.ts
index 42f009db..4a8ea5c1 100644
--- a/src/interfaces/general/tools/utils.ts
+++ b/src/interfaces/general/tools/utils.ts
@@ -33,3 +33,13 @@ export type StringifyObject = {
? StringifyObject
: Base[Key];
};
+
+/**
+ * Как Partial, но уходящий вглубь.
+ */
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type DeepPartial = T extends object
+ ? {
+ [P in keyof T]?: DeepPartial;
+ }
+ : T;
diff --git a/src/themeDescriptions/base/vk.ts b/src/themeDescriptions/base/vk.ts
index 72e06471..5d61110d 100644
--- a/src/themeDescriptions/base/vk.ts
+++ b/src/themeDescriptions/base/vk.ts
@@ -3,6 +3,8 @@ import { alias } from '@/build/helpers/tokenHelpers';
import { ColorsDescription, ThemeDescription } from '@/interfaces/general';
import { Elevation } from '@/interfaces/general/elevation';
import { Gradients } from '@/interfaces/general/gradients';
+import { Adaptive } from '@/interfaces/general/tools';
+import { Fonts, TypographyBaseProps } from '@/interfaces/general/typography';
import figma from '@/themeDescriptions/base/figma/vk.json';
const fontFamilyFallbacks = '-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif';
@@ -250,12 +252,15 @@ export const darkElevation: Elevation = {
elevation4: '0px 0px 8px rgba(0, 0, 0, 0.12), 0px 16px 16px rgba(0, 0, 0, 0.16)',
};
-export const lightTheme: ThemeDescription = {
- themeName: 'vkBase',
- themeNameBase: 'vkBase',
- ...lightColors,
- ...lightGradient,
- ...lightElevation,
+type BaseFonts = Omit<
+ {
+ [key in keyof Fonts]: Adaptive;
+ },
+ 'fontHeadline'
+> &
+ TypographyBaseProps;
+
+export const fonts: BaseFonts = {
// Типографика
fontFamilyFallbacks,
fontFamilyAccent,
@@ -290,7 +295,6 @@ export const lightTheme: ThemeDescription = {
fontWeight: fontWeightAccent1,
},
},
- fontHeadline: alias('fontHeadline1'),
fontHeadline1: {
regular: {
fontSize: 16,
@@ -415,6 +419,16 @@ export const lightTheme: ThemeDescription = {
textTransform: 'uppercase',
},
},
+};
+
+export const lightTheme: ThemeDescription = {
+ themeName: 'vkBase',
+ themeNameBase: 'vkBase',
+ ...lightColors,
+ ...lightGradient,
+ ...lightElevation,
+ ...fonts,
+ fontHeadline: alias('fontHeadline1'),
// Размеры
sizeSelectIconPadding: {
diff --git a/src/themeDescriptions/themes/vkontakteAndroid/index.ts b/src/themeDescriptions/themes/vkontakteAndroid/index.ts
index 646e6673..c706d72a 100644
--- a/src/themeDescriptions/themes/vkontakteAndroid/index.ts
+++ b/src/themeDescriptions/themes/vkontakteAndroid/index.ts
@@ -1,3 +1,6 @@
+import lodash from 'lodash';
+
+import { DeepPartial } from '@/interfaces/general/tools/utils';
import type {
LocalVkontakteAndroidColorsDescriptionStruct,
ThemeVkontakteAndroidDescription,
@@ -5,7 +8,7 @@ import type {
} from '@/interfaces/themes/vkontakteAndroid';
import type { ThemeVkontakteAndroidDarkDescription } from '@/interfaces/themes/vkontakteAndroidDark';
-import { darkTheme as vkDarkTheme, lightTheme as vkLightTheme } from '../../base/vk';
+import { darkTheme as vkDarkTheme, fonts, lightTheme as vkLightTheme } from '../../base/vk';
const themeNameBase = 'vkontakteAndroid';
@@ -228,6 +231,76 @@ const gradients: VkontakteAndroidGradients = {
vkontakteGradientWomensDay: '#FF99CC, #E52E6A',
};
+const androidFonts: typeof fonts = lodash.merge>(
+ lodash.cloneDeep(fonts),
+ {
+ fontHeadline1: {
+ regular: {
+ letterSpacing: '0.15px',
+ },
+ compact: {
+ letterSpacing: '0.15px',
+ },
+ },
+ fontText: {
+ regular: {
+ letterSpacing: '0.15px',
+ },
+ compact: {
+ letterSpacing: '0.15px',
+ },
+ },
+ fontSubhead: {
+ regular: {
+ letterSpacing: '0.15px',
+ },
+ compact: {
+ letterSpacing: '0.15px',
+ },
+ },
+ fontFootnote: {
+ regular: {
+ letterSpacing: '0.2px',
+ },
+ },
+ fontFootnoteCaps: {
+ regular: {
+ letterSpacing: '0.2px',
+ },
+ },
+ fontCaption1: {
+ regular: {
+ letterSpacing: '0.3px',
+ },
+ },
+ fontCaption1Caps: {
+ regular: {
+ letterSpacing: '0.3px',
+ },
+ },
+ fontCaption2: {
+ regular: {
+ letterSpacing: '0.3px',
+ },
+ },
+ fontCaption2Caps: {
+ regular: {
+ letterSpacing: '0.3px',
+ },
+ },
+ fontCaption3: {
+ regular: {
+ letterSpacing: '0.3px',
+ },
+ },
+ fontCaption3Caps: {
+ regular: {
+ letterSpacing: '0.3px',
+ },
+ },
+ },
+);
+
export const vkontakteTokens = {
...gradients,
};
@@ -243,6 +316,7 @@ export const vkontakteAndroidTheme: ThemeVkontakteAndroidDescription = {
...vkontakteLocalColorLight,
},
...vkontakteTokens,
+ ...androidFonts,
};
export const vkontakteAndroidThemeDark: ThemeVkontakteAndroidDarkDescription = {
@@ -257,4 +331,5 @@ export const vkontakteAndroidThemeDark: ThemeVkontakteAndroidDarkDescription = {
...vkontakteLocalColorDark,
},
...vkontakteTokens,
+ ...androidFonts,
};
diff --git a/yarn.lock b/yarn.lock
index a63f8881..ade0ce48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,12 +17,19 @@
dependencies:
"@babel/highlight" "^7.10.4"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5":
- version "7.22.10"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.10.tgz#1c20e612b768fefa75f6e90d6ecb86329247f0a3"
- integrity sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
+ version "7.21.4"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
+ integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
+ dependencies:
+ "@babel/highlight" "^7.18.6"
+
+"@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.13":
+ version "7.22.13"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+ integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
dependencies:
- "@babel/highlight" "^7.22.10"
+ "@babel/highlight" "^7.22.13"
chalk "^2.4.2"
"@babel/compat-data@^7.17.7":
@@ -35,12 +42,17 @@
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
+"@babel/compat-data@^7.21.5":
+ version "7.21.7"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc"
+ integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==
+
"@babel/compat-data@^7.22.9":
version "7.22.9"
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
-"@babel/core@7.22.10", "@babel/core@^7.11.6", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.21.3":
+"@babel/core@7.22.10":
version "7.22.10"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.10.tgz#aad442c7bcd1582252cb4576747ace35bc122f35"
integrity sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==
@@ -61,6 +73,27 @@
json5 "^2.2.2"
semver "^6.3.1"
+"@babel/core@^7.11.6", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.21.3":
+ version "7.21.8"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4"
+ integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==
+ dependencies:
+ "@ampproject/remapping" "^2.2.0"
+ "@babel/code-frame" "^7.21.4"
+ "@babel/generator" "^7.21.5"
+ "@babel/helper-compilation-targets" "^7.21.5"
+ "@babel/helper-module-transforms" "^7.21.5"
+ "@babel/helpers" "^7.21.5"
+ "@babel/parser" "^7.21.8"
+ "@babel/template" "^7.20.7"
+ "@babel/traverse" "^7.21.5"
+ "@babel/types" "^7.21.5"
+ convert-source-map "^1.7.0"
+ debug "^4.1.0"
+ gensync "^1.0.0-beta.2"
+ json5 "^2.2.2"
+ semver "^6.3.0"
+
"@babel/eslint-parser@^7.12.16":
version "7.19.1"
resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz#4f68f6b0825489e00a24b41b6a1ae35414ecd2f4"
@@ -70,12 +103,22 @@
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/generator@^7.22.10", "@babel/generator@^7.7.2":
- version "7.22.10"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.10.tgz#c92254361f398e160645ac58831069707382b722"
- integrity sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==
+"@babel/generator@^7.21.5", "@babel/generator@^7.7.2":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f"
+ integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==
dependencies:
- "@babel/types" "^7.22.10"
+ "@babel/types" "^7.21.5"
+ "@jridgewell/gen-mapping" "^0.3.2"
+ "@jridgewell/trace-mapping" "^0.3.17"
+ jsesc "^2.5.1"
+
+"@babel/generator@^7.22.10", "@babel/generator@^7.22.15":
+ version "7.22.15"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339"
+ integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==
+ dependencies:
+ "@babel/types" "^7.22.15"
"@jridgewell/gen-mapping" "^0.3.2"
"@jridgewell/trace-mapping" "^0.3.17"
jsesc "^2.5.1"
@@ -95,13 +138,24 @@
"@babel/helper-explode-assignable-expression" "^7.18.6"
"@babel/types" "^7.18.9"
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4", "@babel/helper-compilation-targets@^7.22.10":
- version "7.22.10"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz#01d648bbc25dd88f513d862ee0df27b7d4e67024"
- integrity sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4", "@babel/helper-compilation-targets@^7.21.5":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366"
+ integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==
+ dependencies:
+ "@babel/compat-data" "^7.21.5"
+ "@babel/helper-validator-option" "^7.21.0"
+ browserslist "^4.21.3"
+ lru-cache "^5.1.1"
+ semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.22.10":
+ version "7.22.15"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
+ integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
dependencies:
"@babel/compat-data" "^7.22.9"
- "@babel/helper-validator-option" "^7.22.5"
+ "@babel/helper-validator-option" "^7.22.15"
browserslist "^4.21.9"
lru-cache "^5.1.1"
semver "^6.3.1"
@@ -166,6 +220,11 @@
resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+"@babel/helper-environment-visitor@^7.21.5":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba"
+ integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==
+
"@babel/helper-environment-visitor@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
@@ -237,23 +296,44 @@
dependencies:
"@babel/types" "^7.18.6"
-"@babel/helper-module-imports@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
- integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+"@babel/helper-module-imports@^7.21.4":
+ version "7.21.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af"
+ integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
dependencies:
- "@babel/types" "^7.22.5"
+ "@babel/types" "^7.21.4"
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2", "@babel/helper-module-transforms@^7.22.9":
- version "7.22.9"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
- integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
+"@babel/helper-module-imports@^7.22.15":
+ version "7.22.15"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+ integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+ dependencies:
+ "@babel/types" "^7.22.15"
+
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2", "@babel/helper-module-transforms@^7.21.5":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420"
+ integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==
+ dependencies:
+ "@babel/helper-environment-visitor" "^7.21.5"
+ "@babel/helper-module-imports" "^7.21.4"
+ "@babel/helper-simple-access" "^7.21.5"
+ "@babel/helper-split-export-declaration" "^7.18.6"
+ "@babel/helper-validator-identifier" "^7.19.1"
+ "@babel/template" "^7.20.7"
+ "@babel/traverse" "^7.21.5"
+ "@babel/types" "^7.21.5"
+
+"@babel/helper-module-transforms@^7.22.9":
+ version "7.22.17"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.17.tgz#7edf129097a51ccc12443adbc6320e90eab76693"
+ integrity sha512-XouDDhQESrLHTpnBtCKExJdyY4gJCdrvH2Pyv8r8kovX2U8G0dRUOT45T9XlbLtuu9CLXP15eusnkprhoPV5iQ==
dependencies:
"@babel/helper-environment-visitor" "^7.22.5"
- "@babel/helper-module-imports" "^7.22.5"
+ "@babel/helper-module-imports" "^7.22.15"
"@babel/helper-simple-access" "^7.22.5"
"@babel/helper-split-export-declaration" "^7.22.6"
- "@babel/helper-validator-identifier" "^7.22.5"
+ "@babel/helper-validator-identifier" "^7.22.15"
"@babel/helper-optimise-call-expression@^7.18.6":
version "7.18.6"
@@ -317,6 +397,13 @@
dependencies:
"@babel/types" "^7.20.2"
+"@babel/helper-simple-access@^7.21.5":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee"
+ integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==
+ dependencies:
+ "@babel/types" "^7.21.5"
+
"@babel/helper-simple-access@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
@@ -345,6 +432,11 @@
dependencies:
"@babel/types" "^7.22.5"
+"@babel/helper-string-parser@^7.21.5":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd"
+ integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==
+
"@babel/helper-string-parser@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
@@ -355,15 +447,15 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c"
integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==
-"@babel/helper-validator-identifier@^7.19.1":
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
version "7.19.1"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-"@babel/helper-validator-identifier@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
- integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+"@babel/helper-validator-identifier@^7.22.15", "@babel/helper-validator-identifier@^7.22.5":
+ version "7.22.15"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044"
+ integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==
"@babel/helper-validator-option@^7.18.6":
version "7.18.6"
@@ -375,10 +467,10 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
-"@babel/helper-validator-option@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
- integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+"@babel/helper-validator-option@^7.22.15":
+ version "7.22.15"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
+ integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
"@babel/helper-wrap-function@^7.18.9":
version "7.19.0"
@@ -390,14 +482,23 @@
"@babel/traverse" "^7.19.0"
"@babel/types" "^7.19.0"
+"@babel/helpers@^7.21.5":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08"
+ integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==
+ dependencies:
+ "@babel/template" "^7.20.7"
+ "@babel/traverse" "^7.21.5"
+ "@babel/types" "^7.21.5"
+
"@babel/helpers@^7.22.10":
- version "7.22.10"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.10.tgz#ae6005c539dfbcb5cd71fb51bfc8a52ba63bc37a"
- integrity sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==
+ version "7.22.15"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1"
+ integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==
dependencies:
- "@babel/template" "^7.22.5"
- "@babel/traverse" "^7.22.10"
- "@babel/types" "^7.22.10"
+ "@babel/template" "^7.22.15"
+ "@babel/traverse" "^7.22.15"
+ "@babel/types" "^7.22.15"
"@babel/highlight@^7.10.4":
version "7.14.5"
@@ -408,19 +509,33 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/highlight@^7.22.10":
- version "7.22.10"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.10.tgz#02a3f6d8c1cb4521b2fd0ab0da8f4739936137d7"
- integrity sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==
+"@babel/highlight@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+ integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.18.6"
+ chalk "^2.0.0"
+ js-tokens "^4.0.0"
+
+"@babel/highlight@^7.22.13":
+ version "7.22.13"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16"
+ integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==
dependencies:
"@babel/helper-validator-identifier" "^7.22.5"
chalk "^2.4.2"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.22.10", "@babel/parser@^7.22.5":
- version "7.22.10"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55"
- integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8":
+ version "7.21.8"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8"
+ integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==
+
+"@babel/parser@^7.22.10", "@babel/parser@^7.22.15", "@babel/parser@^7.22.16":
+ version "7.22.16"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95"
+ integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
version "7.18.6"
@@ -1150,38 +1265,72 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.5", "@babel/template@^7.3.3":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
- integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
+ version "7.20.7"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+ integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
dependencies:
- "@babel/code-frame" "^7.22.5"
- "@babel/parser" "^7.22.5"
- "@babel/types" "^7.22.5"
+ "@babel/code-frame" "^7.18.6"
+ "@babel/parser" "^7.20.7"
+ "@babel/types" "^7.20.7"
-"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.7", "@babel/traverse@^7.22.10", "@babel/traverse@^7.7.2":
- version "7.22.10"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.10.tgz#20252acb240e746d27c2e82b4484f199cf8141aa"
- integrity sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==
+"@babel/template@^7.22.15", "@babel/template@^7.22.5":
+ version "7.22.15"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+ integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
dependencies:
- "@babel/code-frame" "^7.22.10"
- "@babel/generator" "^7.22.10"
+ "@babel/code-frame" "^7.22.13"
+ "@babel/parser" "^7.22.15"
+ "@babel/types" "^7.22.15"
+
+"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.5", "@babel/traverse@^7.7.2":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133"
+ integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==
+ dependencies:
+ "@babel/code-frame" "^7.21.4"
+ "@babel/generator" "^7.21.5"
+ "@babel/helper-environment-visitor" "^7.21.5"
+ "@babel/helper-function-name" "^7.21.0"
+ "@babel/helper-hoist-variables" "^7.18.6"
+ "@babel/helper-split-export-declaration" "^7.18.6"
+ "@babel/parser" "^7.21.5"
+ "@babel/types" "^7.21.5"
+ debug "^4.1.0"
+ globals "^11.1.0"
+
+"@babel/traverse@^7.22.10", "@babel/traverse@^7.22.15":
+ version "7.22.17"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.17.tgz#b23c203ab3707e3be816043081b4a994fcacec44"
+ integrity sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg==
+ dependencies:
+ "@babel/code-frame" "^7.22.13"
+ "@babel/generator" "^7.22.15"
"@babel/helper-environment-visitor" "^7.22.5"
"@babel/helper-function-name" "^7.22.5"
"@babel/helper-hoist-variables" "^7.22.5"
"@babel/helper-split-export-declaration" "^7.22.6"
- "@babel/parser" "^7.22.10"
- "@babel/types" "^7.22.10"
+ "@babel/parser" "^7.22.16"
+ "@babel/types" "^7.22.17"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.3", "@babel/types@^7.21.4", "@babel/types@^7.22.10", "@babel/types@^7.22.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
- version "7.22.10"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.10.tgz#4a9e76446048f2c66982d1a989dd12b8a2d2dc03"
- integrity sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.3", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+ version "7.21.5"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
+ integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==
+ dependencies:
+ "@babel/helper-string-parser" "^7.21.5"
+ "@babel/helper-validator-identifier" "^7.19.1"
+ to-fast-properties "^2.0.0"
+
+"@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.5":
+ version "7.22.17"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.17.tgz#f753352c4610ffddf9c8bc6823f9ff03e2303eee"
+ integrity sha512-YSQPHLFtQNE5xN9tHuZnzu8vPr61wVTBZdfv1meex1NBosa4iT05k/Jw06ddJugi4bk7The/oSwQGFcksmEJQg==
dependencies:
"@babel/helper-string-parser" "^7.22.5"
- "@babel/helper-validator-identifier" "^7.22.5"
+ "@babel/helper-validator-identifier" "^7.22.15"
to-fast-properties "^2.0.0"
"@bcoe/v8-coverage@^0.2.3":
@@ -1224,9 +1373,9 @@
"@floating-ui/utils" "^0.1.1"
"@floating-ui/dom@^1.5.1":
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.1.tgz#88b70defd002fe851f17b4a25efb2d3c04d7a8d7"
- integrity sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.2.tgz#6812e89d1d4d4ea32f10d15c3b81feb7f9836d89"
+ integrity sha512-6ArmenS6qJEWmwzczWyhvrXRdI/rI78poBcW0h/456+onlabit+2G+QxHx5xTOX60NBJQXjsCLFbW2CmsXpUog==
dependencies:
"@floating-ui/core" "^1.4.1"
"@floating-ui/utils" "^0.1.1"
@@ -1239,9 +1388,9 @@
"@floating-ui/dom" "^1.5.1"
"@floating-ui/utils@^0.1.1":
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.1.tgz#1a5b1959a528e374e8037c4396c3e825d6cf4a83"
- integrity sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.2.tgz#b7e9309ccce5a0a40ac482cb894f120dba2b357f"
+ integrity sha512-ou3elfqG/hZsbmF4bxeJhPHIf3G2pm0ujc39hYEZrfVqt7Vk/Zji6CXc3W0pmYM8BW1g40U+akTl9DKZhFhInQ==
"@humanwhocodes/config-array@^0.5.0":
version "0.5.0"
@@ -1403,10 +1552,10 @@
dependencies:
"@sinclair/typebox" "^0.25.16"
-"@jest/schemas@^29.6.0":
- version "29.6.0"
- resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.0.tgz#0f4cb2c8e3dca80c135507ba5635a4fd755b0040"
- integrity sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==
+"@jest/schemas@^29.6.3":
+ version "29.6.3"
+ resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+ integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
dependencies:
"@sinclair/typebox" "^0.27.8"
@@ -1439,22 +1588,22 @@
jest-haste-map "^29.5.0"
slash "^3.0.0"
-"@jest/transform@^29.5.0", "@jest/transform@^29.6.2":
- version "29.6.2"
- resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.6.2.tgz#522901ebbb211af08835bc3bcdf765ab778094e3"
- integrity sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==
+"@jest/transform@^29.5.0", "@jest/transform@^29.7.0":
+ version "29.7.0"
+ resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
+ integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
dependencies:
"@babel/core" "^7.11.6"
- "@jest/types" "^29.6.1"
+ "@jest/types" "^29.6.3"
"@jridgewell/trace-mapping" "^0.3.18"
babel-plugin-istanbul "^6.1.1"
chalk "^4.0.0"
convert-source-map "^2.0.0"
fast-json-stable-stringify "^2.1.0"
graceful-fs "^4.2.9"
- jest-haste-map "^29.6.2"
- jest-regex-util "^29.4.3"
- jest-util "^29.6.2"
+ jest-haste-map "^29.7.0"
+ jest-regex-util "^29.6.3"
+ jest-util "^29.7.0"
micromatch "^4.0.4"
pirates "^4.0.4"
slash "^3.0.0"
@@ -1472,12 +1621,12 @@
"@types/yargs" "^17.0.8"
chalk "^4.0.0"
-"@jest/types@^29.6.1":
- version "29.6.1"
- resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.1.tgz#ae79080278acff0a6af5eb49d063385aaa897bf2"
- integrity sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==
+"@jest/types@^29.6.3":
+ version "29.6.3"
+ resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+ integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
dependencies:
- "@jest/schemas" "^29.6.0"
+ "@jest/schemas" "^29.6.3"
"@types/istanbul-lib-coverage" "^2.0.0"
"@types/istanbul-reports" "^3.0.0"
"@types/node" "*"
@@ -1506,6 +1655,11 @@
resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.1.0":
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+ integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
+
"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
@@ -1524,6 +1678,11 @@
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+"@jridgewell/sourcemap-codec@^1.4.14":
+ version "1.4.15"
+ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+ integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
"@jridgewell/trace-mapping@0.3.9":
version "0.3.9"
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
@@ -1541,12 +1700,12 @@
"@jridgewell/sourcemap-codec" "1.4.14"
"@jridgewell/trace-mapping@^0.3.18":
- version "0.3.18"
- resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
- integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
+ version "0.3.19"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
+ integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
dependencies:
- "@jridgewell/resolve-uri" "3.1.0"
- "@jridgewell/sourcemap-codec" "1.4.14"
+ "@jridgewell/resolve-uri" "^3.1.0"
+ "@jridgewell/sourcemap-codec" "^1.4.14"
"@leichtgewicht/ip-codec@^2.0.1":
version "2.0.4"
@@ -1734,7 +1893,14 @@
"@svgr/plugin-jsx" "8.0.1"
"@svgr/plugin-svgo" "8.0.1"
-"@swc/helpers@^0.5.0", "@swc/helpers@^0.5.1":
+"@swc/helpers@^0.5.0":
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.0.tgz#bf1d807b60f7290d0ec763feea7ccdeda06e85f1"
+ integrity sha512-SjY/p4MmECVVEWspzSRpQEM3sjR17sP8PbGxELWrT+YZMBfiUyt1MRUNjMV23zohwlG2HYtCQOsCwsTHguXkyg==
+ dependencies:
+ tslib "^2.4.0"
+
+"@swc/helpers@^0.5.1":
version "0.5.2"
resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.2.tgz#85ea0c76450b61ad7d10a37050289eded783c27d"
integrity sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==
@@ -1879,7 +2045,12 @@
"@types/estree" "*"
"@types/json-schema" "*"
-"@types/estree@*", "@types/estree@^1.0.0":
+"@types/estree@*":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
+ integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+
+"@types/estree@^1.0.0":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
@@ -1974,6 +2145,11 @@
dependencies:
"@types/node" "*"
+"@types/lodash@4.14.198":
+ version "4.14.198"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.198.tgz#4d27465257011aedc741a809f1269941fa2c5d4c"
+ integrity sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg==
+
"@types/mime@*":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
@@ -2014,10 +2190,10 @@
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
-"@types/react-dom@18.2.1":
- version "18.2.1"
- resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.1.tgz#663b2612feb5f6431a70207430d7c04881b87f29"
- integrity sha512-8QZEV9+Kwy7tXFmjJrp3XUKQSs9LTnE0KnoUb0YCguWBiNW0Yfb2iBMYZ08WPg35IR6P3Z0s00B15SwZnO26+w==
+"@types/react-dom@18.2.7":
+ version "18.2.7"
+ resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.7.tgz#67222a08c0a6ae0a0da33c3532348277c70abb63"
+ integrity sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==
dependencies:
"@types/react" "*"
@@ -2198,24 +2374,17 @@
resolved "https://registry.yarnpkg.com/@vkontakte/vk-bridge/-/vk-bridge-2.11.1.tgz#28cdb8d25fe3f0f81f6620bdf08f6a235573091f"
integrity sha512-GOtL/u4ju1PLJW+GqFUulS5zmmhu1o0AG2Y0HTx4a07Wbpdp7XvGsOjp/xkOILjFVDSZtNQJ64ud6xwei3q+Iw==
-"@vkontakte/vkjs@0.32.2":
- version "0.32.2"
- resolved "https://registry.yarnpkg.com/@vkontakte/vkjs/-/vkjs-0.32.2.tgz#ecdf5d217fa80d2dfac240aa7ff42ca949ed0c26"
- integrity sha512-OTEPdsOY/UWdzVL31qGg32ZYXnRYzGxAfYy4/T15MIV/z+/Gz2z+wiNXyV2xO5K+/Ytyqg+Bzf7v1vv87DMYOw==
- dependencies:
- "@swc/helpers" "^0.5.0"
-
-"@vkontakte/vkjs@^1.1.0":
+"@vkontakte/vkjs@1.1.0", "@vkontakte/vkjs@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@vkontakte/vkjs/-/vkjs-1.1.0.tgz#7bb12ae0f2e9b4a4a7482709bd71c1a223aff4ed"
integrity sha512-cBhngz1x4lwctQJMgXrmCsgbmA7DsLlRASlCKJtDf65BU3pqybW+GIyCSDOYKqGQOk4c8n5MgA3uTCHUWufSdw==
dependencies:
"@swc/helpers" "^0.5.0"
-"@vkontakte/vkui@5.8.0":
- version "5.8.0"
- resolved "https://registry.yarnpkg.com/@vkontakte/vkui/-/vkui-5.8.0.tgz#d26c6fe79f21c6122eaf9c3c24df40d507195f5e"
- integrity sha512-uRnkM85DRotoDyyiRL0edkFNUSwcGBEOhzP6WCdwUPegS0jZK6Pm6N6ntIkbGTZrx1ps+6fngPNJT+fGGC+wQw==
+"@vkontakte/vkui@5.8.1":
+ version "5.8.1"
+ resolved "https://registry.yarnpkg.com/@vkontakte/vkui/-/vkui-5.8.1.tgz#d4789c6f7514b44e6d6a5a6cf29f91ce224f9ed9"
+ integrity sha512-YVqyX7Y+6JaFNU6ebI2Bk4UVYfBx6crPJMizvoIa3lOB/oxiIYqmQ7ktzCzbCFmMXnjL+j0bUfY1fAHo5mBYBQ==
dependencies:
"@floating-ui/react-dom" "^2.0.2"
"@swc/helpers" "^0.5.1"
@@ -2695,12 +2864,25 @@ axobject-query@^2.2.0:
resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
-babel-jest@29.6.2, babel-jest@^29.5.0:
- version "29.6.2"
- resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.6.2.tgz#cada0a59e07f5acaeb11cbae7e3ba92aec9c1126"
- integrity sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==
+babel-jest@29.7.0:
+ version "29.7.0"
+ resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
+ integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
dependencies:
- "@jest/transform" "^29.6.2"
+ "@jest/transform" "^29.7.0"
+ "@types/babel__core" "^7.1.14"
+ babel-plugin-istanbul "^6.1.1"
+ babel-preset-jest "^29.6.3"
+ chalk "^4.0.0"
+ graceful-fs "^4.2.9"
+ slash "^3.0.0"
+
+babel-jest@^29.5.0:
+ version "29.5.0"
+ resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5"
+ integrity sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==
+ dependencies:
+ "@jest/transform" "^29.5.0"
"@types/babel__core" "^7.1.14"
babel-plugin-istanbul "^6.1.1"
babel-preset-jest "^29.5.0"
@@ -2727,10 +2909,10 @@ babel-plugin-istanbul@^6.1.1:
istanbul-lib-instrument "^5.0.4"
test-exclude "^6.0.0"
-babel-plugin-jest-hoist@^29.5.0:
- version "29.5.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a"
- integrity sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==
+babel-plugin-jest-hoist@^29.6.3:
+ version "29.6.3"
+ resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
+ integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==
dependencies:
"@babel/template" "^7.3.3"
"@babel/types" "^7.3.3"
@@ -2779,12 +2961,12 @@ babel-preset-current-node-syntax@^1.0.0:
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
"@babel/plugin-syntax-top-level-await" "^7.8.3"
-babel-preset-jest@^29.5.0:
- version "29.5.0"
- resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2"
- integrity sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==
+babel-preset-jest@^29.5.0, babel-preset-jest@^29.6.3:
+ version "29.6.3"
+ resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
+ integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
dependencies:
- babel-plugin-jest-hoist "^29.5.0"
+ babel-plugin-jest-hoist "^29.6.3"
babel-preset-current-node-syntax "^1.0.0"
balanced-match@^1.0.0:
@@ -2886,7 +3068,17 @@ braces@^3.0.2, braces@~3.0.2:
dependencies:
fill-range "^7.0.1"
-browserslist@^4.14.5, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.21.9:
+browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+ version "4.21.5"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
+ integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
+ dependencies:
+ caniuse-lite "^1.0.30001449"
+ electron-to-chromium "^1.4.284"
+ node-releases "^2.0.8"
+ update-browserslist-db "^1.0.10"
+
+browserslist@^4.21.9:
version "4.21.10"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
@@ -2981,15 +3173,15 @@ camelcase@^6.2.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-caniuse-lite@^1.0.30001473:
+caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001473:
version "1.0.30001478"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001478.tgz#0ef8a1cf8b16be47a0f9fc4ecfc952232724b32a"
integrity sha512-gMhDyXGItTHipJj2ApIvR+iVB5hd0KP3svMWWXDvZOmjzJJassGLMfxRkQCSYgGd2gtdL/ReeiyvMSFD1Ss6Mw==
caniuse-lite@^1.0.30001517:
- version "1.0.30001519"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz#3e7b8b8a7077e78b0eb054d69e6edf5c7df35601"
- integrity sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==
+ version "1.0.30001533"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001533.tgz#1180daeb2518b93c82f19b904d1fefcf82197707"
+ integrity sha512-9aY/b05NKU4Yl2sbcJhn4A7MsGwR1EPfW/nrqsnqVA0Oq50wpmPaGI+R1Z0UKlUl96oxUkGEOILWtOHck0eCWw==
chalk@5.3.0:
version "5.3.0"
@@ -3721,10 +3913,15 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
+electron-to-chromium@^1.4.284:
+ version "1.4.328"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.328.tgz#b4565ffa502542b561cea16086d6d9b916c7095a"
+ integrity sha512-DE9tTy2PNmy1v55AZAO542ui+MLC2cvINMK4P2LXGsJdput/ThVG9t+QGecPuAZZSgC8XoI+Jh9M1OG9IoNSCw==
+
electron-to-chromium@^1.4.477:
- version "1.4.487"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.487.tgz#e2ef8b15f2791bf68fa6f38f2656f1a551d360ae"
- integrity sha512-XbCRs/34l31np/p33m+5tdBrdXu9jJkZxSbNxj5I0H1KtV2ZMSB+i/HYqDiRzHaFx2T5EdytjoBRe8QRJE2vQg==
+ version "1.4.515"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.515.tgz#f5fec9662106ac5752894af221606cf4db443e70"
+ integrity sha512-VTq6vjk3kCfG2qdzQRd/i9dIyVVm0dbtZIgFzrLgfB73mXDQT2HPKVRc1EoZcAVUv9XhXAu08DWqJuababdGGg==
emittery@^0.13.1:
version "0.13.1"
@@ -3746,7 +3943,15 @@ encodeurl@~1.0.2:
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.15.0:
+enhanced-resolve@^5.0.0:
+ version "5.10.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
+ integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
+ dependencies:
+ graceful-fs "^4.2.4"
+ tapable "^2.2.0"
+
+enhanced-resolve@^5.15.0:
version "5.15.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
@@ -3902,9 +4107,9 @@ es-abstract@^1.22.1:
which-typed-array "^1.1.10"
es-module-lexer@^1.2.1:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f"
- integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.1.tgz#c1b0dd5ada807a3b3155315911f364dc4e909db1"
+ integrity sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==
es-set-tostringtag@^2.0.1:
version "2.0.1"
@@ -3989,7 +4194,14 @@ eslint-import-resolver-node@^0.3.4, eslint-import-resolver-node@^0.3.7:
is-core-module "^2.11.0"
resolve "^1.22.1"
-eslint-module-utils@^2.6.1, eslint-module-utils@^2.8.0:
+eslint-module-utils@^2.6.1:
+ version "2.7.4"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
+ integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
+ dependencies:
+ debug "^3.2.7"
+
+eslint-module-utils@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
@@ -5291,7 +5503,14 @@ is-callable@^1.2.4:
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.4.0, is-core-module@^2.9.0:
+is-core-module@^2.11.0, is-core-module@^2.4.0, is-core-module@^2.9.0:
+ version "2.11.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+ integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+ dependencies:
+ has "^1.0.3"
+
+is-core-module@^2.13.0:
version "2.13.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
@@ -5740,20 +5959,20 @@ jest-haste-map@^29.5.0:
optionalDependencies:
fsevents "^2.3.2"
-jest-haste-map@^29.6.2:
- version "29.6.2"
- resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.6.2.tgz#298c25ea5255cfad8b723179d4295cf3a50a70d1"
- integrity sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==
+jest-haste-map@^29.7.0:
+ version "29.7.0"
+ resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
+ integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==
dependencies:
- "@jest/types" "^29.6.1"
+ "@jest/types" "^29.6.3"
"@types/graceful-fs" "^4.1.3"
"@types/node" "*"
anymatch "^3.0.3"
fb-watchman "^2.0.0"
graceful-fs "^4.2.9"
- jest-regex-util "^29.4.3"
- jest-util "^29.6.2"
- jest-worker "^29.6.2"
+ jest-regex-util "^29.6.3"
+ jest-util "^29.7.0"
+ jest-worker "^29.7.0"
micromatch "^4.0.4"
walker "^1.0.8"
optionalDependencies:
@@ -5821,6 +6040,11 @@ jest-regex-util@^29.4.3:
resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8"
integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==
+jest-regex-util@^29.6.3:
+ version "29.6.3"
+ resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
+ integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
+
jest-resolve-dependencies@^29.5.0:
version "29.5.0"
resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz#f0ea29955996f49788bf70996052aa98e7befee4"
@@ -5940,12 +6164,12 @@ jest-util@^29.0.0, jest-util@^29.5.0:
graceful-fs "^4.2.9"
picomatch "^2.2.3"
-jest-util@^29.6.2:
- version "29.6.2"
- resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.6.2.tgz#8a052df8fff2eebe446769fd88814521a517664d"
- integrity sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==
+jest-util@^29.7.0:
+ version "29.7.0"
+ resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+ integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
dependencies:
- "@jest/types" "^29.6.1"
+ "@jest/types" "^29.6.3"
"@types/node" "*"
chalk "^4.0.0"
ci-info "^3.2.0"
@@ -5997,13 +6221,13 @@ jest-worker@^29.5.0:
merge-stream "^2.0.0"
supports-color "^8.0.0"
-jest-worker@^29.6.2:
- version "29.6.2"
- resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.6.2.tgz#682fbc4b6856ad0aa122a5403c6d048b83f3fb44"
- integrity sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==
+jest-worker@^29.7.0:
+ version "29.7.0"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
+ integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
dependencies:
"@types/node" "*"
- jest-util "^29.6.2"
+ jest-util "^29.7.0"
merge-stream "^2.0.0"
supports-color "^8.0.0"
@@ -6072,7 +6296,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-json5@^1.0.2:
+json5@^1.0.1, json5@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
@@ -6598,6 +6822,11 @@ node-releases@^2.0.13:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+node-releases@^2.0.8:
+ version "2.0.10"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
+ integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
+
normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6689,7 +6918,16 @@ object.entries@^1.1.4:
define-properties "^1.1.3"
es-abstract "^1.19.1"
-object.fromentries@^2.0.4, object.fromentries@^2.0.6:
+object.fromentries@^2.0.4:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
+ integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
+ dependencies:
+ call-bind "^1.0.2"
+ define-properties "^1.1.3"
+ es-abstract "^1.19.1"
+
+object.fromentries@^2.0.6:
version "2.0.7"
resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
@@ -7608,7 +7846,16 @@ scheduler@^0.23.0:
dependencies:
loose-envify "^1.1.0"
-schema-utils@^3.1.1, schema-utils@^3.2.0:
+schema-utils@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+ integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+ dependencies:
+ "@types/json-schema" "^7.0.8"
+ ajv "^6.12.5"
+ ajv-keywords "^3.5.2"
+
+schema-utils@^3.2.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
@@ -7640,25 +7887,23 @@ selfsigned@^2.1.1:
node-forge "^1"
"semver@2 || 3 || 4 || 5":
- version "5.7.2"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
- integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+ integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-semver@7.3.8:
+semver@7.3.8, semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
version "7.3.8"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
dependencies:
lru-cache "^6.0.0"
-semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
- version "7.5.4"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
- integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
- dependencies:
- lru-cache "^6.0.0"
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+ integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
+semver@^6.3.1:
version "6.3.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -8059,13 +8304,13 @@ string.prototype.matchall@^4.0.5:
side-channel "^1.0.4"
string.prototype.trim@^1.2.7:
- version "1.2.7"
- resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
- integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+ version "1.2.8"
+ resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+ integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
dependencies:
call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
+ define-properties "^1.2.0"
+ es-abstract "^1.22.1"
string.prototype.trimend@^1.0.5:
version "1.0.5"
@@ -8367,7 +8612,7 @@ tsconfig-paths@4.2.0:
minimist "^1.2.6"
strip-bom "^3.0.0"
-tsconfig-paths@^3.14.2, tsconfig-paths@^3.9.0:
+tsconfig-paths@^3.14.2:
version "3.14.2"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
@@ -8377,6 +8622,16 @@ tsconfig-paths@^3.14.2, tsconfig-paths@^3.9.0:
minimist "^1.2.6"
strip-bom "^3.0.0"
+tsconfig-paths@^3.9.0:
+ version "3.14.1"
+ resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+ integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+ dependencies:
+ "@types/json5" "^0.0.29"
+ json5 "^1.0.1"
+ minimist "^1.2.6"
+ strip-bom "^3.0.0"
+
tscpaths@0.0.9:
version "0.0.9"
resolved "https://registry.yarnpkg.com/tscpaths/-/tscpaths-0.0.9.tgz#c77abfde6820920f10c64f83c27753b9505814ab"
@@ -8567,6 +8822,14 @@ unset-value@^1.0.0:
has-value "^0.3.1"
isobject "^3.0.0"
+update-browserslist-db@^1.0.10:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+ integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+ dependencies:
+ escalade "^3.1.1"
+ picocolors "^1.0.0"
+
update-browserslist-db@^1.0.11:
version "1.0.11"
resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
@@ -8844,9 +9107,9 @@ wildcard@^2.0.0:
integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
word-wrap@^1.2.3:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
- integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+ integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
wrap-ansi@^7.0.0:
version "7.0.0"