From 123707a6910731a367c8c8b21ce56d5164c7c26e Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 12 Aug 2019 12:38:22 +0300 Subject: [PATCH 1/7] Update 000-shared_mode_special.js --- hooks/after_plugin_install/000-shared_mode_special.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/after_plugin_install/000-shared_mode_special.js b/hooks/after_plugin_install/000-shared_mode_special.js index d0a33ca..83d6196 100644 --- a/hooks/after_plugin_install/000-shared_mode_special.js +++ b/hooks/after_plugin_install/000-shared_mode_special.js @@ -3,7 +3,7 @@ module.exports = function(context) { /** @external */ - var deferral = context.requireCordovaModule('q').defer(), + var deferral = require('q').defer(), UpdateConfig = require('./../update_config.js'), updateConfig = new UpdateConfig(context); From d9e2ea645fa91f741e9d74962966db8f3def8c5c Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 12 Aug 2019 12:40:58 +0300 Subject: [PATCH 2/7] Update update_config.js --- hooks/update_config.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hooks/update_config.js b/hooks/update_config.js index 1f70dcc..17826a5 100644 --- a/hooks/update_config.js +++ b/hooks/update_config.js @@ -13,16 +13,15 @@ module.exports = function(context) { } /** @external */ - var fs = context.requireCordovaModule('fs'), - path = context.requireCordovaModule('path'), - et = context.requireCordovaModule('elementtree'); + var fs = require('fs'), + path = require('path'), + et = require('elementtree'); /** @defaults */ var xwalkVariables = {}, argumentsString = context.cmdLine, pluginConfigurationFile = path.join(context.opts.plugin.dir, 'plugin.xml'), androidPlatformDir = path.join(context.opts.projectRoot, - 'platforms', 'android'), projectConfigurationFile = path.join(context.opts.projectRoot, 'config.xml'), platformConfigurationFile, From e80714ff49bb58b911d0255031c525c5fd3f1e37 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 12 Aug 2019 12:44:04 +0300 Subject: [PATCH 3/7] Update update_config.js --- hooks/update_config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/hooks/update_config.js b/hooks/update_config.js index 17826a5..1d3a968 100644 --- a/hooks/update_config.js +++ b/hooks/update_config.js @@ -22,6 +22,7 @@ module.exports = function(context) { argumentsString = context.cmdLine, pluginConfigurationFile = path.join(context.opts.plugin.dir, 'plugin.xml'), androidPlatformDir = path.join(context.opts.projectRoot, + 'platforms', 'android'), projectConfigurationFile = path.join(context.opts.projectRoot, 'config.xml'), platformConfigurationFile, From ad69292afc6460f30d2e2bd79c03baede600af72 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 12 Aug 2019 12:45:38 +0300 Subject: [PATCH 4/7] Update update_config.js --- hooks/update_config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hooks/update_config.js b/hooks/update_config.js index 1d3a968..77d7849 100644 --- a/hooks/update_config.js +++ b/hooks/update_config.js @@ -5,11 +5,11 @@ module.exports = function(context) { var ConfigParser, XmlHelpers; try { // cordova-lib >= 5.3.4 doesn't contain ConfigParser and xml-helpers anymore - ConfigParser = context.requireCordovaModule("cordova-common").ConfigParser; - XmlHelpers = context.requireCordovaModule("cordova-common").xmlHelpers; + ConfigParser = require("cordova-common").ConfigParser; + XmlHelpers = require("cordova-common").xmlHelpers; } catch (e) { - ConfigParser = context.requireCordovaModule("cordova-lib/src/configparser/ConfigParser"); - XmlHelpers = context.requireCordovaModule("cordova-lib/src/util/xml-helpers"); + ConfigParser = require("cordova-lib/src/configparser/ConfigParser"); + XmlHelpers = require("cordova-lib/src/util/xml-helpers"); } /** @external */ From fc852ccaec290236f779d9661caf2b13a183ad63 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 12 Aug 2019 12:47:43 +0300 Subject: [PATCH 5/7] Update 000-build_64_bit.js --- hooks/after_build/000-build_64_bit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/after_build/000-build_64_bit.js b/hooks/after_build/000-build_64_bit.js index 4083ecc..cb9eec0 100644 --- a/hooks/after_build/000-build_64_bit.js +++ b/hooks/after_build/000-build_64_bit.js @@ -3,7 +3,7 @@ module.exports = function(context) { /** @external */ - var deferral = context.requireCordovaModule('q').defer(), + var deferral = require('q').defer(), UpdateConfig = require('./../update_config.js'), updateConfig = new UpdateConfig(context); From 71020f561e0b7369d0c790766a2bc2ad2e5120c5 Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 12 Aug 2019 12:48:03 +0300 Subject: [PATCH 6/7] Update 000-build_64_bit.js --- hooks/before_build/000-build_64_bit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/before_build/000-build_64_bit.js b/hooks/before_build/000-build_64_bit.js index 7c6fef7..82979f5 100644 --- a/hooks/before_build/000-build_64_bit.js +++ b/hooks/before_build/000-build_64_bit.js @@ -3,7 +3,7 @@ module.exports = function(context) { /** @external */ - var deferral = context.requireCordovaModule('q').defer(), + var deferral = require('q').defer(), UpdateConfig = require('./../update_config.js'), updateConfig = new UpdateConfig(context); From cc16aa32915f043004bd575c4b637bf7a3bdeecb Mon Sep 17 00:00:00 2001 From: Alin Jurj Date: Mon, 12 Aug 2019 12:49:27 +0300 Subject: [PATCH 7/7] Update 000-shared_mode_special.js --- hooks/before_plugin_uninstall/000-shared_mode_special.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/before_plugin_uninstall/000-shared_mode_special.js b/hooks/before_plugin_uninstall/000-shared_mode_special.js index 19909b8..407d748 100644 --- a/hooks/before_plugin_uninstall/000-shared_mode_special.js +++ b/hooks/before_plugin_uninstall/000-shared_mode_special.js @@ -3,7 +3,7 @@ module.exports = function(context) { /** @external */ - var deferral = context.requireCordovaModule('q').defer(), + var deferral = require('q').defer(), UpdateConfig = require('./../update_config.js'), updateConfig = new UpdateConfig(context);