Skip to content

Commit ac83aab

Browse files
committed
Merge branch 'main' into fix/rntester-tests
2 parents ba9b1db + 976c849 commit ac83aab

121 files changed

Lines changed: 1341 additions & 943 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/test-ios-rntester/action.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: test-ios-rntester
22
description: Test iOS RNTester
33
inputs:
4-
use-frameworks:
5-
description: The dependency building and linking strategy to use. Must be one of "StaticLibraries", "DynamicFrameworks"
6-
default: StaticLibraries
74
ruby-version:
85
description: The version of ruby that must be used
96
default: 2.6.10
@@ -17,6 +14,10 @@ inputs:
1714
description: Whether we want to run E2E tests or not
1815
required: false
1916
default: false
17+
use-frameworks:
18+
description: Whether we have to build with Dynamic Frameworks. If this is set to true, it builds from source
19+
required: false
20+
default: false
2021

2122
runs:
2223
using: composite
@@ -43,29 +44,34 @@ runs:
4344
if: ${{ inputs.run-unit-integration-tests == 'true' }}
4445
uses: ./.github/actions/prepare-ios-tests
4546
- name: Download ReactNativeDependencies
47+
if: ${{ inputs.use-frameworks == 'false' }}
4648
uses: actions/download-artifact@v4
4749
with:
4850
name: ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz
4951
path: /tmp/third-party/
5052
- name: Print third-party folder
53+
if: ${{ inputs.use-frameworks == 'false' }}
5154
shell: bash
5255
run: ls -lR /tmp/third-party
5356
- name: Download React Native Prebuilds
57+
if: ${{ inputs.use-frameworks == 'false' }}
5458
uses: actions/download-artifact@v4
5559
with:
5660
name: ReactCore${{ inputs.flavor }}.xcframework.tar.gz
5761
path: /tmp/ReactCore
5862
- name: Print ReactCore folder
63+
if: ${{ inputs.use-frameworks == 'false' }}
5964
shell: bash
6065
run: ls -lR /tmp/ReactCore
6166
- name: Install CocoaPods dependencies
6267
shell: bash
6368
run: |
64-
export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
65-
export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
66-
67-
if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
69+
if [[ ${{ inputs.use-frameworks }} == "true" ]]; then
6870
export USE_FRAMEWORKS=dynamic
71+
else
72+
# If use-frameworks is false, let's use prebuilds
73+
export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
74+
export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
6975
fi
7076
7177
cd packages/rn-tester
@@ -108,7 +114,7 @@ runs:
108114
name: xcresults-${{ inputs.flavor }}-${{ inputs.use-frameworks }}-Ruby${{ inputs.ruby-version }}
109115
path: /Users/runner/Library/Developer/Xcode/xcresults.tar.gz
110116
- name: Upload RNTester App
111-
if: ${{ inputs.use-frameworks == 'StaticLibraries' && inputs.ruby-version == '2.6.10' }} # This is needed to avoid conflicts with the artifacts
117+
if: ${{ inputs.use-frameworks == 'false' && inputs.ruby-version == '2.6.10' }} # This is needed to avoid conflicts with the artifacts
112118
uses: actions/upload-artifact@v4.3.4
113119
with:
114120
name: RNTesterApp-NewArch-${{ inputs.flavor }}

.github/workflows/test-all.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,22 @@ jobs:
5858
ruby-version: "3.2.0"
5959
flavor: Debug
6060

61+
test_ios_rntester_dynamic_frameworks:
62+
runs-on: macos-15-large
63+
strategy:
64+
fail-fast: false
65+
matrix:
66+
flavor: [Debug, Release]
67+
steps:
68+
- name: Checkout
69+
uses: actions/checkout@v4
70+
- name: Run it
71+
uses: ./.github/actions/test-ios-rntester
72+
with:
73+
flavor: Debug
74+
use-frameworks: true
75+
76+
6177
test_ios_rntester:
6278
runs-on: macos-15-large
6379
needs:
@@ -67,7 +83,7 @@ jobs:
6783
fail-fast: false
6884
matrix:
6985
flavor: [Debug, Release]
70-
frameworks: [StaticLibraries, DynamicFrameworks]
86+
frameworks: [false, true]
7187
steps:
7288
- name: Checkout
7389
uses: actions/checkout@v4
@@ -441,7 +457,7 @@ jobs:
441457
strategy:
442458
matrix:
443459
flavor: [Debug, Release]
444-
use_frameworks: [StaticLibraries, DynamicFrameworks]
460+
use_frameworks: [false, true]
445461
exclude:
446462
# This config is tested with Ruby 3.2.0. Let's not double test it.
447463
- flavor: Debug

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## v0.83.0-rc.1
4+
5+
### Changed
6+
7+
- React Native DevTools: Remove network experiment and experimental icon, Add conditional disabling of features incompatible with multiple hosts ([19359ed095](https://github.com/facebook/react-native/commit/19359ed095059c5d6befcc7e2ff3472447680add) by [@huntie](https://github.com/huntie))
8+
- Bump HermesV1 versions ([79302df4de](https://github.com/facebook/react-native/commit/79302df4de1e4fb55ecfdcc4b9f4a7d6afa56810) by [@cipolleschi](https://github.com/cipolleschi))
9+
310
## v0.83.0-rc.0
411

512
### Breaking

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
"@jest/create-cache-key-function": "^29.7.0",
5959
"@microsoft/api-extractor": "^7.52.2",
6060
"@octokit/rest": "^22.0.0",
61-
"@react-native/metro-babel-transformer": "0.83.0-main",
62-
"@react-native/metro-config": "0.83.0-main",
61+
"@react-native/metro-babel-transformer": "0.84.0-main",
62+
"@react-native/metro-config": "0.84.0-main",
6363
"@tsconfig/node22": "22.0.2",
6464
"@types/react": "^19.1.0",
6565
"@typescript-eslint/parser": "^8.36.0",

packages/assets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native/assets-registry",
3-
"version": "0.83.0-main",
3+
"version": "0.84.0-main",
44
"description": "Asset support code for React Native.",
55
"license": "MIT",
66
"repository": {

packages/babel-plugin-codegen/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native/babel-plugin-codegen",
3-
"version": "0.83.0-main",
3+
"version": "0.84.0-main",
44
"description": "Babel plugin to generate native module and view manager code for React Native.",
55
"license": "MIT",
66
"repository": {
@@ -26,7 +26,7 @@
2626
],
2727
"dependencies": {
2828
"@babel/traverse": "^7.25.3",
29-
"@react-native/codegen": "0.83.0-main"
29+
"@react-native/codegen": "0.84.0-main"
3030
},
3131
"devDependencies": {
3232
"@babel/core": "^7.25.2"

packages/community-cli-plugin/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native/community-cli-plugin",
3-
"version": "0.83.0-main",
3+
"version": "0.84.0-main",
44
"description": "Core CLI commands for React Native",
55
"keywords": [
66
"react-native",
@@ -22,7 +22,7 @@
2222
"dist"
2323
],
2424
"dependencies": {
25-
"@react-native/dev-middleware": "0.83.0-main",
25+
"@react-native/dev-middleware": "0.84.0-main",
2626
"debug": "^4.4.0",
2727
"invariant": "^2.2.4",
2828
"metro": "^0.83.3",

packages/core-cli-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native/core-cli-utils",
3-
"version": "0.83.0-main",
3+
"version": "0.84.0-main",
44
"description": "React Native CLI library for Frameworks to build on",
55
"license": "MIT",
66
"main": "./src/index.flow.js",

packages/debugger-frontend/BUILD_INFO

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@generated SignedSource<<b62ff235444c99d1d66a64ceb11e3bad>>
2-
Git revision: d8824de5790a32c018ec9926a970daa7feb9a84c
1+
@generated SignedSource<<e06b1f2e62286749dc811af700de2391>>
2+
Git revision: e1dd7af9019d54f5a7b89d2ca09c2e63da02e76c
33
Built with --nohooks: false
44
Is local checkout: false
55
Remote URL: https://github.com/facebook/react-native-devtools-frontend

packages/debugger-frontend/dist/third-party/front_end/core/i18n/locales/en-US.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)