Skip to content

Commit 6535d11

Browse files
Merge branch 'master' into annotations-compiler
2 parents 03d7adf + 111aab5 commit 6535d11

File tree

1,157 files changed

+19678
-13655
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,157 files changed

+19678
-13655
lines changed

.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ function e2e_suite() {
199199
return 1
200200
fi
201201

202-
echo "Starting packager server"
202+
echo "Starting Metro"
203203
npm start >> /dev/null &
204204
SERVER_PID=$!
205205
sleep 15

.circleci/config.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ commands:
122122
description: Homebrew package to install
123123
type: string
124124
steps:
125-
- run:
125+
- run:
126126
name: "Brew: Install << parameters.package >>"
127127
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install << parameters.package >> >/dev/null
128128

@@ -411,7 +411,7 @@ jobs:
411411
name: Fetch CocoaPods Specs
412412
command: |
413413
curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
414-
- run:
414+
- run:
415415
name: Setup the CocoaPods environment
416416
command: pod setup
417417

@@ -430,7 +430,7 @@ jobs:
430430
- when:
431431
condition: << parameters.run_unit_tests >>
432432
steps:
433-
- run:
433+
- run:
434434
name: "Run Tests: iOS Unit and Integration Tests"
435435
command: yarn test-ios
436436
# Runs iOS Detox e2e tests
@@ -474,7 +474,7 @@ jobs:
474474
parameters:
475475
run_disabled_tests:
476476
type: boolean
477-
default: false
477+
default: false
478478
steps:
479479
- restore_cache_checkout:
480480
checkout_type: android
@@ -498,8 +498,8 @@ jobs:
498498
# Keep configuring Android dependencies while AVD boots up
499499

500500
- run:
501-
name: Install rsync
502-
command: apt-get update -y && apt-get install rsync -y
501+
name: Install rsync, zip
502+
command: apt-get update -y && apt-get install rsync zip -y
503503

504504
# Install Buck
505505
- install_buck_tooling
@@ -607,7 +607,7 @@ jobs:
607607
- ANDROID_HOME: "C:\\Android\\android-sdk"
608608
- ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\19.2.5345600"
609609
- ANDROID_BUILD_VERSION: 28
610-
- ANDROID_TOOLS_VERSION: 29.0.2
610+
- ANDROID_TOOLS_VERSION: 29.0.3
611611
- GRADLE_OPTS: -Dorg.gradle.daemon=false
612612
- NDK_VERSION: 19.2.5345600
613613
steps:
@@ -783,18 +783,18 @@ workflows:
783783
run_unit_tests: true
784784
requires:
785785
- setup_ios
786-
- test_ios:
787-
name: test_ios_detox
788-
run_disabled_tests: false
789-
run_detox_tests: true
790-
requires:
791-
- setup_ios
792-
- test_ios:
793-
name: test_ios_detox_frameworks
794-
use_frameworks: true
795-
run_detox_tests: true
796-
requires:
797-
- setup_ios
786+
# - test_ios:
787+
# name: test_ios_detox
788+
# run_disabled_tests: false
789+
# run_detox_tests: true
790+
# requires:
791+
# - setup_ios
792+
# - test_ios:
793+
# name: test_ios_detox_frameworks
794+
# use_frameworks: true
795+
# run_detox_tests: true
796+
# requires:
797+
# - setup_ios
798798
- test_js:
799799
name: test_js_prev_lts
800800
executor: nodeprevlts

.flowconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ suppress_type=$FlowFixMeProps
5454
suppress_type=$FlowFixMeState
5555
suppress_type=$FlowFixMeEmpty
5656

57-
experimental.well_formed_exports=true
58-
experimental.types_first=true
57+
well_formed_exports=true
58+
types_first=true
5959
experimental.abstract_locations=true
6060

6161
[lints]
@@ -81,4 +81,4 @@ untyped-import
8181
untyped-type-import
8282

8383
[version]
84-
^0.125.0
84+
^0.130.0

.flowconfig.android

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ suppress_type=$FlowFixMeProps
5454
suppress_type=$FlowFixMeState
5555
suppress_type=$FlowFixMeEmpty
5656

57-
experimental.well_formed_exports=true
58-
experimental.types_first=true
57+
well_formed_exports=true
58+
types_first=true
5959
experimental.abstract_locations=true
6060

6161
[lints]
@@ -81,4 +81,4 @@ untyped-import
8181
untyped-type-import
8282

8383
[version]
84-
^0.125.0
84+
^0.130.0

ECOSYSTEM.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ There are three types of stakeholders:
1010

1111
## Partners
1212

13-
Partners are companies that are significantly invested in React Native and have been for years. Informed by their use of React Native, they push for improvements of the core and/or the ecosystem around it. Facebook's partners think of React Native as a product: they understand the trade offs that the project makes as well as future plans and goals. Together we shape the vision for React Native to make it the best way to build applications.
13+
Partners are companies that are significantly invested in React Native and have been for years. Informed by their use of React Native, they push for improvements of the core and/or the ecosystem around it. Partners think of React Native as a product: they understand the trade offs that the project makes as well as future plans and goals. Together we shape the vision for React Native to make it the best way to build applications.
1414

15-
Our current set of partners include Callstack, Expo, Infinite Red, Microsoft and Software Mansion. Many engineers from these companies are core contributors, and their partner responsibilities also include:
15+
React Native's current set of partners include Callstack, Expo, Facebook, Infinite Red, Microsoft and Software Mansion. Many engineers from these companies are core contributors, and their partner responsibilities also include:
1616

1717
* **[Callstack](https://callstack.com/):** Manages releases, maintains the [React Native CLI](https://github.com/react-native-community/react-native-cli) and organizes [React Native EU](https://react-native.eu/)
1818
* **[Expo](https://expo.io/):** Builds [expo](https://github.com/expo/expo) on top of React Native to simplify app development
19+
* **[Facebook](https://opensource.facebook.com):** Oversees the React Native product and maintains the [React Native core repo](https://reactnative.dev/)
1920
* **[Infinite Red](https://infinite.red/):** Maintains the [ignite cli/boilerplate](https://github.com/infinitered/ignite), organizes [Chain React Conf](https://infinite.red/ChainReactConf)
20-
* **[Microsoft](https://www.microsoft.com/en-gb/):** Develops [React Native Windows](https://github.com/Microsoft/react-native-windows) for the Universal Windows Platform (UWP)
21+
* **[Microsoft](http://aka.ms/reactnative):** Develops [React Native Windows](https://github.com/Microsoft/react-native-windows) and [React Native macOS](https://github.com/microsoft/react-native-macos) for building apps that target Windows and macOS
2122
* **[Software Mansion](https://swmansion.com/):** Maintain core infrastructure including JSC, Animated, and other popular third-party plugins.
2223

2324
In terms of open source work, pull requests from partners are commonly prioritized. When you are contributing to React Native, you'll most likely meet somebody who works at one of the partner companies and who is a core contributor:

IntegrationTests/AccessibilityManagerTest.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010

1111
'use strict';
1212

13-
const React = require('react');
14-
const ReactNative = require('react-native');
15-
const {View} = ReactNative;
16-
const RCTDeviceEventEmitter = require('react-native/Libraries/EventEmitter/RCTDeviceEventEmitter');
17-
const {TestModule} = ReactNative.NativeModules;
18-
import NativeAccessibilityManager from 'react-native/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager';
1913
import invariant from 'invariant';
14+
import NativeAccessibilityManager from 'react-native/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager';
15+
import {DeviceEventEmitter, NativeModules, View} from 'react-native';
16+
import * as React from 'react';
17+
18+
const {TestModule} = NativeModules;
2019

2120
class AccessibilityManagerTest extends React.Component<{...}> {
2221
componentDidMount() {
@@ -39,7 +38,7 @@ class AccessibilityManagerTest extends React.Component<{...}> {
3938
accessibilityExtraExtraLarge: 11.0,
4039
accessibilityExtraExtraExtraLarge: 12.0,
4140
});
42-
RCTDeviceEventEmitter.addListener('didUpdateDimensions', update => {
41+
DeviceEventEmitter.addListener('didUpdateDimensions', update => {
4342
TestModule.markTestPassed(update.window.fontScale === 4.0);
4443
});
4544
}

IntegrationTests/GlobalEvalWithSourceUrlTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class GlobalEvalWithSourceUrlTest extends React.Component<{...}> {
5959
'Expected globalEvalWithSourceUrl to throw an Error object',
6060
);
6161
}
62-
const parsedStack = parseErrorStack(error);
62+
const parsedStack = parseErrorStack(error?.stack);
6363
if (parsedStack[0].file !== url) {
6464
throw new Error(
6565
`Expected first eval stack frame to be in ${url} but found ${String(

IntegrationTests/ReactContentSizeUpdateTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const ReactNative = require('react-native');
1717
const {View} = ReactNative;
1818

1919
const {TestModule} = ReactNative.NativeModules;
20-
import type EmitterSubscription from 'react-native/Libraries/vendor/emitter/EmitterSubscription';
20+
import {type EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
2121

2222
const reactViewWidth = 101;
2323
const reactViewHeight = 102;
@@ -33,7 +33,7 @@ type State = {|
3333

3434
class ReactContentSizeUpdateTest extends React.Component<Props, State> {
3535
_timeoutID: ?TimeoutID = null;
36-
_subscription: ?EmitterSubscription = null;
36+
_subscription: ?EventSubscription = null;
3737

3838
state: State = {
3939
height: reactViewHeight,

IntegrationTests/SizeFlexibilityUpdateTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const ReactNative = require('react-native');
1616
const {View} = ReactNative;
1717

1818
const {TestModule} = ReactNative.NativeModules;
19-
import type EmitterSubscription from 'react-native/Libraries/vendor/emitter/EmitterSubscription';
19+
import {type EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
2020

2121
const reactViewWidth = 111;
2222
const reactViewHeight = 222;
@@ -31,7 +31,7 @@ type Props = $ReadOnly<{|
3131
|}>;
3232

3333
class SizeFlexibilityUpdateTest extends React.Component<Props> {
34-
_subscription: ?EmitterSubscription = null;
34+
_subscription: ?EventSubscription = null;
3535

3636
UNSAFE_componentWillMount() {
3737
this._subscription = RCTNativeAppEventEmitter.addListener(

Libraries/ART/ARTCGFloatArray.h

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

0 commit comments

Comments
 (0)