Merge pull request facebook#825 from amgleitman/amgleitman/0.64-merge…

…-2020-07-31 Merge from upstream through 2020-07-31
acoates-ms · Sep 3, 2021 · 777bcaf · 777bcaf
2 parents 88e1f4d + 0970acd
commit 777bcaf
Show file tree

Hide file tree

Showing 841 changed files with 8,980 additions and 5,716 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -497,8 +497,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

diff --git a/.flowconfig b/.flowconfig
@@ -86,4 +86,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.129.0
+^0.130.0
diff --git a/.flowconfig.android b/.flowconfig.android
@@ -89,4 +89,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.129.0
+^0.130.0
diff --git a/.flowconfig.macos b/.flowconfig.macos
@@ -85,4 +85,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.129.0
+^0.130.0
diff --git a/ECOSYSTEM.md b/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:

diff --git a/IntegrationTests/GlobalEvalWithSourceUrlTest.js b/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(

diff --git a/Libraries/ART/ARTCGFloatArray.h b/Libraries/ART/ARTCGFloatArray.h
diff --git a/Libraries/ART/ARTContainer.h b/Libraries/ART/ARTContainer.h
diff --git a/Libraries/ART/ARTGroup.h b/Libraries/ART/ARTGroup.h
diff --git a/Libraries/ART/ARTGroup.m b/Libraries/ART/ARTGroup.m
diff --git a/Libraries/ART/ARTNode.h b/Libraries/ART/ARTNode.h
diff --git a/Libraries/ART/ARTNode.m b/Libraries/ART/ARTNode.m
diff --git a/Libraries/ART/ARTRenderable.h b/Libraries/ART/ARTRenderable.h
diff --git a/Libraries/ART/ARTRenderable.m b/Libraries/ART/ARTRenderable.m
diff --git a/Libraries/ART/ARTShape.h b/Libraries/ART/ARTShape.h