Skip to content

Commit 79b8094

Browse files
intergalacticspacehighwayintergalacticspacehighway
committed
Merge remote-tracking branch 'origin/main' into android/sync-update-mode
# Conflicts: # packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt # packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt # packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt # packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt # packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt # packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt # packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp # packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h # packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp # packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h # packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp # packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h # packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h # packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDynamicProvider.h # packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h # packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp # packages/react-native/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h # packages/react-native/ReactCommon/react/renderer/core/State.h # packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js # packages/react-native/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js
2 parents 87fc3cf + 99d327c commit 79b8094

424 files changed

Lines changed: 6250 additions & 4874 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.

‎.eslintrc.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ module.exports = {
5151
files: [
5252
'./packages/react-native/Libraries/**/*.{js,flow}',
5353
'./packages/react-native/src/**/*.{js,flow}',
54-
'./packages/assets-registry/registry.js',
5554
],
5655
parser: 'flow-eslint',
5756
rules: {

‎.flowconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@ untyped-import
9696
untyped-type-import
9797

9898
[version]
99-
^0.333.0
99+
^0.334.0

‎.github/actions/download-artifact/action.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Download artifact with retries
2+
description: Downloads an artifact, retrying transient failures up to two times
3+
4+
inputs:
5+
name:
6+
description: Artifact name
7+
required: true
8+
path:
9+
description: Destination path
10+
required: true
11+
12+
outputs:
13+
download-path:
14+
description: Absolute path where the artifact was downloaded
15+
value: ${{ steps.download-3.outputs.download-path || steps.download-2.outputs.download-path || steps.download-1.outputs.download-path }}
16+
17+
runs:
18+
using: composite
19+
steps:
20+
- name: Download artifact (attempt 1 of 3)
21+
id: download-1
22+
if: ${{ always() }}
23+
continue-on-error: true
24+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
25+
with:
26+
name: ${{ inputs.name }}
27+
path: ${{ inputs.path }}
28+
29+
- name: Wait before attempt 2
30+
if: ${{ always() && steps.download-1.outcome == 'failure' }}
31+
shell: bash
32+
run: |
33+
echo "::warning::Artifact download failed; retrying in 10 seconds"
34+
sleep 10
35+
36+
- name: Download artifact (attempt 2 of 3)
37+
id: download-2
38+
if: ${{ always() && steps.download-1.outcome == 'failure' }}
39+
continue-on-error: true
40+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
41+
with:
42+
name: ${{ inputs.name }}
43+
path: ${{ inputs.path }}
44+
45+
- name: Wait before attempt 3
46+
if: ${{ always() && steps.download-2.outcome == 'failure' }}
47+
shell: bash
48+
run: |
49+
echo "::warning::Artifact download failed again; retrying in 20 seconds"
50+
sleep 20
51+
52+
- name: Download artifact (attempt 3 of 3)
53+
id: download-3
54+
if: ${{ always() && steps.download-2.outcome == 'failure' }}
55+
# Deliberately do not continue on error: the last failure must fail the caller.
56+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
57+
with:
58+
name: ${{ inputs.name }}
59+
path: ${{ inputs.path }}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@ runs:
4141
uses: ruby/setup-ruby@v1
4242
with:
4343
ruby-version: ${{ inputs.ruby-version }}
44+
bundler: none
45+
- name: Install Bundler
46+
shell: bash
47+
run: |
48+
BUNDLER_VERSION="$(awk '/BUNDLED WITH/{getline; print $1}' Gemfile.lock)"
49+
if [ -z "$BUNDLER_VERSION" ]; then
50+
echo "Could not determine Bundler version from Gemfile.lock." >&2
51+
exit 1
52+
fi
53+
for attempt in 1 2 3; do
54+
echo "Attempt $attempt of 3"
55+
if gem install bundler --version "$BUNDLER_VERSION" --no-document; then
56+
exit 0
57+
fi
58+
if [ "$attempt" -lt 3 ]; then
59+
echo "Attempt $attempt failed. Retrying..."
60+
sleep "$((attempt * 10))"
61+
fi
62+
done
63+
echo "All 3 attempts failed."
64+
exit 1
4465
- name: Set Hermes prebuilt version
4566
shell: bash
4667
run: |

‎.github/workflows/e2e-ios-rntester.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ jobs:
6060
steps:
6161
- id: check
6262
run: |
63-
if [[ "${{ needs.test.outputs.status }}" == "failure" ]]; then
63+
if [[ "${{ needs.test.result }}" != "success" ||
64+
"${{ needs.test.outputs.status }}" == "failure" ]]; then
6465
echo "status=failure" >> $GITHUB_OUTPUT
6566
else
6667
echo "status=success" >> $GITHUB_OUTPUT

‎.github/workflows/e2e-ios-templateapp.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ jobs:
3333
with:
3434
ruby-version: 2.6.10
3535
- name: Download React Native Package
36-
uses: actions/download-artifact@v7
36+
uses: ./.github/actions/download-artifact
3737
with:
3838
name: react-native-package
3939
path: /tmp/react-native-tmp
4040
- name: Print /tmp folder
4141
run: ls -lR /tmp/react-native-tmp
4242
- name: Download ReactNativeDependencies
43-
uses: actions/download-artifact@v7
43+
uses: ./.github/actions/download-artifact
4444
with:
4545
name: ReactNativeDependencies${{ matrix.flavor }}.xcframework.tar.gz
4646
path: /tmp/third-party
4747
- name: Print third-party folder
4848
shell: bash
4949
run: ls -lR /tmp/third-party
5050
- name: Download React Native Prebuilds
51-
uses: actions/download-artifact@v7
51+
uses: ./.github/actions/download-artifact
5252
with:
5353
name: ReactCore${{ matrix.flavor }}.xcframework.tar.gz
5454
path: /tmp/ReactCore
@@ -114,15 +114,15 @@ jobs:
114114
- name: Run yarn
115115
uses: ./.github/actions/yarn-install
116116
- name: Download app
117-
uses: actions/download-artifact@v7
117+
uses: ./.github/actions/download-artifact
118118
with:
119119
name: RNTestProject-${{ matrix.flavor }}
120120
path: /tmp/RNTestProjectBuild/RNTestProject.app
121121
- name: Check downloaded folder content
122122
run: ls -l /tmp/RNTestProjectBuild/RNTestProject.app
123123
- name: Download React Native Package
124124
if: ${{ matrix.flavor == 'Debug' }}
125-
uses: actions/download-artifact@v7
125+
uses: ./.github/actions/download-artifact
126126
with:
127127
name: react-native-package
128128
path: /tmp/react-native-tmp

‎.github/workflows/test-ios-spm-newapp.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,27 @@ jobs:
4040
# release/ artifact slots together (and `--download skip` refuses an
4141
# incomplete slot). Please don't "optimise" this down to one flavor.
4242
- name: Download ReactCore (Debug)
43-
uses: actions/download-artifact@v7
43+
uses: ./.github/actions/download-artifact
4444
with:
4545
name: ReactCoreDebug.xcframework.tar.gz
4646
path: /tmp/rc-debug
4747
- name: Download ReactCore (Release)
48-
uses: actions/download-artifact@v7
48+
uses: ./.github/actions/download-artifact
4949
with:
5050
name: ReactCoreRelease.xcframework.tar.gz
5151
path: /tmp/rc-release
5252
- name: Download ReactNativeDependencies (Debug)
53-
uses: actions/download-artifact@v7
53+
uses: ./.github/actions/download-artifact
5454
with:
5555
name: ReactNativeDependenciesDebug.xcframework.tar.gz
5656
path: /tmp/deps-debug
5757
- name: Download ReactNativeDependencies (Release)
58-
uses: actions/download-artifact@v7
58+
uses: ./.github/actions/download-artifact
5959
with:
6060
name: ReactNativeDependenciesRelease.xcframework.tar.gz
6161
path: /tmp/deps-release
6262
- name: Download React Native package
63-
uses: actions/download-artifact@v7
63+
uses: ./.github/actions/download-artifact
6464
with:
6565
name: react-native-package
6666
path: /tmp/react-native-tmp

‎flow-typed/environment/node.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ declare module 'buffer' {
213213

214214
declare function isAscii(input: Buffer | ArrayBuffer | $TypedArray): boolean;
215215

216-
declare function resolveObjectURL(id: string): Blob | void;
216+
declare function resolveObjectURL(id: string): globalThis.Blob | void;
217217

218218
declare var Buffer: Node$Buffer;
219219
declare var Blob: typeof globalThis.Blob;

‎flow-typed/npm/commander_v12.x.x.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ declare module 'commander' {
1717
declare type LiteralUnion<LiteralType, BaseType: string | number> =
1818
LiteralType | {...BaseType, ...{[key: empty]: empty, ...}};
1919

20-
declare export class CommanderError mixins Error {
20+
declare export class CommanderError extends Error {
2121
code: string;
2222
exitCode: number;
2323
message: string;

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@
9595
"eslint-plugin-redundant-undefined": "^0.4.0",
9696
"eslint-plugin-relay": "^1.8.3",
9797
"fb-dotslash": "0.5.8",
98-
"flow-api-translator": "0.331.0",
99-
"flow-bin": "^0.333.0",
100-
"flow-eslint": "0.331.0",
101-
"flow-parser": "0.331.0",
102-
"flow-transform": "0.331.0",
98+
"flow-api-translator": "0.333.0",
99+
"flow-bin": "^0.334.0",
100+
"flow-eslint": "0.333.0",
101+
"flow-parser": "0.333.0",
102+
"flow-transform": "0.333.0",
103103
"google-java-format": "1.4.0",
104104
"ini": "^5.0.0",
105105
"inquirer": "^7.1.0",
@@ -140,7 +140,7 @@
140140
"@xmldom/xmldom": "^0.8.13",
141141
"fast-xml-parser": "^4.5.6",
142142
"yaml": "^2.8.3",
143-
"fast-uri": "^3.1.2",
143+
"fast-uri": "^3.1.6",
144144
"shell-quote": "1.9.0"
145145
}
146146
}

0 commit comments

Comments
 (0)