Skip to content

Commit

Permalink
Merge pull request #129 from mjohnston/rn-0.14
Browse files Browse the repository at this point in the history
Support RN 0.14
  • Loading branch information
elliottsj committed Nov 7, 2015
2 parents 8f2689f + a5adde4 commit 65922b0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Examples/BabelES6/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"babel-core": "^5.8.32",
"babel-loader": "^5.3.2",
"babel-plugin-react-transform": "^1.1.1",
"react-native": "^0.13.2",
"react-native": "^0.14.0",
"react-native-webpack-server": "file:../..",
"react-transform-hmr": "^1.0.1",
"webpack": "^1.12.2",
Expand Down
2 changes: 1 addition & 1 deletion Examples/CoffeeScript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"cjsx-loader": "^2.0.1",
"coffee-loader": "^0.7.2",
"coffee-script": "^1.10.0",
"react-native": "^0.13.2",
"react-native": "^0.14.0",
"react-native-webpack-server": "file:../..",
"react-transform-hmr": "^1.0.1",
"webpack": "^1.12.2",
Expand Down
3 changes: 2 additions & 1 deletion lib/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@ class Server {
// as well... Fixes issues where server cannot be killed cleanly.
const cmd = 'node';
const args = [
'./node_modules/react-native/packager/packager.js',
'./node_modules/react-native/local-cli/cli.js',
'start',
'--root', this.entryDir,
'--port', this.packagerPort,
].concat(
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"node": "^4.0.0"
},
"peerDependencies": {
"react-native": "^0.13.0",
"react-native": ">=0.13.0",
"webpack": ">=1.8.4",
"webpack-dev-server": ">=1.8.0"
},
Expand Down

0 comments on commit 65922b0

Please sign in to comment.