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.

Sign up for GitHub

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

Add platform project instance in hook options context #271

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add platform project instance in hook options context #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion cordova-lib/spec-cordova/HooksRunner.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ var cordova = require('../src/cordova/cordova'),
helpers = require('./helpers'),
PluginInfo = require('../src/PluginInfo'),
superspawn = require('../src/cordova/superspawn'),
config = require('../src/cordova/config');
config = require('../src/cordova/config'),
platform_modules = require('../src/platforms/platforms');

var platform = os.platform();
var tmpDir = helpers.tmpDir('hooks_test');
Expand Down Expand Up @@ -426,10 +427,14 @@ describe('HooksRunner', function() {
var pluginInfo = new PluginInfo(testPluginInstalledPath);

var cordovaVersion = require('../package').version;

var project_dir = path.join(projectRoot, 'platforms', 'android');
var platformProject = platform_modules.getPlatformProject('android', project_dir);

var androidPluginOpts = {
cordova: {
platforms: [ 'android' ],
project: platformProject,
plugins: ['com.plugin.withhooks'],
version: cordovaVersion
},
Expand Down
6 changes: 5 additions & 1 deletion cordova-lib/src/plugman/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,13 @@ function runInstall(actions, platform, project_dir, plugin_dir, plugins_dir, opt
var projectRoot = cordovaUtil.isCordova();

if(projectRoot) {
var platformProject = platform_modules.getPlatformProject(platform, project_dir);
// using unified hooksRunner
var hookOptions = {
cordova: { platforms: [ platform ] },
cordova: {
platforms: [ platform ],
project: platformProject
},
plugin: {
id: pluginInfo.id,
pluginInfo: pluginInfo,
Expand Down
7 changes: 5 additions & 2 deletions cordova-lib/src/plugman/uninstall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,13 @@ function runUninstallPlatform(actions, platform, project_dir, plugin_dir, plugin
var projectRoot = cordovaUtil.isCordova();

if(projectRoot) {

var platformProject = platform_modules.getPlatformProject(platform, project_dir);
// using unified hooksRunner
var hooksRunnerOptions = {
cordova: { platforms: [ platform ] },
cordova: {
platforms: [ platform ],
project: platformProject
},
plugin: {
id: pluginInfo.id,
pluginInfo: pluginInfo,
Expand Down