Merge pull request #111 from vuejs/dev

Compare changes across branches, commits, tags, and more below.

Author: GulajavaMinistudio

package.json

@@ -49,10 +49,10 @@
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^5.0.2",
-    "@vuepress/plugin-pwa": "^1.4.0",
-    "@vuepress/theme-vue": "^1.4.0",
-    "@typescript-eslint/eslint-plugin": "^2.26.0",
-    "@typescript-eslint/parser": "^2.26.0",
+    "@vuepress/plugin-pwa": "^1.4.1",
+    "@vuepress/theme-vue": "^1.4.1",
+    "@typescript-eslint/eslint-plugin": "^2.30.0",
+    "@typescript-eslint/parser": "^2.30.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^24.9.0",
@@ -62,7 +62,7 @@
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-graphql": "^3.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^6.2.2",
@@ -71,7 +71,7 @@
     "geckodriver": "^1.19.1",
     "globby": "^9.2.0",
     "graphql": "^14.6.0",
-    "http-server": "^0.12.1",
+    "http-server": "^0.12.3",
     "inquirer": "^7.1.0",
     "jest": "^24.9.0",
     "lerna": "^3.19.0",
@@ -85,7 +85,7 @@
     "rimraf": "^3.0.2",
     "semver": "^6.1.0",
     "typescript": "~3.8.3",
-    "vuepress": "^1.3.0",
+    "vuepress": "^1.4.1",
     "webpack": "^4.0.0",
     "yorkie": "^2.0.0"
   },

packages/@vue/babel-preset-app/package.json

@@ -30,12 +30,12 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-jsx": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.9.0",
-    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-env": "^7.9.5",
     "@babel/runtime": "^7.9.2",
     "@vue/babel-preset-jsx": "^1.1.2",
-    "babel-plugin-dynamic-import-node": "^2.3.0",
-    "core-js": "^3.6.4",
-    "core-js-compat": "^3.6.4"
+    "babel-plugin-dynamic-import-node": "^2.3.3",
+    "core-js": "^3.6.5",
+    "core-js-compat": "^3.6.5"
   },
   "peerDependencies": {
     "@babel/core": "*"

packages/@vue/cli-plugin-babel/generator.js

@@ -10,7 +10,7 @@ module.exports = api => {
       presets: ['@vue/cli-plugin-babel/preset']
     },
     dependencies: {
-      'core-js': '^3.6.4'
+      'core-js': '^3.6.5'
     }
   })
 }

packages/@vue/cli-plugin-babel/migrator/index.js

@@ -10,7 +10,7 @@ module.exports = api => {
     api.extendPackage(
       {
         dependencies: {
-          'core-js': '^3.6.4'
+          'core-js': '^3.6.5'
         }
       },
       { warnIncompatibleVersions: false }

packages/@vue/cli-plugin-e2e-nightwatch/nightwatch.config.js

@@ -28,6 +28,7 @@ const defaultSettings = {
   page_objects_path: 'tests/e2e/page-objects',
   custom_assertions_path: 'tests/e2e/custom-assertions',
   custom_commands_path: 'tests/e2e/custom-commands',
+  globals_path: path.resolve('tests/e2e/globals.js'),
   test_workers: concurrentMode,
   test_settings: {
     default: {

packages/@vue/cli-plugin-eslint/eslintDeps.js

@@ -9,7 +9,7 @@ const DEPS_MAP = {
   },
   prettier: {
     '@vue/eslint-config-prettier': '^6.0.0',
-    'eslint-plugin-prettier': '^3.1.1',
+    'eslint-plugin-prettier': '^3.1.3',
     prettier: '^1.19.1'
   },
   standard: {
@@ -21,8 +21,8 @@ const DEPS_MAP = {
   },
   typescript: {
     '@vue/eslint-config-typescript': '^5.0.2',
-    '@typescript-eslint/eslint-plugin': '^2.26.0',
-    '@typescript-eslint/parser': '^2.26.0'
+    '@typescript-eslint/eslint-plugin': '^2.30.0',
+    '@typescript-eslint/parser': '^2.30.0'
   }
 }
 

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

@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@types/webpack-env": "^1.15.1",
+    "@types/webpack-env": "^1.15.2",
     "@vue/cli-shared-utils": "^4.3.1",
     "cache-loader": "^4.1.0",
     "fork-ts-checker-webpack-plugin": "^3.1.1",
@@ -44,6 +44,6 @@
     "@types/mocha": "^5.2.6",
     "typescript": "~3.8.3",
     "vue-class-component": "^7.2.3",
-    "vue-property-decorator": "^8.4.1"
+    "vue-property-decorator": "^8.4.2"
   }
 }

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

@@ -26,7 +26,7 @@
     "jsdom": "^15.2.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^6.2.2",
-    "mochapack": "^1.1.13"
+    "mochapack": "^1.1.15"
   },
   "devDependencies": {
     "@vue/test-utils": "1.0.0-beta.31",

packages/@vue/cli-plugin-vuex/generator/index.js

@@ -4,7 +4,7 @@ module.exports = (api, options = {}) => {
 
   api.extendPackage({
     dependencies: {
-      vuex: '^3.1.3'
+      vuex: '^3.3.0'
     }
   })
 

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

@@ -27,11 +27,11 @@
     "@vue/cli-service": "^4.3.1",
     "babel-eslint": "^10.1.0",
     "chalk": "^3.0.0",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.2.2",
     "regenerator-runtime": "^0.13.5",
-    "resolve": "^1.15.1",
+    "resolve": "^1.17.0",
     "vue": "^2.6.11",
     "vue-template-compiler": "^2.6.11"
   }

packages/@vue/cli-service/__tests__/buildWcAsync.spec.js

@@ -1,4 +1,4 @@
-jest.setTimeout(15000)
+jest.setTimeout(30000)
 
 const path = require('path')
 const portfinder = require('portfinder')

packages/@vue/cli-service/generator/index.js

@@ -24,15 +24,15 @@ module.exports = (api, options) => {
   if (options.cssPreprocessor) {
     const deps = {
       sass: {
-        sass: '^1.26.3',
+        sass: '^1.26.5',
         'sass-loader': '^8.0.2'
       },
       'node-sass': {
         'node-sass': '^4.12.0',
         'sass-loader': '^8.0.2'
       },
       'dart-sass': {
-        sass: '^1.26.3',
+        sass: '^1.26.5',
         'sass-loader': '^8.0.2'
       },
       less: {

packages/@vue/cli-service/generator/template/_gitignore

@@ -22,6 +22,7 @@ geckodriver.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
 
 # Editor directories and files
 .idea

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

@@ -30,21 +30,21 @@
     "@vue/cli-plugin-router": "^4.3.1",
     "@vue/cli-plugin-vuex": "^4.3.1",
     "@vue/cli-shared-utils": "^4.3.1",
-    "@vue/component-compiler-utils": "^3.0.2",
+    "@vue/component-compiler-utils": "^3.1.2",
     "@vue/preload-webpack-plugin": "^1.1.0",
     "@vue/web-component-wrapper": "^1.2.0",
-    "acorn": "^7.1.0",
+    "acorn": "^7.1.1",
     "acorn-walk": "^7.1.1",
     "address": "^1.1.2",
-    "autoprefixer": "^9.7.5",
-    "browserslist": "^4.11.1",
+    "autoprefixer": "^9.7.6",
+    "browserslist": "^4.12.0",
     "cache-loader": "^4.1.0",
     "case-sensitive-paths-webpack-plugin": "^2.3.0",
     "cli-highlight": "^2.1.4",
     "clipboardy": "^2.3.0",
     "cliui": "^6.0.0",
     "copy-webpack-plugin": "^5.1.1",
-    "css-loader": "^3.4.2",
+    "css-loader": "^3.5.3",
     "cssnano": "^4.1.10",
     "debug": "^4.1.1",
     "default-gateway": "^5.0.5",
@@ -62,16 +62,16 @@
     "mini-css-extract-plugin": "^0.9.0",
     "minimist": "^1.2.5",
     "pnp-webpack-plugin": "^1.6.4",
-    "portfinder": "^1.0.25",
+    "portfinder": "^1.0.26",
     "postcss-loader": "^3.0.0",
     "ssri": "^7.1.0",
-    "terser-webpack-plugin": "^2.3.5",
+    "terser-webpack-plugin": "^2.3.6",
     "thread-loader": "^2.1.3",
     "url-loader": "^2.2.0",
     "vue-loader": "^15.9.1",
     "vue-style-loader": "^4.1.2",
     "webpack": "^4.0.0",
-    "webpack-bundle-analyzer": "^3.6.1",
+    "webpack-bundle-analyzer": "^3.7.0",
     "webpack-chain": "^6.4.0",
     "webpack-dev-server": "^3.10.3",
     "webpack-merge": "^4.2.2"
@@ -106,7 +106,7 @@
     "vue": "^2.6.11",
     "vue-router": "^3.1.6",
     "vue-template-compiler": "^2.6.11",
-    "vuex": "^3.1.3"
+    "vuex": "^3.3.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -22,7 +22,7 @@
     "@vue/cli-plugin-eslint": "^4.3.1",
     "@vue/cli-service": "^4.3.1",
     "@vue/eslint-config-standard": "^5.1.2",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",
@@ -33,7 +33,7 @@
     "stylus-loader": "^3.0.2",
     "vue-progress-path": "^0.0.2",
     "vue-template-compiler": "^2.6.11",
-    "vuex": "^3.1.3"
+    "vuex": "^3.3.0"
   },
   "browserslist": [
     "> 1%",

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

@@ -22,7 +22,7 @@
     "@vue/cli-plugin-eslint": "^4.3.1",
     "@vue/cli-service": "^4.3.1",
     "@vue/eslint-config-standard": "^5.1.2",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",

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

@@ -36,7 +36,7 @@
   "dependencies": {
     "@akryum/winattr": "^3.0.0",
     "@vue/cli-shared-utils": "^4.3.1",
-    "apollo-server-express": "^2.11.0",
+    "apollo-server-express": "^2.12.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
     "express": "^4.17.1",
@@ -56,8 +56,8 @@
     "node-ipc": "^9.1.1",
     "node-notifier": "^6.0.0",
     "parse-git-config": "^2.0.2",
-    "portfinder": "^1.0.25",
-    "prismjs": "^1.19.0",
+    "portfinder": "^1.0.26",
+    "prismjs": "^1.20.0",
     "rss-parser": "^3.7.6",
     "shortid": "^2.2.15",
     "typescript": "~3.8.3",
@@ -73,9 +73,9 @@
     "@vue/ui": "^0.9.2",
     "ansi_up": "^3.0.0",
     "apollo-client": "^2.6.0",
-    "apollo-link": "^1.0.0",
+    "apollo-link": "^1.2.14",
     "babel-eslint": "^10.1.0",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "cross-env": "^6.0.3",
     "eslint": "^6.7.2",
     "eslint-plugin-graphql": "^3.1.0",
@@ -88,21 +88,21 @@
     "lodash.debounce": "^4.0.8",
     "portal-vue": "^1.3.0",
     "rimraf": "^3.0.2",
-    "start-server-and-test": "^1.10.11",
+    "start-server-and-test": "^1.11.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
     "subscriptions-transport-ws": "^0.9.6",
     "vue": "^2.6.11",
     "vue-apollo": "^3.0.3",
     "vue-color": "^2.7.1",
-    "vue-i18n": "^8.16.0",
+    "vue-i18n": "^8.17.4",
     "vue-instantsearch": "^1.5.1",
     "vue-meta": "^1.6.0",
     "vue-observe-visibility": "^0.4.6",
     "vue-router": "^3.1.6",
     "vue-template-compiler": "^2.6.11",
     "vue-timeago": "^5.1.2",
-    "vue-virtual-scroller": "^1.0.0-rc.2",
+    "vue-virtual-scroller": "^1.0.10",
     "xterm": "^3.13.2"
   },
   "browserslist": [

packages/@vue/cli-ui/src/components/plugin/ProjectPluginsAdd.vue

@@ -6,7 +6,7 @@
         class="frame"
         :tab-id.sync="tabId"
       >
-        <template slot-scope="{ next, previous }">
+        <template>
           <VueTab
             id="search"
             :label="$t('org.vue.views.project-plugins-add.tabs.search.label')"

packages/@vue/cli-ui/tests/e2e/specs/g2-plugins.js

@@ -21,7 +21,7 @@ describe('Plugins', () => {
     cy.get('[data-testid="download-plugin"]:contains("@vue/cli-plugin-pwa")').should('not.have.class', 'disabled').click()
     cy.get('.loading-screen .vue-ui-loading-indicator').should('be.visible')
     cy.get('.prompts-list', { timeout: 250000 }).should('be.visible')
-    cy.get('[data-testid="finish-install"]').should('not.have.class', 'disabled').click()
+    cy.get('[data-testid="finish-install"]').should('not.have.class', 'disabled').click({ force: true })
     cy.get('.loading-screen .vue-ui-loading-indicator', { timeout: 3000 }).should('be.visible')
     cy.get('.file-diff-view', { timeout: 250000 }).should('be.visible')
     cy.get('[data-testid="skip-button"]', { timeout: 3000 })

packages/@vue/cli-ui/vue.config.js

@@ -5,7 +5,8 @@ module.exports = {
   pluginOptions: {
     apollo: {
       enableMocks: false,
-      enableEngine: false
+      enableEngine: false,
+      lintGQL: false
     }
   },
 
@@ -32,5 +33,6 @@ module.exports = {
         import: ['~@/style/imports']
       }
     }
-  }
+  },
+  parallel: !process.env.CIRCLECI
 }

packages/@vue/cli/package.json

@@ -35,12 +35,12 @@
     "deepmerge": "^4.2.2",
     "download-git-repo": "^3.0.2",
     "ejs": "^2.7.1",
-    "envinfo": "^7.5.0",
+    "envinfo": "^7.5.1",
     "fs-extra": "^7.0.1",
     "globby": "^9.2.0",
     "import-global": "^0.1.0",
     "inquirer": "^7.1.0",
-    "isbinaryfile": "^4.0.5",
+    "isbinaryfile": "^4.0.6",
     "javascript-stringify": "^1.6.0",
     "js-yaml": "^3.13.1",
     "jscodeshift": "^0.7.0",
@@ -49,7 +49,7 @@
     "lru-cache": "^5.1.1",
     "minimist": "^1.2.5",
     "recast": "^0.18.8",
-    "resolve": "^1.15.1",
+    "resolve": "^1.17.0",
     "shortid": "^2.2.15",
     "slash": "^3.0.0",
     "validate-npm-package-name": "^3.0.0",