Skip to content
Merged
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 .github/scripts/verifyPodfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if ! SPEC_DIRS=$(yq '.["EXTERNAL SOURCES"].[].":path" | select( . == "*node_modu
fi

# Retrieve a list of podspec paths from react-native config
if ! read_lines_into_array PODSPEC_PATHS < <(npx rnef config -p ios | jq --raw-output '.dependencies[].platforms.ios.podspecPath | select ( . != null)'); then
if ! read_lines_into_array PODSPEC_PATHS < <(npx rock config -p ios | jq --raw-output '.dependencies[].platforms.ios.podspecPath | select ( . != null)'); then
error "Error: could not parse podspec paths from react-native config command"
cleanupAndExit 1
fi
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/remote-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ jobs:
git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"

- name: RNEF Remote Build - Android
# rnef v2
uses: callstackincubator/android@d9a81f860e436ff2971323990244e32830dcabd1
- name: Rock Remote Build - Android
# rock v3
uses: callstackincubator/android@1a7d52dfe3ca195ccbe5ad2f06c15f2fc3835115
env:
GITHUB_TOKEN: ${{ github.token }}
IS_HYBRID_APP: ${{ matrix.is_hybrid_build }}
with:
variant: ${{ matrix.variant }}
rnef-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
rock-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
comment-bot: false
8 changes: 4 additions & 4 deletions .github/workflows/remote-build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ jobs:
git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"

- name: RNEF Remote Build - iOS
# rnef v2
uses: callstackincubator/ios@7847e0676242cefa801cba8ede6736140b7bae91
- name: Rock Remote Build - iOS
# rock v3
uses: callstackincubator/ios@08a533dbeda6adec39f94d08d820091514d1f7af
env:
GITHUB_TOKEN: ${{ github.token }}
IS_HYBRID_APP: ${{ matrix.is_hybrid_build }}
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ docs/.bundle
# Output of react compiler healthcheck dev script
react-compiler-output.txt

# React Native Enterprise Framework
.rnef/
# Rock Framework
.rock/

# Generated by bob (for Nitro modules)
modules/*/lib/
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.well-known
desktop/dist/**/*.js
dist/**/*.js
.rnef
.rock
assets/animations
android
ios
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ variables referenced here get updated since your local `.env` file is ignored.
- `E2E_TESTING` (optional) - This needs to be set to `true` when running the e2e tests for performance regression testing.
This happens usually automatically, read [this](tests/e2e/README.md) for more information

> If your changes to .env aren't having an effect, try `rm -rf .rnef`, then re-run `npm run ios` or `npm run android`
> If your changes to .env aren't having an effect, try `rm -rf .rock`, then re-run `npm run ios` or `npm run android`

----

Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ react {
autolinkLibrariesWithApp()
// Added by install-expo-modules
entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
cliFile = file("../../node_modules/@rnef/cli/dist/src/bin.js")
cliFile = file("../../node_modules/rock/dist/src/bin.js")
bundleCommand = "bundle"
}

Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
plugins { id("com.facebook.react.settings") }
apply from: "${rootDir}/../gradleUtils/PatchedArtifactsSettings.gradle"

extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand(['npx', 'rnef', 'config', '-p', 'android']) }
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand(['npx', 'rock', 'config', '-p', 'android']) }
rootProject.name = 'NewExpensify'
include ':react-native-webview'
project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
Expand Down
2 changes: 1 addition & 1 deletion cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@
"retryable",
"Reupholstery",
"rideshare",
"rnef",
"rock",
"RNFS",
"rnmapbox",
"RNTL",
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ target 'NewExpensify' do
'ReleaseProduction' => :release,
'Debug' => :debug

config = use_native_modules!(['npx', 'rnef', 'config', '-p', 'ios'])
config = use_native_modules!(['npx', 'rock', 'config', '-p', 'ios'])

# Flags change depending on the env values.
flags = get_default_flags()
Expand Down
14 changes: 7 additions & 7 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2167,7 +2167,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-pdf (6.7.3):
- react-native-pdf (6.7.7):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -3211,7 +3211,7 @@ PODS:
- RNSound/Core (= 0.11.2)
- RNSound/Core (0.11.2):
- React-Core
- RNSVG (15.12.1):
- RNSVG (15.9.0):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -3234,9 +3234,9 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNSVG/common (= 15.12.1)
- RNSVG/common (= 15.9.0)
- Yoga
- RNSVG/common (15.12.1):
- RNSVG/common (15.9.0):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -3872,7 +3872,7 @@ SPEC CHECKSUMS:
react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
react-native-netinfo: b8577cba87fbe7b7740c279ee23d25d7c5d87666
react-native-pager-view: 12c1b7b6f50efb3e5d57d62ea5c601cba0585bfd
react-native-pdf: 1fee221a1bdb66bb5dc14718e0687dd34f33a823
react-native-pdf: 627c954988c313c3b72a642611ae9160669e2f32
react-native-performance: ed312c0ee791c50077b7ad22b01685fe5a0e3db6
react-native-plaid-link-sdk: e83dc18fa6752fcfb1a9bbe995f78a8a7c659fe1
react-native-release-profiler: 3c899b04a88a63735e74beb1d1010ec8c8616347
Expand Down Expand Up @@ -3933,7 +3933,7 @@ SPEC CHECKSUMS:
RNScreens: 0dcbe4c37daf0ec9b98bc5a655b1303e58e676ff
RNShare: 1e3e15a3d2608acde2808bc35448e2344e38e15b
RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
RNSVG: 9346c68a0d5c5e4e74d82d664b745f28e6cfc1cb
RNSVG: 2aeb75970331da3a64cb89309f7fd7bd3769260a
SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
SDWebImageAVIFCoder: 00310d246aab3232ce77f1d8f0076f8c4b021d90
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
Expand All @@ -3944,6 +3944,6 @@ SPEC CHECKSUMS:
VisionCamera: b3c0cf261b9ad1ac7d60ec292d252cf3368b801e
Yoga: 50518ade05048235d91a78b803336dbb5b159d5d

PODFILE CHECKSUM: f7a8d931f2dd2be0fed9bb22df37140219a07ff3
PODFILE CHECKSUM: 145b53efc0407146c2decf14202d64f78e7dbd96

COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion ios/bundle-react-native-code-and-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fi

if [[ -z "$CLI_PATH" ]]; then
export CONFIG_CMD="dummy-workaround-value"
CLI_PATH="$("$NODE_BINARY" --print "require('path').dirname(require.resolve('@rnef/cli/package.json')) + '/dist/src/bin.js'")"
CLI_PATH="$("$NODE_BINARY" --print "require('path').dirname(require.resolve('rock/package.json')) + '/dist/src/bin.js'")"
export CLI_PATH
fi
if [[ -z "$BUNDLE_COMMAND" ]]; then
Expand Down
Loading
Loading