Skip to content

Commit 38e9c69

Browse files
Saadnajmij-piaseckiiwoplazamateoguzmanacortinico
authored
chore: merge up to 0.79-stable branch (#2620)
## Summary: Merge up to the first commit on `0.79-stable` branch from upstream (81e4901). <details> <summary>Full list files where conflicts had to be manually resolved</summary> - .gitignore - Gemfile - Gemfile.lock - 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/helloworld/Gemfile - packages/metro-config/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-typescript-test/package.json - packages/react-native-codegen/package.json - packages/react-native-fantom/package.json - packages/react-native-popup-menu-android/package.json - packages/react-native-test-library/package.json - packages/react-native/Libraries/Alert/Alert.js - packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h - packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm - packages/react-native/Libraries/Components/Button.js - packages/react-native/Libraries/Components/Pressable/Pressable.js - packages/react-native/Libraries/Components/ScrollView/ScrollView.js - packages/react-native/Libraries/Components/TextInput/TextInput.flow.js - packages/react-native/Libraries/Components/TextInput/TextInput.js - packages/react-native/Libraries/Components/TextInput/TextInputNativeCommands.js - packages/react-native/Libraries/Components/Touchable/Touchable.js - packages/react-native/Libraries/Components/Touchable/TouchableWithoutFeedback.js - packages/react-native/Libraries/Components/View/ViewPropTypes.js - packages/react-native/Libraries/Core/setUpAlert.js - packages/react-native/Libraries/Image/ImageProps.js - packages/react-native/Libraries/Lists/FillRateHelper.js - packages/react-native/Libraries/Lists/FlatList.js - packages/react-native/Libraries/Lists/SectionList.js - packages/react-native/Libraries/Lists/SectionListModern.js - packages/react-native/Libraries/Lists/ViewabilityHelper.js - packages/react-native/Libraries/Lists/VirtualizeUtils.js - packages/react-native/Libraries/Lists/VirtualizedList.js - packages/react-native/Libraries/Lists/VirtualizedListContext.js - packages/react-native/Libraries/Lists/VirtualizedSectionList.js - packages/react-native/Libraries/Modal/Modal.js - packages/react-native/Libraries/Network/RCTDataRequestHandler.mm - packages/react-native/Libraries/Network/RCTFileRequestHandler.mm - packages/react-native/Libraries/Pressability/Pressability.js - packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h - packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm - packages/react-native/Libraries/Text/TextProps.js - packages/react-native/Libraries/Types/CoreEventTypes.js - packages/react-native/Libraries/Utilities/Platform.flow.js - packages/react-native/Libraries/Utilities/ReactNativeTestTools.js - packages/react-native/Libraries/Utilities/__tests__/Platform-test.js - packages/react-native/Libraries/WebSocket/WebSocket.js - packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap - packages/react-native/React/CoreModules/RCTAccessibilityManager.mm - packages/react-native/React/CoreModules/RCTAppearance.mm - packages/react-native/React/CoreModules/RCTDevSettings.mm - packages/react-native/React/CoreModules/RCTDeviceInfo.mm - packages/react-native/React/CoreModules/RCTPlatform.mm - packages/react-native/React/CoreModules/RCTStatusBarManager.mm - packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm - packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm - packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm - packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm - packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm - packages/react-native/React/Fabric/Utils/RCTBoxShadow.mm - packages/react-native/React/Fabric/Utils/RCTLinearGradient.mm - packages/react-native/React/UIUtils/RCTUIUtils.h - packages/react-native/React/UIUtils/RCTUIUtils.m - packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/propsConversions.h - packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm - packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h - packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.mm - packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm - packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h - packages/react-native/index.js - packages/react-native/package.json - packages/react-native/scripts/cocoapods/new_architecture.rb - packages/react-native/src/private/inspector/NetworkOverlay.js - packages/react-native/src/private/specs_DEPRECATED/modules/NativeAlertManager.js - packages/rn-tester/Gemfile - packages/rn-tester/Podfile.lock - packages/rn-tester/RNTester/AppDelegate.h - packages/rn-tester/RNTester/AppDelegate.mm - packages/rn-tester/js/examples/FlatList/FlatList-basic.js - packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js - packages/rn-tester/js/types/RNTesterTypes.js - packages/rn-tester/package.json - packages/typescript-config/package.json - packages/virtualized-lists/Lists/VirtualizedListProps.js - packages/virtualized-lists/package.json - yarn.lock </details> ## Test Plan: Run RNTester locally <img width="1392" height="888" alt="image" src="https://github.com/user-attachments/assets/3a60d6b4-44ea-497d-9e63-cb04607cd7c3" /> --------- Co-authored-by: Jakub Piasecki <[email protected]> Co-authored-by: Iwo Plaza <[email protected]> Co-authored-by: Mateo Guzmán <[email protected]> Co-authored-by: Nicola Corti <[email protected]> Co-authored-by: Dawid Małecki <[email protected]> Co-authored-by: Pieter De Baets <[email protected]> Co-authored-by: Samuel Susla <[email protected]> Co-authored-by: Joe Vilches <[email protected]> Co-authored-by: David Vacca <[email protected]> Co-authored-by: Sam Zhou <[email protected]> Co-authored-by: Nick Gerleman <[email protected]> Co-authored-by: Riccardo Cipolleschi <[email protected]> Co-authored-by: Vitali Zaidman <[email protected]> Co-authored-by: Andrew Datsenko <[email protected]> Co-authored-by: Rob Hogan <[email protected]> Co-authored-by: Dark Knight <> Co-authored-by: chrsmys <[email protected]> Co-authored-by: Shawn Dempsey <[email protected]> Co-authored-by: Eric Rozell <[email protected]> Co-authored-by: Marc Rousavy <[email protected]> Co-authored-by: Liron Yahdav <[email protected]> Co-authored-by: Fabrizio Cucci <[email protected]> Co-authored-by: Jon Thysell <[email protected]> Co-authored-by: Douglas Lowder <[email protected]> Co-authored-by: Alan Lee <[email protected]> Co-authored-by: Rubén Norte <[email protected]> Co-authored-by: Phil Pluckthun <[email protected]> Co-authored-by: Samat Osmonov <[email protected]> Co-authored-by: Janic Duplessis <[email protected]> Co-authored-by: Henry Garant <[email protected]> Co-authored-by: Jack Pope <[email protected]> Co-authored-by: Devan Buggay <[email protected]> Co-authored-by: Jakub Piasecki <[email protected]> Co-authored-by: zhongwuzw <[email protected]> Co-authored-by: Olivier Bouillet <[email protected]> Co-authored-by: Ruslan Lesiutin <[email protected]> Co-authored-by: Rick Hanlon <[email protected]> Co-authored-by: Shawn Dempsey <[email protected]> Co-authored-by: Maddie Lord <[email protected]> Co-authored-by: Soe Lynn <[email protected]> Co-authored-by: Julian Tigler <[email protected]> Co-authored-by: Parsa Nasirimehr <[email protected]> Co-authored-by: Peter Hsieh <[email protected]> Co-authored-by: Intl Scheduler <[email protected]> Co-authored-by: Oskar Kwaśniewski <[email protected]> Co-authored-by: Joanna Qu <[email protected]> Co-authored-by: Christian Falch <[email protected]> Co-authored-by: Nick Lefever <[email protected]> Co-authored-by: Kudo Chien <[email protected]> Co-authored-by: Alex Taylor (alta) <[email protected]> Co-authored-by: Jorge Cabiedes Acosta <[email protected]> Co-authored-by: generatedunixname89002005232357 <[email protected]> Co-authored-by: Alex Hunt <[email protected]> Co-authored-by: Saad Najmi <[email protected]>
2 parents f6c5b4a + 89f1399 commit 38e9c69

File tree

1,943 files changed

+80078
-33977
lines changed

Some content is hidden

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

1,943 files changed

+80078
-33977
lines changed

.circleci/README.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

.circleci/config.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ packages/react-native/Libraries/vendor/**/*
1010
node_modules/
1111
packages/*/node_modules
1212
packages/*/dist
13+
packages/*/types_generated
1314
packages/debugger-frontend/dist/**/*
1415
packages/react-native-codegen/lib
1516
tools/eslint/rules/sort-imports.js

.eslintrc.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ module.exports = {
3535
'no-undef': 0,
3636
},
3737
},
38+
{
39+
files: [
40+
'./packages/react-native/**/*.{js,flow}',
41+
'./packages/assets/registry.js',
42+
],
43+
parser: 'hermes-eslint',
44+
rules: {
45+
'lint/no-commonjs-exports': 1,
46+
},
47+
},
3848
{
3949
files: ['package.json'],
4050
parser: 'jsonc-eslint-parser',

.flowconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
flow-typed/
4242
packages/react-native/interface.js
4343
packages/react-native/flow/
44+
packages/react-native/src/types/
4445

4546
[options]
4647
enums=true
@@ -95,4 +96,4 @@ untyped-import
9596
untyped-type-import
9697

9798
[version]
98-
^0.258.1
99+
^0.262.0

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ body:
6969
- type: textarea
7070
id: react-native-info
7171
attributes:
72-
label: Output of `npx react-native info`
73-
description: Run `npx react-native info` in your terminal, copy and paste the results here.
72+
label: Output of `npx @react-native-community/cli info`
73+
description: Run `npx @react-native-community/cli info` in your terminal, copy and paste the results here.
7474
placeholder: |
75-
Paste the output of `npx react-native info` here. The output looks like:
75+
Paste the output of `npx @react-native-community/cli info` here. The output looks like:
7676
...
7777
System:
7878
OS: macOS 14.1.1

.github/ISSUE_TEMPLATE/debugger_bug_report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ body:
4848
- type: textarea
4949
id: react-native-info
5050
attributes:
51-
label: Output of `npx react-native info`
52-
description: Run `npx react-native info` in your terminal, copy and paste the results here.
51+
label: Output of `npx @react-native-community/cli info`
52+
description: Run `npx @react-native-community/cli info` in your terminal, copy and paste the results here.
5353
placeholder: |
54-
Paste the output of `npx react-native info` here. The output looks like:
54+
Paste the output of `npx @react-native-community/cli info` here. The output looks like:
5555
...
5656
System:
5757
OS: macOS 14.1.1

.github/ISSUE_TEMPLATE/new_architecture_bug_report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ body:
8181
- type: textarea
8282
id: react-native-info
8383
attributes:
84-
label: Output of `npx react-native info`
85-
description: Run `npx react-native info` in your terminal, copy and paste the results here.
84+
label: Output of `npx @react-native-community/cli info`
85+
description: Run `npx @react-native-community/cli info` in your terminal, copy and paste the results here.
8686
placeholder: |
87-
Paste the output of `npx react-native info` here. The output looks like:
87+
Paste the output of `npx @react-native-community/cli info` here. The output looks like:
8888
...
8989
System:
9090
OS: macOS 14.1.1

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ inputs:
77
run-e2e-tests:
88
default: 'false'
99
description: If we need to build to run E2E tests. If yes, we need to build also x86.
10+
gradle-cache-encryption-key:
11+
description: "The encryption key needed to store the Gradle Configuration cache"
1012
runs:
1113
using: composite
1214
steps:
@@ -20,12 +22,11 @@ runs:
2022
- name: Set React Native Version
2123
shell: bash
2224
run: node ./scripts/releases/set-rn-artifacts-version.js --build-type ${{ inputs.release-type }}
23-
# We don't want to re-set the artifacts version if we're on the release branch.
24-
if: ${{ !contains(github.ref, '-stable') }}
2525
- name: Setup gradle
2626
uses: ./.github/actions/setup-gradle
2727
with:
2828
cache-read-only: "false"
29+
cache-encryption-key: ${{ inputs.gradle-cache-encryption-key }}
2930
- name: Restore Android ccache
3031
uses: actions/cache/restore@v4
3132
with:

.github/actions/build-npm-package/action.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ inputs:
1111
required: false
1212
description: The GHA npm token, required only to publish to npm
1313
default: ''
14+
gradle-cache-encryption-key:
15+
description: The encryption key needed to store the Gradle Configuration cache
16+
1417
runs:
1518
using: composite
1619
steps:
@@ -98,10 +101,21 @@ runs:
98101
cp ${{ inputs.hermes-ws-dir }}/hermes-runtime-darwin/hermes-ios-Release.tar.gz ./packages/react-native/ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
99102
cp ${{ inputs.hermes-ws-dir }}/dSYM/Debug/hermes.framework.dSYM ./packages/react-native/ReactAndroid/external-artifacts/artifacts/hermes-framework-dSYM-debug.tar.gz
100103
cp ${{ inputs.hermes-ws-dir }}/dSYM/Release/hermes.framework.dSYM ./packages/react-native/ReactAndroid/external-artifacts/artifacts/hermes-framework-dSYM-release.tar.gz
104+
- name: Download ReactNativeDependencies
105+
uses: actions/download-artifact@v4
106+
with:
107+
pattern: ReactNativeDependencies*
108+
path: ./packages/react-native/ReactAndroid/external-artifacts/artifacts
109+
merge-multiple: true
110+
- name: Print Artifacts Directory
111+
shell: bash
112+
run: ls -lR ./packages/react-native/ReactAndroid/external-artifacts/artifacts/
101113
- name: Setup node.js
102114
uses: ./.github/actions/setup-node
103115
- name: Setup gradle
104116
uses: ./.github/actions/setup-gradle
117+
with:
118+
cache-encryption-key: ${{ inputs.gradle-cache-encryption-key }}
105119
- name: Install dependencies
106120
uses: ./.github/actions/yarn-install
107121
- name: Build packages

0 commit comments

Comments
 (0)