Merged master into 1.0.2_branch

2018-10-09 15:15:16 -05:00
parent bcdffc7059 addc65d324
commit 3d12dabf5a
1 changed files with 1 additions and 1 deletions
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -226,7 +226,7 @@ module.exports = {
      port: 3000,
      openOptions: {
        app: [
-          process.platform === 'win32' ? 'chrome' : 'google-chrome-stable',
+          process.platform === 'win32' ? 'chrome' : process.platform === 'darwin' ? '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome' : 'google-chrome-stable',
          '--disable-web-security',
          '--user-data-dir=' + path.resolve(chromeUserDataDir)
        ]