From bb256efacffc79e80ce3fc65191a5d2fc18acdb9 Mon Sep 17 00:00:00 2001 From: Martin Konicek Date: Sat, 20 Feb 2016 21:26:31 -0800 Subject: [PATCH] Revert "Move `react` to peerDependencies" This reverts commit 9f01f9677096117da8be721913a09db870505c2f. --- local-cli/generator/index.js | 8 -------- local-cli/upgrade/upgrade.js | 13 ------------- package.json | 4 +--- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/local-cli/generator/index.js b/local-cli/generator/index.js index 90f08912a1d..dadbd7a17c4 100644 --- a/local-cli/generator/index.js +++ b/local-cli/generator/index.js @@ -82,13 +82,5 @@ module.exports = yeoman.generators.NamedBase.extend({ {name: this.name} ); } - }, - - install: function() { - if (this.options.upgrade) { - return; - } - - this.npmInstall('react', { '--save': true }); } }); diff --git a/local-cli/upgrade/upgrade.js b/local-cli/upgrade/upgrade.js index 4ce70498453..4038bc6aaee 100644 --- a/local-cli/upgrade/upgrade.js +++ b/local-cli/upgrade/upgrade.js @@ -44,19 +44,6 @@ module.exports = function upgrade(args, config) { 'https://github.com/facebook/react-native/releases/tag/v' + semver.major(v) + '.' + semver.minor(v) + '.0' ) ); - - // >= v0.21.0, we require react to be a peer depdendency - if (semver.gte(v, '0.21.0') && !pak.dependencies['react']) { - console.log( - chalk.yellow( - '\nYour \'package.json\' file doesn\'t seem to have \'react\' as a dependency.\n' + - '\'react\' was changed from a dependency to a peer dependency in react-native v0.21.0.\n' + - 'Therefore, it\'s necessary to include \'react\' in your project\'s dependencies.\n' + - 'Just run \'npm install --save react\', then re-run \'react-native upgrade\'.\n' - ) - ); - return Promise.resolve(); - } } else { console.log( chalk.yellow( diff --git a/package.json b/package.json index 1da2eac4c91..271fcccf4d3 100644 --- a/package.json +++ b/package.json @@ -102,9 +102,6 @@ "bin": { "react-native": "local-cli/wrong-react-native.js" }, - "peerDependencies": { - "react": "^0.14.5" - }, "dependencies": { "absolute-path": "^0.0.0", "art": "^0.10.0", @@ -136,6 +133,7 @@ "optimist": "^0.6.1", "progress": "^1.1.8", "promise": "^7.1.1", + "react": "^0.14.5", "react-timer-mixin": "^0.13.2", "react-transform-hmr": "^1.0.2", "rebound": "^0.0.13",