Merge branch 'master' into feat/disable_buttons_action_sheet

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

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

.circleci/config.yml

@@ -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
 
@@ -148,17 +148,17 @@ commands:
     steps:
       - run:
           name: Setup CocoaPods cache
-          # Copy RNTester/Podfile.lock since it can be changed by pod install
-          command: cp RNTester/Podfile.lock RNTester/Podfile.lock.bak
+          # Copy packages/rn-tester/Podfile.lock since it can be changed by pod install
+          command: cp packages/rn-tester/Podfile.lock packages/rn-tester/Podfile.lock.bak
       - restore_cache:
           keys:
-            - v1-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "RNTester/Podfile.lock.bak" }}
+            - v1-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}
             - v1-pods-{{ .Environment.CIRCLE_JOB }}-
       - steps: << parameters.steps >>
       - save_cache:
           paths:
-            - RNTester/Pods
-          key: v1-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "RNTester/Podfile.lock.bak" }}
+            - packages/rn-tester/Pods
+          key: v1-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}
 
   download_gradle_dependencies:
     steps:
@@ -372,7 +372,7 @@ jobs:
       - run_yarn
 
       - run: |
-          cd RNTester
+          cd packages/rn-tester
           bundle check || bundle install
       - run:
           name: Boot iPhone Simulator
@@ -411,26 +411,26 @@ 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
 
       - with_rntester_pods_cache_span:
           steps:
             - run:
                 name: Generate RNTesterPods Workspace
-                command: cd RNTester && pod install --verbose
+                command: cd packages/rn-tester && pod install --verbose
 
       - run:
           name: Generate RNTesterPods Xcode Workspace
-          command: pushd RNTester && pod install --verbose && popd
+          command: pushd packages/rn-tester && pod install --verbose && popd
 
       # -------------------------
       # Runs iOS unit tests
       - 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
@@ -474,7 +474,7 @@ jobs:
     parameters:
       run_disabled_tests:
         type: boolean
-        default: false    
+        default: false
     steps:
       - restore_cache_checkout:
           checkout_type: android
@@ -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
@@ -535,7 +535,7 @@ jobs:
 
       - run:
           name: Assemble RNTester App
-          command: ./gradlew RNTester:android:app:assembleRelease
+          command: ./gradlew packages:rn-tester:android:app:assembleRelease
 
       # -------------------------
       # Run Android tests
@@ -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:
@@ -668,7 +668,7 @@ jobs:
             - run: echo "Failing tests may be moved here temporarily."
             - run:
                 name: Android Build
-                command: ./gradlew.bat RNTester:android:app:assembleRelease
+                command: ./gradlew.bat packages:rn-tester:android:app:assembleRelease
 
   # -------------------------
   #      JOBS: Coverage
@@ -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

.eslintrc

@@ -22,7 +22,7 @@
         "**/__mocks__/**/*.js",
         "**/__tests__/**/*.js",
         "jest/**/*.js",
-        "RNTester/**/*.js",
+        "packages/rn-tester/**/*.js",
       ],
       "globals": {
         // Expose some Jest globals for test helpers

.flowconfig

@@ -11,10 +11,6 @@
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-.*/node_modules/warning/.*
-
 ; Flow doesn't support platforms
 .*/Libraries/Utilities/LoadingView.js
 
@@ -54,8 +50,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]
@@ -68,8 +64,6 @@ deprecated-type=warn
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
-deprecated-utility=error
-unsafe-addition=error
 
 [strict]
 deprecated-type
@@ -81,4 +75,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.125.0
+^0.132.0

.flowconfig.android

@@ -11,10 +11,6 @@
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-.*/node_modules/warning/.*
-
 ; Flow doesn't support platforms
 .*/Libraries/Utilities/LoadingView.js
 
@@ -54,8 +50,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]
@@ -68,8 +64,6 @@ deprecated-type=warn
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
-deprecated-utility=error
-unsafe-addition=error
 
 [strict]
 deprecated-type
@@ -81,4 +75,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.125.0
+^0.132.0

.gitignore

@@ -23,10 +23,10 @@ project.xcworkspace
 
 # Gradle
 /build/
-/RNTester/android/app/build/
-/RNTester/android/app/gradle/
-/RNTester/android/app/gradlew
-/RNTester/android/app/gradlew.bat
+/packages/rn-tester/android/app/build/
+/packages/rn-tester/android/app/gradle/
+/packages/rn-tester/android/app/gradlew
+/packages/rn-tester/android/app/gradlew.bat
 /ReactAndroid/build/
 /ReactAndroid/gradle/
 /ReactAndroid/gradlew
@@ -35,6 +35,8 @@ project.xcworkspace
 # Buck
 .buckd
 buck-out
+/.lsp.buckd
+/.lsp-buck-out
 /ReactAndroid/src/main/jni/prebuilt/lib/
 /ReactAndroid/src/main/gen
 
@@ -75,7 +77,8 @@ package-lock.json
 
 # ReactCommon subdir shouldn't have Xcode project
 /ReactCommon/**/*.xcodeproj
-RNTester/build
+/packages/rn-tester/build
+/packages/rn-tester/android/app/build/*
 
 # Libs that shouldn't have Xcode project
 /Libraries/FBLazyVector/**/*.xcodeproj
@@ -87,11 +90,11 @@ RNTester/build
 # CocoaPods
 /template/ios/Pods/
 /template/ios/Podfile.lock
-/RNTester/Gemfile.lock
+/packages/rn-tester/Gemfile.lock
 
 # Ignore RNTester specific Pods, but keep the __offline_mirrors__ here.
-RNTester/Pods/*
-!RNTester/Pods/__offline_mirrors
+/packages/rn-tester/Pods/*
+!/packages/rn-tester/Pods/__offline_mirrors__
 
 # react-native-codegen
 /packages/react-native-codegen/lib

ECOSYSTEM.md

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

IntegrationTests/AccessibilityManagerTest.js

@@ -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() {
@@ -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);
     });
   }

IntegrationTests/GlobalEvalWithSourceUrlTest.js

@@ -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(

IntegrationTests/IntegrationTestHarnessTest.js

@@ -13,7 +13,6 @@
 const React = require('react');
 const ReactNative = require('react-native');
 
-const requestAnimationFrame = require('fbjs/lib/requestAnimationFrame');
 const {Text, View, StyleSheet} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 

IntegrationTests/LoggingTestModule.js

@@ -11,7 +11,6 @@
 
 const BatchedBridge = require('react-native/Libraries/BatchedBridge/BatchedBridge');
 
-const warning = require('fbjs/lib/warning');
 const invariant = require('invariant');
 
 const LoggingTestModule = {
@@ -24,7 +23,7 @@ const LoggingTestModule = {
     }, timeout_ms);
   },
   warning: function(str) {
-    warning(false, str);
+    console.warn(str);
   },
   invariant: function(str) {
     invariant(false, str);

IntegrationTests/ReactContentSizeUpdateTest.js

@@ -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;
@@ -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,

IntegrationTests/SimpleSnapshotTest.js

@@ -13,8 +13,6 @@
 const React = require('react');
 const ReactNative = require('react-native');
 
-const requestAnimationFrame = require('fbjs/lib/requestAnimationFrame');
-
 const {StyleSheet, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;