Skip to content

Commit f204f5d

Browse files
authored
Merge pull request #26 from Expensify/Rory-SyncWithUpstream
2 parents 546c4b4 + 07ea97c commit f204f5d

File tree

526 files changed

+20566
-5060
lines changed

Some content is hidden

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

526 files changed

+20566
-5060
lines changed

.circleci/config.yml

Lines changed: 101 additions & 123 deletions
Large diffs are not rendered by default.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
bots/node_modules
44
docs/generatedComponentApiDocs.js
55
flow/
6+
flow-typed/
67
Libraries/Renderer/*
78
Libraries/vendor/**/*
89
node_modules/

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
module.exports = {
1313
root: true,
1414

15-
extends: ['./packages/eslint-config-react-native-community/index.js'],
15+
extends: ['@react-native-community'],
1616

1717
plugins: ['@react-native/eslint-plugin-specs'],
1818

.flowconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ suppress_type=$FlowFixMeProps
5252
suppress_type=$FlowFixMeState
5353
suppress_type=$FlowFixMeEmpty
5454

55-
experimental.env_mode=resolved
55+
inference_mode=constrain_writes
5656

5757
[lints]
5858
sketchy-null-number=warn
@@ -74,4 +74,4 @@ untyped-import
7474
untyped-type-import
7575

7676
[version]
77-
^0.183.0
77+
^0.184.0

.flowconfig.android

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ suppress_type=$FlowFixMeProps
5252
suppress_type=$FlowFixMeState
5353
suppress_type=$FlowFixMeEmpty
5454

55-
experimental.env_mode=resolved
55+
inference_mode=constrain_writes
5656

5757
[lints]
5858
sketchy-null-number=warn
@@ -74,4 +74,4 @@ untyped-import
7474
untyped-type-import
7575

7676
[version]
77-
^0.183.0
77+
^0.184.0

.github/workflows/autorebase.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Automatic Rebase
2+
on:
3+
issue_comment:
4+
types: [created]
5+
jobs:
6+
rebase:
7+
name: Rebase
8+
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER')
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout the latest code
12+
uses: actions/checkout@v2
13+
with:
14+
token: ${{ secrets.GITHUB_TOKEN }}
15+
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
16+
- name: Automatic Rebase
17+
uses: cirrus-actions/[email protected]
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/danger_pr.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
11
name: Run Danger on PR
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types: [opened, edited, reopened, synchronize]
66

77
permissions:
8-
contents: read
8+
actions: write
9+
checks: write
10+
contents: write
11+
issues: write
12+
pull-requests: write
13+
statuses: write
914

1015
jobs:
1116
danger:
1217
runs-on: ubuntu-latest
1318
steps:
1419
- uses: actions/checkout@v3
15-
- run: yarn install
20+
- name: Run Yarn Install on Root
21+
run: yarn install
22+
working-directory: .
23+
- name: Run Yarn Install inside Bots
24+
run: yarn install
1625
working-directory: bots
1726
- name: Danger
18-
run: DANGER_GITHUB_API_TOKEN="$PUBLIC_PULLBOT_GITHUB_TOKEN_A""$PUBLIC_PULLBOT_GITHUB_TOKEN_B" yarn danger ci --use-github-checks --failOnErrors --id danger_pr
27+
run: yarn danger ci --use-github-checks --failOnErrors
1928
working-directory: bots
2029
env:
21-
PUBLIC_PULLBOT_GITHUB_TOKEN_A: a6edf8e8d40ce4e8b11a
22-
PUBLIC_PULLBOT_GITHUB_TOKEN_B: 150e1341f4dd9c944d2a
30+
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

BUCK

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ rn_xplat_cxx_library2(
110110
":RCTCxxUtils",
111111
":ReactInternal",
112112
"//fbobjc/Libraries/FBReactKit:RCTFBSystrace",
113-
"//xplat/folly:molly",
114113
react_native_root_target("React/CoreModules:CoreModules"),
115114
react_native_xplat_target("cxxreact:bridge"),
116115
react_native_xplat_target("cxxreact:jsbigstring"),
@@ -164,7 +163,6 @@ rn_xplat_cxx_library2(
164163
":RCTCxxUtils",
165164
":ReactInternal",
166165
"//xplat/fbsystrace:fbsystrace",
167-
"//xplat/folly:headers_only_do_not_use",
168166
react_native_xplat_target("cxxreact:module"),
169167
react_native_xplat_target("cxxreact:bridge"),
170168
react_native_xplat_target("reactperflogger:reactperflogger"),
@@ -201,7 +199,7 @@ rn_xplat_cxx_library2(
201199
preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
202200
visibility = ["PUBLIC"],
203201
deps = [
204-
"//xplat/folly:molly",
202+
"//xplat/folly:dynamic",
205203
],
206204
)
207205

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## v0.69.4
4+
5+
### Changed
6+
7+
- Upgrade RN CLI to v8.0.4 ([66c68c37ce](https://github.com/facebook/react-native/commit/66c68c37ce94f6c1160e7f260c0d1887539c6605) by [@thymikee](https://github.com/thymikee))
8+
9+
#### Android specific
10+
11+
- Modified **getDefaultJSExecutorFactory** method ([87cfd386cb](https://github.com/facebook/react-native/commit/87cfd386cb2e02bfa440c94706d9d0274f83070c) by [@KunalFarmah98](https://github.com/KunalFarmah98))
12+
313
## v0.69.3
414

515
### Fixed
@@ -250,6 +260,22 @@
250260

251261
- Encode URL params in URLSearchParams.toString() ([1042a8012f](https://github.com/facebook/react-native/commit/1042a8012fb472bd5c882b469fe507dd6279d562) by [@sshic](https://github.com/sshic))
252262

263+
## v0.68.3
264+
265+
### Changed
266+
267+
#### Android specific
268+
269+
- Let's not build reactnativeutilsjni shared library ([af9225ec5f](https://github.com/facebook/react-native/commit/af9225ec5fd22da802e3da4d786fa7f6ec956b0f) by [@SparshaSaha](https://github.com/SparshaSaha))
270+
- Modified **getDefaultJSExecutorFactory** method ([87cfd386cb](https://github.com/facebook/react-native/commit/87cfd386cb2e02bfa440c94706d9d0274f83070c) by [@KunalFarmah98](https://github.com/KunalFarmah98))
271+
272+
### Fixed
273+
274+
- Use monotonic clock for performance.now() ([114d31feee](https://github.com/facebook/react-native/commit/114d31feeeb47f5a57419e5088c3cbe9340f757a))
275+
276+
#### Android specific
277+
278+
- Logging a soft error when ReactRootView has an id other than -1 instead of crashing the app in hybrid apps ([1ca2c24930](https://github.com/facebook/react-native/commit/1ca2c2493027c1b027146cd41e17dd8a4fc33a41) by [@Kunal-Airtel2022](https://github.com/Kunal-Airtel2022))
253279

254280
## v0.68.2
255281

IntegrationTests/AccessibilityManagerTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import * as React from 'react';
1616
const {TestModule} = NativeModules;
1717

1818
class AccessibilityManagerTest extends React.Component<{...}> {
19-
componentDidMount() {
19+
componentDidMount(): void {
2020
invariant(
2121
NativeAccessibilityManager,
2222
"NativeAccessibilityManager doesn't exist",

0 commit comments

Comments
 (0)