Skip to content

Vit 73287 #73783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
10 commits merged into from
Nov 4, 2025
Merged

Vit 73287 #73783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5b07fc6
Bump rock and add dev server commands
OlimpiaZurek Oct 23, 2025
3bb229e
remove automatic Metro server launch
OlimpiaZurek Oct 23, 2025
68033a0
Merge branch 'main' into feat/bump-rock-and-add-dev-server
OlimpiaZurek Oct 23, 2025
1660af1
add dev server flag as default
OlimpiaZurek Oct 23, 2025
9f4b54e
Merge branch 'main' into feat/bump-rock-and-add-dev-server
OlimpiaZurek Oct 24, 2025
ce18f23
Merge branch 'main' into feat/bump-rock-and-add-dev-server
OlimpiaZurek Oct 27, 2025
51aadf5
hardcode dev server flag
OlimpiaZurek Oct 27, 2025
4159d3e
Merge branch 'main' into feat/bump-rock-and-add-dev-server
OlimpiaZurek Nov 3, 2025
550d7c2
Merge branch 'main' into feat/bump-rock-and-add-dev-server
OlimpiaZurek Nov 3, 2025
1adc4f8
fix patch
OlimpiaZurek Nov 3, 2025
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
3 changes: 0 additions & 3 deletions ios/NewExpensify.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
0CDA8E37287DD6A0004ECBEC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CDA8E36287DD6A0004ECBEC /* Images.xcassets */; };
0DFC45942C884E0A00B56C91 /* RCTShortcutManagerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DFC45932C884E0A00B56C91 /* RCTShortcutManagerModule.m */; };
0F5E5350263B73FD004CA14F /* EnvironmentChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */; };
0F749C2B3B8F4562B816DEAB /* BuildFile in Resources */ = {isa = PBXBuildFile; };
1246A3EF20E54E7A9494C8B9 /* ExpensifyNeue-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = F4F8A052A22040339996324B /* ExpensifyNeue-Regular.otf */; };
18D050E0262400AF000D658B /* BridgingFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D050DF262400AF000D658B /* BridgingFile.swift */; };
1F7170E8E7867C00D32F03FE /* Pods_NotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4521D653AC9D36713686E739 /* Pods_NotificationServiceExtension.framework */; };
Expand Down Expand Up @@ -502,7 +501,6 @@
1246A3EF20E54E7A9494C8B9 /* ExpensifyNeue-Regular.otf in Resources */,
D27CE6B77196EF3EF450EEAC /* PrivacyInfo.xcprivacy in Resources */,
524F95D57E75496EBD14B0AA /* ExpensifyMono-BoldItalic.otf in Resources */,
0F749C2B3B8F4562B816DEAB /* BuildFile in Resources */,
59164B2F48344A53975791A9 /* CustomEmojiNativeFont.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -787,7 +785,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [[ -f \"$PODS_ROOT/../.xcode.env\" ]]; then\n source \"$PODS_ROOT/../.xcode.env\"\nfi\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\nexport RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > `$NODE_BINARY --print \"require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/.packager.env'\"`\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open `$NODE_BINARY --print \"require('path').dirname(require.resolve('expo/package.json')) + '/scripts/launchPackager.command'\"` || echo \"Can't start packager automatically\"\n fi\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
96 changes: 42 additions & 54 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,10 @@
"@react-native/babel-preset": "0.81.4",
"@react-native/metro-config": "0.81.4",
"@react-navigation/devtools": "^6.0.10",
"@rock-js/platform-android": "0.11.5",
"@rock-js/platform-ios": "0.11.5",
"@rock-js/plugin-metro": "0.11.5",
"@rock-js/provider-github": "0.11.5",
"@rock-js/platform-android": "0.11.7",
"@rock-js/platform-ios": "0.11.7",
"@rock-js/plugin-metro": "0.11.7",
"@rock-js/provider-github": "0.11.7",
"@storybook/addon-a11y": "^8.6.9",
"@storybook/addon-essentials": "^8.6.9",
"@storybook/addon-webpack5-compiler-babel": "^3.0.5",
Expand Down Expand Up @@ -348,7 +348,7 @@
"react-refresh": "^0.14.2",
"react-test-renderer": "19.1.0",
"reassure": "^1.0.0-rc.4",
"rock": "0.11.5",
"rock": "0.11.7",
"semver": "7.5.2",
"setimmediate": "^1.0.5",
"shellcheck": "^1.1.0",
Expand Down
0 ...rs+0.11.6+001+fix-ios-remote-builds.patch → ...rs+0.11.7+001+fix-ios-remote-builds.patch
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion patches/@rock-js/platform-apple-helpers/details.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# `@rock-js/platform-apple-helpers` patches

### [@rock-js+platform-apple-helpers+0.11.6+001+fix-ios-remote-builds.patch](@rock-js+platform-apple-helpers+0.11.6+001+fix-ios-remote-builds.patch)
### [@rock-js+platform-apple-helpers+0.11.7+001+fix-ios-remote-builds.patch](@rock-js+platform-apple-helpers+0.11.7+001+fix-ios-remote-builds.patch)

- Reason:

Expand Down
10 changes: 5 additions & 5 deletions scripts/run-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ IS_HYBRID_APP_REPO=$(scripts/is-hybrid-app.sh)
# See if we should force standalone NewDot build
NEW_DOT_FLAG="${STANDALONE_NEW_DOT:-false}"

if [[ "$IS_HYBRID_APP_REPO" == "true" && "$NEW_DOT_FLAG" == "false" ]]; then
if [[ "$IS_HYBRID_APP_REPO" == "true" && "$NEW_DOT_FLAG" == "false" ]]; then
# Set HybridApp-specific arguments
IOS_MODE="Debug"
ANDROID_MODE="Debug"
Expand All @@ -57,16 +57,16 @@ fi
# Check if the argument is one of the desired values
case "$BUILD" in
--ios)
npx rock run:ios --configuration $IOS_MODE --scheme "$SCHEME"
npx rock run:ios --configuration $IOS_MODE --scheme "$SCHEME" --dev-server
;;
--ipad)
npx rock run:ios --simulator "iPad Pro (12.9-inch) (6th generation)" --configuration $IOS_MODE --scheme "$SCHEME"
npx rock run:ios --simulator "iPad Pro (12.9-inch) (6th generation)" --configuration $IOS_MODE --scheme "$SCHEME" --dev-server
;;
--ipad-sm)
npx rock run:ios --simulator "iPad Pro (11-inch) (4th generation)" --configuration $IOS_MODE --scheme "$SCHEME"
npx rock run:ios --simulator "iPad Pro (11-inch) (4th generation)" --configuration $IOS_MODE --scheme "$SCHEME" --dev-server
;;
--android)
npx rock run:android --variant $ANDROID_MODE --app-id $APP_ID --active-arch-only --verbose
npx rock run:android --variant $ANDROID_MODE --app-id $APP_ID --active-arch-only --verbose --dev-server
;;
*)
print_error_and_exit
Expand Down
Loading