Skip to content

Commit

Permalink
Fixing ENOENT error
Browse files Browse the repository at this point in the history
This solution was reported on issue: apla#135 . The solution was implemented in this branch: https://github.com/vash15/me.apla.cordova.app-preferences.
But as we need to have a solution which contains both cordova 9.0.0 compatibility AND a fix for this error. I'm mergin the two solutions into our own repository
  • Loading branch information
gabcvit committed Aug 14, 2020
1 parent adac3de commit 9ff1a5f
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 41 deletions.
14 changes: 6 additions & 8 deletions bin/after_plugin_install.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
'use strict';

module.exports = function (context) {
var req = context.requireCordovaModule,
Q = req('q'),
path = req('path'),
fs = require("./lib/filesystem")(Q, req('fs'), path),
var Q = require('q'),
path = require('path'),
fs = require("./lib/filesystem")(Q, require('fs'), path),
settings = require("./lib/settings")(fs, path),
android = require("./lib/android")(context),
ios = require("./lib/ios")(Q, fs, path, req('plist'), req('xcode'));
pu = require('./lib/platform-util')(context),
android = pu.forPlatform('android', () => require("./lib/android")(context));

return settings.get()
.then(function (config) {
return Q.all([
android.afterPluginInstall(config),
// ios.afterPluginInstall(config) // not implemented for iOS
android && android.afterPluginInstall && android.afterPluginInstall(config)
]);
})
.catch(function(err) {
Expand Down
16 changes: 6 additions & 10 deletions bin/after_prepare.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
'use strict';

module.exports = function (context) {
var req = context.requireCordovaModule,
Q = req('q'),
path = req('path'),
ET = req('elementtree'),
cordova = req('cordova'),
cordova_lib = cordova.cordova_lib,
cordova_lib_util = req('cordova-lib/src/cordova/util'),
fs = require("./lib/filesystem")(Q, req('fs'), path),
var Q = require('q'),
path = require('path'),
fs = require("./lib/filesystem")(Q, require('fs'), path),
settings = require("./lib/settings")(fs, path),
pu = require('./lib/platform-util')(context),
platforms = {};

platforms.android = require("./lib/android")(context);
platforms.ios = require("./lib/ios")(Q, fs, path, req('plist'), req('xcode'));
platforms.android = pu.forPlatform('android', () => require("./lib/android")(context));
platforms.ios = pu.forPlatform('ios', () => require("./lib/ios")(Q, fs, path, require('plist'), require('xcode')));
// platforms.browser = require("./lib/browser")(Q, fs, path, req('plist'), req('xcode'));

return settings.get()
Expand Down
4 changes: 1 addition & 3 deletions bin/before_plugin_install.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
'use strict';

module.exports = function (context) {
var req = context.requireCordovaModule,

path = req ('path'),
var path = require ('path'),
pathParse = require ('./lib/path-parse');

path.parse = path.parse || pathParse;
Expand Down
18 changes: 8 additions & 10 deletions bin/before_plugin_uninstall.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
'use strict';

module.exports = function (context) {
var req = context.requireCordovaModule,

Q = req('q'),
path = req('path'),
fs = require("./lib/filesystem")(Q, req('fs'), path),
var Q = require('q'),
path = require('path'),
fs = require("./lib/filesystem")(Q, require('fs'), path),
settings = require("./lib/settings")(fs, path),

android = require("./lib/android")(context),
ios = require("./lib/ios")(Q, fs, path, req('plist'), req('xcode'));
pu = require('./lib/platform-util')(context),
android = pu.forPlatform('android', () => require("./lib/android")(context)),
ios = pu.forPlatform('ios', () => require("./lib/ios")(Q, fs, path, require('plist'), require('xcode')));

return settings.get()
.then(function (config) {
return Q.all([
android.clean(config),
ios.clean(config)
android && android.clean && android.clean(config),
ios && ios.clean && ios.clean(config)
]);
})
.then(settings.remove)
Expand Down
15 changes: 6 additions & 9 deletions bin/lib/android.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@ var mappings = require("./mappings"),

module.exports = function (context) {

var
req = context ? context.requireCordovaModule : require,
Q = req('q'),
path = req('path'),
ET = req('elementtree'),
cordova = req('cordova'),
cordova_lib = cordova.cordova_lib,
var Q = require('q'),
path = require('path'),
ET = require('elementtree'),
cordova_lib = require('cordova-lib'),
ConfigParser = cordova_lib.configparser,
cordova_util = req('cordova-lib/src/cordova/util'),
cordova_util = require('cordova-lib/src/cordova/util'),
ofs = req("fs"),
fs = require("./filesystem")(Q, req('fs'), path),
fs = require("./filesystem")(Q, require('fs'), path),
platforms = {};

// fs, path, ET, cordova_util, ConfigParser
Expand Down
18 changes: 18 additions & 0 deletions bin/lib/platform-util.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';

module.exports = (context) => ({
forPlatform: function (platform, action) {
try {
if (context.opts.platforms && context.opts.platforms.indexOf(platform)=== -1) {
return;
} else {
return action();
}
} catch (e) {
console.info(`Failed for platform: ${platform} -- START`);
console.info(`If you don't need ${platform} just ignore this error.`);
console.info(e);
console.info(`Failed for platform: ${platform} -- END`);
}
},
});
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-app-preferences",
"version": "0.99.4",
"version": "0.99.5",
"description": "Application preferences plugin and preference pane generator",
"cordova": {
"id": "cordova-plugin-app-preferences",
Expand All @@ -22,6 +22,9 @@
"bin": {
"cordova-app-preferences-generator": "bin/build-app-settings.js"
},
"dependencies": {
"cordova-lib": "^9.0.0"
},
"devDependencies": {
"cordova": ">=5.4.1",
"elementtree": "^0.1.6",
Expand Down

0 comments on commit 9ff1a5f

Please sign in to comment.