chore: update main deps (vuejs#1772)

Akryum · web-flow · commit 96778b2caf87 · 2018-07-08T13:56:10.000+02:00
* 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
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "inquirer": "^6.0.0",
     "jest": "^23.1.0",
     "lerna": "^2.8.0",
-    "lint-staged": "^6.0.1",
+    "lint-staged": "^7.2.0",
     "memfs": "^2.8.0",
     "puppeteer": "^1.0.0",
     "request": "^2.83.0",
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.0.0-rc.3",
-    "cypress": "^3.0.0",
+    "cypress": "^3.0.2",
     "eslint-plugin-cypress": "^2.0.1"
   }
 }
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
@@ -23,10 +23,10 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.0.0-rc.3",
-    "chromedriver": "^2.38.3",
-    "deepmerge": "^2.1.0",
+    "chromedriver": "^2.40.0",
+    "deepmerge": "^2.1.1",
     "execa": "^0.10.0",
     "nightwatch": "^0.9.21",
-    "selenium-server": "^3.12.0"
+    "selenium-server": "^3.13.0"
   }
 }
diff --git a/packages/@vue/cli-plugin-eslint/generator.js b/packages/@vue/cli-plugin-eslint/generator.js
@@ -49,7 +49,7 @@ module.exports = (api, { config, lintOn = [] }) => {
 
   if (lintOn.includes('commit')) {
     Object.assign(pkg.devDependencies, {
-      'lint-staged': '^6.0.0'
+      'lint-staged': '^7.2.0'
     })
     pkg.gitHooks = {
       'pre-commit': 'lint-staged'
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.0.0-rc.3",
-    "babel-eslint": "^8.2.3",
+    "babel-eslint": "^8.2.5",
     "eslint": "^4.19.1",
     "eslint-loader": "^2.0.0",
     "eslint-plugin-vue": "^4.5.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "launch-editor": "^2.2.1",
-    "workbox-webpack-plugin": "^3.2.0"
+    "workbox-webpack-plugin": "^3.3.1"
   },
   "devDependencies": {
     "register-service-worker": "^1.0.0"
diff --git a/packages/@vue/cli-plugin-typescript/generator/index.js b/packages/@vue/cli-plugin-typescript/generator/index.js
@@ -11,7 +11,7 @@ module.exports = (api, {
     api.extendPackage({
       dependencies: {
         'vue-class-component': '^6.0.0',
-        'vue-property-decorator': '^6.0.0'
+        'vue-property-decorator': '^7.0.0'
       }
     })
   }
@@ -58,7 +58,7 @@ module.exports = (api, {
   if (hasMocha) {
     api.extendPackage({
       devDependencies: {
-        '@types/mocha': '^2.2.46',
+        '@types/mocha': '^5.2.4',
         '@types/chai': '^4.1.0'
       }
     })
@@ -68,7 +68,7 @@ module.exports = (api, {
   if (hasJest) {
     api.extendPackage({
       devDependencies: {
-        '@types/jest': '^22.0.1'
+        '@types/jest': '^23.1.4'
       }
     })
   }
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
@@ -22,19 +22,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@types/node": "^9.3.0",
+    "@types/node": "^10.5.2",
     "@vue/cli-shared-utils": "^3.0.0-rc.3",
-    "fork-ts-checker-webpack-plugin": "^0.4.1",
+    "fork-ts-checker-webpack-plugin": "^0.4.2",
     "globby": "^8.0.1",
-    "ts-loader": "^4.3.1",
+    "ts-loader": "^4.4.2",
     "tslint": "^5.10.0",
     "typescript": "~2.9.0"
   },
   "devDependencies": {
     "@types/chai": "^4.1.0",
-    "@types/jest": "^22.0.1",
-    "@types/mocha": "^2.2.46",
-    "vue-class-component": "^6.0.0",
-    "vue-property-decorator": "^6.0.0"
+    "@types/jest": "^23.1.4",
+    "@types/mocha": "^5.2.4",
+    "vue-class-component": "^6.2.0",
+    "vue-property-decorator": "^7.0.0"
   }
 }
diff --git a/packages/@vue/cli-plugin-unit-jest/generator/index.js b/packages/@vue/cli-plugin-unit-jest/generator/index.js
@@ -5,7 +5,7 @@ module.exports = api => {
       'test:unit': 'vue-cli-service test:unit'
     },
     devDependencies: {
-      '@vue/test-utils': '^1.0.0-beta.16'
+      '@vue/test-utils': '^1.0.0-beta.20'
     }
   })
 
@@ -31,7 +31,7 @@ module.exports = api => {
       'jest-serializer-vue'
     ],
     'testMatch': [
-      '<rootDir>/(tests/unit/*.spec.(js|jsx|ts|tsx)|**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx))'
+      '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
     ]
   }
 
@@ -57,7 +57,7 @@ module.exports = api => {
     jestConfig.transform['^.+\\.tsx?$'] = 'ts-jest'
     api.extendPackage({
       devDependencies: {
-        'ts-jest': '^22.4.6'
+        'ts-jest': '^23.0.0'
       }
     })
     if (api.hasPlugin('babel')) {
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
@@ -23,15 +23,15 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.0.0-rc.3",
-    "babel-jest": "^23.0.1",
+    "babel-jest": "^23.2.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
-    "jest": "^23.1.0",
-    "jest-serializer-vue": "^1.0.0",
+    "jest": "^23.3.0",
+    "jest-serializer-vue": "^2.0.2",
     "jest-transform-stub": "^1.0.0",
     "vue-jest": "^2.6.0"
   },
   "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.16",
-    "ts-jest": "^22.4.6"
+    "@vue/test-utils": "^1.0.0-beta.20",
+    "ts-jest": "^23.0.0"
   }
 }
diff --git a/packages/@vue/cli-plugin-unit-mocha/generator/index.js b/packages/@vue/cli-plugin-unit-mocha/generator/index.js
@@ -2,7 +2,7 @@ module.exports = api => {
   api.render('./template')
 
   const devDependencies = {
-    '@vue/test-utils': '^1.0.0-beta.16',
+    '@vue/test-utils': '^1.0.0-beta.20',
     'chai': '^4.1.2'
   }
 
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
@@ -22,13 +22,13 @@
   "homepage": "https://github.com/vuejs/vue-cli/packages/@vue/cli-plugin-unit-mocha#readme",
   "dependencies": {
     "@vue/cli-shared-utils": "^3.0.0-rc.3",
-    "jsdom": "^11.10.0",
+    "jsdom": "^11.11.0",
     "jsdom-global": "^3.0.2",
-    "mocha": "^5.1.1",
+    "mocha": "^5.2.0",
     "mocha-webpack": "^2.0.0-beta.0"
   },
   "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.16",
+    "@vue/test-utils": "^1.0.0-beta.20",
     "chai": "^4.1.2"
   },
   "publishConfig": {
diff --git a/packages/@vue/cli-service-global/package.json b/packages/@vue/cli-service-global/package.json
@@ -27,7 +27,7 @@
     "@vue/cli-service": "^3.0.0-rc.3",
     "chalk": "^2.4.1",
     "eslint-plugin-vue": "^4.5.0",
-    "resolve": "^1.7.1",
+    "resolve": "^1.8.1",
     "vue": "^2.5.16"
   }
 }
diff --git a/packages/@vue/cli-service/__tests__/css.spec.js b/packages/@vue/cli-service/__tests__/css.spec.js
@@ -56,7 +56,6 @@ test('default loaders', () => {
     expect(findLoaders(config, lang)).toEqual(['vue-style', 'css', 'postcss'].concat(loader))
     // assert css-loader options
     expect(findOptions(config, lang, 'css')).toEqual({
-      minimize: false,
       sourceMap: false,
       importLoaders: lang === 'css' ? 2 : 3
     })
@@ -71,7 +70,6 @@ test('production defaults', () => {
     const loader = lang === 'css' ? [] : LOADERS[lang]
     expect(findLoaders(config, lang)).toEqual([extractLoaderPath, 'css', 'postcss'].concat(loader))
     expect(findOptions(config, lang, 'css')).toEqual({
-      minimize: true,
       sourceMap: false,
       importLoaders: lang === 'css' ? 2 : 3
     })
@@ -90,7 +88,6 @@ test('CSS Modules rules', () => {
     const expected = {
       importLoaders: lang === 'css' ? 1 : 2, // no postcss-loader
       localIdentName: `[name]_[local]_[hash:base64:5]`,
-      minimize: false,
       sourceMap: false,
       modules: true
     }
diff --git a/packages/@vue/cli-service/lib/Service.js b/packages/@vue/cli-service/lib/Service.js
@@ -40,7 +40,7 @@ module.exports = class Service {
     if (inlinePkg) {
       return inlinePkg
     } else if (fs.existsSync(path.join(this.context, 'package.json'))) {
-      return readPkg.sync(this.context)
+      return readPkg.sync({ cwd: this.context })
     } else {
       return {}
     }
diff --git a/packages/@vue/cli-service/lib/config/css.js b/packages/@vue/cli-service/lib/config/css.js
@@ -79,7 +79,6 @@ module.exports = (api, options) => {
         }
 
         const cssLoaderOptions = Object.assign({
-          minimize: isProd,
           sourceMap,
           importLoaders: (
             1 + // stylePostLoader injected by vue-loader
@@ -149,9 +148,9 @@ module.exports = (api, options) => {
       }
       webpackConfig
         .plugin('optimize-css')
-          .use(require('optimize-css-assets-webpack-plugin'), [{
-            canPrint: false,
-            cssProcessorOptions
+          .use(require('@intervolga/optimize-cssnano-plugin'), [{
+            sourceMap: options.productionSourceMap && sourceMap,
+            cssnanoOptions: cssProcessorOptions
           }])
     }
   })
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
@@ -21,20 +21,21 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/packages/@vue/cli-service#readme",
   "dependencies": {
+    "@intervolga/optimize-cssnano-plugin": "^1.0.5",
     "@vue/cli-overlay": "^3.0.0-rc.3",
     "@vue/cli-shared-utils": "^3.0.0-rc.3",
     "@vue/preload-webpack-plugin": "^1.0.0",
     "@vue/web-component-wrapper": "^1.2.0",
-    "acorn": "^5.5.3",
+    "acorn": "^5.7.1",
     "address": "^1.0.3",
-    "autoprefixer": "^8.4.1",
+    "autoprefixer": "^8.6.5",
     "cache-loader": "^1.2.2",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "chalk": "^2.4.1",
     "clipboardy": "^1.2.3",
     "cliui": "^4.1.0",
-    "copy-webpack-plugin": "^4.5.1",
-    "css-loader": "^0.28.11",
+    "copy-webpack-plugin": "^4.5.2",
+    "css-loader": "^1.0.0",
     "debug": "^3.1.0",
     "escape-string-regexp": "^1.0.5",
     "file-loader": "^1.1.11",
@@ -48,27 +49,26 @@
     "lodash.defaultsdeep": "^4.6.0",
     "lodash.mapvalues": "^4.6.0",
     "lodash.transform": "^4.6.0",
-    "mini-css-extract-plugin": "^0.4.0",
+    "mini-css-extract-plugin": "^0.4.1",
     "minimist": "^1.2.0",
-    "optimize-css-assets-webpack-plugin": "^4.0.1",
     "ora": "^2.1.0",
     "portfinder": "^1.0.13",
     "postcss-loader": "^2.1.5",
-    "read-pkg": "^3.0.0",
+    "read-pkg": "^4.0.1",
     "semver": "^5.5.0",
     "slash": "^2.0.0",
     "source-map-url": "^0.4.0",
     "string.prototype.padend": "^3.0.0",
     "thread-loader": "^1.1.5",
-    "uglifyjs-webpack-plugin": "^1.2.5",
+    "uglifyjs-webpack-plugin": "^1.2.7",
     "url-loader": "^1.0.1",
-    "vue-loader": "^15.2.0",
+    "vue-loader": "^15.2.4",
     "vue-template-compiler": "^2.5.16",
-    "webpack": "^4.8.2",
+    "webpack": "^4.15.1",
     "webpack-bundle-analyzer": "^2.13.1",
     "webpack-chain": "^4.8.0",
     "webpack-dev-server": "^3.1.4",
-    "webpack-merge": "^4.1.2",
+    "webpack-merge": "^4.1.3",
     "yorkie": "^1.0.3"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
@@ -19,13 +19,13 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/packages/@vue/cli-shared-utils#readme",
   "dependencies": {
-    "chalk": "^2.3.0",
+    "chalk": "^2.4.1",
     "execa": "^0.10.0",
-    "joi": "^12.0.0",
+    "joi": "^13.0.0",
     "node-ipc": "^9.1.1",
-    "opn": "^5.2.0",
-    "ora": "^1.3.0",
-    "request": "^2.83.0",
+    "opn": "^5.3.0",
+    "ora": "^2.1.0",
+    "request": "^2.87.0",
     "request-promise-native": "^1.0.5",
     "string.prototype.padstart": "^3.0.0"
   },
diff --git a/packages/@vue/cli-ui-addon-webpack/package.json b/packages/@vue/cli-ui-addon-webpack/package.json
@@ -17,7 +17,7 @@
     "@vue/cli-service": "^3.0.0-rc.3",
     "@vue/eslint-config-standard": "^3.0.0-rc.3",
     "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.1",
+    "stylus-loader": "^3.0.2",
     "vue-progress-path": "^0.0.2",
     "vue-template-compiler": "^2.5.16",
     "vuex": "^3.0.1"
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/folders.js b/packages/@vue/cli-ui/apollo-server/connectors/folders.js
@@ -2,6 +2,7 @@ const path = require('path')
 const fs = require('fs-extra')
 const LRU = require('lru-cache')
 const winattr = require('@akryum/winattr')
+const readPkg = require('read-pkg')
 
 const hiddenPrefix = '.'
 const isPlatformWindows = process.platform.indexOf('win') === 0
@@ -100,9 +101,11 @@ function readPackage (file, context, force = false) {
       return cachedValue
     }
   }
-  const pkg = fs.readJsonSync(path.join(file, 'package.json'))
-  pkgCache.set(file, pkg)
-  return pkg
+  if (fs.existsSync(path.join(file, 'package.json'))) {
+    const pkg = readPkg.sync({ cwd: file })
+    pkgCache.set(file, pkg)
+    return pkg
+  }
 }
 
 function writePackage ({ file, data }, context) {
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
diff --git a/packages/@vue/eslint-config-prettier/package.json b/packages/@vue/eslint-config-prettier/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`},`
`24`	`24`	`"dependencies": {`
`25`	`25`	`"@vue/cli-shared-utils": "^3.0.0-rc.3",`
`26`		`- "cypress": "^3.0.0",`
	`26`	`+ "cypress": "^3.0.2",`
`27`	`27`	`"eslint-plugin-cypress": "^2.0.1"`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@`
`23`	`23`	`},`
`24`	`24`	`"dependencies": {`
`25`	`25`	`"@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",`
`28`	`28`	`"execa": "^0.10.0",`
`29`	`29`	`"nightwatch": "^0.9.21",`
`30`		`- "selenium-server": "^3.12.0"`
	`30`	`+ "selenium-server": "^3.13.0"`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ module.exports = (api, {`
`11`	`11`	`api.extendPackage({`
`12`	`12`	`dependencies: {`
`13`	`13`	`'vue-class-component': '^6.0.0',`
`14`		`- 'vue-property-decorator': '^6.0.0'`
	`14`	`+ 'vue-property-decorator': '^7.0.0'`
`15`	`15`	`}`
`16`	`16`	`})`
`17`	`17`	`}`
`@@ -58,7 +58,7 @@ module.exports = (api, {`
`58`	`58`	`if (hasMocha) {`
`59`	`59`	`api.extendPackage({`
`60`	`60`	`devDependencies: {`
`61`		`- '@types/mocha': '^2.2.46',`
	`61`	`+ '@types/mocha': '^5.2.4',`
`62`	`62`	`'@types/chai': '^4.1.0'`
`63`	`63`	`}`
`64`	`64`	`})`
`@@ -68,7 +68,7 @@ module.exports = (api, {`
`68`	`68`	`if (hasJest) {`
`69`	`69`	`api.extendPackage({`
`70`	`70`	`devDependencies: {`
`71`		`- '@types/jest': '^22.0.1'`
	`71`	`+ '@types/jest': '^23.1.4'`
`72`	`72`	`}`
`73`	`73`	`})`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ module.exports = api => {`
`5`	`5`	`'test:unit': 'vue-cli-service test:unit'`
`6`	`6`	`},`
`7`	`7`	`devDependencies: {`
`8`		`- '@vue/test-utils': '^1.0.0-beta.16'`
	`8`	`+ '@vue/test-utils': '^1.0.0-beta.20'`
`9`	`9`	`}`
`10`	`10`	`})`
`11`	`11`
`@@ -31,7 +31,7 @@ module.exports = api => {`
`31`	`31`	`'jest-serializer-vue'`
`32`	`32`	`],`
`33`	`33`	`'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)'`
`35`	`35`	`]`
`36`	`36`	`}`
`37`	`37`
`@@ -57,7 +57,7 @@ module.exports = api => {`
`57`	`57`	`jestConfig.transform['^.+\\.tsx?$'] = 'ts-jest'`
`58`	`58`	`api.extendPackage({`
`59`	`59`	`devDependencies: {`
`60`		`- 'ts-jest': '^22.4.6'`
	`60`	`+ 'ts-jest': '^23.0.0'`
`61`	`61`	`}`
`62`	`62`	`})`
`63`	`63`	`if (api.hasPlugin('babel')) {`