Skip to content

Commit 1a0b591

Browse files
committed
refactor: use dependencies from @vue/cli-share-utils whenver possible
1 parent 3873d02 commit 1a0b591

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+102
-95
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"memfs": "^3.0.1",
7676
"minimist": "^1.2.0",
7777
"prettier": ">= 1.13.0",
78-
"request": "^2.83.0",
78+
"request": "^2.87.0",
7979
"request-promise-native": "^1.0.8",
8080
"rimraf": "^3.0.0",
8181
"semver": "^6.1.0",

packages/@vue/cli-plugin-e2e-nightwatch/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"dependencies": {
2626
"@vue/cli-shared-utils": "^4.1.1",
2727
"deepmerge": "^3.2.0",
28-
"execa": "^1.0.0",
2928
"nightwatch": "^1.3.1"
3029
},
3130
"devDependencies": {

packages/@vue/cli-service/bin/vue-cli-service.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env node
22

3-
const semver = require('semver')
4-
const { error } = require('@vue/cli-shared-utils')
3+
const { semver, error } = require('@vue/cli-shared-utils')
54
const requiredVersion = require('../package.json').engines.node
65

76
if (!semver.satisfies(process.version, requiredVersion)) {

packages/@vue/cli-service/lib/PluginAPI.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const path = require('path')
22
const hash = require('hash-sum')
3-
const semver = require('semver')
4-
const { matchesPluginId } = require('@vue/cli-shared-utils')
3+
const { semver, matchesPluginId } = require('@vue/cli-shared-utils')
54

65
// Note: if a plugin-registered command needs to run in a specific default mode,
76
// the plugin needs to expose it via `module.exports.defaultModes` in the form

packages/@vue/cli-service/lib/Service.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
const fs = require('fs')
22
const path = require('path')
33
const debug = require('debug')
4-
const chalk = require('chalk')
54
const readPkg = require('read-pkg')
65
const merge = require('webpack-merge')
76
const Config = require('webpack-chain')
87
const PluginAPI = require('./PluginAPI')
98
const dotenv = require('dotenv')
109
const dotenvExpand = require('dotenv-expand')
1110
const defaultsDeep = require('lodash.defaultsdeep')
12-
const { warn, error, isPlugin, resolvePluginId, loadModule } = require('@vue/cli-shared-utils')
11+
const { chalk, warn, error, isPlugin, resolvePluginId, loadModule } = require('@vue/cli-shared-utils')
1312

1413
const { defaults, validate } = require('./options')
1514

packages/@vue/cli-service/lib/commands/build/formatStats.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ module.exports = function formatStats (stats, dir, api) {
22
const fs = require('fs')
33
const path = require('path')
44
const zlib = require('zlib')
5-
const chalk = require('chalk')
65
const ui = require('cliui')({ width: 80 })
6+
const { chalk } = require('@vue/cli-shared-utils')
77

88
const json = stats.toJson({
99
hash: false,

packages/@vue/cli-service/lib/commands/build/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ module.exports = (api, options) => {
9494
async function build (args, api, options) {
9595
const fs = require('fs-extra')
9696
const path = require('path')
97-
const chalk = require('chalk')
9897
const webpack = require('webpack')
98+
const { chalk } = require('@vue/cli-shared-utils')
9999
const formatStats = require('./formatStats')
100100
const validateWebpackConfig = require('../../util/validateWebpackConfig')
101101
const {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const chalk = require('chalk')
1+
const { chalk } = require('@vue/cli-shared-utils')
22
const padEnd = require('string.prototype.padend')
33
const getPadLength = require('../util/getPadLength')
44

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ module.exports = (api, options) => {
1515
}
1616
},
1717
args => {
18-
const chalk = require('chalk')
19-
const { get } = require('@vue/cli-shared-utils')
18+
const { chalk, get } = require('@vue/cli-shared-utils')
2019
const { toString } = require('webpack-chain')
2120
const { highlight } = require('cli-highlight')
2221
const config = api.resolveWebpackConfig()

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module.exports = (api, options) => {
3535
const isProduction = process.env.NODE_ENV === 'production'
3636

3737
const url = require('url')
38-
const chalk = require('chalk')
38+
const { chalk } = require('@vue/cli-shared-utils')
3939
const webpack = require('webpack')
4040
const WebpackDevServer = require('webpack-dev-server')
4141
const portfinder = require('portfinder')

packages/@vue/cli-service/lib/config/css.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const fs = require('fs')
22
const path = require('path')
3-
const semver = require('semver')
4-
const { warn, pauseSpinner, resumeSpinner } = require('@vue/cli-shared-utils')
3+
const { semver, warn, pauseSpinner, resumeSpinner } = require('@vue/cli-shared-utils')
54

65
const findExisting = (context, files) => {
76
for (const file of files) {

packages/@vue/cli-service/lib/util/prepareProxy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
const fs = require('fs')
1010
const url = require('url')
1111
const path = require('path')
12-
const chalk = require('chalk')
12+
const { chalk } = require('@vue/cli-shared-utils')
1313
const address = require('address')
1414

1515
const defaultConfig = {

packages/@vue/cli-service/lib/util/prepareURLs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
const url = require('url')
10-
const chalk = require('chalk')
10+
const { chalk } = require('@vue/cli-shared-utils')
1111
const address = require('address')
1212
const defaultGateway = require('default-gateway')
1313

packages/@vue/cli-service/lib/util/resolveLoaderError.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const chalk = require('chalk')
1+
const { chalk } = require('@vue/cli-shared-utils')
22

33
const rules = [
44
{

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

-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
"browserslist": "^4.7.3",
4040
"cache-loader": "^4.1.0",
4141
"case-sensitive-paths-webpack-plugin": "^2.2.0",
42-
"chalk": "^2.4.2",
4342
"cli-highlight": "^2.1.4",
4443
"clipboardy": "^2.0.0",
4544
"cliui": "^5.0.0",
@@ -66,7 +65,6 @@
6665
"portfinder": "^1.0.25",
6766
"postcss-loader": "^3.0.0",
6867
"read-pkg": "^5.1.1",
69-
"semver": "^6.1.0",
7068
"slash": "^3.0.0",
7169
"source-map-url": "^0.4.0",
7270
"ssri": "^7.1.0",

packages/@vue/cli-shared-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-shared-utils#readme",
2222
"dependencies": {
2323
"@hapi/joi": "^15.0.1",
24-
"chalk": "^2.4.1",
24+
"chalk": "^2.4.2",
2525
"execa": "^1.0.0",
2626
"launch-editor": "^2.2.1",
2727
"lru-cache": "^5.1.1",

packages/@vue/cli-ui/apollo-server/connectors/dependencies.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
const fs = require('fs')
22
const path = require('path')
33
const LRU = require('lru-cache')
4-
const semver = require('semver')
5-
const chalk = require('chalk')
4+
const { chalk, semver } = require('@vue/cli-shared-utils')
65
// Connectors
76
const cwd = require('./cwd')
87
const folders = require('./folders')

packages/@vue/cli-ui/apollo-server/connectors/git.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
const execa = require('execa')
21
const path = require('path')
32
const fs = require('fs-extra')
43
const parseDiff = require('../util/parse-diff')
54
// Connectors
65
const cwd = require('./cwd')
76
// Utils
8-
const { hasProjectGit } = require('@vue/cli-shared-utils')
7+
const { execa, hasProjectGit } = require('@vue/cli-shared-utils')
98

109
async function getNewFiles (context) {
1110
if (!hasProjectGit(cwd.get())) return []

packages/@vue/cli-ui/apollo-server/connectors/plugins.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require('path')
22
const fs = require('fs-extra')
33
const LRU = require('lru-cache')
4-
const chalk = require('chalk')
4+
const { chalk } = require('@vue/cli-shared-utils')
55
// Context
66
const getContext = require('../context')
77
// Subs

packages/@vue/cli-ui/apollo-server/connectors/tasks.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const execa = require('execa')
2-
const chalk = require('chalk')
1+
const { chalk, execa } = require('@vue/cli-shared-utils')
32
// Subs
43
const channels = require('../channels')
54
// Connectors

packages/@vue/cli-ui/apollo-server/util/logger.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const chalk = require('chalk')
1+
const { chalk } = require('@vue/cli-shared-utils')
22

33
exports.log = (...args) => {
44
if (!process.env.VUE_APP_CLI_UI_DEBUG) return

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

-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@
3535
"dependencies": {
3636
"@akryum/winattr": "^3.0.0",
3737
"@vue/cli-shared-utils": "^4.1.1",
38-
"chalk": "^2.4.1",
3938
"clone": "^2.1.1",
4039
"deepmerge": "^3.2.0",
41-
"execa": "^1.0.0",
4240
"express-history-api-fallback": "^2.2.1",
4341
"fkill": "^6.1.0",
4442
"fs-extra": "^7.0.1",
@@ -58,7 +56,6 @@
5856
"portfinder": "^1.0.25",
5957
"prismjs": "^1.16.0",
6058
"rss-parser": "^3.7.3",
61-
"semver": "^6.1.0",
6259
"shortid": "^2.2.15",
6360
"typescript": "^3.4.5",
6461
"vue-cli-plugin-apollo": "^0.21.3",

packages/@vue/cli-ui/ui-defaults/suggestions.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const semver = require('semver')
2-
const { loadModule } = require('@vue/cli-shared-utils')
1+
const { semver, loadModule } = require('@vue/cli-shared-utils')
32
const invoke = require('@vue/cli/lib/invoke')
43
const add = require('@vue/cli/lib/add')
54

packages/@vue/cli/bin/vue.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
// Check node version before requiring/doing anything else
44
// The user may be on a very old node version
55

6-
const chalk = require('chalk')
7-
const semver = require('semver')
6+
const { chalk, semver } = require('@vue/cli-shared-utils')
87
const requiredVersion = require('../package.json').engines.node
98
const didYouMean = require('didyoumean')
109

packages/@vue/cli/lib/Creator.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
const path = require('path')
2-
const chalk = require('chalk')
32
const debug = require('debug')
4-
const execa = require('execa')
53
const inquirer = require('inquirer')
6-
const semver = require('semver')
74
const EventEmitter = require('events')
85
const Generator = require('./Generator')
96
const cloneDeep = require('lodash.clonedeep')
@@ -27,16 +24,22 @@ const {
2724
} = require('./options')
2825

2926
const {
27+
chalk,
28+
execa,
29+
semver,
30+
3031
log,
3132
warn,
3233
error,
34+
logWithSpinner,
35+
stopSpinner,
36+
3337
hasGit,
3438
hasProjectGit,
3539
hasYarn,
3640
hasPnpm3OrLater,
3741
hasPnpmVersionOrLater,
38-
logWithSpinner,
39-
stopSpinner,
42+
4043
exit,
4144
loadModule
4245
} = require('@vue/cli-shared-utils')

packages/@vue/cli/lib/Generator.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
const ejs = require('ejs')
22
const debug = require('debug')
3-
const semver = require('semver')
43
const GeneratorAPI = require('./GeneratorAPI')
54
const PackageManager = require('./util/ProjectPackageManager')
65
const sortObject = require('./util/sortObject')
76
const writeFileTree = require('./util/writeFileTree')
87
const inferRootOptions = require('./util/inferRootOptions')
98
const normalizeFilePaths = require('./util/normalizeFilePaths')
109
const runCodemod = require('./util/runCodemod')
11-
const { toShortPluginId, matchesPluginId, loadModule, isPlugin } = require('@vue/cli-shared-utils')
10+
const {
11+
semver,
12+
13+
isPlugin,
14+
toShortPluginId,
15+
matchesPluginId,
16+
17+
loadModule
18+
} = require('@vue/cli-shared-utils')
1219
const ConfigTransform = require('./ConfigTransform')
1320

1421
const logger = require('@vue/cli-shared-utils/lib/logger')

packages/@vue/cli/lib/GeneratorAPI.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ const path = require('path')
44
const merge = require('deepmerge')
55
const resolve = require('resolve')
66
const { isBinaryFileSync } = require('isbinaryfile')
7-
const semver = require('semver')
87
const mergeDeps = require('./util/mergeDeps')
98
const runCodemod = require('./util/runCodemod')
109
const stringifyJS = require('./util/stringifyJS')
1110
const ConfigTransform = require('./ConfigTransform')
12-
const { getPluginLink, toShortPluginId, loadModule } = require('@vue/cli-shared-utils')
11+
const { semver, getPluginLink, toShortPluginId, loadModule } = require('@vue/cli-shared-utils')
1312

1413
const isString = val => typeof val === 'string'
1514
const isFunction = val => typeof val === 'function'

packages/@vue/cli/lib/MigratorAPI.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const semver = require('semver')
1+
const { semver } = require('@vue/cli-shared-utils')
22
const GeneratorAPI = require('./GeneratorAPI')
33

44
class MigratorAPI extends GeneratorAPI {

packages/@vue/cli/lib/Upgrader.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
const fs = require('fs')
22
const path = require('path')
3-
const chalk = require('chalk')
4-
const execa = require('execa')
5-
const semver = require('semver')
63
const {
4+
chalk,
5+
execa,
6+
semver,
7+
78
log,
89
done,
910

packages/@vue/cli/lib/add.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
const chalk = require('chalk')
2-
const semver = require('semver')
31
const invoke = require('./invoke')
42
const inquirer = require('inquirer')
5-
const { resolveModule, loadModule } = require('@vue/cli-shared-utils')
3+
const {
4+
chalk,
5+
semver,
6+
resolveModule,
7+
loadModule
8+
} = require('@vue/cli-shared-utils')
69

710
const PackageManager = require('./util/ProjectPackageManager')
811
const {

packages/@vue/cli/lib/create.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
const fs = require('fs-extra')
22
const path = require('path')
3-
const chalk = require('chalk')
43
const inquirer = require('inquirer')
54
const Creator = require('./Creator')
65
const { clearConsole } = require('./util/clearConsole')
76
const { getPromptModules } = require('./util/createTools')
8-
const { error, stopSpinner, exit } = require('@vue/cli-shared-utils')
7+
const { chalk, error, stopSpinner, exit } = require('@vue/cli-shared-utils')
98
const validateProjectName = require('validate-npm-package-name')
109

1110
async function create (projectName, options) {

packages/@vue/cli/lib/inspect.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const fs = require('fs')
22
const path = require('path')
3-
const execa = require('execa')
43
const resolve = require('resolve')
4+
const { execa } = require('@vue/cli-shared-utils')
55

66
module.exports = function inspect (paths, args) {
77
const cwd = process.cwd()

packages/@vue/cli/lib/invoke.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
const fs = require('fs-extra')
22
const path = require('path')
3-
const execa = require('execa')
4-
const chalk = require('chalk')
53
const inquirer = require('inquirer')
64
const {
5+
chalk,
6+
execa,
7+
78
log,
89
error,
9-
hasProjectGit,
1010
logWithSpinner,
1111
stopSpinner,
12+
13+
hasProjectGit,
14+
1215
resolvePluginId,
16+
1317
loadModule
1418
} = require('@vue/cli-shared-utils')
1519

packages/@vue/cli/lib/promptModules/linter.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module.exports = cli => {
2-
const chalk = require('chalk')
3-
const { hasGit } = require('@vue/cli-shared-utils')
2+
const { chalk, hasGit } = require('@vue/cli-shared-utils')
43

54
cli.injectFeature({
65
name: 'Linter / Formatter',

0 commit comments

Comments
 (0)