refactor: refactor shared utils + move openBrowser

Author: yyx990803

packages/@vue/cli-service/lib/commands/serve.js

@@ -2,6 +2,7 @@ const {
   info,
   error,
   hasYarn,
+  openBrowser,
   clearConsole
 } = require('@vue/cli-shared-utils')
 
@@ -37,7 +38,6 @@ module.exports = (api, options) => {
     const webpack = require('webpack')
     const WebpackDevServer = require('webpack-dev-server')
     const portfinder = require('portfinder')
-    const openBrowser = require('../util/openBrowser')
     const prepareURLs = require('../util/prepareURLs')
     const prepareProxy = require('../util/prepareProxy')
     const launchEditorMiddleware = require('launch-editor-middleware')

packages/@vue/cli-service/package.json

@@ -42,7 +42,6 @@
     "javascript-stringify": "^1.6.0",
     "launch-editor-middleware": "^2.2.0",
     "minimist": "^1.2.0",
-    "opn": "^5.2.0",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.3.0",
     "portfinder": "^1.0.13",

packages/@vue/cli-shared-utils/index.js

@@ -1,4 +1,10 @@
-Object.assign(exports, require('./env'))
-Object.assign(exports, require('./logger'))
-Object.assign(exports, require('./validate'))
-Object.assign(exports, require('./linkBin'))
+[
+  'env',
+  'linkBin',
+  'logger',
+  'spinner',
+  'validate',
+  'openBrowser'
+].forEach(m => {
+  Object.assign(exports, require(`./lib/${m}`))
+})

packages/@vue/cli-shared-utils/lib/_silence.js

@@ -0,0 +1,12 @@
+module.exports = function silence (exports) {
+  const logs = {}
+  Object.keys(exports).forEach(key => {
+    if (key !== 'error') {
+      exports[key] = (...args) => {
+        if (!logs[key]) logs[key] = []
+        logs[key].push(args)
+      }
+    }
+  })
+  exports.logs = logs
+}

packages/@vue/cli-shared-utils/env.js renamed to packages/@vue/cli-shared-utils/lib/env.js

@@ -1,10 +1,7 @@
 const chalk = require('chalk')
-const spinner = require('./spinner')
 const readline = require('readline')
 const padStart = require('string.prototype.padstart')
 
-Object.assign(exports, spinner)
-
 const format = (label, msg) => {
   return msg.split('\n').map((line, i) => {
     return i === 0
@@ -48,14 +45,5 @@ exports.clearConsole = title => {
 
 // silent all logs except errors during tests and keep record
 if (process.env.VUE_CLI_TEST) {
-  const logs = {}
-  Object.keys(exports).forEach(key => {
-    if (key !== 'error') {
-      exports[key] = (...args) => {
-        if (!logs[key]) logs[key] = []
-        logs[key].push(args)
-      }
-    }
-  })
-  exports.logs = logs
+  require('./_silence')(exports)
 }

packages/@vue/cli-shared-utils/linkBin.js renamed to packages/@vue/cli-shared-utils/lib/linkBin.js

@@ -6,10 +6,10 @@
  * https://github.com/facebookincubator/create-react-app/blob/master/LICENSE
  */
 
+const opn = require('opn')
+const execa = require('execa')
 const chalk = require('chalk')
 const execSync = require('child_process').execSync
-const execa = require('execa')
-const opn = require('opn')
 
 // https://github.com/sindresorhus/opn#app
 const OSX_CHROME = 'google chrome'
@@ -107,7 +107,7 @@ function startBrowserProcess (browser, url) {
  * Reads the BROWSER evironment 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) {
+exports.openBrowser = function (url) {
   const { action, value } = getBrowserEnv()
   switch (action) {
   case Actions.NONE:
@@ -121,5 +121,3 @@ function openBrowser (url) {
     throw new Error('Not implemented.')
   }
 }
-
-module.exports = openBrowser

packages/@vue/cli-shared-utils/logger.js renamed to packages/@vue/cli-shared-utils/lib/logger.js

@@ -42,3 +42,8 @@ exports.pauseSpinner = () => {
 exports.resumeSpinner = () => {
   spinner.start()
 }
+
+// silent all logs except errors during tests and keep record
+if (process.env.VUE_CLI_TEST) {
+  require('./_silence')(exports)
+}

packages/@vue/cli-service/lib/util/openBrowser.js renamed to packages/@vue/cli-shared-utils/lib/openBrowser.js

@@ -21,9 +21,10 @@
   "dependencies": {
     "chalk": "^2.3.0",
     "cmd-shim": "^2.0.2",
+    "execa": "^0.9.0",
     "joi": "^12.0.0",
+    "opn": "^5.2.0",
     "ora": "^1.3.0",
-    "readline": "^1.3.0",
     "string.prototype.padstart": "^3.0.0"
   },
   "publishConfig": {

packages/@vue/cli-service/lib/util/openChrome.applescript renamed to packages/@vue/cli-shared-utils/lib/openChrome.applescript

@@ -6112,6 +6112,31 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lint-staged@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.1.0.tgz#28f600c10a6cbd249ceb003118a1552e53544a93"
+  dependencies:
+    app-root-path "^2.0.0"
+    chalk "^2.1.0"
+    commander "^2.11.0"
+    cosmiconfig "^4.0.0"
+    debug "^3.1.0"
+    dedent "^0.7.0"
+    execa "^0.8.0"
+    find-parent-dir "^0.3.0"
+    is-glob "^4.0.0"
+    jest-validate "^21.1.0"
+    listr "^0.13.0"
+    lodash "^4.17.4"
+    log-symbols "^2.0.0"
+    minimatch "^3.0.0"
+    npm-which "^3.0.1"
+    p-map "^1.1.1"
+    path-is-inside "^1.0.2"
+    pify "^3.0.0"
+    staged-git-files "0.0.4"
+    stringify-object "^3.2.0"
+
 lint-staged@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.0.1.tgz#855f2993ab4a265430e2fd9828427e648d65e6b4"
@@ -8249,10 +8274,6 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-readline@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/readline/-/readline-1.3.0.tgz#c580d77ef2cfc8752b132498060dc9793a7ac01c"
-
 realpath-native@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.0.tgz#7885721a83b43bd5327609f0ddecb2482305fdf0"