Skip to content

Commit d0d593f

Browse files
committed
Merge branch 'main' into text-input-errors-improvements
2 parents 86fb537 + 8ea1cba commit d0d593f

File tree

445 files changed

+7057
-7676
lines changed

Some content is hidden

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

445 files changed

+7057
-7676
lines changed

.circleci/config.yml

Lines changed: 115 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ references:
3434
attach_workspace:
3535
at: *hermes_workspace_root
3636

37+
main_only: &main_only
38+
filters:
39+
branches:
40+
only: main
41+
main_or_stable_only: &main_or_stable_only
42+
filters:
43+
branches:
44+
only:
45+
- main
46+
- /0\.[0-9]+[\.[0-9]+]?-stable/
47+
48+
3749
# -------------------------
3850
# Dependency Anchors
3951
# -------------------------
@@ -120,6 +132,8 @@ executors:
120132
macos:
121133
xcode: *xcode_version
122134
resource_class: macos.x86.medium.gen2
135+
environment:
136+
- BUILD_FROM_SOURCE: true
123137

124138
# -------------------------
125139
# COMMANDS
@@ -848,35 +862,6 @@ jobs:
848862
- PROJECT_NAME: "iOSTemplateProject"
849863
- HERMES_WS_DIR: *hermes_workspace_root
850864
steps:
851-
# Early exit in case of Release and WithFlipper. The two does not make sense together.
852-
# Unfortunately, the `exclude` parameter of `matrix` does not work, so we have to do it manually.
853-
- when:
854-
condition:
855-
and:
856-
- equal: [ << parameters.flavor >>, "Release"]
857-
- equal: [ << parameters.flipper >>, "WithFlipper" ]
858-
steps:
859-
- run:
860-
command: circleci-agent step halt # this interrupts the job successfully.
861-
# use_frameworks! does not works with Flipper enabled
862-
- when:
863-
condition:
864-
and:
865-
- equal: [ << parameters.use_frameworks >>, "StaticFrameworks"]
866-
- equal: [ << parameters.flipper >>, "WithFlipper" ]
867-
steps:
868-
- run:
869-
command: circleci-agent step halt # this interrupts the job successfully.
870-
# use_frameworks! does not works with the New Architecture enabled
871-
- when:
872-
condition:
873-
and:
874-
- equal: [ << parameters.use_frameworks >>, "StaticFrameworks"]
875-
- equal: [ << parameters.architecture >>, "NewArch" ]
876-
steps:
877-
- run:
878-
command: circleci-agent step halt # this interrupts the job successfully.
879-
# Valid configuration, we can continue
880865
- checkout_code_with_cache
881866
- run_yarn
882867
- attach_workspace:
@@ -1130,6 +1115,7 @@ jobs:
11301115
environment:
11311116
- HERMES_WS_DIR: *hermes_workspace_root
11321117
- HERMES_VERSION_FILE: "sdks/.hermesversion"
1118+
- BUILD_FROM_SOURCE: true
11331119
steps:
11341120
- run:
11351121
name: Install dependencies
@@ -1412,7 +1398,7 @@ jobs:
14121398
- run_yarn
14131399
- add_ssh_keys:
14141400
fingerprints:
1415-
- "1c:98:e0:3a:52:79:95:29:12:cd:b4:87:5b:41:e2:bb"
1401+
- "1f:c7:61:c4:e2:ff:77:e3:cc:ca:a7:34:c2:79:e3:3c"
14161402
- brew_install:
14171403
package: cmake
14181404
- run:
@@ -1480,10 +1466,6 @@ jobs:
14801466
- equal: [ "nightly", << parameters.release_type >> ]
14811467
steps:
14821468
- run: echo "//registry.npmjs.org/:_authToken=${CIRCLE_NPM_TOKEN}" > ~/.npmrc
1483-
- run: |
1484-
git config --global user.email "react-native-bot@users.noreply.github.com"
1485-
git config --global user.name "npm Deployment Script"
1486-
echo "machine github.com login react-native-bot password $GITHUB_TOKEN" > ~/.netrc
14871469
# END: Stables and nightlies
14881470

14891471
- run: node ./scripts/publish-npm.js --<< parameters.release_type >>
@@ -1545,7 +1527,7 @@ jobs:
15451527
command: |
15461528
curl -X POST https://api.github.com/repos/react-native-community/rn-diff-purge/dispatches \
15471529
-H "Accept: application/vnd.github.v3+json" \
1548-
-u "$PAT_USERNAME:$PAT_TOKEN" \
1530+
-H "Authorization: Bearer $REACT_NATIVE_BOT_GITHUB_TOKEN" \
15491531
-d "{\"event_type\": \"publish\", \"client_payload\": { \"version\": \"${CIRCLE_TAG:1}\" }}"
15501532
# END: Stable releases
15511533

@@ -1561,6 +1543,17 @@ jobs:
15611543
command: |
15621544
echo "Nightly build run"
15631545
1546+
find_and_publish_bumped_packages:
1547+
executor: reactnativeandroid
1548+
steps:
1549+
- checkout
1550+
- run:
1551+
name: Set NPM auth token
1552+
command: echo "//registry.npmjs.org/:_authToken=${CIRCLE_NPM_TOKEN}" > ~/.npmrc
1553+
- run:
1554+
name: Find and publish all bumped packages
1555+
command: node ./scripts/monorepo/find-and-publish-all-bumped-packages.js
1556+
15641557

15651558
# -------------------------
15661559
# PIPELINE PARAMETERS
@@ -1634,6 +1627,87 @@ workflows:
16341627
jsengine: ["Hermes", "JSC"]
16351628
flipper: ["WithFlipper", "WithoutFlipper"]
16361629
use_frameworks: [ "StaticLibraries", "StaticFrameworks" ] #TODO: make it works with DynamicFrameworks
1630+
exclude:
1631+
- architecture: "NewArch"
1632+
flavor: "Release"
1633+
jsengine: "Hermes"
1634+
flipper: "WithFlipper"
1635+
use_frameworks: "StaticLibraries"
1636+
- architecture: "NewArch"
1637+
flavor: "Release"
1638+
jsengine: "Hermes"
1639+
flipper: "WithFlipper"
1640+
use_frameworks: "StaticFrameworks"
1641+
- architecture: "NewArch"
1642+
flavor: "Release"
1643+
jsengine: "Hermes"
1644+
flipper: "WithoutFlipper"
1645+
use_frameworks: "StaticFrameworks"
1646+
- architecture: "NewArch"
1647+
flavor: "Release"
1648+
jsengine: "JSC"
1649+
flipper: "WithFlipper"
1650+
use_frameworks: "StaticLibraries"
1651+
- architecture: "NewArch"
1652+
flavor: "Release"
1653+
jsengine: "JSC"
1654+
flipper: "WithFlipper"
1655+
use_frameworks: "StaticFrameworks"
1656+
- architecture: "NewArch"
1657+
flavor: "Release"
1658+
jsengine: "JSC"
1659+
flipper: "WithoutFlipper"
1660+
use_frameworks: "StaticFrameworks"
1661+
- architecture: "OldArch"
1662+
flavor: "Release"
1663+
jsengine: "Hermes"
1664+
flipper: "WithFlipper"
1665+
use_frameworks: "StaticLibraries"
1666+
- architecture: "OldArch"
1667+
flavor: "Release"
1668+
jsengine: "Hermes"
1669+
flipper: "WithFlipper"
1670+
use_frameworks: "StaticFrameworks"
1671+
- architecture: "OldArch"
1672+
flavor: "Release"
1673+
jsengine: "JSC"
1674+
flipper: "WithFlipper"
1675+
use_frameworks: "StaticLibraries"
1676+
- architecture: "OldArch"
1677+
flavor: "Release"
1678+
jsengine: "JSC"
1679+
flipper: "WithFlipper"
1680+
use_frameworks: "StaticFrameworks"
1681+
- architecture: "NewArch"
1682+
flavor: "Debug"
1683+
jsengine: "Hermes"
1684+
flipper: "WithFlipper"
1685+
use_frameworks: "StaticFrameworks"
1686+
- architecture: "NewArch"
1687+
flavor: "Debug"
1688+
jsengine: "Hermes"
1689+
flipper: "WithoutFlipper"
1690+
use_frameworks: "StaticFrameworks"
1691+
- architecture: "NewArch"
1692+
flavor: "Debug"
1693+
jsengine: "JSC"
1694+
flipper: "WithFlipper"
1695+
use_frameworks: "StaticFrameworks"
1696+
- architecture: "NewArch"
1697+
flavor: "Debug"
1698+
jsengine: "JSC"
1699+
flipper: "WithoutFlipper"
1700+
use_frameworks: "StaticFrameworks"
1701+
- architecture: "OldArch"
1702+
flavor: "Debug"
1703+
jsengine: "Hermes"
1704+
flipper: "WithFlipper"
1705+
use_frameworks: "StaticFrameworks"
1706+
- architecture: "OldArch"
1707+
flavor: "Debug"
1708+
jsengine: "JSC"
1709+
flipper: "WithFlipper"
1710+
use_frameworks: "StaticFrameworks"
16371711
- test_ios_rntester:
16381712
requires:
16391713
- build_hermes_macos
@@ -1749,11 +1823,8 @@ workflows:
17491823
unless: << pipeline.parameters.run_package_release_workflow_only >>
17501824
triggers:
17511825
- schedule:
1826+
<<: *main_only
17521827
cron: "0 20 * * *"
1753-
filters:
1754-
branches:
1755-
only:
1756-
- main
17571828
jobs:
17581829
- nightly_job
17591830

@@ -1776,3 +1847,8 @@ workflows:
17761847
- build_hermesc_linux
17771848
- build_hermes_macos
17781849
- build_hermesc_windows
1850+
1851+
publish_bumped_packages:
1852+
jobs:
1853+
- find_and_publish_bumped_packages:
1854+
<<: *main_or_stable_only

.flowconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ untyped-import
7474
untyped-type-import
7575

7676
[version]
77-
^0.195.1
77+
^0.196.3

.flowconfig.android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ untyped-import
7474
untyped-type-import
7575

7676
[version]
77-
^0.195.1
77+
^0.196.3

.github/workflows/on-issue-labeled.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,22 @@ jobs:
163163
repo: context.repo.repo,
164164
labels: ['Needs: Author Feedback']
165165
})
166+
unsupported-version:
167+
runs-on: ubuntu-latest
168+
if: "${{ contains(github.event.label.name, 'Type: Unsupported Version') }}"
169+
steps:
170+
- uses: actions/github-script@v6
171+
with:
172+
script: |
173+
await github.rest.issues.createComment({
174+
issue_number: context.issue.number,
175+
owner: context.repo.owner,
176+
repo: context.repo.repo,
177+
body: `It looks like your issue or the example you provided uses an [unsupported version of React Native](https://github.com/reactwg/react-native-releases/blob/main/README.md#releases-support-policy). Due to the amount of issues we receive, we're currently accepting only new issues against one of the supported version. Please open your issue on [StackOverflow](https://stackoverflow.com/questions/tagged/react-native) to get further community support.`,
178+
})
179+
await github.rest.issues.addLabels({
180+
issue_number: context.issue.number,
181+
owner: context.repo.owner,
182+
repo: context.repo.repo,
183+
labels: ['Needs: Author Feedback']
184+
})

.github/workflows/stale-bot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,18 @@ jobs:
1717
stale-pr-message: 'This PR is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
1818
close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
1919
close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity.'
20+
stale-versions:
21+
runs-on: ubuntu-latest
22+
permissions:
23+
issues: write
24+
pull-requests: write
25+
steps:
26+
- uses: actions/stale@v5
27+
with:
28+
repo-token: ${{ secrets.GITHUB_TOKEN }}
29+
any-of-labels: 'Needs: Author Feedback'
30+
days-before-stale: 24
31+
stale-issue-message: 'This issue is stale because it has been open 24 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
32+
stale-pr-message: 'This PR is stale because it has been open 24 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
33+
close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
34+
close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity.'

BUCK

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,6 @@ rn_apple_xplat_cxx_library(
522522
react_fabric_component_plugin_provider("ScrollView", "RCTScrollViewCls"),
523523
react_fabric_component_plugin_provider("PullToRefreshView", "RCTPullToRefreshViewCls"),
524524
react_fabric_component_plugin_provider("ActivityIndicatorView", "RCTActivityIndicatorViewCls"),
525-
react_fabric_component_plugin_provider("Slider", "RCTSliderCls"),
526525
react_fabric_component_plugin_provider("Switch", "RCTSwitchCls"),
527526
react_fabric_component_plugin_provider("UnimplementedNativeView", "RCTUnimplementedNativeViewCls"),
528527
react_fabric_component_plugin_provider("Paragraph", "RCTParagraphCls"),
@@ -563,7 +562,6 @@ rn_apple_xplat_cxx_library(
563562
exported_deps = [
564563
react_native_xplat_target("react/renderer/animations:animations"),
565564
react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
566-
react_native_xplat_target("react/renderer/components/slider:slider"),
567565
react_native_xplat_target("react/renderer/components/safeareaview:safeareaview"),
568566
react_native_xplat_target("react/renderer/components/modal:modal"),
569567
react_native_xplat_target("react/renderer/components/unimplementedview:unimplementedview"),
@@ -1477,5 +1475,7 @@ rn_apple_xplat_cxx_library(
14771475
visibility = ["PUBLIC"],
14781476
deps = [
14791477
":FBReactNativeSpecJSI",
1478+
react_native_xplat_target("react/renderer/core:core"),
1479+
react_native_xplat_target("cxxreact:bridge"),
14801480
],
14811481
)

0 commit comments

Comments
 (0)