diff --git a/app.config.ts b/app.config.ts index a09ccef..5b45f03 100644 --- a/app.config.ts +++ b/app.config.ts @@ -32,7 +32,7 @@ const config = { otaUpdateUrl: '', } -const environment = process.env.EXPO_PUBLIC_APP_ENV || 'dev' +const detectedEnvironment = process.env.EXPO_PUBLIC_APP_ENV || 'dev' // your custom fonts const fonts = ['./assets/fonts/Domine-Bold.ttf'] @@ -40,7 +40,9 @@ const fonts = ['./assets/fonts/Domine-Bold.ttf'] // prefetched/embedded assets, can be referenced as source='strv_logo' https://docs.expo.dev/versions/latest/sdk/asset/#configurable-properties const assets = ['./assets/images/strv_logo.png'] -const getEnvironmentInfo = (): { +export const getEnvironmentInfo = ( + environment: Environment, +): { name: ExpoConfig['name'] appIdentifier: IOS['bundleIdentifier'] icon: ExpoConfig['icon'] @@ -62,7 +64,7 @@ const getEnvironmentInfo = (): { } } -const { name, appIdentifier, icon } = getEnvironmentInfo() +const { name, appIdentifier, icon } = getEnvironmentInfo(detectedEnvironment) const plugins: ExpoConfig['plugins'] = [ ['expo-build-properties'], diff --git a/eas.json b/eas.json index d5e7fc9..a8a9ccd 100644 --- a/eas.json +++ b/eas.json @@ -41,5 +41,12 @@ "environment": "production" } }, - "submit": {} + "submit": { + "production": { + "ios": { + "ascAppId": "1234567890", + "appleTeamId": "1234567890" + } + } + } } diff --git a/package.json b/package.json index c7d424c..59267ee 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,11 @@ "@dev-plugins/react-native-mmkv": "^0.2.0", "@react-native-community/netinfo": "11.4.1", "expo": "^52.0.44", + "expo-asset": "~11.0.5", "expo-build-properties": "~0.13.2", "expo-constants": "~17.0.8", "expo-dev-client": "~5.0.20", + "expo-font": "~13.0.4", "expo-image": "~2.0.7", "expo-linking": "~7.0.5", "expo-router": "~4.0.20", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9bfdd2b..ec28c57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,6 +16,9 @@ importers: expo: specifier: ^52.0.44 version: 52.0.44(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@expo/metro-runtime@4.0.1(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1)))(graphql@15.8.0)(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1) + expo-asset: + specifier: ~11.0.5 + version: 11.0.5(expo@52.0.44(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@expo/metro-runtime@4.0.1(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1)))(graphql@15.8.0)(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1))(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1) expo-build-properties: specifier: ~0.13.2 version: 0.13.2(expo@52.0.44(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@expo/metro-runtime@4.0.1(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1)))(graphql@15.8.0)(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1)) @@ -25,6 +28,9 @@ importers: expo-dev-client: specifier: ~5.0.20 version: 5.0.20(expo@52.0.44(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@expo/metro-runtime@4.0.1(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1)))(graphql@15.8.0)(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1)) + expo-font: + specifier: ~13.0.4 + version: 13.0.4(expo@52.0.44(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@expo/metro-runtime@4.0.1(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1)))(graphql@15.8.0)(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1))(react@18.3.1) expo-image: specifier: ~2.0.7 version: 2.0.7(expo@52.0.44(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@expo/metro-runtime@4.0.1(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1)))(graphql@15.8.0)(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1))(react-native-web@0.19.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-native@0.76.9(@babel/core@7.26.0)(@babel/preset-env@7.24.5(@babel/core@7.26.0))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1) diff --git a/src/config.ts b/src/config.ts deleted file mode 100644 index 4a00b5b..0000000 --- a/src/config.ts +++ /dev/null @@ -1,9 +0,0 @@ -import Constants from 'expo-constants' - -export const env = { APP_ENV: process.env.EXPO_PUBLIC_APP_ENV } - -export const config = { - applicationIdProd: 'com.expo.template', - appleIdProd: '123456789', - installedAppVersion: Constants.expoConfig?.version, -} diff --git a/src/utils/getStoreLink.ts b/src/utils/getStoreLink.ts index 9e1cc0a..f9c411c 100644 --- a/src/utils/getStoreLink.ts +++ b/src/utils/getStoreLink.ts @@ -1,9 +1,9 @@ +import { getEnvironmentInfo } from 'app.config' +import easJson from 'eas.json' import { Platform } from 'react-native' -import { config } from '~/config' - -const applicationIdProd = config.applicationIdProd -const appleIdProd = config.appleIdProd +const applicationIdProd = getEnvironmentInfo('production').appIdentifier +const appleIdProd = easJson.submit.production.ios.ascAppId type StoreLink = { storeURI: string