Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ opencode.json
/.dual-graph-pro
.DS_Store
/docs
.env.development
11 changes: 9 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,19 @@
"statusBar.background": "#254de6",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#5372eb",
"statusBarItem.remoteBackground": "#254de6",
"statusBarItem.remoteBackground": "#ef708a",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#254de6",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#254de699",
"titleBar.inactiveForeground": "#e7e7e799"
"titleBar.inactiveForeground": "#e7e7e799",
"activityBarTop.activeBackground": "#5372eb",
"activityBarTop.background": "#5372eb",
"activityBarTop.foreground": "#e7e7e7",
"activityBarTop.inactiveForeground": "#e7e7e799",
"commandCenter.foreground": "#e7e7e7",
"statusBar.debuggingBackground": "#254de6",
"statusBar.debuggingForeground": "#e7e7e7"
},
"peacock.color": "#254de6",
}
6 changes: 4 additions & 2 deletions app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
orientation: 'default',
icon: './assets/icon.png',
userInterfaceStyle: 'automatic',
newArchEnabled: true,
updates: {
fallbackToCacheTimeout: 0,
},
Expand Down Expand Up @@ -134,6 +133,9 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
['react-native-edge-to-edge'],
'expo-web-browser',
'expo-secure-store',
'expo-image',
'expo-sharing',
'expo-status-bar',
[
'@rnmapbox/maps',
{
Expand Down Expand Up @@ -179,7 +181,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
android: {
extraProguardRules: '-keep class expo.modules.location.** { *; }',
extraMavenRepos: ['../../node_modules/@notifee/react-native/android/libs'],
targetSdkVersion: 35,
targetSdkVersion: 36,
},
ios: {
deploymentTarget: '18.1',
Expand Down
10 changes: 3 additions & 7 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
module.exports = function (api) {
api.cache(true);

// Check if we're in test environment
const isTest = process.env.NODE_ENV === 'test';

return {
presets: isTest
? ['babel-preset-expo'] // No nativewind in test environment
: [['babel-preset-expo', { jsxImportSource: 'nativewind' }], 'nativewind/babel'],
// NativeWind v5 no longer needs a babel preset or jsxImportSource —
// styling is wired through the metro transform (react-native-css).
presets: ['babel-preset-expo'],
plugins: [
[
'module-resolver',
Expand All @@ -19,7 +16,6 @@ module.exports = function (api) {
'@unitools/image': '@unitools/image-expo',
'@unitools/router': '@unitools/router-expo',
'@unitools/link': '@unitools/link-expo',
'@tailwind.config': './tailwind.config.js',
'@assets': './assets',
},
extensions: ['.ios.ts', '.android.ts', '.ts', '.ios.tsx', '.android.tsx', '.tsx', '.jsx', '.js', '.json'],
Expand Down
Loading
Loading