refactor: use dependencies from @vue/cli-share-utils whenver possible

haoqunjiang · haoqunjiang · commit 1a0b59142aa8 · 2019-11-29T15:41:18.000+08:00
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "memfs": "^3.0.1",
     "minimist": "^1.2.0",
     "prettier": ">= 1.13.0",
-    "request": "^2.83.0",
+    "request": "^2.87.0",
     "request-promise-native": "^1.0.8",
     "rimraf": "^3.0.0",
     "semver": "^6.1.0",
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
@@ -25,7 +25,6 @@
   "dependencies": {
     "@vue/cli-shared-utils": "^4.1.1",
     "deepmerge": "^3.2.0",
-    "execa": "^1.0.0",
     "nightwatch": "^1.3.1"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-service/bin/vue-cli-service.js b/packages/@vue/cli-service/bin/vue-cli-service.js
@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
-const semver = require('semver')
-const { error } = require('@vue/cli-shared-utils')
+const { semver, error } = require('@vue/cli-shared-utils')
 const requiredVersion = require('../package.json').engines.node
 
 if (!semver.satisfies(process.version, requiredVersion)) {
diff --git a/packages/@vue/cli-service/lib/PluginAPI.js b/packages/@vue/cli-service/lib/PluginAPI.js
@@ -1,7 +1,6 @@
 const path = require('path')
 const hash = require('hash-sum')
-const semver = require('semver')
-const { matchesPluginId } = require('@vue/cli-shared-utils')
+const { semver, matchesPluginId } = require('@vue/cli-shared-utils')
 
 // Note: if a plugin-registered command needs to run in a specific default mode,
 // the plugin needs to expose it via `module.exports.defaultModes` in the form
diff --git a/packages/@vue/cli-service/lib/Service.js b/packages/@vue/cli-service/lib/Service.js
@@ -1,15 +1,14 @@
 const fs = require('fs')
 const path = require('path')
 const debug = require('debug')
-const chalk = require('chalk')
 const readPkg = require('read-pkg')
 const merge = require('webpack-merge')
 const Config = require('webpack-chain')
 const PluginAPI = require('./PluginAPI')
 const dotenv = require('dotenv')
 const dotenvExpand = require('dotenv-expand')
 const defaultsDeep = require('lodash.defaultsdeep')
-const { warn, error, isPlugin, resolvePluginId, loadModule } = require('@vue/cli-shared-utils')
+const { chalk, warn, error, isPlugin, resolvePluginId, loadModule } = require('@vue/cli-shared-utils')
 
 const { defaults, validate } = require('./options')
 
diff --git a/packages/@vue/cli-service/lib/commands/build/formatStats.js b/packages/@vue/cli-service/lib/commands/build/formatStats.js
@@ -2,8 +2,8 @@ module.exports = function formatStats (stats, dir, api) {
   const fs = require('fs')
   const path = require('path')
   const zlib = require('zlib')
-  const chalk = require('chalk')
   const ui = require('cliui')({ width: 80 })
+  const { chalk } = require('@vue/cli-shared-utils')
 
   const json = stats.toJson({
     hash: false,
diff --git a/packages/@vue/cli-service/lib/commands/build/index.js b/packages/@vue/cli-service/lib/commands/build/index.js
@@ -94,8 +94,8 @@ module.exports = (api, options) => {
 async function build (args, api, options) {
   const fs = require('fs-extra')
   const path = require('path')
-  const chalk = require('chalk')
   const webpack = require('webpack')
+  const { chalk } = require('@vue/cli-shared-utils')
   const formatStats = require('./formatStats')
   const validateWebpackConfig = require('../../util/validateWebpackConfig')
   const {
diff --git a/packages/@vue/cli-service/lib/commands/help.js b/packages/@vue/cli-service/lib/commands/help.js
@@ -1,4 +1,4 @@
-const chalk = require('chalk')
+const { chalk } = require('@vue/cli-shared-utils')
 const padEnd = require('string.prototype.padend')
 const getPadLength = require('../util/getPadLength')
 
diff --git a/packages/@vue/cli-service/lib/commands/inspect.js b/packages/@vue/cli-service/lib/commands/inspect.js
@@ -15,8 +15,7 @@ module.exports = (api, options) => {
       }
     },
     args => {
-      const chalk = require('chalk')
-      const { get } = require('@vue/cli-shared-utils')
+      const { chalk, get } = require('@vue/cli-shared-utils')
       const { toString } = require('webpack-chain')
       const { highlight } = require('cli-highlight')
       const config = api.resolveWebpackConfig()
diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
@@ -35,7 +35,7 @@ module.exports = (api, options) => {
     const isProduction = process.env.NODE_ENV === 'production'
 
     const url = require('url')
-    const chalk = require('chalk')
+    const { chalk } = require('@vue/cli-shared-utils')
     const webpack = require('webpack')
     const WebpackDevServer = require('webpack-dev-server')
     const portfinder = require('portfinder')
diff --git a/packages/@vue/cli-service/lib/config/css.js b/packages/@vue/cli-service/lib/config/css.js
@@ -1,7 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-const semver = require('semver')
-const { warn, pauseSpinner, resumeSpinner } = require('@vue/cli-shared-utils')
+const { semver, warn, pauseSpinner, resumeSpinner } = require('@vue/cli-shared-utils')
 
 const findExisting = (context, files) => {
   for (const file of files) {
diff --git a/packages/@vue/cli-service/lib/util/prepareProxy.js b/packages/@vue/cli-service/lib/util/prepareProxy.js
@@ -9,7 +9,7 @@
 const fs = require('fs')
 const url = require('url')
 const path = require('path')
-const chalk = require('chalk')
+const { chalk } = require('@vue/cli-shared-utils')
 const address = require('address')
 
 const defaultConfig = {
diff --git a/packages/@vue/cli-service/lib/util/prepareURLs.js b/packages/@vue/cli-service/lib/util/prepareURLs.js
@@ -7,7 +7,7 @@
  */
 
 const url = require('url')
-const chalk = require('chalk')
+const { chalk } = require('@vue/cli-shared-utils')
 const address = require('address')
 const defaultGateway = require('default-gateway')
 
diff --git a/packages/@vue/cli-service/lib/util/resolveLoaderError.js b/packages/@vue/cli-service/lib/util/resolveLoaderError.js
@@ -1,4 +1,4 @@
-const chalk = require('chalk')
+const { chalk } = require('@vue/cli-shared-utils')
 
 const rules = [
   {
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
@@ -39,7 +39,6 @@
     "browserslist": "^4.7.3",
     "cache-loader": "^4.1.0",
     "case-sensitive-paths-webpack-plugin": "^2.2.0",
-    "chalk": "^2.4.2",
     "cli-highlight": "^2.1.4",
     "clipboardy": "^2.0.0",
     "cliui": "^5.0.0",
@@ -66,7 +65,6 @@
     "portfinder": "^1.0.25",
     "postcss-loader": "^3.0.0",
     "read-pkg": "^5.1.1",
-    "semver": "^6.1.0",
     "slash": "^3.0.0",
     "source-map-url": "^0.4.0",
     "ssri": "^7.1.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
@@ -21,7 +21,7 @@
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-shared-utils#readme",
   "dependencies": {
     "@hapi/joi": "^15.0.1",
-    "chalk": "^2.4.1",
+    "chalk": "^2.4.2",
     "execa": "^1.0.0",
     "launch-editor": "^2.2.1",
     "lru-cache": "^5.1.1",
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/dependencies.js b/packages/@vue/cli-ui/apollo-server/connectors/dependencies.js
@@ -1,8 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const LRU = require('lru-cache')
-const semver = require('semver')
-const chalk = require('chalk')
+const { chalk, semver } = require('@vue/cli-shared-utils')
 // Connectors
 const cwd = require('./cwd')
 const folders = require('./folders')
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/git.js b/packages/@vue/cli-ui/apollo-server/connectors/git.js
@@ -1,11 +1,10 @@
-const execa = require('execa')
 const path = require('path')
 const fs = require('fs-extra')
 const parseDiff = require('../util/parse-diff')
 // Connectors
 const cwd = require('./cwd')
 // Utils
-const { hasProjectGit } = require('@vue/cli-shared-utils')
+const { execa, hasProjectGit } = require('@vue/cli-shared-utils')
 
 async function getNewFiles (context) {
   if (!hasProjectGit(cwd.get())) return []
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/plugins.js b/packages/@vue/cli-ui/apollo-server/connectors/plugins.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const fs = require('fs-extra')
 const LRU = require('lru-cache')
-const chalk = require('chalk')
+const { chalk } = require('@vue/cli-shared-utils')
 // Context
 const getContext = require('../context')
 // Subs
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/tasks.js b/packages/@vue/cli-ui/apollo-server/connectors/tasks.js
@@ -1,5 +1,4 @@
-const execa = require('execa')
-const chalk = require('chalk')
+const { chalk, execa } = require('@vue/cli-shared-utils')
 // Subs
 const channels = require('../channels')
 // Connectors
diff --git a/packages/@vue/cli-ui/apollo-server/util/logger.js b/packages/@vue/cli-ui/apollo-server/util/logger.js
@@ -1,4 +1,4 @@
-const chalk = require('chalk')
+const { chalk } = require('@vue/cli-shared-utils')
 
 exports.log = (...args) => {
   if (!process.env.VUE_APP_CLI_UI_DEBUG) return
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
@@ -35,10 +35,8 @@
   "dependencies": {
     "@akryum/winattr": "^3.0.0",
     "@vue/cli-shared-utils": "^4.1.1",
-    "chalk": "^2.4.1",
     "clone": "^2.1.1",
     "deepmerge": "^3.2.0",
-    "execa": "^1.0.0",
     "express-history-api-fallback": "^2.2.1",
     "fkill": "^6.1.0",
     "fs-extra": "^7.0.1",
@@ -58,7 +56,6 @@
     "portfinder": "^1.0.25",
     "prismjs": "^1.16.0",
     "rss-parser": "^3.7.3",
-    "semver": "^6.1.0",
     "shortid": "^2.2.15",
     "typescript": "^3.4.5",
     "vue-cli-plugin-apollo": "^0.21.3",
diff --git a/packages/@vue/cli-ui/ui-defaults/suggestions.js b/packages/@vue/cli-ui/ui-defaults/suggestions.js
@@ -1,5 +1,4 @@
-const semver = require('semver')
-const { loadModule } = require('@vue/cli-shared-utils')
+const { semver, loadModule } = require('@vue/cli-shared-utils')
 const invoke = require('@vue/cli/lib/invoke')
 const add = require('@vue/cli/lib/add')
 
diff --git a/packages/@vue/cli/bin/vue.js b/packages/@vue/cli/bin/vue.js
@@ -3,8 +3,7 @@
 // Check node version before requiring/doing anything else
 // The user may be on a very old node version
 
-const chalk = require('chalk')
-const semver = require('semver')
+const { chalk, semver } = require('@vue/cli-shared-utils')
 const requiredVersion = require('../package.json').engines.node
 const didYouMean = require('didyoumean')
 
diff --git a/packages/@vue/cli/lib/Creator.js b/packages/@vue/cli/lib/Creator.js
@@ -1,9 +1,6 @@
 const path = require('path')
-const chalk = require('chalk')
 const debug = require('debug')
-const execa = require('execa')
 const inquirer = require('inquirer')
-const semver = require('semver')
 const EventEmitter = require('events')
 const Generator = require('./Generator')
 const cloneDeep = require('lodash.clonedeep')
@@ -27,16 +24,22 @@ const {
 } = require('./options')
 
 const {
+  chalk,
+  execa,
+  semver,
+
   log,
   warn,
   error,
+  logWithSpinner,
+  stopSpinner,
+
   hasGit,
   hasProjectGit,
   hasYarn,
   hasPnpm3OrLater,
   hasPnpmVersionOrLater,
-  logWithSpinner,
-  stopSpinner,
+
   exit,
   loadModule
 } = require('@vue/cli-shared-utils')
diff --git a/packages/@vue/cli/lib/Generator.js b/packages/@vue/cli/lib/Generator.js
@@ -1,14 +1,21 @@
 const ejs = require('ejs')
 const debug = require('debug')
-const semver = require('semver')
 const GeneratorAPI = require('./GeneratorAPI')
 const PackageManager = require('./util/ProjectPackageManager')
 const sortObject = require('./util/sortObject')
 const writeFileTree = require('./util/writeFileTree')
 const inferRootOptions = require('./util/inferRootOptions')
 const normalizeFilePaths = require('./util/normalizeFilePaths')
 const runCodemod = require('./util/runCodemod')
-const { toShortPluginId, matchesPluginId, loadModule, isPlugin } = require('@vue/cli-shared-utils')
+const {
+  semver,
+
+  isPlugin,
+  toShortPluginId,
+  matchesPluginId,
+
+  loadModule
+} = require('@vue/cli-shared-utils')
 const ConfigTransform = require('./ConfigTransform')
 
 const logger = require('@vue/cli-shared-utils/lib/logger')
diff --git a/packages/@vue/cli/lib/GeneratorAPI.js b/packages/@vue/cli/lib/GeneratorAPI.js
@@ -4,12 +4,11 @@ const path = require('path')
 const merge = require('deepmerge')
 const resolve = require('resolve')
 const { isBinaryFileSync } = require('isbinaryfile')
-const semver = require('semver')
 const mergeDeps = require('./util/mergeDeps')
 const runCodemod = require('./util/runCodemod')
 const stringifyJS = require('./util/stringifyJS')
 const ConfigTransform = require('./ConfigTransform')
-const { getPluginLink, toShortPluginId, loadModule } = require('@vue/cli-shared-utils')
+const { semver, getPluginLink, toShortPluginId, loadModule } = require('@vue/cli-shared-utils')
 
 const isString = val => typeof val === 'string'
 const isFunction = val => typeof val === 'function'
diff --git a/packages/@vue/cli/lib/MigratorAPI.js b/packages/@vue/cli/lib/MigratorAPI.js
@@ -1,4 +1,4 @@
-const semver = require('semver')
+const { semver } = require('@vue/cli-shared-utils')
 const GeneratorAPI = require('./GeneratorAPI')
 
 class MigratorAPI extends GeneratorAPI {
diff --git a/packages/@vue/cli/lib/Upgrader.js b/packages/@vue/cli/lib/Upgrader.js
@@ -1,9 +1,10 @@
 const fs = require('fs')
 const path = require('path')
-const chalk = require('chalk')
-const execa = require('execa')
-const semver = require('semver')
 const {
+  chalk,
+  execa,
+  semver,
+
   log,
   done,
 
diff --git a/packages/@vue/cli/lib/add.js b/packages/@vue/cli/lib/add.js
@@ -1,8 +1,11 @@
-const chalk = require('chalk')
-const semver = require('semver')
 const invoke = require('./invoke')
 const inquirer = require('inquirer')
-const { resolveModule, loadModule } = require('@vue/cli-shared-utils')
+const {
+  chalk,
+  semver,
+  resolveModule,
+  loadModule
+} = require('@vue/cli-shared-utils')
 
 const PackageManager = require('./util/ProjectPackageManager')
 const {
diff --git a/packages/@vue/cli/lib/create.js b/packages/@vue/cli/lib/create.js
@@ -1,11 +1,10 @@
 const fs = require('fs-extra')
 const path = require('path')
-const chalk = require('chalk')
 const inquirer = require('inquirer')
 const Creator = require('./Creator')
 const { clearConsole } = require('./util/clearConsole')
 const { getPromptModules } = require('./util/createTools')
-const { error, stopSpinner, exit } = require('@vue/cli-shared-utils')
+const { chalk, error, stopSpinner, exit } = require('@vue/cli-shared-utils')
 const validateProjectName = require('validate-npm-package-name')
 
 async function create (projectName, options) {
diff --git a/packages/@vue/cli/lib/inspect.js b/packages/@vue/cli/lib/inspect.js
@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
-const execa = require('execa')
 const resolve = require('resolve')
+const { execa } = require('@vue/cli-shared-utils')
 
 module.exports = function inspect (paths, args) {
   const cwd = process.cwd()
diff --git a/packages/@vue/cli/lib/invoke.js b/packages/@vue/cli/lib/invoke.js
@@ -1,15 +1,19 @@
 const fs = require('fs-extra')
 const path = require('path')
-const execa = require('execa')
-const chalk = require('chalk')
 const inquirer = require('inquirer')
 const {
+  chalk,
+  execa,
+
   log,
   error,
-  hasProjectGit,
   logWithSpinner,
   stopSpinner,
+
+  hasProjectGit,
+
   resolvePluginId,
+
   loadModule
 } = require('@vue/cli-shared-utils')
 
diff --git a/packages/@vue/cli/lib/promptModules/linter.js b/packages/@vue/cli/lib/promptModules/linter.js
@@ -1,6 +1,5 @@
 module.exports = cli => {
-  const chalk = require('chalk')
-  const { hasGit } = require('@vue/cli-shared-utils')
+  const { chalk, hasGit } = require('@vue/cli-shared-utils')
 
   cli.injectFeature({
     name: 'Linter / Formatter',
diff --git a/packages/@vue/cli/lib/promptModules/router.js b/packages/@vue/cli/lib/promptModules/router.js
diff --git a/packages/@vue/cli/lib/util/ProjectPackageManager.js b/packages/@vue/cli/lib/util/ProjectPackageManager.js
diff --git a/packages/@vue/cli/lib/util/clearConsole.js b/packages/@vue/cli/lib/util/clearConsole.js
diff --git a/packages/@vue/cli/lib/util/confirmIfGitDirty.js b/packages/@vue/cli/lib/util/confirmIfGitDirty.js
diff --git a/packages/@vue/cli/lib/util/enhanceErrorMessages.js b/packages/@vue/cli/lib/util/enhanceErrorMessages.js
diff --git a/packages/@vue/cli/lib/util/executeCommand.js b/packages/@vue/cli/lib/util/executeCommand.js
diff --git a/packages/@vue/cli/lib/util/features.js b/packages/@vue/cli/lib/util/features.js
diff --git a/packages/@vue/cli/lib/util/getVersions.js b/packages/@vue/cli/lib/util/getVersions.js
diff --git a/packages/@vue/cli/lib/util/loadCommand.js b/packages/@vue/cli/lib/util/loadCommand.js
diff --git a/packages/@vue/cli/lib/util/mergeDeps.js b/packages/@vue/cli/lib/util/mergeDeps.js
diff --git a/packages/@vue/cli/lib/util/shouldUseTaobao.js b/packages/@vue/cli/lib/util/shouldUseTaobao.js
diff --git a/packages/@vue/cli/lib/util/tryGetNewerRange.js b/packages/@vue/cli/lib/util/tryGetNewerRange.js
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const chalk = require('chalk')`
	`1`	`+const { chalk } = require('@vue/cli-shared-utils')`
`2`	`2`	`const padEnd = require('string.prototype.padend')`
`3`	`3`	`const getPadLength = require('../util/getPadLength')`
`4`	`4`