mirror/react-native-pushy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity GitHub Gitee

Merge pull request from reactnativecn/sunnylqm-patch-2

Browse Source 
support 0.42
This commit is contained in:
DengYun 2017-03-14 10:28:01 +08:00 committed by GitHub
commit 7db4213bfd
1 changed files with 11 additions and 4 deletions

15
local-cli/src/bundle.js

@ -382,10 +382,17 @@ export const commands = {
let defaultConfig; let defaultConfig;
if (major >= 0 && minor >= 33) { if (major >= 0 && minor >= 33) {
defaultConfig= Config.get( if (minor >= 42) {
path.resolve('node_modules/react-native/local-cli'), defaultConfig= Config.get(
require(path.resolve('node_modules/react-native/local-cli/default.config')), path.resolve('node_modules/react-native/local-cli'),
path.resolve('node_modules/react-native/packager/rn-cli.config.js')); require(path.resolve('node_modules/react-native/local-cli/core/default.config')),
path.resolve('node_modules/react-native/packager/rn-cli.config.js'));
} else {
defaultConfig= Config.get(
path.resolve('node_modules/react-native/local-cli'),
require(path.resolve('node_modules/react-native/local-cli/default.config')),
path.resolve('node_modules/react-native/packager/rn-cli.config.js'));
}
} else { } else {
defaultConfig= Config.get(path.resolve('node_modules/react-native/local-cli'), require(path.resolve('node_modules/react-native/local-cli/default.config'))); defaultConfig= Config.get(path.resolve('node_modules/react-native/local-cli'), require(path.resolve('node_modules/react-native/local-cli/default.config')));
} }