diff --git a/local-cli/link/ios/common/isInstalled.js b/local-cli/link/ios/common/isInstalled.js index a7a5f2d07d192e..69bcd8bdf32d88 100644 --- a/local-cli/link/ios/common/isInstalled.js +++ b/local-cli/link/ios/common/isInstalled.js @@ -1,6 +1,6 @@ const isInstalledIOS = require('../isInstalled'); const isInstalledPods = require('../../pods/isInstalled'); -module.exports = function isInstalled(config, name) { - return isInstalledIOS(config, name) || isInstalledPods(config, name); +module.exports = function isInstalled(projectConfig, name, dependencyConfig) { + return isInstalledIOS(projectConfig, dependencyConfig) || isInstalledPods(projectConfig, dependencyConfig); }; diff --git a/local-cli/link/ios/common/unregisterNativeModule.js b/local-cli/link/ios/common/unregisterNativeModule.js index b42882623fbe34..e6d34ada4cce95 100644 --- a/local-cli/link/ios/common/unregisterNativeModule.js +++ b/local-cli/link/ios/common/unregisterNativeModule.js @@ -1,8 +1,8 @@ const compact = require('lodash').compact; const isInstalledIOS = require('../isInstalled'); const isInstalledPods = require('../../pods/isInstalled'); -const unregisterDependencyIOS = require('../registerNativeModule'); -const unregisterDependencyPods = require('../../pods/registerNativeModule'); +const unregisterDependencyIOS = require('../unregisterNativeModule'); +const unregisterDependencyPods = require('../../pods/unregisterNativeModule'); module.exports = function unregisterNativeModule( name, diff --git a/local-cli/link/link.js b/local-cli/link/link.js index 8711f278bd08cc..aeeb61ce49585a 100644 --- a/local-cli/link/link.js +++ b/local-cli/link/link.js @@ -51,7 +51,7 @@ const linkDependency = (platforms, project, dependency) => { return null; } - const isInstalled = linkConfig.isInstalled(project[platform], dependency.config[platform]); + const isInstalled = linkConfig.isInstalled(project[platform], dependency.name, dependency.config[platform]); if (isInstalled) { log.info(chalk.grey(`Platform '${platform}' module ${dependency.name} is already linked`)); diff --git a/local-cli/link/unlink.js b/local-cli/link/unlink.js index ed3772c4b45c39..781b922baea9b7 100644 --- a/local-cli/link/unlink.js +++ b/local-cli/link/unlink.js @@ -34,7 +34,7 @@ const unlinkDependency = (platforms, project, dependency, packageName, otherDepe return; } - const isInstalled = linkConfig.isInstalled(project[platform], dependency[platform]); + const isInstalled = linkConfig.isInstalled(project[platform], packageName, dependency[platform]); if (!isInstalled) { log.info(`Platform '${platform}' module ${packageName} is not installed`);