Skip to content

Commit 96778b2

Browse files
AkryumAkryum
authored
chore: update main deps (vuejs#1772)
* chore: update main deps * chore: update ts types * chore: update generator deps versions * fix: ts-jest * chore: upgrade ts-jest again * fix: re-generated yarn.lock * chore: more upgrades * fix: jest test matching on Windows
1 parent 31e1b49 commit 96778b2

File tree

24 files changed

+1464
-1143
lines changed

24 files changed

+1464
-1143
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"inquirer": "^6.0.0",
6060
"jest": "^23.1.0",
6161
"lerna": "^2.8.0",
62-
"lint-staged": "^6.0.1",
62+
"lint-staged": "^7.2.0",
6363
"memfs": "^2.8.0",
6464
"puppeteer": "^1.0.0",
6565
"request": "^2.83.0",

‎packages/@vue/cli-plugin-e2e-cypress/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"@vue/cli-shared-utils": "^3.0.0-rc.3",
26-
"cypress": "^3.0.0",
26+
"cypress": "^3.0.2",
2727
"eslint-plugin-cypress": "^2.0.1"
2828
}
2929
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
},
2424
"dependencies": {
2525
"@vue/cli-shared-utils": "^3.0.0-rc.3",
26-
"chromedriver": "^2.38.3",
27-
"deepmerge": "^2.1.0",
26+
"chromedriver": "^2.40.0",
27+
"deepmerge": "^2.1.1",
2828
"execa": "^0.10.0",
2929
"nightwatch": "^0.9.21",
30-
"selenium-server": "^3.12.0"
30+
"selenium-server": "^3.13.0"
3131
}
3232
}

‎packages/@vue/cli-plugin-eslint/generator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = (api, { config, lintOn = [] }) => {
4949

5050
if (lintOn.includes('commit')) {
5151
Object.assign(pkg.devDependencies, {
52-
'lint-staged': '^6.0.0'
52+
'lint-staged': '^7.2.0'
5353
})
5454
pkg.gitHooks = {
5555
'pre-commit': 'lint-staged'

‎packages/@vue/cli-plugin-eslint/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"@vue/cli-shared-utils": "^3.0.0-rc.3",
26-
"babel-eslint": "^8.2.3",
26+
"babel-eslint": "^8.2.5",
2727
"eslint": "^4.19.1",
2828
"eslint-loader": "^2.0.0",
2929
"eslint-plugin-vue": "^4.5.0",

‎packages/@vue/cli-plugin-pwa/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"launch-editor": "^2.2.1",
26-
"workbox-webpack-plugin": "^3.2.0"
26+
"workbox-webpack-plugin": "^3.3.1"
2727
},
2828
"devDependencies": {
2929
"register-service-worker": "^1.0.0"

‎packages/@vue/cli-plugin-typescript/generator/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = (api, {
1111
api.extendPackage({
1212
dependencies: {
1313
'vue-class-component': '^6.0.0',
14-
'vue-property-decorator': '^6.0.0'
14+
'vue-property-decorator': '^7.0.0'
1515
}
1616
})
1717
}
@@ -58,7 +58,7 @@ module.exports = (api, {
5858
if (hasMocha) {
5959
api.extendPackage({
6060
devDependencies: {
61-
'@types/mocha': '^2.2.46',
61+
'@types/mocha': '^5.2.4',
6262
'@types/chai': '^4.1.0'
6363
}
6464
})
@@ -68,7 +68,7 @@ module.exports = (api, {
6868
if (hasJest) {
6969
api.extendPackage({
7070
devDependencies: {
71-
'@types/jest': '^22.0.1'
71+
'@types/jest': '^23.1.4'
7272
}
7373
})
7474
}

‎packages/@vue/cli-plugin-typescript/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
"access": "public"
2323
},
2424
"dependencies": {
25-
"@types/node": "^9.3.0",
25+
"@types/node": "^10.5.2",
2626
"@vue/cli-shared-utils": "^3.0.0-rc.3",
27-
"fork-ts-checker-webpack-plugin": "^0.4.1",
27+
"fork-ts-checker-webpack-plugin": "^0.4.2",
2828
"globby": "^8.0.1",
29-
"ts-loader": "^4.3.1",
29+
"ts-loader": "^4.4.2",
3030
"tslint": "^5.10.0",
3131
"typescript": "~2.9.0"
3232
},
3333
"devDependencies": {
3434
"@types/chai": "^4.1.0",
35-
"@types/jest": "^22.0.1",
36-
"@types/mocha": "^2.2.46",
37-
"vue-class-component": "^6.0.0",
38-
"vue-property-decorator": "^6.0.0"
35+
"@types/jest": "^23.1.4",
36+
"@types/mocha": "^5.2.4",
37+
"vue-class-component": "^6.2.0",
38+
"vue-property-decorator": "^7.0.0"
3939
}
4040
}

‎packages/@vue/cli-plugin-unit-jest/generator/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = api => {
55
'test:unit': 'vue-cli-service test:unit'
66
},
77
devDependencies: {
8-
'@vue/test-utils': '^1.0.0-beta.16'
8+
'@vue/test-utils': '^1.0.0-beta.20'
99
}
1010
})
1111

@@ -31,7 +31,7 @@ module.exports = api => {
3131
'jest-serializer-vue'
3232
],
3333
'testMatch': [
34-
'<rootDir>/(tests/unit/*.spec.(js|jsx|ts|tsx)|**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx))'
34+
'**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
3535
]
3636
}
3737

@@ -57,7 +57,7 @@ module.exports = api => {
5757
jestConfig.transform['^.+\\.tsx?$'] = 'ts-jest'
5858
api.extendPackage({
5959
devDependencies: {
60-
'ts-jest': '^22.4.6'
60+
'ts-jest': '^23.0.0'
6161
}
6262
})
6363
if (api.hasPlugin('babel')) {

‎packages/@vue/cli-plugin-unit-jest/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
},
2424
"dependencies": {
2525
"@vue/cli-shared-utils": "^3.0.0-rc.3",
26-
"babel-jest": "^23.0.1",
26+
"babel-jest": "^23.2.0",
2727
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
28-
"jest": "^23.1.0",
29-
"jest-serializer-vue": "^1.0.0",
28+
"jest": "^23.3.0",
29+
"jest-serializer-vue": "^2.0.2",
3030
"jest-transform-stub": "^1.0.0",
3131
"vue-jest": "^2.6.0"
3232
},
3333
"devDependencies": {
34-
"@vue/test-utils": "^1.0.0-beta.16",
35-
"ts-jest": "^22.4.6"
34+
"@vue/test-utils": "^1.0.0-beta.20",
35+
"ts-jest": "^23.0.0"
3636
}
3737
}

‎packages/@vue/cli-plugin-unit-mocha/generator/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = api => {
22
api.render('./template')
33

44
const devDependencies = {
5-
'@vue/test-utils': '^1.0.0-beta.16',
5+
'@vue/test-utils': '^1.0.0-beta.20',
66
'chai': '^4.1.2'
77
}
88

‎packages/@vue/cli-plugin-unit-mocha/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"homepage": "https://github.com/vuejs/vue-cli/packages/@vue/cli-plugin-unit-mocha#readme",
2323
"dependencies": {
2424
"@vue/cli-shared-utils": "^3.0.0-rc.3",
25-
"jsdom": "^11.10.0",
25+
"jsdom": "^11.11.0",
2626
"jsdom-global": "^3.0.2",
27-
"mocha": "^5.1.1",
27+
"mocha": "^5.2.0",
2828
"mocha-webpack": "^2.0.0-beta.0"
2929
},
3030
"devDependencies": {
31-
"@vue/test-utils": "^1.0.0-beta.16",
31+
"@vue/test-utils": "^1.0.0-beta.20",
3232
"chai": "^4.1.2"
3333
},
3434
"publishConfig": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@vue/cli-service": "^3.0.0-rc.3",
2828
"chalk": "^2.4.1",
2929
"eslint-plugin-vue": "^4.5.0",
30-
"resolve": "^1.7.1",
30+
"resolve": "^1.8.1",
3131
"vue": "^2.5.16"
3232
}
3333
}

‎packages/@vue/cli-service/__tests__/css.spec.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ test('default loaders', () => {
5656
expect(findLoaders(config, lang)).toEqual(['vue-style', 'css', 'postcss'].concat(loader))
5757
// assert css-loader options
5858
expect(findOptions(config, lang, 'css')).toEqual({
59-
minimize: false,
6059
sourceMap: false,
6160
importLoaders: lang === 'css' ? 2 : 3
6261
})
@@ -71,7 +70,6 @@ test('production defaults', () => {
7170
const loader = lang === 'css' ? [] : LOADERS[lang]
7271
expect(findLoaders(config, lang)).toEqual([extractLoaderPath, 'css', 'postcss'].concat(loader))
7372
expect(findOptions(config, lang, 'css')).toEqual({
74-
minimize: true,
7573
sourceMap: false,
7674
importLoaders: lang === 'css' ? 2 : 3
7775
})
@@ -90,7 +88,6 @@ test('CSS Modules rules', () => {
9088
const expected = {
9189
importLoaders: lang === 'css' ? 1 : 2, // no postcss-loader
9290
localIdentName: `[name]_[local]_[hash:base64:5]`,
93-
minimize: false,
9491
sourceMap: false,
9592
modules: true
9693
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module.exports = class Service {
4040
if (inlinePkg) {
4141
return inlinePkg
4242
} else if (fs.existsSync(path.join(this.context, 'package.json'))) {
43-
return readPkg.sync(this.context)
43+
return readPkg.sync({ cwd: this.context })
4444
} else {
4545
return {}
4646
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ module.exports = (api, options) => {
7979
}
8080

8181
const cssLoaderOptions = Object.assign({
82-
minimize: isProd,
8382
sourceMap,
8483
importLoaders: (
8584
1 + // stylePostLoader injected by vue-loader
@@ -149,9 +148,9 @@ module.exports = (api, options) => {
149148
}
150149
webpackConfig
151150
.plugin('optimize-css')
152-
.use(require('optimize-css-assets-webpack-plugin'), [{
153-
canPrint: false,
154-
cssProcessorOptions
151+
.use(require('@intervolga/optimize-cssnano-plugin'), [{
152+
sourceMap: options.productionSourceMap && sourceMap,
153+
cssnanoOptions: cssProcessorOptions
155154
}])
156155
}
157156
})

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,21 @@
2121
},
2222
"homepage": "https://github.com/vuejs/vue-cli/packages/@vue/cli-service#readme",
2323
"dependencies": {
24+
"@intervolga/optimize-cssnano-plugin": "^1.0.5",
2425
"@vue/cli-overlay": "^3.0.0-rc.3",
2526
"@vue/cli-shared-utils": "^3.0.0-rc.3",
2627
"@vue/preload-webpack-plugin": "^1.0.0",
2728
"@vue/web-component-wrapper": "^1.2.0",
28-
"acorn": "^5.5.3",
29+
"acorn": "^5.7.1",
2930
"address": "^1.0.3",
30-
"autoprefixer": "^8.4.1",
31+
"autoprefixer": "^8.6.5",
3132
"cache-loader": "^1.2.2",
3233
"case-sensitive-paths-webpack-plugin": "^2.1.2",
3334
"chalk": "^2.4.1",
3435
"clipboardy": "^1.2.3",
3536
"cliui": "^4.1.0",
36-
"copy-webpack-plugin": "^4.5.1",
37-
"css-loader": "^0.28.11",
37+
"copy-webpack-plugin": "^4.5.2",
38+
"css-loader": "^1.0.0",
3839
"debug": "^3.1.0",
3940
"escape-string-regexp": "^1.0.5",
4041
"file-loader": "^1.1.11",
@@ -48,27 +49,26 @@
4849
"lodash.defaultsdeep": "^4.6.0",
4950
"lodash.mapvalues": "^4.6.0",
5051
"lodash.transform": "^4.6.0",
51-
"mini-css-extract-plugin": "^0.4.0",
52+
"mini-css-extract-plugin": "^0.4.1",
5253
"minimist": "^1.2.0",
53-
"optimize-css-assets-webpack-plugin": "^4.0.1",
5454
"ora": "^2.1.0",
5555
"portfinder": "^1.0.13",
5656
"postcss-loader": "^2.1.5",
57-
"read-pkg": "^3.0.0",
57+
"read-pkg": "^4.0.1",
5858
"semver": "^5.5.0",
5959
"slash": "^2.0.0",
6060
"source-map-url": "^0.4.0",
6161
"string.prototype.padend": "^3.0.0",
6262
"thread-loader": "^1.1.5",
63-
"uglifyjs-webpack-plugin": "^1.2.5",
63+
"uglifyjs-webpack-plugin": "^1.2.7",
6464
"url-loader": "^1.0.1",
65-
"vue-loader": "^15.2.0",
65+
"vue-loader": "^15.2.4",
6666
"vue-template-compiler": "^2.5.16",
67-
"webpack": "^4.8.2",
67+
"webpack": "^4.15.1",
6868
"webpack-bundle-analyzer": "^2.13.1",
6969
"webpack-chain": "^4.8.0",
7070
"webpack-dev-server": "^3.1.4",
71-
"webpack-merge": "^4.1.2",
71+
"webpack-merge": "^4.1.3",
7272
"yorkie": "^1.0.3"
7373
},
7474
"devDependencies": {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
},
2020
"homepage": "https://github.com/vuejs/vue-cli/packages/@vue/cli-shared-utils#readme",
2121
"dependencies": {
22-
"chalk": "^2.3.0",
22+
"chalk": "^2.4.1",
2323
"execa": "^0.10.0",
24-
"joi": "^12.0.0",
24+
"joi": "^13.0.0",
2525
"node-ipc": "^9.1.1",
26-
"opn": "^5.2.0",
27-
"ora": "^1.3.0",
28-
"request": "^2.83.0",
26+
"opn": "^5.3.0",
27+
"ora": "^2.1.0",
28+
"request": "^2.87.0",
2929
"request-promise-native": "^1.0.5",
3030
"string.prototype.padstart": "^3.0.0"
3131
},

‎packages/@vue/cli-ui-addon-webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@vue/cli-service": "^3.0.0-rc.3",
1818
"@vue/eslint-config-standard": "^3.0.0-rc.3",
1919
"stylus": "^0.54.5",
20-
"stylus-loader": "^3.0.1",
20+
"stylus-loader": "^3.0.2",
2121
"vue-progress-path": "^0.0.2",
2222
"vue-template-compiler": "^2.5.16",
2323
"vuex": "^3.0.1"

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const path = require('path')
22
const fs = require('fs-extra')
33
const LRU = require('lru-cache')
44
const winattr = require('@akryum/winattr')
5+
const readPkg = require('read-pkg')
56

67
const hiddenPrefix = '.'
78
const isPlatformWindows = process.platform.indexOf('win') === 0
@@ -100,9 +101,11 @@ function readPackage (file, context, force = false) {
100101
return cachedValue
101102
}
102103
}
103-
const pkg = fs.readJsonSync(path.join(file, 'package.json'))
104-
pkgCache.set(file, pkg)
105-
return pkg
104+
if (fs.existsSync(path.join(file, 'package.json'))) {
105+
const pkg = readPkg.sync({ cwd: file })
106+
pkgCache.set(file, pkg)
107+
return pkg
108+
}
106109
}
107110

108111
function writePackage ({ file, data }, context) {

0 commit comments

Comments
 (0)