Skip to content

Commit ec88489

Browse files
rozelefacebook-github-bot
authored andcommittedMar 7, 2018
Fixing bugs in link and unlink
Summary: Android uses the name of the package, not the config, for the `isInstalled` check. Sending both parameters to `isInstalled` so we have a consistent API. <!-- Thank you for sending the PR! We appreciate you spending the time to work on these changes. Help us understand your motivation by explaining why you decided to make this change. You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html Happy contributing! --> A bug was uncovered in the react-native link command where Android would not unlink because the wrong parameters were being sent to `isInstalled`. Successfully linked and unlinked `react-native-fs` on Windows and Mac. Jest tests pass. <!-- Help reviewers and the release process by writing your own release notes **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.** CATEGORY [----------] TYPE [ CLI ] [-------------] LOCATION [ DOCS ] [ BREAKING ] [-------------] [ GENERAL ] [ BUGFIX ] [-{Component}-] [ INTERNAL ] [ ENHANCEMENT ] [ {File} ] [ IOS ] [ FEATURE ] [ {Directory} ] |-----------| [ ANDROID ] [ MINOR ] [ {Framework} ] - | {Message} | [----------] [-------------] [-------------] |-----------| [CATEGORY] [TYPE] [LOCATION] - MESSAGE EXAMPLES: [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see --> [CLI][BUGFIX][local-cli/link/link.js] - Fix issue with `isInstalled` check for Android [CLI][BUGFIX][local-cli/link/unlink.js] - Fix issue with `isInstalled` check for Android [CLI][BUGFIX][local-cli/link/ios/common/unregisterNativeModule.js] - Fix references to unregister implementations. Closes #18207 Differential Revision: D7180885 Pulled By: hramos fbshipit-source-id: 5f479cd9d7b1ebd8626b461e9dc1f22988e2c61f
1 parent b58e377 commit ec88489

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed
 
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const isInstalledIOS = require('../isInstalled');
22
const isInstalledPods = require('../../pods/isInstalled');
33

4-
module.exports = function isInstalled(config, name) {
5-
return isInstalledIOS(config, name) || isInstalledPods(config, name);
4+
module.exports = function isInstalled(projectConfig, name, dependencyConfig) {
5+
return isInstalledIOS(projectConfig, dependencyConfig) || isInstalledPods(projectConfig, dependencyConfig);
66
};

‎local-cli/link/ios/common/unregisterNativeModule.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const compact = require('lodash').compact;
22
const isInstalledIOS = require('../isInstalled');
33
const isInstalledPods = require('../../pods/isInstalled');
4-
const unregisterDependencyIOS = require('../registerNativeModule');
5-
const unregisterDependencyPods = require('../../pods/registerNativeModule');
4+
const unregisterDependencyIOS = require('../unregisterNativeModule');
5+
const unregisterDependencyPods = require('../../pods/unregisterNativeModule');
66

77
module.exports = function unregisterNativeModule(
88
name,

‎local-cli/link/link.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const linkDependency = (platforms, project, dependency) => {
4949
return null;
5050
}
5151

52-
const isInstalled = linkConfig.isInstalled(project[platform], dependency.config[platform]);
52+
const isInstalled = linkConfig.isInstalled(project[platform], dependency.name, dependency.config[platform]);
5353

5454
if (isInstalled) {
5555
log.info(chalk.grey(`Platform '${platform}' module ${dependency.name} is already linked`));

‎local-cli/link/unlink.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const unlinkDependency = (platforms, project, dependency, packageName, otherDepe
3232
return;
3333
}
3434

35-
const isInstalled = linkConfig.isInstalled(project[platform], dependency[platform]);
35+
const isInstalled = linkConfig.isInstalled(project[platform], packageName, dependency[platform]);
3636

3737
if (!isInstalled) {
3838
log.info(`Platform '${platform}' module ${packageName} is not installed`);

0 commit comments

Comments
 (0)
Please sign in to comment.