Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ bump tamagui #1385

Merged
merged 3 commits into from
Dec 22, 2024
Merged

⬆️ bump tamagui #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
116d05b
⬆️ bump tamagui
andrew-bierman Dec 21, 2024
b0b9432
🐛 import error fix
andrew-bierman Dec 21, 2024
85bd527
⚡️ switch to default config to fix type errors for now
andrew-bierman Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/expo/app/(app)/(drawer)/(tabs)/(stack)/map/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Map from 'app/screens/map';
import { Platform } from 'react-native';
import { Stack } from 'expo-router';
import Head from 'expo-router/head';
import { OfflineMapsScreen } from 'app/modules/map/screens/OfflineMapsScreen';

export default function FeedNav() {
return (
Expand Down
26 changes: 13 additions & 13 deletions apps/expo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@
"@rneui/base": "^4.0.0-rc.8",
"@rneui/themed": "^4.0.0-rc.8",
"@rnmapbox/maps": "^10.1.29",
"@tamagui/animations-react-native": "1.96.0",
"@tamagui/babel-plugin": "1.96.0",
"@tamagui/config": "1.96.0",
"@tamagui/font-inter": "1.96.0",
"@tamagui/linear-gradient": "1.96.0",
"@tamagui/lucide-icons": "1.96.0",
"@tamagui/progress": "1.96.0",
"@tamagui/react-native-media-driver": "1.96.0",
"@tamagui/shorthands": "1.96.0",
"@tamagui/switch": "1.96.0",
"@tamagui/theme-base": "1.96.0",
"@tamagui/themes": "1.96.0",
"@tamagui/animations-react-native": "^1.120.2",
"@tamagui/babel-plugin": "^1.120.2",
"@tamagui/config": "^1.120.2",
"@tamagui/font-inter": "^1.120.2",
"@tamagui/linear-gradient": "^1.120.2",
"@tamagui/lucide-icons": "^1.120.2",
"@tamagui/progress": "^1.120.2",
"@tamagui/react-native-media-driver": "^1.120.2",
"@tamagui/shorthands": "^1.120.2",
"@tamagui/switch": "^1.120.2",
"@tamagui/theme-base": "^1.120.2",
"@tamagui/themes": "^1.120.2",
"@tanstack/query-async-storage-persister": "^4.36.1",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-query-devtools": "^4.36.1",
Expand Down Expand Up @@ -150,7 +150,7 @@
"serve": "^14.2.0",
"server": "*",
"superjson": "^2.0.0",
"tamagui": "1.96.0",
"tamagui": "^1.120.2",
"togpx": "^0.5.4",
"uuid": "3.4.0",
"xmldom": "^0.6.0",
Expand Down
8 changes: 4 additions & 4 deletions apps/next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"@babel/plugin-transform-react-jsx": "^7.23.4",
"@expo/next-adapter": "5.0.2",
"@react-native/assets-registry": "0.74.81",
"@tamagui/config": "1.96.0",
"@tamagui/next-plugin": "1.96.0",
"@tamagui/next-theme": "1.96.0",
"@tamagui/config": "^1.120.2",
"@tamagui/next-plugin": "^1.120.2",
"@tamagui/next-theme": "^1.120.2",
"app": "*",
"babel-preset-expo": "^10.0.1",
"babel-preset-react-native": "^4.0.1",
Expand All @@ -38,7 +38,7 @@
"react-dom": "18.2.0",
"react-native-web": "^0.19.10",
"setimmediate": "^1.0.5",
"tamagui": "1.96.0",
"tamagui": "^1.120.2",
"url-loader": "^4.1.1",
"vercel": "latest"
},
Expand Down
2 changes: 1 addition & 1 deletion apps/tauri/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@packrat/ui": "*",
"@packrat/validations": "*",
"@react-native/assets-registry": "0.74.81",
"@tamagui/vite-plugin": "1.96.0",
"@tamagui/vite-plugin": "^1.120.2",
"@tanstack/react-router": "^1.16.5",
"@tanstack/router-devtools": "^1.16.5",
"@tanstack/router-vite-plugin": "^1.16.5",
Expand Down
2 changes: 1 addition & 1 deletion apps/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@packrat/ui": "*",
"@packrat/validations": "*",
"@react-native/assets-registry": "0.74.81",
"@tamagui/vite-plugin": "1.96.0",
"@tamagui/vite-plugin": "^1.120.2",
"@tanstack/react-router": "^1.16.5",
"@tanstack/router-devtools": "^1.16.5",
"@tanstack/router-vite-plugin": "^1.16.5",
Expand Down
28 changes: 14 additions & 14 deletions packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@
"@rneui/base": "^4.0.0-rc.8",
"@rneui/themed": "^4.0.0-rc.8",
"@rnmapbox/maps": "*",
"@tamagui/animations-react-native": "1.96.0",
"@tamagui/babel-plugin": "1.96.0",
"@tamagui/config": "1.96.0",
"@tamagui/font-inter": "1.96.0",
"@tamagui/linear-gradient": "1.96.0",
"@tamagui/lucide-icons": "1.96.0",
"@tamagui/progress": "1.96.0",
"@tamagui/react-native-media-driver": "1.96.0",
"@tamagui/shorthands": "1.96.0",
"@tamagui/switch": "1.96.0",
"@tamagui/theme-base": "1.96.0",
"@tamagui/themes": "1.96.0",
"@tamagui/use-did-finish-ssr": "1.96.0",
"@tamagui/animations-react-native": "^1.120.2",
"@tamagui/babel-plugin": "^1.120.2",
"@tamagui/config": "^1.120.2",
"@tamagui/font-inter": "^1.120.2",
"@tamagui/linear-gradient": "^1.120.2",
"@tamagui/lucide-icons": "^1.120.2",
"@tamagui/progress": "^1.120.2",
"@tamagui/react-native-media-driver": "^1.120.2",
"@tamagui/shorthands": "^1.120.2",
"@tamagui/switch": "^1.120.2",
"@tamagui/theme-base": "^1.120.2",
"@tamagui/themes": "^1.120.2",
"@tamagui/use-did-finish-ssr": "^1.120.2",
"@tanstack/query-async-storage-persister": "^4.36.1",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-query-devtools": "^4.36.1",
Expand Down Expand Up @@ -139,7 +139,7 @@
"server": "*",
"solito": "^4.2.0",
"superjson": "^2.0.0",
"tamagui": "1.96.0",
"tamagui": "^1.120.2",
"togpx": "^0.5.4",
"uuid": "3.4.0",
"xmldom": "^0.6.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/crosspath/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"solito": "^4.2.0"
},
"devDependencies": {
"@tamagui/build": "1.96.0",
"@tamagui/build": "^1.120.2",
"typescript": "^5.5.3"
}
}
40 changes: 20 additions & 20 deletions packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@
"@shopify/flash-list": "^1.6.1",
"@tamagui-extras/core": "^1.12.2",
"@tamagui-extras/form": "^1.17.2",
"@tamagui/animations-react-native": "1.96.0",
"@tamagui/animations-reanimated": "1.96.0",
"@tamagui/cli": "1.96.0",
"@tamagui/colors": "1.96.0",
"@tamagui/config": "1.96.0",
"@tamagui/core": "1.96.0",
"@tamagui/demos": "1.96.0",
"@tamagui/font-inter": "1.96.0",
"@tamagui/lucide-icons": "1.96.0",
"@tamagui/progress": "1.96.0",
"@tamagui/react-native-media-driver": "1.96.0",
"@tamagui/shorthands": "1.96.0",
"@tamagui/switch": "1.96.0",
"@tamagui/themes": "1.96.0",
"@tamagui/toast": "1.96.0",
"@tamagui/use-store": "1.96.0",
"@tamagui/web": "1.96.0",
"@tamagui/animations-react-native": "^1.120.2",
"@tamagui/animations-reanimated": "^1.120.2",
"@tamagui/cli": "^1.120.2",
"@tamagui/colors": "^1.120.2",
"@tamagui/config": "^1.120.2",
"@tamagui/core": "^1.120.2",
"@tamagui/demos": "^1.120.2",
"@tamagui/font-inter": "^1.120.2",
"@tamagui/lucide-icons": "^1.120.2",
"@tamagui/progress": "^1.120.2",
"@tamagui/react-native-media-driver": "^1.120.2",
"@tamagui/shorthands": "^1.120.2",
"@tamagui/switch": "^1.120.2",
"@tamagui/themes": "^1.120.2",
"@tamagui/toast": "^1.120.2",
"@tamagui/use-store": "^1.120.2",
"@tamagui/web": "^1.120.2",
"@tanstack/react-table": "^8.11.2",
"@tanstack/react-virtual": "3.0.0-beta.54",
"@ts-react/form": "^1.8.3",
Expand All @@ -60,12 +60,12 @@
"react-native-svg": "14.1.0",
"react-native-web": "^0.19.10",
"swr": "^2.2.5",
"tamagui": "1.96.0",
"tamagui": "^1.120.2",
"zeego": "^1.7.2",
"zod": "^3.22.4"
},
"devDependencies": {
"@tamagui/babel-plugin": "1.96.0",
"@tamagui/build": "1.96.0"
"@tamagui/babel-plugin": "^1.120.2",
"@tamagui/build": "^1.120.2"
}
}
13 changes: 12 additions & 1 deletion packages/ui/src/tamagui.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { createAnimations } from '@tamagui/animations-react-native';
import { config as defaultTamaguiConfig } from '@tamagui/config/v3';
import { createInterFont } from '@tamagui/font-inter';
import { createMedia } from '@tamagui/react-native-media-driver';
import { shorthands } from '@tamagui/shorthands';
import { themes, tokens } from '@tamagui/themes/v2';
import { createTamagui } from 'tamagui';

// CUSTOM CONFIG

// Define fonts using createInterFont
const headingFont = createInterFont({
size: {
Expand Down Expand Up @@ -72,7 +75,7 @@ const animations = createAnimations({
});

// Create Tamagui config
export const config = createTamagui({
export const customConfig = createTamagui({
defaultTheme: 'dark',
defaultFont: 'body',
shouldAddPrefersColorThemes: true,
Expand Down Expand Up @@ -109,5 +112,13 @@ export const config = createTamagui({
animations,
});

// DEFAULT CONFIG
export const defaultConfig = createTamagui(defaultTamaguiConfig);

// Handle export for either config
const effectiveConfig = defaultConfig;

export const config = effectiveConfig;

// for the compiler to find it
export default config;
Loading
Loading