diff --git a/global.css b/global.css index 1cab906..45f130e 100644 --- a/global.css +++ b/global.css @@ -13,7 +13,7 @@ --primary: 202.36 82.8% 41%; --primary-foreground: 210 40% 98%; --secondary: 210 40% 96.1%; - --secondary-foreground: 222.2 47.4% 11.2%; + --secondary-foreground: 209 28% 39%; --tertiary: 29 89% 54%; --tertiary-foreground: 210 40% 98%; --muted: 210 40% 96%; diff --git a/metro.config.js b/metro.config.js index c1e9c54..3437703 100644 --- a/metro.config.js +++ b/metro.config.js @@ -20,29 +20,16 @@ config.resolver.nodeModulesPaths = [ // if (process.env.ELECTRON === 'true') { - config.resolver.sourceExts = [ + config.resolver.sourceExts = config.resolver.sourceExts || []; + config.resolver.sourceExts.unshift( 'electron.ts', 'electron.tsx', 'electron.js', 'electron.jsx', 'electron.json', 'electron.cjs', - 'electron.mjs', - 'web.ts', - 'web.tsx', - 'web.js', - 'web.jsx', - 'web.json', - 'web.cjs', - 'web.mjs', - 'ts', - 'tsx', - 'js', - 'jsx', - 'json', - 'cjs', - 'mjs', - ]; + 'electron.mjs' + ); } module.exports = withNativeWind(config, { input: './global.css' }); diff --git a/package.json b/package.json index 07e8edc..62b1b1f 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@react-navigation/stack": "6.3.29", "@sentry/react-native": "5.22.2", "@wcpos/core": "*", - "expo": "51.0.22", + "expo": "51.0.26", "expo-application": "~5.9.1", "expo-barcode-scanner": "~13.0.1", "expo-constants": "~16.0.2", @@ -48,11 +48,11 @@ "expo-sqlite": "~14.0.5", "expo-status-bar": "~1.12.1", "expo-system-ui": "3.0.7", - "expo-updates": "~0.25.21", + "expo-updates": "~0.25.22", "nativewind": "^4.0.36", "react": "18.2.0", "react-dom": "18.2.0", - "react-native": "0.74.3", + "react-native": "0.74.5", "react-native-device-info": "10.14.0", "react-native-gesture-handler": "~2.16.2", "react-native-get-random-values": "~1.11.0", diff --git a/tailwind.config.js b/tailwind.config.js index 1eccaac..ce7033f 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -16,6 +16,8 @@ module.exports = { }, extend: { fontSize: { + '3xs': ['0.625rem', { lineHeight: '0.75rem' }], // 10px / 12px + '2xs': ['0.6875rem', { lineHeight: '0.8125rem' }], // 11px / 13px xs: ['0.75rem', { lineHeight: '0.875rem' }], // 12px / 14px sm: ['0.8125rem', { lineHeight: '0.9375rem' }], // 13px / 15px base: ['0.875rem', { lineHeight: '1rem' }], // 14px / 16px