breaking: remove q dependency

apache · May 20, 2020 · 9f2fbbb · 9f2fbbb
1 parent 48a88f9
commit 9f2fbbb
Show file tree

Hide file tree

Showing 25 changed files with 116 additions and 121 deletions.
diff --git a/bin/apple_ios_version b/bin/apple_ios_version
@@ -21,7 +21,7 @@
 
 var versions = require('./templates/scripts/cordova/lib/versions.js');
 
-versions.get_apple_ios_version().done(null, function (err) {
+versions.get_apple_ios_version().catch(err => {
     console.log(err);
     process.exit(2);
 });
diff --git a/bin/apple_osx_version b/bin/apple_osx_version
@@ -21,7 +21,7 @@
 
 var versions = require('./templates/scripts/cordova/lib/versions.js');
 
-versions.get_apple_osx_version().done(null, function (err) {
+versions.get_apple_osx_version().catch(err => {
     console.log(err);
     process.exit(2);
 });
diff --git a/bin/apple_xcode_version b/bin/apple_xcode_version
@@ -21,9 +21,12 @@
 
 var versions = require('./templates/scripts/cordova/lib/versions.js');
 
-versions.get_apple_xcode_version().done(function (version) {
-    console.log(version);
-}, function (err) {
-    console.error(err);
-    process.exit(2);
-});
+versions.get_apple_xcode_version().then(
+    version => {
+        console.log(version);
+    },
+    err => {
+        console.error(err);
+        process.exit(2);
+    }
+);
diff --git a/bin/check_reqs b/bin/check_reqs
@@ -25,7 +25,7 @@ var check_reqs = require('./templates/scripts/cordova/lib/check_reqs');
 if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) > -1) {
     console.log('Usage: check_reqs or node check_reqs');
 } else {
-    check_reqs.run().done(null, function (err) {
+    check_reqs.run().catch(err => {
         console.error('Failed to check requirements due to ' + err);
         process.exit(2);
     });

diff --git a/bin/lib/create.js b/bin/lib/create.js
@@ -17,12 +17,11 @@
     under the License.
 */
 
-const Q = require('q');
 const path = require('path');
 const fs = require('fs-extra');
 const xmlescape = require('xml-escape');
 const ROOT = path.join(__dirname, '..', '..');
-const events = require('cordova-common').events;
+const { CordovaError, events } = require('cordova-common');
 const utils = require('./utils');
 
 function updateSubprojectHelp () {
@@ -204,12 +203,12 @@ exports.createProject = (project_path, package_name, project_name, opts, config)
 
     // check that project path doesn't exist
     if (fs.existsSync(project_path)) {
-        return Q.reject('Project already exists');
+        return Promise.reject(new CordovaError('Project already exists'));
     }
 
     // check that parent directory does exist so cp -r will not fail
     if (!fs.existsSync(project_parent)) {
-        return Q.reject(`Parent directory "${project_parent}" of given project path does not exist`);
+        return Promise.reject(new CordovaError(`Parent directory "${project_parent}" of given project path does not exist`));
     }
 
     events.emit('log', 'Creating Cordova project for the iOS platform:');
@@ -235,7 +234,7 @@ exports.createProject = (project_path, package_name, project_name, opts, config)
     copyScripts(project_path, project_name);
 
     events.emit('log', generateDoneMessage('create', use_shared));
-    return Q.resolve();
+    return Promise.resolve();
 };
 
 exports.updateProject = (projectPath, opts) => {
@@ -248,7 +247,7 @@ exports.updateProject = (projectPath, opts) => {
     '\tcordova platform rm ios\n' +
     '\tcordova platform add ios\n';
 
-    return Q.reject(errorString);
+    return Promise.reject(new CordovaError(errorString));
 };
 
 function generateDoneMessage (type, link) {

diff --git a/bin/templates/scripts/cordova/Api.js b/bin/templates/scripts/cordova/Api.js
@@ -37,7 +37,6 @@ const CordovaError = require('cordova-common').CordovaError;
 const CordovaLogger = require('cordova-common').CordovaLogger;
 const events = require('cordova-common').events;
 const PluginManager = require('cordova-common').PluginManager;
-const Q = require('q');
 const util = require('util');
 const xcode = require('xcode');
 const ConfigParser = require('cordova-common').ConfigParser;
@@ -278,10 +277,7 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
                 const frameworkPods = frameworkTags.filter(obj => obj.type === 'podspec');
                 return this.addPodSpecs(plugin, podSpecs, frameworkPods, installOptions);
             }
-        })
-        // CB-11022 return non-falsy value to indicate
-        // that there is no need to run prepare after
-        .thenResolve(true);
+        });
 };
 
 /**
@@ -327,10 +323,7 @@ Api.prototype.removePlugin = function (plugin, uninstallOptions) {
                 const frameworkPods = frameworkTags.filter(obj => obj.type === 'podspec');
                 return this.removePodSpecs(plugin, podSpecs, frameworkPods, uninstallOptions);
             }
-        })
-        // CB-11022 return non-falsy value to indicate
-        // that there is no need to run prepare after
-        .thenResolve(true);
+        });
 };
 
 /**
@@ -449,7 +442,7 @@ Api.prototype.addPodSpecs = function (plugin, podSpecs, frameworkPods, installOp
             events.emit('verbose', 'Podfile unchanged, skipping `pod install`');
         }
     }
-    return Q.when();
+    return Promise.resolve();
 };
 
 /**
@@ -567,7 +560,7 @@ Api.prototype.removePodSpecs = function (plugin, podSpecs, frameworkPods, uninst
             events.emit('verbose', 'Podfile unchanged, skipping `pod install`');
         }
     }
-    return Q.when();
+    return Promise.resolve();
 };
 
 /**

diff --git a/bin/templates/scripts/cordova/build b/bin/templates/scripts/cordova/build
@@ -54,10 +54,13 @@ buildOpts.argv = buildOpts.argv.remain;
 
 require('./loggingHelper').adjustLoggerLevel(buildOpts);
 
-new Api().build(buildOpts).done(function () {
-    console.log('** BUILD SUCCEEDED **');
-}, function (err) {
-    var errorMessage = (err && err.stack) ? err.stack : err;
-    console.error(errorMessage);
-    process.exit(2);
-});
+new Api().build(buildOpts).then(
+    () => {
+        console.log('** BUILD SUCCEEDED **');
+    },
+    err => {
+        var errorMessage = (err && err.stack) ? err.stack : err;
+        console.error(errorMessage);
+        process.exit(2);
+    }
+);
diff --git a/bin/templates/scripts/cordova/clean b/bin/templates/scripts/cordova/clean
@@ -41,9 +41,12 @@ opts.noPrepare = true;
 
 require('./loggingHelper').adjustLoggerLevel(opts);
 
-new Api().clean(opts).done(function () {
-    console.log('** CLEAN SUCCEEDED **');
-}, function (err) {
-    console.error(err);
-    process.exit(2);
-});
+new Api().clean(opts).then(
+    () => {
+        console.log('** CLEAN SUCCEEDED **');
+    },
+    err => {
+        console.error(err);
+        process.exit(2);
+    }
+);
diff --git a/bin/templates/scripts/cordova/lib/Podfile.js b/bin/templates/scripts/cordova/lib/Podfile.js
@@ -21,7 +21,6 @@
 const fs = require('fs-extra');
 const path = require('path');
 const util = require('util');
-const Q = require('q');
 const {
     CordovaError,
     events,
@@ -376,7 +375,7 @@ Podfile.prototype.before_install = function (toolOptions) {
     fs.writeFileSync(debugConfigPath, debugContents, 'utf8');
     fs.writeFileSync(releaseConfigPath, releaseContents, 'utf8');
 
-    return Q.resolve(toolOptions);
+    return Promise.resolve(toolOptions);
 };
 
 Podfile.prototype.install = function (requirementsCheckerFunction) {
@@ -387,7 +386,7 @@ Podfile.prototype.install = function (requirementsCheckerFunction) {
     let first = true;
 
     if (!requirementsCheckerFunction) {
-        requirementsCheckerFunction = Q();
+        requirementsCheckerFunction = Promise.resolve();
     }
 
     return requirementsCheckerFunction()
@@ -396,7 +395,7 @@ Podfile.prototype.install = function (requirementsCheckerFunction) {
             if (toolOptions.ignore) {
                 events.emit('verbose', '==== pod install start ====\n');
                 events.emit('verbose', toolOptions.ignoreMessage);
-                return Q.resolve();
+                return Promise.resolve();
             } else {
                 return spawn('pod', ['install', '--verbose'], opts)
                     .progress(stdio => {

diff --git a/bin/templates/scripts/cordova/lib/build.js b/bin/templates/scripts/cordova/lib/build.js
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-const Q = require('q');
 const path = require('path');
 const which = require('which');
 const {
+    CordovaError,
     events,
     superspawn: { spawn }
 } = require('cordova-common');
@@ -112,16 +112,16 @@ module.exports.run = buildOpts => {
     buildOpts = buildOpts || {};
 
     if (buildOpts.debug && buildOpts.release) {
-        return Q.reject('Cannot specify "debug" and "release" options together.');
+        return Promise.reject(new CordovaError('Cannot specify "debug" and "release" options together.'));
     }
 
     if (buildOpts.device && buildOpts.emulator) {
-        return Q.reject('Cannot specify "device" and "emulator" options together.');
+        return Promise.reject(new CordovaError('Cannot specify "device" and "emulator" options together.'));
     }
 
     if (buildOpts.buildConfig) {
         if (!fs.existsSync(buildOpts.buildConfig)) {
-            return Q.reject(`Build config file does not exist: ${buildOpts.buildConfig}`);
+            return Promise.reject(new CordovaError(`Build config file does not exist: ${buildOpts.buildConfig}`));
         }
         events.emit('log', `Reading build config file: ${path.resolve(buildOpts.buildConfig)}`);
         const contents = fs.readFileSync(buildOpts.buildConfig, 'utf-8');
@@ -211,7 +211,7 @@ module.exports.run = buildOpts => {
                 writeCodeSignStyle('Automatic');
             }
 
-            return Q.nfcall(fs.writeFile, path.join(__dirname, '..', 'build-extras.xcconfig'), extraConfig, 'utf-8');
+            return fs.writeFile(path.join(__dirname, '..', 'build-extras.xcconfig'), extraConfig, 'utf-8');
         }).then(() => {
             const configuration = buildOpts.release ? 'Release' : 'Debug';
 
@@ -277,7 +277,7 @@ module.exports.run = buildOpts => {
                 return spawn('xcodebuild', xcodearchiveArgs, { cwd: projectPath, printCommand: true, stdio: 'inherit' });
             }
 
-            return Q.nfcall(fs.writeFile, exportOptionsPath, exportOptionsPlist, 'utf-8')
+            return fs.writeFile(exportOptionsPath, exportOptionsPlist, 'utf-8')
                 .then(checkSystemRuby)
                 .then(packageArchive);
         });
@@ -293,14 +293,14 @@ function findXCodeProjectIn (projectPath) {
     const xcodeProjFiles = fs.readdirSync(projectPath).filter(name => path.extname(name) === '.xcodeproj');
 
     if (xcodeProjFiles.length === 0) {
-        return Q.reject(`No Xcode project found in ${projectPath}`);
+        return Promise.reject(new CordovaError(`No Xcode project found in ${projectPath}`));
     }
     if (xcodeProjFiles.length > 1) {
         events.emit('warn', `Found multiple .xcodeproj directories in \n${projectPath}\nUsing first one`);
     }
 
     const projectName = path.basename(xcodeProjFiles[0], '.xcodeproj');
-    return Q.resolve(projectName);
+    return Promise.resolve(projectName);
 }
 
 module.exports.findXCodeProjectIn = findXCodeProjectIn;

diff --git a/bin/templates/scripts/cordova/lib/check_reqs.js b/bin/templates/scripts/cordova/lib/check_reqs.js
@@ -19,9 +19,9 @@
 
 'use strict';
 
-const Q = require('q');
 const which = require('which');
 const versions = require('./versions');
+const { CordovaError } = require('cordova-common');
 
 const SUPPORTED_OS_PLATFORMS = ['darwin'];
 
@@ -55,8 +55,8 @@ module.exports.check_ios_deploy = () => {
 module.exports.check_os = () => {
     // Build iOS apps available for OSX platform only, so we reject on others platforms
     return os_platform_is_supported()
-        ? Q.resolve(process.platform)
-        : Q.reject('Cordova tooling for iOS requires Apple macOS');
+        ? Promise.resolve(process.platform)
+        : Promise.reject(new CordovaError('Cordova tooling for iOS requires Apple macOS'));
 };
 
 function os_platform_is_supported () {
@@ -85,15 +85,15 @@ function checkTool (tool, minVersion, message, toolFriendlyName) {
     // Check whether tool command is available at all
     const tool_command = which.sync(tool, { nothrow: true });
     if (!tool_command) {
-        return Q.reject(`${toolFriendlyName} was not found. ${message || ''}`);
+        return Promise.reject(new CordovaError(`${toolFriendlyName} was not found. ${message || ''}`));
     }
 
     // check if tool version is greater than specified one
     return versions.get_tool_version(tool).then(version => {
         version = version.trim();
         return versions.compareVersions(version, minVersion) >= 0
-            ? Q.resolve({ version })
-            : Q.reject(`Cordova needs ${toolFriendlyName} version ${minVersion} or greater, you have version ${version}. ${message || ''}`);
+            ? Promise.resolve({ version })
+            : Promise.reject(new CordovaError(`Cordova needs ${toolFriendlyName} version ${minVersion} or greater, you have version ${version}. ${message || ''}`));
     });
 }
 
@@ -141,7 +141,7 @@ module.exports.check_all = () => {
         return promise.then(() => {
             // If fatal requirement is failed,
             // we don't need to check others
-            if (fatalIsHit) return Q();
+            if (fatalIsHit) return Promise.resolve();
 
             const requirement = requirements[idx];
             return checkFn()
@@ -155,7 +155,7 @@ module.exports.check_all = () => {
                     result.push(requirement);
                 });
         });
-    }, Q())
+    }, Promise.resolve())
         // When chain is completed, return requirements array to upstream API
         .then(() => result);
 };
diff --git a/bin/templates/scripts/cordova/lib/clean.js b/bin/templates/scripts/cordova/lib/clean.js
@@ -17,18 +17,20 @@
  * under the License.
  */
 
-const Q = require('q');
 const path = require('path');
 const fs = require('fs-extra');
-const { superspawn: { spawn } } = require('cordova-common');
+const {
+    CordovaError,
+    superspawn: { spawn }
+} = require('cordova-common');
 
 const projectPath = path.join(__dirname, '..', '..');
 
 module.exports.run = () => {
     const projectName = fs.readdirSync(projectPath).filter(name => path.extname(name) === '.xcodeproj');
 
     if (!projectName) {
-        return Q.reject(`No Xcode project found in ${projectPath}`);
+        return Promise.reject(new CordovaError(`No Xcode project found in ${projectPath}`));
     }
 
     const xcodebuildClean = configName => {

diff --git a/bin/templates/scripts/cordova/lib/listEmulatorImages.js b/bin/templates/scripts/cordova/lib/listEmulatorImages.js
@@ -17,15 +17,14 @@
        under the License.
 */
 
-var Q = require('q');
 var iossim = require('ios-sim');
 
 /**
  * Gets list of iOS devices available for simulation
  * @return {Promise} Promise fulfilled with list of devices available for simulation
  */
 function listEmulatorImages () {
-    return Q.resolve(iossim.getdevicetypes());
+    return Promise.resolve(iossim.getdevicetypes());
 }
 
 exports.run = listEmulatorImages;