Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest React Native CLI #24517

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update hasteImpl and bump CLI
  • Loading branch information
grabbou committed Apr 18, 2019
commit 50f36d7c322815d7469da394789ee2f812dada40
4 changes: 2 additions & 2 deletions jest/hasteImpl.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const NAME_REDUCERS /*: Array<[RegExp, string]> */ = [
[/^(?:.*[\\\/])?([a-zA-Z0-9$_.-]+)$/, '$1'],
// strip .js/.js.flow suffix
[/^(.*)\.js(\.flow)?$/, '$1'],
// strip platform suffix
[/^(.*)\.(android|ios|native)$/, '$1'],
// strip native suffix
[/^(.*)\.(native)$/, '$1'],
// strip plugin platform suffixes
...pluginNameReducers,
];
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
},
"dependencies": {
"@babel/runtime": "^7.0.0",
"@react-native-community/cli": "2.0.0-alpha.10",
"@react-native-community/cli": "2.0.0-alpha.12",
"@react-native-community/cli-platform-ios": "2.0.0-alpha.9",
"@react-native-community/cli-platform-android": "2.0.0-alpha.9",
orta marked this conversation as resolved.
Show resolved Hide resolved
"abort-controller": "^3.0.0",
Expand Down
19 changes: 19 additions & 0 deletions react-native.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,25 @@
*/
'use strict';

const {
commands: iOSCommands,
...ios
} = require('@react-native-community/cli-platform-ios');
const {
commands: androidCommands,
...android
} = require('@react-native-community/cli-platform-android');

module.exports = {
reactNativePath: '.',
commands: [...iOSCommands, ...androidCommands],
platforms: {ios, android},
grabbou marked this conversation as resolved.
Show resolved Hide resolved
project: {
ios: {
project: './RNTester/RNTester.xcodeproj',
},
android: {
sourceDir: './RNTester',
},
},
};
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1093,10 +1093,10 @@
lodash "^4.17.5"
mime "^1.3.4"

"@react-native-community/cli@2.0.0-alpha.10":
version "2.0.0-alpha.10"
resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-2.0.0-alpha.10.tgz#dab59fac81ffa764e104d91f0852be5494d1e755"
integrity sha512-zOkQi1gJRpzJM3vG7s5hTwbtAk0+kT5txKt7d3jcx1zspv/B3jCzv42BWaHy5E/l/6grnsxMtNv0dmABNNYinA==
"@react-native-community/cli@2.0.0-alpha.12":
version "2.0.0-alpha.12"
resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-2.0.0-alpha.12.tgz#4dbe04f4ffe24751c8ead6cd18dce06aee7d5752"
integrity sha512-XvyjjA3Uvri9eujakz8IrvpUokIdEiNpIoATdHxLp4tpj7xyGaoI6Dze81ttKkYzIsq0dbeYAVvUSapCmmOuwA==
dependencies:
"@react-native-community/cli-platform-android" "^2.0.0-alpha.9"
"@react-native-community/cli-platform-ios" "^2.0.0-alpha.9"
Expand Down