refactor: update @vue/cli-global-utils imports

Guillaume Chau · Guillaume Chau · commit 9cc17464faa2 · 2019-07-07T15:56:26.000+02:00
diff --git a/packages/@vue/cli-global-utils/package.json b/packages/@vue/cli-global-utils/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@vue/cli-utils",
+  "name": "@vue/cli-global-utils",
   "version": "4.0.0-alpha.3",
   "description": "Utilities for the `vue` commands.",
   "repository": {
diff --git a/packages/@vue/cli-plugin-babel/__tests__/transpileDependencies.spec.js b/packages/@vue/cli-plugin-babel/__tests__/transpileDependencies.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
 
 const fs = require('fs-extra')
 const path = require('path')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 
 let project
diff --git a/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js b/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js
@@ -1,7 +1,7 @@
 jest.setTimeout(35000)
 
 const path = require('path')
-const { linkBin } = require('@vue/cli-utils/lib/util/linkBin')
+const { linkBin } = require('@vue/cli-global-utils/lib/util/linkBin')
 const create = require('@vue/cli-test-utils/createTestProject')
 
 const runSilently = fn => {
diff --git a/packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js b/packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(50000)
 const path = require('path')
 const portfinder = require('portfinder')
 const createServer = require('@vue/cli-test-utils/createServer')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service/__tests__/build.spec.js b/packages/@vue/cli-service/__tests__/build.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(30000)
 const path = require('path')
 const portfinder = require('portfinder')
 const createServer = require('@vue/cli-test-utils/createServer')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service/__tests__/buildLib.spec.js b/packages/@vue/cli-service/__tests__/buildLib.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(40000)
 const path = require('path')
 const portfinder = require('portfinder')
 const createServer = require('@vue/cli-test-utils/createServer')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service/__tests__/buildLibFormats.spec.js b/packages/@vue/cli-service/__tests__/buildLibFormats.spec.js
@@ -1,6 +1,6 @@
 jest.setTimeout(40000)
 
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 
 let project
diff --git a/packages/@vue/cli-service/__tests__/buildWc.spec.js b/packages/@vue/cli-service/__tests__/buildWc.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(30000)
 const path = require('path')
 const portfinder = require('portfinder')
 const createServer = require('@vue/cli-test-utils/createServer')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service/__tests__/buildWcAsync.spec.js b/packages/@vue/cli-service/__tests__/buildWcAsync.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(15000)
 const path = require('path')
 const portfinder = require('portfinder')
 const createServer = require('@vue/cli-test-utils/createServer')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service/__tests__/cors.spec.js b/packages/@vue/cli-service/__tests__/cors.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(30000)
 const path = require('path')
 const portfinder = require('portfinder')
 const createServer = require('@vue/cli-test-utils/createServer')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service/__tests__/modernMode.spec.js b/packages/@vue/cli-service/__tests__/modernMode.spec.js
@@ -4,7 +4,7 @@ const fs = require('fs-extra')
 const path = require('path')
 const portfinder = require('portfinder')
 const createServer = require('@vue/cli-test-utils/createServer')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service/__tests__/multiPage.spec.js b/packages/@vue/cli-service/__tests__/multiPage.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(80000)
 const path = require('path')
 const portfinder = require('portfinder')
 const createServer = require('@vue/cli-test-utils/createServer')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service/__tests__/proxy.spec.js b/packages/@vue/cli-service/__tests__/proxy.spec.js
@@ -1,7 +1,7 @@
 jest.setTimeout(30000)
 
 const request = require('request-promise-native')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
 const createJSONServer = require('@vue/cli-test-utils/createJSONServer')
diff --git a/packages/@vue/cli-service/__tests__/serve.spec.js b/packages/@vue/cli-service/__tests__/serve.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(60000)
 
 const path = require('path')
 const fs = require('fs-extra')
-const { defaultPreset } = require('@vue/cli-utils/lib/options')
+const { defaultPreset } = require('@vue/cli-global-utils/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
 
diff --git a/packages/@vue/cli-test-utils/assertPromptModule.js b/packages/@vue/cli-test-utils/assertPromptModule.js
@@ -1,7 +1,7 @@
 // using this requires mocking fs & inquirer
 
 const Creator = require('@vue/cli/lib/Creator')
-const { loadOptions } = require('@vue/cli-utils/lib/options')
+const { loadOptions } = require('@vue/cli-global-utils/lib/options')
 const { expectPrompts } = require('inquirer') // from mock
 
 module.exports = async function assertPromptModule (
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/projects.js b/packages/@vue/cli-ui/apollo-server/connectors/projects.js
@@ -4,7 +4,7 @@ const shortId = require('shortid')
 const Creator = require('@vue/cli/lib/Creator')
 const { getPromptModules } = require('@vue/cli/lib/util/createTools')
 const { getFeatures } = require('@vue/cli/lib/util/features')
-const { defaults } = require('@vue/cli-utils/lib/options')
+const { defaults } = require('@vue/cli-global-utils/lib/options')
 const { toShortPluginId, execa } = require('@vue/cli-shared-utils')
 const { progress: installProgress } = require('@vue/cli/lib/util/installDeps')
 const parseGitConfig = require('parse-git-config')
diff --git a/packages/@vue/cli-ui/apollo-server/util/command.js b/packages/@vue/cli-ui/apollo-server/util/command.js
@@ -4,7 +4,7 @@ const {
   hasPnpm3OrLater,
   hasProjectPnpm
 } = require('@vue/cli-shared-utils')
-const { loadOptions } = require('@vue/cli-utils/lib/options')
+const { loadOptions } = require('@vue/cli-global-utils/lib/options')
 
 exports.getCommand = function (cwd = undefined) {
   if (!cwd) {
diff --git a/packages/@vue/cli/__tests__/Creator.spec.js b/packages/@vue/cli/__tests__/Creator.spec.js
@@ -1,7 +1,7 @@
 jest.mock('fs')
 jest.mock('inquirer')
 
-const { defaults } = require('@vue/cli-utils/lib/options')
+const { defaults } = require('@vue/cli-global-utils/lib/options')
 const assertPromptModule = require('@vue/cli-test-utils/assertPromptModule')
 
 test('default', async () => {
diff --git a/packages/@vue/cli/__tests__/Generator.spec.js b/packages/@vue/cli/__tests__/Generator.spec.js
@@ -4,7 +4,7 @@ const fs = require('fs-extra')
 const path = require('path')
 const Generator = require('../lib/Generator')
 const { logs } = require('@vue/cli-shared-utils')
-const stringifyJS = require('@vue/cli-utils/lib/util/stringifyJS')
+const stringifyJS = require('@vue/cli-global-utils/lib/util/stringifyJS')
 
 // prepare template fixtures
 const templateDir = path.resolve(__dirname, 'template')
diff --git a/packages/@vue/cli/__tests__/options.spec.js b/packages/@vue/cli/__tests__/options.spec.js
@@ -6,7 +6,7 @@ const {
   loadOptions,
   saveOptions,
   savePreset
-} = require('@vue/cli-utils/lib/options')
+} = require('@vue/cli-global-utils/lib/options')
 
 test('load options', () => {
   expect(loadOptions()).toEqual({})
diff --git a/packages/@vue/cli/bin/vue.js b/packages/@vue/cli/bin/vue.js
@@ -47,7 +47,7 @@ if (
 }
 
 const program = require('commander')
-const loadCommand = require('@vue/cli-utils/lib/util/loadCommand')
+const loadCommand = require('@vue/cli-global-utils/lib/util/loadCommand')
 
 program
   .version(require('../package').version)
@@ -215,7 +215,7 @@ program.on('--help', () => {
 program.commands.forEach(c => c.on('--help', () => console.log()))
 
 // enhance common error messages
-const enhanceErrorMessages = require('@vue/cli-utils/lib/util/enhanceErrorMessages')
+const enhanceErrorMessages = require('@vue/cli-global-utils/lib/util/enhanceErrorMessages')
 
 enhanceErrorMessages('missingArgument', argName => {
   return `Missing required argument ${chalk.yellow(`<${argName}>`)}.`
diff --git a/packages/@vue/cli/lib/ConfigTransform.js b/packages/@vue/cli/lib/ConfigTransform.js
@@ -1,4 +1,4 @@
-const transforms = require('@vue/cli-utils/lib/util/configTransforms')
+const transforms = require('@vue/cli-global-utils/lib/util/configTransforms')
 
 class ConfigTransform {
   constructor (options) {
diff --git a/packages/@vue/cli/lib/Creator.js b/packages/@vue/cli/lib/Creator.js
@@ -5,22 +5,22 @@ const inquirer = require('inquirer')
 const semver = require('semver')
 const Generator = require('./Generator')
 const cloneDeep = require('lodash.clonedeep')
-const sortObject = require('@vue/cli-utils/lib/util/sortObject')
-const getVersions = require('@vue/cli-utils/lib/util/getVersions')
-const { installDeps } = require('@vue/cli-utils/lib/util/installDeps')
-const { clearConsole } = require('@vue/cli-utils/lib/util/clearConsole')
-const PromptModuleAPI = require('@vue/cli-utils/lib/PromptModuleAPI')
-const writeFileTree = require('@vue/cli-utils/lib/util/writeFileTree')
-const { formatFeatures } = require('@vue/cli-utils/lib/util/features')
-const { resolvePreset } = require('@vue/cli-utils/lib/util/resolvePreset')
-const generateReadme = require('@vue/cli-utils/lib/util/generateReadme')
-const { getPresets } = require('@vue/cli-utils/lib/util/getPresets')
-const { getPresetFromAnswers } = require('@vue/cli-utils/lib/util/getPresetFromAnswers')
+const sortObject = require('@vue/cli-global-utils/lib/util/sortObject')
+const getVersions = require('@vue/cli-global-utils/lib/util/getVersions')
+const { installDeps } = require('@vue/cli-global-utils/lib/util/installDeps')
+const { clearConsole } = require('@vue/cli-global-utils/lib/util/clearConsole')
+const PromptModuleAPI = require('@vue/cli-global-utils/lib/PromptModuleAPI')
+const writeFileTree = require('@vue/cli-global-utils/lib/util/writeFileTree')
+const { formatFeatures } = require('@vue/cli-global-utils/lib/util/features')
+const { resolvePreset } = require('@vue/cli-global-utils/lib/util/resolvePreset')
+const generateReadme = require('@vue/cli-global-utils/lib/util/generateReadme')
+const { getPresets } = require('@vue/cli-global-utils/lib/util/getPresets')
+const { getPresetFromAnswers } = require('@vue/cli-global-utils/lib/util/getPresetFromAnswers')
 
 const {
   defaults,
   loadOptions
-} = require('@vue/cli-utils/lib/options')
+} = require('@vue/cli-global-utils/lib/options')
 
 const {
   log,
@@ -168,7 +168,7 @@ module.exports = class Creator {
 
     if (isTestOrDebug && !process.env.VUE_CLI_TEST_DO_INSTALL_PLUGIN) {
       // in development, avoid installation process
-      await require('@vue/cli-utils/lib/util/setupDevProject')(context)
+      await require('@vue/cli-global-utils/lib/util/setupDevProject')(context)
     } else {
       await installDeps(context, packageManager)
     }
diff --git a/packages/@vue/cli/lib/Generator.js b/packages/@vue/cli/lib/Generator.js
@@ -1,11 +1,11 @@
 const ejs = require('ejs')
 const debug = require('debug')
 const GeneratorAPI = require('./GeneratorAPI')
-const sortObject = require('@vue/cli-utils/lib/util/sortObject')
-const writeFileTree = require('@vue/cli-utils/lib/util/writeFileTree')
-const inferRootOptions = require('@vue/cli-utils/lib/util/inferRootOptions')
-const normalizeFilePaths = require('@vue/cli-utils/lib/util/normalizeFilePaths')
-const runCodemod = require('@vue/cli-utils/lib/util/runCodemod')
+const sortObject = require('@vue/cli-global-utils/lib/util/sortObject')
+const writeFileTree = require('@vue/cli-global-utils/lib/util/writeFileTree')
+const inferRootOptions = require('@vue/cli-global-utils/lib/util/inferRootOptions')
+const normalizeFilePaths = require('@vue/cli-global-utils/lib/util/normalizeFilePaths')
+const runCodemod = require('@vue/cli-global-utils/lib/util/runCodemod')
 const { toShortPluginId, matchesPluginId } = require('@vue/cli-shared-utils')
 const ConfigTransform = require('./ConfigTransform')
 
@@ -219,7 +219,7 @@ module.exports = class Generator {
       imports = imports instanceof Set ? Array.from(imports) : imports
       if (imports && imports.length > 0) {
         files[file] = runCodemod(
-          require('@vue/cli-utils/lib/util/codemods/injectImports'),
+          require('@vue/cli-global-utils/lib/util/codemods/injectImports'),
           { path: file, source: files[file] },
           { imports }
         )
@@ -229,7 +229,7 @@ module.exports = class Generator {
       injections = injections instanceof Set ? Array.from(injections) : injections
       if (injections && injections.length > 0) {
         files[file] = runCodemod(
-          require('@vue/cli-utils/lib/util/codemods/injectOptions'),
+          require('@vue/cli-global-utils/lib/util/codemods/injectOptions'),
           { path: file, source: files[file] },
           { injections }
         )
diff --git a/packages/@vue/cli/lib/GeneratorAPI.js b/packages/@vue/cli/lib/GeneratorAPI.js
@@ -5,9 +5,9 @@ const merge = require('deepmerge')
 const resolve = require('resolve')
 const { isBinaryFileSync } = require('isbinaryfile')
 const semver = require('semver')
-const mergeDeps = require('@vue/cli-utils/lib/util/mergeDeps')
-const runCodemod = require('@vue/cli-utils/lib/util/runCodemod')
-const stringifyJS = require('@vue/cli-utils/lib/util/stringifyJS')
+const mergeDeps = require('@vue/cli-global-utils/lib/util/mergeDeps')
+const runCodemod = require('@vue/cli-global-utils/lib/util/runCodemod')
+const stringifyJS = require('@vue/cli-global-utils/lib/util/stringifyJS')
 const ConfigTransform = require('./ConfigTransform')
 const { getPluginLink, toShortPluginId, loadModule } = require('@vue/cli-shared-utils')
 
diff --git a/packages/@vue/cli/lib/Migrator.js b/packages/@vue/cli/lib/Migrator.js
@@ -1,7 +1,7 @@
 const Generator = require('./Generator')
 const MigratorAPI = require('./MigratorAPI')
 
-const inferRootOptions = require('@vue/cli-utils/lib/util/inferRootOptions')
+const inferRootOptions = require('@vue/cli-global-utils/lib/util/inferRootOptions')
 
 module.exports = class Migrator extends Generator {
   constructor (context, {
diff --git a/packages/@vue/cli/lib/add.js b/packages/@vue/cli/lib/add.js
@@ -1,7 +1,7 @@
 const chalk = require('chalk')
 const invoke = require('./invoke')
-const { loadOptions } = require('@vue/cli-utils/lib/options')
-const { installPackage } = require('@vue/cli-utils/lib/util/installDeps')
+const { loadOptions } = require('@vue/cli-global-utils/lib/options')
+const { installPackage } = require('@vue/cli-global-utils/lib/util/installDeps')
 const {
   log,
   error,
diff --git a/packages/@vue/cli/lib/create.js b/packages/@vue/cli/lib/create.js
@@ -3,8 +3,8 @@ const path = require('path')
 const chalk = require('chalk')
 const inquirer = require('inquirer')
 const Creator = require('./Creator')
-const { clearConsole } = require('@vue/cli-utils/lib/util/clearConsole')
-const { getPromptModules } = require('@vue/cli-utils/lib/util/createTools')
+const { clearConsole } = require('@vue/cli-global-utils/lib/util/clearConsole')
+const { getPromptModules } = require('@vue/cli-global-utils/lib/util/createTools')
 const { error, stopSpinner, exit } = require('@vue/cli-shared-utils')
 const validateProjectName = require('validate-npm-package-name')
 
diff --git a/packages/@vue/cli/lib/invoke.js b/packages/@vue/cli/lib/invoke.js
@@ -16,9 +16,9 @@ const {
 } = require('@vue/cli-shared-utils')
 
 const Generator = require('./Generator')
-const { loadOptions } = require('@vue/cli-utils/lib/options')
-const { installDeps } = require('@vue/cli-utils/lib/util/installDeps')
-const readFiles = require('@vue/cli-utils/lib/util/readFiles')
+const { loadOptions } = require('@vue/cli-global-utils/lib/options')
+const { installDeps } = require('@vue/cli-global-utils/lib/util/installDeps')
+const readFiles = require('@vue/cli-global-utils/lib/util/readFiles')
 
 function getPkg (context) {
   const pkgPath = path.resolve(context, 'package.json')
diff --git a/packages/@vue/cli/lib/upgrade.js b/packages/@vue/cli/lib/upgrade.js
@@ -19,14 +19,14 @@ const {
 
 const Migrator = require('./Migrator')
 
-const { getCommand, getVersion } = require('@vue/cli-utils/lib/util/packageManager')
-const { installDeps, updatePackage } = require('@vue/cli-utils/lib/util/installDeps')
-const { linkPackage } = require('@vue/cli-utils/lib/util/linkBin')
-
-const getPackageJson = require('@vue/cli-utils/lib/util/getPackageJson')
-const getInstalledVersion = require('@vue/cli-utils/lib/util/getInstalledVersion')
-const tryGetNewerRange = require('@vue/cli-utils/lib/util/tryGetNewerRange')
-const readFiles = require('@vue/cli-utils/lib/util/readFiles')
+const { getCommand, getVersion } = require('@vue/cli-global-utils/lib/util/packageManager')
+const { installDeps, updatePackage } = require('@vue/cli-global-utils/lib/util/installDeps')
+const { linkPackage } = require('@vue/cli-global-utils/lib/util/linkBin')
+
+const getPackageJson = require('@vue/cli-global-utils/lib/util/getPackageJson')
+const getInstalledVersion = require('@vue/cli-global-utils/lib/util/getInstalledVersion')
+const tryGetNewerRange = require('@vue/cli-global-utils/lib/util/tryGetNewerRange')
+const readFiles = require('@vue/cli-global-utils/lib/util/readFiles')
 
 const isTestOrDebug = process.env.VUE_CLI_TEST || process.env.VUE_CLI_DEBUG
 
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
@@ -28,7 +28,7 @@
     "@vue/cli-ui": "^4.0.0-alpha.3",
     "@vue/cli-ui-addon-webpack": "^4.0.0-alpha.3",
     "@vue/cli-ui-addon-widgets": "^4.0.0-alpha.3",
-    "@vue/cli-utils": "^4.0.0-alpha.3",
+    "@vue/cli-global-utils": "^4.0.0-alpha.3",
     "chalk": "^2.4.1",
     "commander": "^2.20.0",
     "debug": "^4.1.0",
diff --git a/scripts/checkLinks.js b/scripts/checkLinks.js
@@ -50,7 +50,7 @@ function checkFiles (folder, all = false, recursive = false) {
 }
 
 checkFiles(path.resolve(__dirname, '../packages/@vue'), false, true)
-checkFiles(path.resolve(__dirname, '../packages/@vue/cli-utils/lib/promptModules'), true, true)
+checkFiles(path.resolve(__dirname, '../packages/@vue/cli-global-utils/lib/promptModules'), true, true)
 Promise.all(promises).catch(() => {
   process.exit(1)
 })

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "@vue/cli-utils",`
	`2`	`+ "name": "@vue/cli-global-utils",`
`3`	`3`	`"version": "4.0.0-alpha.3",`
`4`	`4`	"description": "Utilities for the `vue` commands.",
`5`	`5`	`"repository": {`