dep: bump @cordova/eslint-config@^4.0.0 w/ fix (#226)

* dep(npm): bump @cordova/eslint-config@^4.0.0 * style: apply eslint auto corrections * style: apply eslint manual corrections
apache · May 20, 2022 · d6d3d41 · d6d3d41
1 parent de5e8bd
commit d6d3d41
Show file tree

Hide file tree

Showing 7 changed files with 8,804 additions and 1,609 deletions.
diff --git a/bin/templates/platform_www/cdv-electron-main.js b/bin/templates/platform_www/cdv-electron-main.js
@@ -63,12 +63,12 @@ let mainWindow;
 function createWindow () {
     // Create the browser window.
     let appIcon;
-    if (fs.existsSync(`${__dirname}/img/app.png`)) {
-        appIcon = `${__dirname}/img/app.png`;
-    } else if (fs.existsSync(`${__dirname}/img/icon.png`)) {
-        appIcon = `${__dirname}/img/icon.png`;
+    if (fs.existsSync(path.join(__dirname, 'img/app.png'))) {
+        appIcon = path.join(__dirname, 'img/app.png');
+    } else if (fs.existsSync(path.join(__dirname, 'img/icon.png'))) {
+        appIcon = path.join(__dirname, 'img/icon.png');
     } else {
-        appIcon = `${__dirname}/img/logo.png`;
+        appIcon = path.join(__dirname, 'img/logo.png');
     }
 
     const browserWindowOpts = Object.assign({}, cdvElectronSettings.browserWindow, { icon: appIcon });
@@ -101,7 +101,7 @@ function createWindow () {
 function configureProtocol () {
     protocol.registerFileProtocol(scheme, (request, cb) => {
         const url = request.url.substr(basePath.length + 1);
-        cb({ path: path.normalize(`${__dirname}/${url}`) });
+        cb({ path: path.normalize(path.join(__dirname, url)) }); // eslint-disable-line node/no-callback-literal
     });
 
     protocol.interceptFileProtocol('file', (_, cb) => { cb(null); });

diff --git a/cordova-js-src/confighelper.js b/cordova-js-src/confighelper.js
@@ -35,7 +35,7 @@ function Config (xhr) {
 }
 
 function readConfig (success, error) {
-    var xhr;
+    let xhr; // eslint-disable-line prefer-const
 
     if (typeof config !== 'undefined') {
         success(config);
@@ -49,7 +49,7 @@ function readConfig (success, error) {
         }
     }
 
-    var xhrStatusChangeHandler = function () {
+    const xhrStatusChangeHandler = function () {
         if (xhr.readyState === 4) {
             if (xhr.status === 200 || xhr.status === 304 || xhr.status === 0 /* file:// */) {
                 config = new Config(xhr);
@@ -76,7 +76,7 @@ function readConfig (success, error) {
  * Returns preference value or undefined if it does not exist.
  * @param {String} preferenceName Preference name to read */
 Config.prototype.getPreferenceValue = function getPreferenceValue (preferenceName) {
-    var preferenceItem = this.preferences && this.preferences.filter(function (item) {
+    const preferenceItem = this.preferences && this.preferences.filter(function (item) {
         return item.attributes.name && item.attributes.name.value === preferenceName;
     });
 

diff --git a/cordova-js-src/exec.js b/cordova-js-src/exec.js
@@ -49,17 +49,17 @@ module.exports = function (success, fail, service, action, args) {
         args = args || [];
 
         if (proxy) {
-            var callbackId = service + cordova.callbackId++;
+            const callbackId = service + cordova.callbackId++;
 
             if (typeof success === 'function' || typeof fail === 'function') {
                 cordova.callbacks[callbackId] = { success: success, fail: fail };
             }
             try {
                 // callbackOptions param represents additional optional parameters command could pass back, like keepCallback or
                 // custom callbackId, for example {callbackId: id, keepCallback: true, status: cordova.callbackStatus.JSON_EXCEPTION }
-                var onSuccess = function (result, callbackOptions) {
+                const onSuccess = function (result, callbackOptions) {
                     callbackOptions = callbackOptions || {};
-                    var callbackStatus;
+                    let callbackStatus;
                     // covering both undefined and null.
                     // strict null comparison was causing callbackStatus to be undefined
                     // and then no callback was called because of the check in cordova.callbackFromNative
@@ -76,9 +76,9 @@ module.exports = function (success, fail, service, action, args) {
                             keepCallback: callbackOptions.keepCallback || false
                         });
                 };
-                var onError = function (err, callbackOptions) {
+                const onError = function (err, callbackOptions) {
                     callbackOptions = callbackOptions || {};
-                    var callbackStatus;
+                    let callbackStatus;
                     // covering both undefined and null.
                     // strict null comparison was causing callbackStatus to be undefined
                     // and then no callback was called because of the check in cordova.callbackFromNative

diff --git a/cordova-js-src/platform.js b/cordova-js-src/platform.js
@@ -24,8 +24,8 @@ module.exports = {
     cordovaVersion: '4.2.0', // cordova-js
 
     bootstrap: function () {
-        var modulemapper = require('cordova/modulemapper');
-        var channel = require('cordova/channel');
+        const modulemapper = require('cordova/modulemapper');
+        const channel = require('cordova/channel');
 
         modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
 

diff --git a/lib/prepare.js b/lib/prepare.js
@@ -246,7 +246,7 @@ function findHighResIcons (icons) {
             : false
     );
 
-    const highResIcons = icons.filter(icon => {
+    const highResIcons = icons.filter(icon => { // eslint-disable-line array-callback-return
         if (icon.src.includes('@')) {
             const extension = path.extname(icon.src);
             const suffix = icon.src.split('@').pop().slice(0, -extension.length);