Skip to content

Commit 0191f94

Browse files
committed
Merge remote-tracking branch 'facebook/0.83-stable' into 0.83/saadnajmi/merge-0.83.10
# Conflicts: # .github/ISSUE_TEMPLATE.md # .gitignore # README.md # package.json # packages/assets/package.json # packages/babel-plugin-codegen/package.json # packages/community-cli-plugin/package.json # packages/core-cli-utils/package.json # packages/debugger-frontend/package.json # packages/dev-middleware/package.json # packages/eslint-config-react-native/package.json # packages/eslint-plugin-react-native/package.json # packages/eslint-plugin-specs/package.json # packages/gradle-plugin/package.json # packages/metro-config/package.json # packages/new-app-screen/package.json # packages/normalize-color/package.json # packages/polyfills/package.json # packages/react-native-babel-preset/package.json # packages/react-native-babel-transformer/package.json # packages/react-native-codegen/package.json # packages/react-native-compatibility-check/package.json # packages/react-native-popup-menu-android/package.json # packages/react-native/Package.swift # packages/react-native/React/CoreModules/RCTRedBox.mm # packages/react-native/React/CoreModules/RCTWebSocketModule.mm # packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm # packages/react-native/gradle/libs.versions.toml # packages/react-native/package.json # packages/react-native/sdks/.hermesv1version # packages/react-native/sdks/.hermesversion # packages/react-native/sdks/hermes-engine/version.properties # packages/react-native/third-party-podspecs/RCT-Folly.podspec # packages/react-native/third-party-podspecs/fmt.podspec # packages/rn-tester/Podfile.lock # packages/rn-tester/package.json # packages/typescript-config/package.json # packages/virtualized-lists/package.json # private/helloworld/package.json # private/react-native-codegen-typescript-test/package.json # scripts/releases/ios-prebuild/configuration.js # yarn.lock
2 parents 5db893a + ff4f96a commit 0191f94

434 files changed

Lines changed: 20349 additions & 10764 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/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ body:
1616
* If you're found a problem with our **documentation**, [report it here](https://github.com/facebook/react-native-website/issues/).
1717
* If you're having an issue with **Metro** (the bundler), [report it here](https://github.com/facebook/metro/issues/).
1818
* If you're using an external library, report the issue to the **library first**.
19-
* Please [search for similar issues](https://github.com/facebook/react-native/issues) in our issue tracker.
19+
* Please [search for similar issues](https://github.com/react/react-native/issues) in our issue tracker.
2020
2121
Make sure that your issue:
2222
* Have a **valid reproducer** (See [How to report a bug](https://reactnative.dev/contributing/how-to-report-a-bug)).
23-
* Is tested against the [**latest stable**](https://github.com/facebook/react-native/releases/) of React Native.
23+
* Is tested against the [**latest stable**](https://github.com/react/react-native/releases/) of React Native.
2424
2525
🚨 IMPORTANT: Due to the extreme number of bugs we receive, issues **without a reproducer** or for an [**unsupported versions**](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported) of React Native **will be closed**.
2626
- type: textarea

‎.github/ISSUE_TEMPLATE/debugger_bug_report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ body:
1616
* If you've found a problem with our **documentation**, [report it here](https://github.com/facebook/react-native-website/issues/).
1717
* If you're having an issue with **Metro** (the bundler), [report it here](https://github.com/facebook/metro/issues/).
1818
* If you're using an external library, report the issue to the **library first**.
19-
* Please [search for similar issues](https://github.com/facebook/react-native/issues) in our issue tracker.
19+
* Please [search for similar issues](https://github.com/react/react-native/issues) in our issue tracker.
2020
21-
Make sure that your issue is tested against the [**latest stable**](https://github.com/facebook/react-native/releases/) of React Native.
21+
Make sure that your issue is tested against the [**latest stable**](https://github.com/react/react-native/releases/) of React Native.
2222
- type: textarea
2323
id: description
2424
attributes:

‎.github/ISSUE_TEMPLATE/new_architecture_bug_report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ body:
1212
Thank you for taking the time to report an issue for [the New Architecture of React Native](https://reactnative.dev/docs/the-new-architecture/landing-page),
1313
your contribution will help make the framework better for everyone.
1414
15-
If you're **NOT** using the New Architecture, please use this [other bug type](https://github.com/facebook/react-native/issues/new?template=bug_report.yml).
15+
If you're **NOT** using the New Architecture, please use this [other bug type](https://github.com/react/react-native/issues/new?template=bug_report.yml).
1616
Do not attempt to open a bug in this category if you're not using the New Architecture as your bug will be closed.
1717
1818
Make sure that your issue:
1919
* Have a **valid reproducer** (See [How to report a bug](https://reactnative.dev/contributing/how-to-report-a-bug)).
20-
* Is tested against the [**latest stable**](https://github.com/facebook/react-native/releases/) of React Native.
20+
* Is tested against the [**latest stable**](https://github.com/react/react-native/releases/) of React Native.
2121
2222
🚨 IMPORTANT: Due to the extreme number of bugs we receive, issues **without a reproducer** or for an [**unsupported versions**](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported) of React Native **will be closed**.
2323
- type: textarea

‎.github/RELEASE_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ To help you upgrade to this version, you can use the [upgrade helper](https://re
2020

2121
---
2222

23-
See changes from this release in the [changelog PR](https://github.com/facebook/react-native/labels/%F0%9F%93%9D%20Changelog)
23+
See changes from this release in the [changelog PR](https://github.com/react/react-native/labels/%F0%9F%93%9D%20Changelog)

‎.github/SUPPORT.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The React Native website is hosted on a [separate repository](https://github.com
1515

1616
## 🐛 I found a bug in React Native.
1717

18-
If you want to report a reproducible bug or regression in the React Native library, you can [create a new issue](https://github.com/facebook/react-native/issues/new?labels=Type%3A+Bug+Report&template=bug_report.md). It's a good idea to look through [open issues](https://github.com/facebook/react-native/issues) before doing so, as someone else may have reported a similar issue.
18+
If you want to report a reproducible bug or regression in the React Native library, you can [create a new issue](https://github.com/react/react-native/issues/new?labels=Type%3A+Bug+Report&template=bug_report.md). It's a good idea to look through [open issues](https://github.com/react/react-native/issues) before doing so, as someone else may have reported a similar issue.
1919

2020

2121
## 🚀 I want to discuss the future of React Native.

‎.github/actions/build-android/action.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,19 @@ runs:
1616
uses: ./.github/actions/setup-node
1717
- name: Install node dependencies
1818
uses: ./.github/actions/yarn-install
19+
- name: Read current RNVersion
20+
shell: bash
21+
id: read-rn-version
22+
run: |
23+
echo "rn-version=$(cat packages/react-native/package.json | jq -r '.version')" >> $GITHUB_OUTPUT
1924
- name: Set React Native Version
2025
# We don't want to set the version for stable branches, because this has been
2126
# already set from the 'create release' commits on the release branch.
22-
if: ${{ !endsWith(github.ref_name, '-stable') }}
27+
# For testing RC.0, though, the version has not been set yet. In that case, we are on Stable branch and
28+
# it is the only case when the version is still 1000.0.0
29+
# We also skip this when the PR targets a stable branch (github.base_ref ends with '-stable'),
30+
# since the version is already set on the stable branch.
31+
if: ${{ !endsWith(github.ref_name, '-stable') && !endsWith(github.base_ref || '', '-stable') || endsWith(github.ref_name, '-stable') && steps.read-rn-version.outputs.rn-version == '1000.0.0' }}
2332
shell: bash
2433
run: node ./scripts/releases/set-rn-artifacts-version.js --build-type ${{ inputs.release-type }}
2534
- name: Setup gradle

‎.github/actions/test-ios-helloworld/action.yml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ inputs:
1010
flavor:
1111
description: The flavor of the build. Must be one of "Debug", "Release".
1212
default: Debug
13+
use-hermes-nightly:
14+
description: Whether to override pinned Hermes versions with the latest nightly
15+
required: false
16+
default: 'true'
1317
runs:
1418
using: composite
1519
steps:
@@ -26,25 +30,34 @@ runs:
2630
with:
2731
ruby-version: ${{ inputs.ruby-version }}
2832
- name: Set nightly Hermes versions
33+
if: ${{ inputs.use-hermes-nightly == 'true' }}
2934
shell: bash
3035
run: |
31-
node ./scripts/releases/use-hermes-nightly.js
36+
HERMES_VERSION=$(sed -n 's/^HERMES_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)
37+
if [ "$HERMES_VERSION" == "1000.0.0" ]; then
38+
node ./scripts/releases/use-hermes-nightly.js
39+
fi
3240
- name: Run yarn install again, with the correct hermes version
41+
if: ${{ inputs.use-hermes-nightly == 'true' }}
3342
uses: ./.github/actions/yarn-install
3443
- name: Download ReactNativeDependencies
44+
if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
3545
uses: actions/download-artifact@v4
3646
with:
3747
name: ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz
3848
path: /tmp/third-party
3949
- name: Print third-party folder
50+
if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
4051
shell: bash
4152
run: ls -lR /tmp/third-party
4253
- name: Download React Native Prebuilds
54+
if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
4355
uses: actions/download-artifact@v4
4456
with:
4557
name: ReactCore${{ inputs.flavor }}.xcframework.tar.gz
4658
path: /tmp/ReactCore
4759
- name: Print ReactCore folder
60+
if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
4861
shell: bash
4962
run: ls -lR /tmp/ReactCore
5063
- name: Install iOS dependencies - Configuration ${{ inputs.flavor }};
@@ -55,11 +68,11 @@ runs:
5568
5669
if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
5770
args+=(--frameworks dynamic)
71+
else
72+
export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
73+
export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
5874
fi
5975
60-
export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
61-
export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
62-
6376
yarn bootstrap ios "${args[@]}" | cat
6477
6578
- name: Run Helloworld tests

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ inputs:
1717
description: Whether we want to run E2E tests or not
1818
required: false
1919
default: false
20+
use-hermes-nightly:
21+
description: Whether to override pinned Hermes versions with the latest nightly
22+
required: false
23+
default: 'true'
2024

2125
runs:
2226
using: composite
@@ -34,38 +38,47 @@ runs:
3438
with:
3539
ruby-version: ${{ inputs.ruby-version }}
3640
- name: Set nightly Hermes versions
41+
if: ${{ inputs.use-hermes-nightly == 'true' }}
3742
shell: bash
3843
run: |
39-
node ./scripts/releases/use-hermes-nightly.js
44+
HERMES_VERSION=$(sed -n 's/^HERMES_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)
45+
if [ "$HERMES_VERSION" == "1000.0.0" ]; then
46+
node ./scripts/releases/use-hermes-nightly.js
47+
fi
4048
- name: Run yarn install again, with the correct hermes version
49+
if: ${{ inputs.use-hermes-nightly == 'true' }}
4150
uses: ./.github/actions/yarn-install
4251
- name: Prepare IOS Tests
4352
if: ${{ inputs.run-unit-tests == 'true' }}
4453
uses: ./.github/actions/prepare-ios-tests
4554
- name: Download ReactNativeDependencies
55+
if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
4656
uses: actions/download-artifact@v4
4757
with:
4858
name: ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz
4959
path: /tmp/third-party/
5060
- name: Print third-party folder
61+
if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
5162
shell: bash
5263
run: ls -lR /tmp/third-party
5364
- name: Download React Native Prebuilds
65+
if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
5466
uses: actions/download-artifact@v4
5567
with:
5668
name: ReactCore${{ inputs.flavor }}.xcframework.tar.gz
5769
path: /tmp/ReactCore
5870
- name: Print ReactCore folder
71+
if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
5972
shell: bash
6073
run: ls -lR /tmp/ReactCore
6174
- name: Install CocoaPods dependencies
6275
shell: bash
6376
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-
6777
if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
6878
export USE_FRAMEWORKS=dynamic
79+
else
80+
export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
81+
export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
6982
fi
7083
7184
cd packages/rn-tester

0 commit comments

Comments
 (0)