Skip to content

Commit

Permalink
Merge branch 'master' into annotations-compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
janicduplessis authored Aug 1, 2020
2 parents 03d7adf + 111aab5 commit 6535d11
Show file tree
Hide file tree
Showing 1,157 changed files with 19,678 additions and 13,655 deletions.
2 changes: 1 addition & 1 deletion .circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ function e2e_suite() {
return 1
fi

echo "Starting packager server"
echo "Starting Metro"
npm start >> /dev/null &
SERVER_PID=$!
sleep 15
Expand Down
38 changes: 19 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ commands:
description: Homebrew package to install
type: string
steps:
- run:
- run:
name: "Brew: Install << parameters.package >>"
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install << parameters.package >> >/dev/null

Expand Down Expand Up @@ -411,7 +411,7 @@ jobs:
name: Fetch CocoaPods Specs
command: |
curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
- run:
- run:
name: Setup the CocoaPods environment
command: pod setup

Expand All @@ -430,7 +430,7 @@ jobs:
- when:
condition: << parameters.run_unit_tests >>
steps:
- run:
- run:
name: "Run Tests: iOS Unit and Integration Tests"
command: yarn test-ios
# Runs iOS Detox e2e tests
Expand Down Expand Up @@ -474,7 +474,7 @@ jobs:
parameters:
run_disabled_tests:
type: boolean
default: false
default: false
steps:
- restore_cache_checkout:
checkout_type: android
Expand All @@ -498,8 +498,8 @@ jobs:
# Keep configuring Android dependencies while AVD boots up

- run:
name: Install rsync
command: apt-get update -y && apt-get install rsync -y
name: Install rsync, zip
command: apt-get update -y && apt-get install rsync zip -y

# Install Buck
- install_buck_tooling
Expand Down Expand Up @@ -607,7 +607,7 @@ jobs:
- ANDROID_HOME: "C:\\Android\\android-sdk"
- ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\19.2.5345600"
- ANDROID_BUILD_VERSION: 28
- ANDROID_TOOLS_VERSION: 29.0.2
- ANDROID_TOOLS_VERSION: 29.0.3
- GRADLE_OPTS: -Dorg.gradle.daemon=false
- NDK_VERSION: 19.2.5345600
steps:
Expand Down Expand Up @@ -783,18 +783,18 @@ workflows:
run_unit_tests: true
requires:
- setup_ios
- test_ios:
name: test_ios_detox
run_disabled_tests: false
run_detox_tests: true
requires:
- setup_ios
- test_ios:
name: test_ios_detox_frameworks
use_frameworks: true
run_detox_tests: true
requires:
- setup_ios
# - test_ios:
# name: test_ios_detox
# run_disabled_tests: false
# run_detox_tests: true
# requires:
# - setup_ios
# - test_ios:
# name: test_ios_detox_frameworks
# use_frameworks: true
# run_detox_tests: true
# requires:
# - setup_ios
- test_js:
name: test_js_prev_lts
executor: nodeprevlts
Expand Down
6 changes: 3 additions & 3 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_type=$FlowFixMeEmpty

experimental.well_formed_exports=true
experimental.types_first=true
well_formed_exports=true
types_first=true
experimental.abstract_locations=true

[lints]
Expand All @@ -81,4 +81,4 @@ untyped-import
untyped-type-import

[version]
^0.125.0
^0.130.0
6 changes: 3 additions & 3 deletions .flowconfig.android
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_type=$FlowFixMeEmpty

experimental.well_formed_exports=true
experimental.types_first=true
well_formed_exports=true
types_first=true
experimental.abstract_locations=true

[lints]
Expand All @@ -81,4 +81,4 @@ untyped-import
untyped-type-import

[version]
^0.125.0
^0.130.0
7 changes: 4 additions & 3 deletions ECOSYSTEM.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ There are three types of stakeholders:

## Partners

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.
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.

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:
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:

* **[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/)
* **[Expo](https://expo.io/):** Builds [expo](https://github.com/expo/expo) on top of React Native to simplify app development
* **[Facebook](https://opensource.facebook.com):** Oversees the React Native product and maintains the [React Native core repo](https://reactnative.dev/)
* **[Infinite Red](https://infinite.red/):** Maintains the [ignite cli/boilerplate](https://github.com/infinitered/ignite), organizes [Chain React Conf](https://infinite.red/ChainReactConf)
* **[Microsoft](https://www.microsoft.com/en-gb/):** Develops [React Native Windows](https://github.com/Microsoft/react-native-windows) for the Universal Windows Platform (UWP)
* **[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
* **[Software Mansion](https://swmansion.com/):** Maintain core infrastructure including JSC, Animated, and other popular third-party plugins.

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:
Expand Down
13 changes: 6 additions & 7 deletions IntegrationTests/AccessibilityManagerTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@

'use strict';

const React = require('react');
const ReactNative = require('react-native');
const {View} = ReactNative;
const RCTDeviceEventEmitter = require('react-native/Libraries/EventEmitter/RCTDeviceEventEmitter');
const {TestModule} = ReactNative.NativeModules;
import NativeAccessibilityManager from 'react-native/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager';
import invariant from 'invariant';
import NativeAccessibilityManager from 'react-native/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager';
import {DeviceEventEmitter, NativeModules, View} from 'react-native';
import * as React from 'react';

const {TestModule} = NativeModules;

class AccessibilityManagerTest extends React.Component<{...}> {
componentDidMount() {
Expand All @@ -39,7 +38,7 @@ class AccessibilityManagerTest extends React.Component<{...}> {
accessibilityExtraExtraLarge: 11.0,
accessibilityExtraExtraExtraLarge: 12.0,
});
RCTDeviceEventEmitter.addListener('didUpdateDimensions', update => {
DeviceEventEmitter.addListener('didUpdateDimensions', update => {
TestModule.markTestPassed(update.window.fontScale === 4.0);
});
}
Expand Down
2 changes: 1 addition & 1 deletion IntegrationTests/GlobalEvalWithSourceUrlTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class GlobalEvalWithSourceUrlTest extends React.Component<{...}> {
'Expected globalEvalWithSourceUrl to throw an Error object',
);
}
const parsedStack = parseErrorStack(error);
const parsedStack = parseErrorStack(error?.stack);
if (parsedStack[0].file !== url) {
throw new Error(
`Expected first eval stack frame to be in ${url} but found ${String(
Expand Down
4 changes: 2 additions & 2 deletions IntegrationTests/ReactContentSizeUpdateTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const ReactNative = require('react-native');
const {View} = ReactNative;

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

const reactViewWidth = 101;
const reactViewHeight = 102;
Expand All @@ -33,7 +33,7 @@ type State = {|

class ReactContentSizeUpdateTest extends React.Component<Props, State> {
_timeoutID: ?TimeoutID = null;
_subscription: ?EmitterSubscription = null;
_subscription: ?EventSubscription = null;

state: State = {
height: reactViewHeight,
Expand Down
4 changes: 2 additions & 2 deletions IntegrationTests/SizeFlexibilityUpdateTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const ReactNative = require('react-native');
const {View} = ReactNative;

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

const reactViewWidth = 111;
const reactViewHeight = 222;
Expand All @@ -31,7 +31,7 @@ type Props = $ReadOnly<{|
|}>;

class SizeFlexibilityUpdateTest extends React.Component<Props> {
_subscription: ?EmitterSubscription = null;
_subscription: ?EventSubscription = null;

UNSAFE_componentWillMount() {
this._subscription = RCTNativeAppEventEmitter.addListener(
Expand Down
18 changes: 0 additions & 18 deletions Libraries/ART/ARTCGFloatArray.h

This file was deleted.

16 changes: 0 additions & 16 deletions Libraries/ART/ARTContainer.h

This file was deleted.

17 changes: 0 additions & 17 deletions Libraries/ART/ARTGroup.h

This file was deleted.

30 changes: 0 additions & 30 deletions Libraries/ART/ARTGroup.m

This file was deleted.

30 changes: 0 additions & 30 deletions Libraries/ART/ARTNode.h

This file was deleted.

Loading

0 comments on commit 6535d11

Please sign in to comment.