upgrade tamagui to latest

This commit is contained in:
Pavel Prichodko 2023-03-13 16:44:40 +01:00
parent 30a2fbb33a
commit 86abc4df44
No known key found for this signature in database
GPG Key ID: 0EB8D75C775AB6F1
5 changed files with 1124 additions and 801 deletions

View File

@ -26,13 +26,13 @@
"react-native": "0.70.5", "react-native": "0.70.5",
"react-native-safe-area-context": "4.4.1", "react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.18.0", "react-native-screens": "~3.18.0",
"react-native-svg": "^13.7.0", "react-native-svg": "^13.8.0",
"react-native-web": "~0.18.7" "react-native-web": "~0.18.12"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.17.9", "@babel/core": "^7.17.9",
"@expo/metro-config": "^0.3.21", "@expo/metro-config": "^0.3.21",
"@tamagui/babel-plugin": "1.0.15", "@tamagui/babel-plugin": "1.7.7",
"@types/react-native": "~0.70.6", "@types/react-native": "~0.70.6",
"babel-plugin-module-resolver": "^4.1.0", "babel-plugin-module-resolver": "^4.1.0",
"babel-plugin-transform-inline-environment-variables": "^0.4.4", "babel-plugin-transform-inline-environment-variables": "^0.4.4",

View File

@ -10,13 +10,13 @@
"dependencies": { "dependencies": {
"@status-im/components": "*", "@status-im/components": "*",
"@status-im/icons": "*", "@status-im/icons": "*",
"@tamagui/core": "1.0.15", "@tamagui/core": "1.7.7",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-native-web": "^0.18.6" "react-native-web": "^0.18.12"
}, },
"devDependencies": { "devDependencies": {
"@tamagui/vite-plugin": "1.0.15", "@tamagui/vite-plugin": "1.7.7",
"@types/react": "^18.0.26", "@types/react": "^18.0.26",
"@types/react-dom": "^18.0.9", "@types/react-dom": "^18.0.9",
"@vitejs/plugin-react-swc": "^3.0.0", "@vitejs/plugin-react-swc": "^3.0.0",

View File

@ -26,15 +26,15 @@
"@radix-ui/react-popover": "^1.0.3", "@radix-ui/react-popover": "^1.0.3",
"@radix-ui/react-tooltip": "^1.0.3", "@radix-ui/react-tooltip": "^1.0.3",
"@status-im/icons": "*", "@status-im/icons": "*",
"@tamagui/animations-css": "1.0.15", "@tamagui/animations-css": "1.7.7",
"@tamagui/animations-react-native": "1.0.15", "@tamagui/animations-react-native": "1.7.7",
"@tamagui/core": "1.0.15", "@tamagui/core": "1.7.7",
"@tamagui/font-inter": "1.0.15", "@tamagui/font-inter": "1.7.7",
"@tamagui/react-native-media-driver": "1.0.15", "@tamagui/react-native-media-driver": "1.7.7",
"@tamagui/shorthands": "1.0.15", "@tamagui/shorthands": "1.7.7",
"@tamagui/theme-base": "1.0.15", "@tamagui/theme-base": "1.7.7",
"tamagui": "1.0.15",
"expo-blur": "~12.0.1", "expo-blur": "~12.0.1",
"tamagui": "1.7.7",
"zustand": "^4.3.4" "zustand": "^4.3.4"
}, },
"devDependencies": { "devDependencies": {
@ -45,12 +45,12 @@
"@storybook/react": "7.0.0-beta.21", "@storybook/react": "7.0.0-beta.21",
"@storybook/react-vite": "7.0.0-beta.21", "@storybook/react-vite": "7.0.0-beta.21",
"@storybook/testing-library": "^0.0.13", "@storybook/testing-library": "^0.0.13",
"@tamagui/build": "1.0.15", "@tamagui/build": "1.7.7",
"@tamagui/vite-plugin": "1.0.15", "@tamagui/vite-plugin": "1.7.7",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-native-svg": "^13.7.0", "react-native-svg": "^13.8.0",
"react-native-web": "^0.18.0", "react-native-web": "^0.18.12",
"storybook": "7.0.0-beta.21", "storybook": "7.0.0-beta.21",
"storybook-addon-designs": "7.0.0-beta.2", "storybook-addon-designs": "7.0.0-beta.2",
"storybook-dark-mode": "^2.0.5", "storybook-dark-mode": "^2.0.5",

View File

@ -20,16 +20,12 @@ const interFont = createInterFont({
7: 13, 7: 13,
8: 15, 8: 15,
9: 19, 9: 19,
10: 27, 10: 27
},
transform: {
6: 'uppercase',
7: 'none',
}, },
weight: { weight: {
6: '400', 6: '400',
7: '500', 7: '500',
8: '600', 8: '600'
}, },
letterSpacing: { letterSpacing: {
5: 2, 5: 2,
@ -40,19 +36,19 @@ const interFont = createInterFont({
10: -3, 10: -3,
12: -4, 12: -4,
14: -5, 14: -5,
15: -6, 15: -6
}, },
face: { face: {
400: { normal: 'Inter' }, 400: { normal: 'Inter' },
500: { normal: 'Inter' }, 500: { normal: 'Inter' },
600: { normal: 'InterBold' }, 600: { normal: 'InterBold' }
}, }
}) })
const monoFont = createFont({ const monoFont = createFont({
family: 'UbuntuMono', family: 'UbuntuMono',
weight: { weight: {
1: '500', 1: '500'
}, },
letterSpacing: { letterSpacing: {
5: 2, 5: 2,
@ -63,7 +59,7 @@ const monoFont = createFont({
10: -3, 10: -3,
12: -4, 12: -4,
14: -5, 14: -5,
15: -6, 15: -6
}, },
size: { size: {
1: 11, 1: 11,
@ -81,25 +77,25 @@ const monoFont = createFont({
13: 72, 13: 72,
14: 92, 14: 92,
15: 114, 15: 114,
16: 124, 16: 124
}, },
lineHeight: { lineHeight: {
1: 14, 1: 14,
2: 15, 2: 15
}, }
}) })
export const config = createTamagui({ export const config = createTamagui({
fonts: { fonts: {
inter: interFont, inter: interFont,
mono: monoFont, mono: monoFont
}, },
themes, themes,
tokens: { tokens: {
colors: { colors: {
...tokens.color, ...tokens.color
}, },
...tokens, ...tokens
}, },
shouldAddPrefersColorThemes: true, shouldAddPrefersColorThemes: true,
media: createMedia({ media: createMedia({
@ -116,8 +112,8 @@ export const config = createTamagui({
short: { maxHeight: 820 }, short: { maxHeight: 820 },
tall: { minHeight: 820 }, tall: { minHeight: 820 },
hoverNone: { hover: 'none' }, hoverNone: { hover: 'none' },
pointerCoarse: { pointer: 'coarse' }, pointerCoarse: { pointer: 'coarse' }
}), }),
shorthands, shorthands,
animations, animations
}) })

1855
yarn.lock

File diff suppressed because it is too large Load Diff