Skip to content
Open
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
2 changes: 1 addition & 1 deletion __e2e__/flows/composer-self-label.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/composer.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/create-account.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/curate-lists.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/feed-reorder.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/home-screen.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/login.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/mod-lists.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/onboarding-avatar-creator.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/onboarding.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/post-report-flow.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/profile-screen-edit.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/profile-screen.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/report-dialog/account.default.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/report-dialog/post.default.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/report-dialog/post.edit-reason.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/report-dialog/post.reason-other.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/search-screen.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/shared-prefs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/thread-muting.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/flows/thread-screen.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- runScript:
file: ../setupServer.js
Expand Down
2 changes: 1 addition & 1 deletion __e2e__/perf-test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# flow.yaml

appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- launchApp
# Login
Expand Down
4 changes: 2 additions & 2 deletions __e2e__/setupApp.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
appId: xyz.blueskyweb.app
appId: dev.xyz.blueskyweb.app
---
- launchApp:
appId: "xyz.blueskyweb.app"
appId: "dev.xyz.blueskyweb.app"
clearState: true
- waitForAnimationToEnd
- tapOn: "http://localhost:8081"
Expand Down
28 changes: 20 additions & 8 deletions app.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ module.exports = function (_config) {

const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
const IS_PRODUCTION = process.env.EXPO_PUBLIC_ENV === 'production'
const IS_DEV = !IS_TESTFLIGHT || !IS_PRODUCTION
const IS_DEV =
process.env.EXPO_PUBLIC_ENV === 'development' ||
(!IS_TESTFLIGHT && !IS_PRODUCTION)

const ASSOCIATED_DOMAINS = [
'applinks:bsky.app',
Expand All @@ -33,7 +35,7 @@ module.exports = function (_config) {
return {
expo: {
version: VERSION,
name: 'Bluesky',
name: IS_DEV ? 'Bluesky (DEV)' : 'Bluesky',
slug: 'bluesky',
scheme: 'bluesky',
owner: 'blueskysocial',
Expand All @@ -46,7 +48,9 @@ module.exports = function (_config) {
newArchEnabled: false,
ios: {
supportsTablet: false,
bundleIdentifier: 'xyz.blueskyweb.app',
bundleIdentifier: IS_DEV
? 'dev.xyz.blueskyweb.app'
: 'xyz.blueskyweb.app',
config: {
usesNonExemptEncryption: false,
},
Expand Down Expand Up @@ -150,8 +154,10 @@ module.exports = function (_config) {
backgroundImage: './assets/icon-android-background.png',
backgroundColor: '#1185FE',
},
googleServicesFile: './google-services.json',
package: 'xyz.blueskyweb.app',
googleServicesFile: IS_DEV
? './google-services.json.example'
: './google-services.json',
Comment on lines +157 to +159
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see this being a problem - Testflight builds would then not get push notifications

package: IS_DEV ? 'dev.xyz.blueskyweb.app' : 'xyz.blueskyweb.app',
intentFilters: [
{
action: 'VIEW',
Expand Down Expand Up @@ -371,7 +377,9 @@ module.exports = function (_config) {
appExtensions: [
{
targetName: 'Share-with-Bluesky',
bundleIdentifier: 'xyz.blueskyweb.app.Share-with-Bluesky',
bundleIdentifier: IS_DEV
? 'dev.xyz.blueskyweb.app.Share-with-Bluesky'
: 'xyz.blueskyweb.app.Share-with-Bluesky',
entitlements: {
'com.apple.security.application-groups': [
'group.app.bsky',
Expand All @@ -380,7 +388,9 @@ module.exports = function (_config) {
},
{
targetName: 'BlueskyNSE',
bundleIdentifier: 'xyz.blueskyweb.app.BlueskyNSE',
bundleIdentifier: IS_DEV
? 'dev.xyz.blueskyweb.app.BlueskyNSE'
: 'xyz.blueskyweb.app.BlueskyNSE',
entitlements: {
'com.apple.security.application-groups': [
'group.app.bsky',
Expand All @@ -389,7 +399,9 @@ module.exports = function (_config) {
},
{
targetName: 'BlueskyClip',
bundleIdentifier: 'xyz.blueskyweb.app.AppClip',
bundleIdentifier: IS_DEV
? 'dev.xyz.blueskyweb.app.AppClip'
: 'xyz.blueskyweb.app.AppClip',
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion google-services.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063",
"android_client_info": {
"package_name": "xyz.blueskyweb.app"
"package_name": "dev.xyz.blueskyweb.app"
}
},
"oauth_client": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"e2e:run": "maestro test __e2e__",
"perf:test": "NODE_ENV=test maestro test",
"perf:test:run": "NODE_ENV=test maestro test __e2e__/perf-test.yml",
"perf:test:measure": "NODE_ENV=test flashlight test --bundleId xyz.blueskyweb.app --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json",
"perf:test:measure": "NODE_ENV=test flashlight test --bundleId dev.xyz.blueskyweb.app --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json",
"perf:test:results": "NODE_ENV=test flashlight report .perf/results.json",
"perf:measure": "NODE_ENV=test flashlight measure",
"intl:build": "yarn intl:extract:all && yarn intl:compile",
Expand Down