Skip to content

Commit 8e82444

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/android-font-scale-layout
2 parents 0dc3215 + 549e4e2 commit 8e82444

76 files changed

Lines changed: 460 additions & 743 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.

.flowconfig

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,8 @@ packages/react-native/interface.js
4343
packages/react-native/flow/
4444

4545
[options]
46-
enums=true
47-
experimental.pattern_matching=true
48-
experimental.allow_variance_keywords=true
49-
casting_syntax=both
50-
component_syntax=true
51-
5246
emoji=true
5347

54-
exact_by_default=true
55-
5648
format.bracket_spacing=false
5749

5850
module.file_ext=.js
@@ -73,6 +65,9 @@ module.system.haste.module_ref_prefix=m#
7365

7466
react.runtime=automatic
7567

68+
experimental.deprecated_utilities.excludes=<PROJECT_ROOT>/packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js
69+
experimental.deprecated_utilities.excludes=<PROJECT_ROOT>/packages/react-native/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
70+
experimental.deprecated_utilities.excludes=<PROJECT_ROOT>/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js
7671
ban_spread_key_props=true
7772

7873
[lints]
@@ -96,4 +91,4 @@ untyped-import
9691
untyped-type-import
9792

9893
[version]
99-
^0.317.0
94+
^0.318.0

.github/workflows/analyze-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
analyze_pr:
1313
runs-on: ubuntu-latest
14-
if: github.repository == 'facebook/react-native'
14+
if: github.repository == 'react/react-native'
1515
steps:
1616
- name: Check out main branch
1717
uses: actions/checkout@v6

.github/workflows/api-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
api_changes:
1212
runs-on: ubuntu-latest
13-
if: github.repository == 'facebook/react-native'
13+
if: github.repository == 'react/react-native'
1414
steps:
1515
- name: Check out main branch
1616
uses: actions/checkout@v6

.github/workflows/cache-reaper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
cache-cleaner:
11-
if: github.repository == 'facebook/react-native'
11+
if: github.repository == 'react/react-native'
1212
runs-on: ubuntu-latest
1313
env:
1414
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-for-reproducer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
check-for-reproducer:
99
runs-on: ubuntu-latest
1010
if: |
11-
github.repository == 'facebook/react-native' && github.event.issue.pull_request == null && github.event.issue.state == 'open' && !contains(github.event.issue.labels.*.name, ':open_umbrella: Umbrella')
11+
github.repository == 'react/react-native' && github.event.issue.pull_request == null && github.event.issue.state == 'open' && !contains(github.event.issue.labels.*.name, ':open_umbrella: Umbrella')
1212
steps:
1313
- uses: actions/checkout@v6
1414
- uses: actions/github-script@v8

.github/workflows/close-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
jobs:
1010
comment-and-label:
1111
runs-on: ubuntu-latest
12-
if: github.repository == 'facebook/react-native'
12+
if: github.repository == 'react/react-native'
1313
steps:
1414
- uses: actions/github-script@v8
1515
with:

.github/workflows/create-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
jobs:
2121
create_release:
22-
if: github.repository == 'facebook/react-native'
22+
if: github.repository == 'react/react-native'
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Checkout

.github/workflows/e2e-android-templateapp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
echo "Feed maven local to gradle.properties"
6868
cd /tmp/RNTestProject
69-
echo "\nreact.internal.mavenLocalRepo=$MAVEN_LOCAL" >> android/gradle.properties
69+
echo -e "\nreact.internal.mavenLocalRepo=$MAVEN_LOCAL" >> android/gradle.properties
7070
7171
# Build
7272
cd android

.github/workflows/monitor-new-issues.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
monitor-issues:
1414
runs-on: ubuntu-latest
15-
if: github.repository == 'facebook/react-native'
15+
if: github.repository == 'react/react-native'
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v6
@@ -34,7 +34,7 @@ jobs:
3434
git_secret: ${{ secrets.GITHUB_TOKEN }}
3535
notifier: "discord"
3636
fetch_data_interval: 6
37-
repo_owner: "facebook"
37+
repo_owner: "react"
3838
repo_name: "react-native"
3939
discord_webhook_url: "${{ secrets.DISCORD_WEBHOOK_URL }}"
4040
discord_id_type: "user"

.github/workflows/needs-attention.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
issues: write # for react-native-community/needs-attention to label issues
1515
name: Apply Needs Attention Label
1616
runs-on: ubuntu-latest
17-
if: github.repository == 'facebook/react-native'
17+
if: github.repository == 'react/react-native'
1818
steps:
1919
- uses: actions/checkout@v6
2020
- name: Apply Needs Attention Label

0 commit comments

Comments
 (0)