Update to [email protected] (#2628)

* Update to [email protected] * Fix dependencies to allow unforked version of RN
microsoft · Jun 17, 2019 · 721d1c6 · 721d1c6
1 parent f9c8c41
commit 721d1c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.ado/evergreen.js b/.ado/evergreen.js
@@ -138,7 +138,7 @@ request.get('https://raw.githubusercontent.com/microsoft/react-native/master/pac
 
   let existingPkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
 
-  const rnDependency = `${pkgJson.version} || https://github.com/microsoft/react-native/archive/v${pkgJson.version}.tar.gz`;
+  const rnDependency = `^${pkgJson.version.slice(0, pkgJson.version.indexOf('-'))} || ${pkgJson.version} || https://github.com/microsoft/react-native/archive/v${pkgJson.version}.tar.gz`;
 
   if (existingPkgJson.peerDependencies['react-native'] === rnDependency) {
     console.log(`Already at latest react-native version: ${pkgJson.version}.`);

diff --git a/vnext/package.json b/vnext/package.json
@@ -66,10 +66,10 @@
     "tslint-microsoft-contrib": "^5.0.1",
     "tslint-react": "^4",
     "typescript": "3.5.1",
-    "react-native": "0.59.0-microsoft.2"
+    "react-native": "0.59.0-microsoft.4"
   },
   "peerDependencies": {
     "react": "16.8.3",
-    "react-native": "0.59.0-microsoft.2 || https://github.com/microsoft/react-native/archive/v0.59.0-microsoft.2.tar.gz"
+    "react-native": "^0.59.0 || 0.59.0-microsoft.4 || https://github.com/microsoft/react-native/archive/v0.59.0-microsoft.4.tar.gz"
   }
 }
diff --git a/vnext/yarn.lock b/vnext/yarn.lock
@@ -4895,9 +4895,9 @@ react-native-local-cli@^1.0.0-alpha.5:
     xcode "^1.0.0"
     xmldoc "^0.4.0"
 
-"react-native@https://github.com/Microsoft/react-native/archive/v0.59.0-microsoft.2.tar.gz":
-  version "0.59.0-microsoft.2"
-  resolved "https://github.com/Microsoft/react-native/archive/v0.59.0-microsoft.2.tar.gz#cc414b6055f976dac88ef5ca2c8490785ff16525"
+"react-native@https://github.com/Microsoft/react-native/archive/v0.59.0-microsoft.4.tar.gz":
+  version "0.59.0-microsoft.4"
+  resolved "https://github.com/Microsoft/react-native/archive/v0.59.0-microsoft.4.tar.gz#1776b512acd24257a3c1a64aaf7983ca30e37237"
   dependencies:
     "@babel/core" "^7.4.0"
     "@babel/generator" "^7.4.0"