From 0bd89353598ecf7150f3240580fc4aaa045d457a Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 29 Feb 2024 23:39:56 -0800 Subject: [PATCH] Resolved production build challenges. Deployed as 1.6.0-9 --- app.json | 21 +++++++++++----- eas.json | 8 ++---- env.js | 74 ++++++++++++++++++++++++-------------------------------- 3 files changed, 48 insertions(+), 55 deletions(-) diff --git a/app.json b/app.json index 2372083..9a8935e 100644 --- a/app.json +++ b/app.json @@ -4,14 +4,17 @@ "slug": "imexmobile", "version": "1.6.0", "extra": { - "expover": "8", + "expover": "9", "eas": { "projectId": "ffe01f3a-d507-4698-82cd-da1f1cad450b" } }, "orientation": "default", "icon": "./assets/logo192noa.png", - "platforms": ["ios", "android"], + "platforms": [ + "ios", + "android" + ], "ios": { "supportsTablet": true, "bundleIdentifier": "com.imex.imexmobile", @@ -24,7 +27,7 @@ }, "android": { "package": "com.imex.imexmobile", - "versionCode": 1100033, + "versionCode": 1100034, "googleServicesFile": "./google-services.json", "permissions": [ "android.permission.READ_EXTERNAL_STORAGE", @@ -40,9 +43,12 @@ "icon": "./assets/logo192noa.png" }, "updates": { - "fallbackToCacheTimeout": 0 + "fallbackToCacheTimeout": 0, + "url": "https://u.expo.dev/ffe01f3a-d507-4698-82cd-da1f1cad450b" }, - "assetBundlePatterns": ["**/*"], + "assetBundlePatterns": [ + "**/*" + ], "web": { "favicon": "./assets/logo192noa.png", "config": { @@ -77,6 +83,9 @@ } ], "expo-localization" - ] + ], + "runtimeVersion": { + "policy": "appVersion" + } } } diff --git a/eas.json b/eas.json index 5a4e47d..8804bd7 100644 --- a/eas.json +++ b/eas.json @@ -9,14 +9,10 @@ "distribution": "internal" }, "test": { - "releaseChannel": "test", - "channel": "test", - "env": { "API_URL": "https://api.test.imex.online" } + "channel": "test" }, "production": { - "channel": "production", - "releaseChannel": "production", - "env": { "ANDROID_SDK_ROOT": "/Users/pfic/Library/Android/sdk" } + "channel": "production" } }, "submit": { diff --git a/env.js b/env.js index c540a06..59ad636 100644 --- a/env.js +++ b/env.js @@ -1,62 +1,50 @@ -import * as Updates from "expo-updates"; +import * as Updates from 'expo-updates'; const ENV = { test: { - API_URL: "https://api.test.imex.online", - uri: "https://db.test.bodyshop.app/v1/graphql", - wsuri: "wss://db.test.bodyshop.app/v1/graphql", + API_URL: 'https://api.test.imex.online', + uri: 'https://db.test.bodyshop.app/v1/graphql', + wsuri: 'wss://db.test.bodyshop.app/v1/graphql', REACT_APP_CLOUDINARY_ENDPOINT_API: - "https://api.cloudinary.com/v1_1/bodyshop", - REACT_APP_CLOUDINARY_ENDPOINT: "https://res.cloudinary.com/bodyshop", - REACT_APP_CLOUDINARY_API_KEY: "473322739956866", - REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: "c_fill,h_250,w_250", + 'https://api.cloudinary.com/v1_1/bodyshop', + REACT_APP_CLOUDINARY_ENDPOINT: 'https://res.cloudinary.com/bodyshop', + REACT_APP_CLOUDINARY_API_KEY: '473322739956866', + REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: 'c_fill,h_250,w_250', firebase: { - apiKey: "AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c", - authDomain: "imex-test.firebaseapp.com", - projectId: "imex-test", - storageBucket: "imex-test.appspot.com", - messagingSenderId: "991923618608", - appId: "1:991923618608:web:633437569cdad78299bef5", - measurementId: "G-TW0XLZEH18", + apiKey: 'AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c', + authDomain: 'imex-test.firebaseapp.com', + projectId: 'imex-test', + storageBucket: 'imex-test.appspot.com', + messagingSenderId: '991923618608', + appId: '1:991923618608:web:633437569cdad78299bef5', + measurementId: 'G-TW0XLZEH18', }, }, prod: { - API_URL: "https://api.imex.online", - uri: "https://db.imex.online/v1/graphql", - wsuri: "wss://db.imex.online/v1/graphql", + API_URL: 'https://api.imex.online', + uri: 'https://db.imex.online/v1/graphql', + wsuri: 'wss://db.imex.online/v1/graphql', REACT_APP_CLOUDINARY_ENDPOINT_API: - "https://api.cloudinary.com/v1_1/bodyshop", - REACT_APP_CLOUDINARY_ENDPOINT: "https://res.cloudinary.com/bodyshop", - REACT_APP_CLOUDINARY_API_KEY: "473322739956866", - REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: "c_fill,h_250,w_250", + 'https://api.cloudinary.com/v1_1/bodyshop', + REACT_APP_CLOUDINARY_ENDPOINT: 'https://res.cloudinary.com/bodyshop', + REACT_APP_CLOUDINARY_API_KEY: '473322739956866', + REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS: 'c_fill,h_250,w_250', firebase: { - apiKey: "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU", - authDomain: "imex-prod.firebaseapp.com", - databaseURL: "https://imex-prod.firebaseio.com", - projectId: "imex-prod", - storageBucket: "imex-prod.appspot.com", - messagingSenderId: "253497221485", - appId: "1:253497221485:web:3c81c483b94db84b227a64", - measurementId: "G-NTWBKG2L0M", + apiKey: 'AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU', + authDomain: 'imex-prod.firebaseapp.com', + databaseURL: 'https://imex-prod.firebaseio.com', + projectId: 'imex-prod', + storageBucket: 'imex-prod.appspot.com', + messagingSenderId: '253497221485', + appId: '1:253497221485:web:3c81c483b94db84b227a64', + measurementId: 'G-NTWBKG2L0M', }, }, }; function getEnvVars() { - if (process.env.NODE_ENV === "development") return ENV.test; - - let releaseChannel = Updates.channel; - if ( - releaseChannel === null || - releaseChannel === undefined || - releaseChannel === "" - ) - return ENV.test; - if (releaseChannel.indexOf("development") !== -1) return ENV.test; - - if (releaseChannel.indexOf("test") !== -1) return ENV.test; - if (releaseChannel.indexOf("default") !== -1) return ENV.test; + if (Updates.channel !== 'production') return ENV.test; else return ENV.prod; }