Skip to content

Commit 8494e69

Browse files
authored
Merge pull request Expensify#69350 from callstack-internal/Migrate-rnef-to-rock
[NoQA] Migrate RNEF to ROCK
2 parents 224400a + ab257e4 commit 8494e69

16 files changed

+748
-459
lines changed

.github/scripts/verifyPodfile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if ! SPEC_DIRS=$(yq '.["EXTERNAL SOURCES"].[].":path" | select( . == "*node_modu
6464
fi
6565

6666
# Retrieve a list of podspec paths from react-native config
67-
if ! read_lines_into_array PODSPEC_PATHS < <(npx rnef config -p ios | jq --raw-output '.dependencies[].platforms.ios.podspecPath | select ( . != null)'); then
67+
if ! read_lines_into_array PODSPEC_PATHS < <(npx rock config -p ios | jq --raw-output '.dependencies[].platforms.ios.podspecPath | select ( . != null)'); then
6868
error "Error: could not parse podspec paths from react-native config command"
6969
cleanupAndExit 1
7070
fi

.github/workflows/remote-build-android.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
4848
git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
4949
echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"
50-
51-
- name: RNEF Remote Build - Android
52-
# rnef v2
53-
uses: callstackincubator/android@d9a81f860e436ff2971323990244e32830dcabd1
50+
51+
- name: Rock Remote Build - Android
52+
# rock v3
53+
uses: callstackincubator/android@1a7d52dfe3ca195ccbe5ad2f06c15f2fc3835115
5454
env:
5555
GITHUB_TOKEN: ${{ github.token }}
5656
IS_HYBRID_APP: ${{ matrix.is_hybrid_build }}
5757
with:
5858
variant: ${{ matrix.variant }}
59-
rnef-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
59+
rock-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
6060
comment-bot: false

.github/workflows/remote-build-ios.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
5252
git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
5353
echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"
54-
55-
- name: RNEF Remote Build - iOS
56-
# rnef v2
57-
uses: callstackincubator/ios@7847e0676242cefa801cba8ede6736140b7bae91
54+
55+
- name: Rock Remote Build - iOS
56+
# rock v3
57+
uses: callstackincubator/ios@08a533dbeda6adec39f94d08d820091514d1f7af
5858
env:
5959
GITHUB_TOKEN: ${{ github.token }}
6060
IS_HYBRID_APP: ${{ matrix.is_hybrid_build }}

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ docs/.bundle
148148
# Output of react compiler healthcheck dev script
149149
react-compiler-output.txt
150150

151-
# React Native Enterprise Framework
152-
.rnef/
151+
# Rock Framework
152+
.rock/
153153

154154
# Generated by bob (for Nitro modules)
155155
modules/*/lib/

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.well-known
44
desktop/dist/**/*.js
55
dist/**/*.js
6-
.rnef
6+
.rock
77
assets/animations
88
android
99
ios

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ variables referenced here get updated since your local `.env` file is ignored.
182182
- `E2E_TESTING` (optional) - This needs to be set to `true` when running the e2e tests for performance regression testing.
183183
This happens usually automatically, read [this](tests/e2e/README.md) for more information
184184

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

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ react {
6666
autolinkLibrariesWithApp()
6767
// Added by install-expo-modules
6868
entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
69-
cliFile = file("../../node_modules/@rnef/cli/dist/src/bin.js")
69+
cliFile = file("../../node_modules/rock/dist/src/bin.js")
7070
bundleCommand = "bundle"
7171
}
7272

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
22
plugins { id("com.facebook.react.settings") }
33
apply from: "${rootDir}/../gradleUtils/PatchedArtifactsSettings.gradle"
44

5-
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand(['npx', 'rnef', 'config', '-p', 'android']) }
5+
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand(['npx', 'rock', 'config', '-p', 'android']) }
66
rootProject.name = 'NewExpensify'
77
include ':react-native-webview'
88
project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')

cspell.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@
548548
"retryable",
549549
"Reupholstery",
550550
"rideshare",
551-
"rnef",
551+
"rock",
552552
"RNFS",
553553
"rnmapbox",
554554
"RNTL",

ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ target 'NewExpensify' do
8282
'ReleaseProduction' => :release,
8383
'Debug' => :debug
8484

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

8787
# Flags change depending on the env values.
8888
flags = get_default_flags()

0 commit comments

Comments
 (0)