Upgrade opn v5.3.0 to open v7.0.0

Author: jaywcjlove

index.js

@@ -10,9 +10,9 @@
 var chalk = require('colors-cli');
 var execSync = require('child_process').execSync;
 var spawn = require('cross-spawn');
-var opn = require('opn');
+var open = require('open');
 
-// https://github.com/sindresorhus/opn#app
+// https://github.com/sindresorhus/open#app
 var OSX_CHROME = 'google chrome';
 
 const Actions = Object.freeze({
@@ -24,8 +24,11 @@ const Actions = Object.freeze({
 function getBrowserEnv() {
   // Attempt to honor this environment variable.
   // It is specific to the operating system.
-  // See https://github.com/sindresorhus/opn#app for documentation.
+  // See https://github.com/sindresorhus/open#app for documentation.
   const value = process.env.BROWSER;
+  const args = process.env.BROWSER_ARGS
+    ? process.env.BROWSER_ARGS.split(' ')
+    : [];
   let action;
   if (!value) {
     // Default.
@@ -37,7 +40,7 @@ function getBrowserEnv() {
   } else {
     action = Actions.BROWSER;
   }
-  return { action, value };
+  return { action, value, args };
 }
 
 function executeNodeScript(scriptPath, url) {
@@ -61,7 +64,7 @@ function executeNodeScript(scriptPath, url) {
   return true;
 }
 
-function startBrowserProcess(browser, url) {
+function startBrowserProcess(browser, url, args) {
   // If we're on OS X, the user hasn't specifically
   // requested a different browser, we can try opening
   // Chrome with AppleScript. This lets us reuse an
@@ -93,34 +96,39 @@ function startBrowserProcess(browser, url) {
     browser = undefined;
   }
 
-  // Fallback to opn
+  // If there are arguments, they must be passed as array with the browser
+  if (typeof browser === 'string' && args.length > 0) {
+    browser = [browser].concat(args);
+  }
+
+  // Fallback to open
   // (It will always open new tab)
   try {
-    var options = { app: browser };
-    opn(url, options).catch(() => { }); // Prevent `unhandledRejection` error.
+    var options = { app: browser, wait: false, url: true };
+    open(url, options).catch(() => {}); // Prevent `unhandledRejection` error.
     return true;
   } catch (err) {
     return false;
   }
 }
 
 /**
- * Reads the BROWSER evironment variable and decides what to do with it. Returns
+ * Reads the BROWSER environment variable and decides what to do with it. Returns
  * true if it opened a browser or ran a node.js script, otherwise false.
  */
 function openBrowser(url) {
-  const { action, value } = getBrowserEnv();
+  const { action, value, args } = getBrowserEnv();
   switch (action) {
     case Actions.NONE:
       // Special case: BROWSER="none" will prevent opening completely.
       return false;
     case Actions.SCRIPT:
       return executeNodeScript(value, url);
     case Actions.BROWSER:
-      return startBrowserProcess(value, url);
+      return startBrowserProcess(value, url, args);
     default:
       throw new Error('Not implemented.');
   }
 }
 
-module.exports = openBrowser;
+module.exports = openBrowser;

package-lock.json

@@ -44,6 +44,6 @@
   "dependencies": {
     "colors-cli": "^1.0.13",
     "cross-spawn": "^6.0.5",
-    "opn": "^5.3.0"
+    "open": "^7.0.0"
   }
 }