From 4c091745dd65a9de4dbe0991cda7d8223d2671f7 Mon Sep 17 00:00:00 2001 From: Loewy Date: Thu, 25 Jan 2024 17:27:24 -0800 Subject: [PATCH] rebased with master + reset package json to previous spacing/commands --- ios/Railbird.xcodeproj/project.pbxproj | 8 +- package.json | 120 ++++++++++++------------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/ios/Railbird.xcodeproj/project.pbxproj b/ios/Railbird.xcodeproj/project.pbxproj index ccdc107..48d621a 100644 --- a/ios/Railbird.xcodeproj/project.pbxproj +++ b/ios/Railbird.xcodeproj/project.pbxproj @@ -14,8 +14,8 @@ 5EA6FB8605FF4C68A904CCF2 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2CA28C34ACE4214B13C5C6D /* noop-file.swift */; }; A5A02A4705E041DE78F5D7DE /* Pods_Railbird.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C8A4A0B4D962697036ED5DD /* Pods_Railbird.framework */; }; B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; }; - BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; }; B6EAE3092E2C4CF7A0CBEF32 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DC392C3D22484A91957B59E5 /* GoogleService-Info.plist */; }; + BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -32,9 +32,9 @@ A2CA28C34ACE4214B13C5C6D /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "Railbird/noop-file.swift"; sourceTree = ""; }; AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = Railbird/SplashScreen.storyboard; sourceTree = ""; }; BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = ""; }; + DC392C3D22484A91957B59E5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Railbird/GoogleService-Info.plist"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-Railbird/ExpoModulesProvider.swift"; sourceTree = ""; }; - DC392C3D22484A91957B59E5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; name = "GoogleService-Info.plist"; path = "Railbird/GoogleService-Info.plist"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = text.plist.xml; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -384,7 +384,7 @@ ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = ai.railbird.railbird; - PRODUCT_NAME = "Railbird"; + PRODUCT_NAME = Railbird; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Railbird/Railbird-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -419,7 +419,7 @@ ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = ai.railbird.railbird; - PRODUCT_NAME = "Railbird"; + PRODUCT_NAME = Railbird; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Railbird/Railbird-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/package.json b/package.json index 9deee5b..4c16d41 100644 --- a/package.json +++ b/package.json @@ -1,61 +1,61 @@ { - "name": "railbird-rn", - "version": "1.0.0", - "main": "node_modules/expo/AppEntry.js", - "scripts": { - "start": "cp .env.development .env && expo start", - "android": "expo start --android", - "ios": "expo start --ios", - "run:android": "expo run:android", - "run:ios": "expo run:ios", - "web": "expo start --web", - "lint": "eslint . --ext .js,.ts,.tsx", - "lint:fix": "eslint . --ext .ts,.tsx --fix", - "test": "jest --forceExit" - }, - "jest": { - "preset": "jest-expo", - "transformIgnorePatterns": [ - "node_modules/(?!((jest-)?react-native|@react-native(-community)?|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|react-native-svg|react-native-svg-charts|d3-path)/)" - ] - }, - "dependencies": { - "@apollo/client": "^3.8.8", - "@react-native-firebase/app": "^18.8.0", - "@react-native-firebase/auth": "^18.8.0", - "@types/react": "~18.2.14", - "@typescript-eslint/eslint-plugin": "^6.17.0", - "@typescript-eslint/parser": "^6.17.0", - "babel-plugin-inline-dotenv": "^1.7.0", - "d3-path": "^3.1.0", - "d3-scale": "^1.0.6", - "eslint": "^8.56.0", - "eslint-plugin-react": "^7.33.2", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-native": "^4.1.0", - "expo": "~49.0.15", - "expo-build-properties": "^0.11.0", - "expo-splash-screen": "~0.20.5", - "expo-status-bar": "~1.6.0", - "graphql": "^16.8.1", - "jest": "^29.2.1", - "jest-expo": "~49.0.0", - "react": "18.2.0", - "react-native": "0.72.6", - "react-native-dotenv": "^3.4.9", - "react-native-svg": "13.9.0", - "react-native-svg-charts": "^5.4.0", - "typescript": "^5.3.3" - - }, - "devDependencies": { - "@babel/core": "^7.20.0", - "@testing-library/jest-native": "^5.4.3", - "@testing-library/react-native": "^12.4.3", - "@types/d3-path": "^3.0.2", - "@types/jest": "^29.5.11", - "@types/react-native-svg-charts": "^5.0.16", - "eslint-config-prettier": "^9.1.0" - }, - "private": true -} \ No newline at end of file + "name": "railbird-rn", + "version": "1.0.0", + "main": "node_modules/expo/AppEntry.js", + "scripts": { + "start": "cp .env.development .env && expo start", + "android": "expo start --android", + "ios": "expo start --ios", + "run:android": "expo run:android", + "run:ios": "expo run:ios", + "web": "expo start --web", + "lint": "eslint . --ext .js,.ts,.tsx", + "lint:fix": "eslint . --ext .ts,.tsx --fix", + "test": "jest --forceExit" + }, + "jest": { + "preset": "jest-expo", + "transformIgnorePatterns": [ + "node_modules/(?!((jest-)?react-native|@react-native(-community)?|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|react-native-svg|react-native-svg-charts|d3-path)/)" + ] + }, + "dependencies": { + "@apollo/client": "^3.8.8", + "@react-native-firebase/app": "^18.8.0", + "@react-native-firebase/auth": "^18.8.0", + "@types/react": "~18.2.14", + "@typescript-eslint/eslint-plugin": "^6.17.0", + "@typescript-eslint/parser": "^6.17.0", + "babel-plugin-inline-dotenv": "^1.7.0", + "d3-path": "^3.1.0", + "d3-scale": "^1.0.6", + "eslint": "^8.56.0", + "eslint-plugin-react": "^7.33.2", + "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-react-native": "^4.1.0", + "expo": "~49.0.15", + "expo-build-properties": "^0.11.0", + "expo-splash-screen": "~0.20.5", + "expo-status-bar": "~1.6.0", + "graphql": "^16.8.1", + "jest": "^29.2.1", + "jest-expo": "~49.0.0", + "react": "18.2.0", + "react-native": "0.72.6", + "react-native-dotenv": "^3.4.9", + "react-native-svg": "13.9.0", + "react-native-svg-charts": "^5.4.0", + "typescript": "^5.3.3" + }, + "devDependencies": { + "@babel/core": "^7.20.0", + "@testing-library/jest-native": "^5.4.3", + "@testing-library/react-native": "^12.4.3", + "@types/d3-path": "^3.0.2", + "@types/jest": "^29.5.11", + "@types/react-native-svg-charts": "^5.0.16", + "eslint-config-prettier": "^9.1.0" + }, + "private": true +} +