Skip to content

Commit

Permalink
chore: dependency maintenance (vuejs#4734)
Browse files Browse the repository at this point in the history 
* chore: dependency maintenance

* Revert "test: replace `waitForFunction` with `waitForXPath`"

This reverts commit b2848ae.
  • Loading branch information
@haoqunjiang
haoqunjiang authored Oct 21, 2019
1 parent 96890b5 commit 86c500f
Show file tree
Hide file tree
Showing 25 changed files with 2,069 additions and 2,361 deletions.
21 changes: 11 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,31 @@
]
},
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/core": "^7.6.4",
"@vue/eslint-config-airbnb": "^4.0.0",
"@vue/eslint-config-prettier": "^5.0.0",
"@vue/eslint-config-standard": "^4.0.0",
"@vue/eslint-config-typescript": "^4.0.0",
"@vuepress/plugin-pwa": "^1.0.4",
"@vuepress/theme-vue": "^1.0.4",
"@vuepress/plugin-pwa": "^1.2.0",
"@vuepress/theme-vue": "^1.2.0",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.8.0",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"chromedriver": "^77.0.0",
"debug": "^4.1.0",
"eslint": "^5.16.0",
"eslint-plugin-graphql": "^3.0.3",
"eslint-plugin-graphql": "^3.1.0",
"eslint-plugin-node": "^9.1.0",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-vue": "^5.2.2",
"eslint-plugin-vue-libs": "^4.0.0",
"execa": "^1.0.0",
"geckodriver": "^1.16.2",
"geckodriver": "^1.19.0",
"globby": "^9.2.0",
"graphql": "^14.3.1",
"http-server": "^0.11.1",
"inquirer": "^6.3.1",
"jest": "^24.7.1",
"jest": "^24.9.0",
"lerna": "^3.13.4",
"lerna-changelog": "^0.8.2",
"lint-staged": "^8.1.5",
Expand All @@ -79,11 +79,12 @@
"rimraf": "^2.6.2",
"semver": "^6.1.0",
"typescript": "^3.4.5",
"vuepress": "^1.0.4",
"vuepress": "^1.2.0",
"webpack": "^4.0.0",
"yorkie": "^2.0.0"
},
"resolutions": {
"puppeteer": "1.11.0",
"vue": "^2.6.10",
"vue-template-compiler": "^2.6.10",
"vue-server-renderer": "^2.6.10"
Expand Down
17 changes: 9 additions & 8 deletions packages/@vue/babel-preset-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,20 @@
},
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/babel-preset-app#readme",
"dependencies": {
"@babel/core": "^7.6.4",
"@babel/helper-module-imports": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/plugin-proposal-decorators": "^7.4.4",
"@babel/plugin-proposal-decorators": "^7.6.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-syntax-jsx": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.4.3",
"@babel/preset-env": "^7.4.5",
"@babel/runtime": "^7.4.5",
"@babel/runtime-corejs3": "^7.4.5",
"@vue/babel-preset-jsx": "^1.0.0",
"@babel/plugin-transform-runtime": "^7.6.2",
"@babel/preset-env": "^7.6.3",
"@babel/runtime": "^7.6.3",
"@babel/runtime-corejs3": "^7.6.3",
"@vue/babel-preset-jsx": "^1.1.1",
"babel-plugin-dynamic-import-node": "^2.2.0",
"babel-plugin-module-resolver": "^3.2.0",
"core-js": "^3.1.2",
"core-js-compat": "^3.1.2"
"core-js": "^3.3.2",
"core-js-compat": "^3.3.2"
}
}
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-babel/generator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = api => {
presets: ['@vue/cli-plugin-babel/preset']
},
dependencies: {
'core-js': '^3.1.2'
'core-js': '^3.3.2'
}
})
}
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-babel/migrator/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = (api) => {
if (api.fromVersion('^3')) {
api.extendPackage({
dependencies: {
'core-js': '^3.1.2'
'core-js': '^3.3.2'
}
}, true)

Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-babel/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
"dependencies": {
"@babel/core": "^7.4.5",
"@babel/core": "^7.6.4",
"@vue/babel-preset-app": "^4.0.4",
"@vue/cli-shared-utils": "^4.0.4",
"babel-loader": "^8.0.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-e2e-cypress/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@vue/cli-shared-utils": "^4.0.4",
"cypress": "^3.3.1",
"eslint-plugin-cypress": "^2.2.1"
"eslint-plugin-cypress": "^2.7.0"
},
"peerDependencies": {
"@vue/cli-service": "^3.0.0 || ^4.0.0-0"
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-e2e-nightwatch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"@vue/cli-shared-utils": "^4.0.4",
"deepmerge": "^3.2.0",
"execa": "^1.0.0",
"nightwatch": "^1.2.2"
"nightwatch": "^1.2.4"
},
"devDependencies": {
"chromedriver": "^77.0.0",
"geckodriver": "^1.16.2",
"geckodriver": "^1.19.0",
"selenium-server": "^3.141.59"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-eslint/generator/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => {
}

if (!api.hasPlugin('typescript')) {
pkg.devDependencies['babel-eslint'] = '^10.0.1'
pkg.devDependencies['babel-eslint'] = '^10.0.3'
}

if (config === 'airbnb') {
Expand All @@ -37,7 +37,7 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => {
eslintConfig.extends.push('@vue/prettier')
Object.assign(pkg.devDependencies, {
'@vue/eslint-config-prettier': '^5.0.0',
'eslint-plugin-prettier': '^3.1.0',
'eslint-plugin-prettier': '^3.1.1',
prettier: '^1.18.2'
})
// prettier & default config do not have any style rules
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-router/generator/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = (api, options = {}) => {

api.extendPackage({
dependencies: {
'vue-router': '^3.0.6'
'vue-router': '^3.1.3'
}
})

Expand Down
5 changes: 4 additions & 1 deletion packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ exports.assertServe = async (name, options) => {
project.write(`src/App.vue`, file.replace(msg, `Updated`))
await nextUpdate() // wait for child stdout update signal
try {
await page.waitForXPath('//h1[contains(text(), "Updated")]', { timeout: 60000 })
await page.waitForFunction(selector => {
const el = document.querySelector(selector)
return el && el.textContent.includes('Updated')
}, { timeout: 60000 }, 'h1')
} catch (e) {
if (process.env.APPVEYOR && e.message.match('timeout')) {
// AppVeyor VM is so slow that there's a large chance this test cases will time out,
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-typescript/generator/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = (api, {
api.extendPackage({
dependencies: {
'vue-class-component': '^7.0.2',
'vue-property-decorator': '^8.1.0'
'vue-property-decorator': '^8.3.0'
}
})
}
Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"dependencies": {
"@types/webpack-env": "^1.13.9",
"@vue/cli-shared-utils": "^4.0.4",
"fork-ts-checker-webpack-plugin": "^1.3.4",
"fork-ts-checker-webpack-plugin": "^1.5.1",
"globby": "^9.2.0",
"ts-loader": "^6.0.1",
"ts-loader": "^6.2.0",
"tslint": "^5.16.0",
"webpack": "^4.0.0",
"yorkie": "^2.0.0"
Expand All @@ -42,6 +42,6 @@
"@types/mocha": "^5.2.6",
"typescript": "^3.4.5",
"vue-class-component": "^7.0.2",
"vue-property-decorator": "^8.1.0"
"vue-property-decorator": "^8.3.0"
}
}
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-unit-jest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"access": "public"
},
"dependencies": {
"@babel/core": "^7.0.0",
"@babel/plugin-transform-modules-commonjs": "^7.4.4",
"@babel/core": "^7.6.4",
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
"@types/jest": "^24.0.18",
"@vue/cli-shared-utils": "^4.0.4",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^24.9.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
"deepmerge": "^4.0.0",
"jest": "^24.8.0",
"jest": "^24.9.0",
"jest-environment-jsdom-fifteen": "^1.0.0",
"jest-serializer-vue": "^2.0.2",
"jest-transform-stub": "^2.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-unit-mocha/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-unit-mocha#readme",
"dependencies": {
"@vue/cli-shared-utils": "^4.0.4",
"jsdom": "^15.1.0",
"jsdom": "^15.2.0",
"jsdom-global": "^3.0.2",
"mocha": "^6.1.4",
"mochapack": "^1.1.1"
"mocha": "^6.2.2",
"mochapack": "^1.1.5"
},
"devDependencies": {
"@vue/test-utils": "1.0.0-beta.29",
Expand Down
5 changes: 4 additions & 1 deletion packages/@vue/cli-service-global/__tests__/globalService.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ test('global serve', async () => {
write('App.vue', entryVue.replace(`{{ msg }}`, 'Updated'))
await nextUpdate() // wait for child stdout update signal
try {
await page.waitForXPath('//h1[contains(text(), "Updated")]', { timeout: 60000 })
await page.waitForFunction(selector => {
const el = document.querySelector(selector)
return el && el.textContent.includes('Updated')
}, { timeout: 60000 }, 'h1')
} catch (e) {
if (process.env.APPVEYOR && e.message.match('timeout')) {
// AppVeyor VM is so slow that there's a large chance this test cases will time out,
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-service-global/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"@vue/cli-plugin-babel": "^4.0.4",
"@vue/cli-plugin-eslint": "^4.0.4",
"@vue/cli-service": "^4.0.4",
"babel-eslint": "^10.0.1",
"babel-eslint": "^10.0.3",
"chalk": "^2.4.2",
"core-js": "^3.1.2",
"core-js": "^3.3.2",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.2.2",
"regenerator-runtime": "^0.13.2",
Expand Down
15 changes: 12 additions & 3 deletions packages/@vue/cli-service/__tests__/serve.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ test('serve', async () => {
project.write(`src/App.vue`, file.replace(msg, `Updated`))
await nextUpdate() // wait for child stdout update signal
try {
await page.waitForXPath('//h1[contains(text(), "Updated")]', { timeout: 60000 })
await page.waitForFunction(selector => {
const el = document.querySelector(selector)
return el && el.textContent.includes('Updated')
}, { timeout: 60000 }, 'h1')
} catch (e) {
if (process.env.APPVEYOR && e.message.match('timeout')) {
// AppVeyor VM is so slow that there's a large chance this test cases will time out,
Expand Down Expand Up @@ -113,7 +116,10 @@ test('serve with inline entry', async () => {
project.write(`src/App.vue`, file.replace(msg, `Updated`))
await nextUpdate() // wait for child stdout update signal
try {
await page.waitForXPath('//h1[contains(text(), "Updated")]', { timeout: 60000 })
await page.waitForFunction(selector => {
const el = document.querySelector(selector)
return el && el.textContent.includes('Updated')
}, { timeout: 60000 }, 'h1')
} catch (e) {
if (process.env.APPVEYOR && e.message.match('timeout')) {
// AppVeyor VM is so slow that there's a large chance this test cases will time out,
Expand Down Expand Up @@ -143,7 +149,10 @@ test('serve with no public dir', async () => {
project.write(`src/App.vue`, file.replace(msg, `Updated`))
await nextUpdate() // wait for child stdout update signal
try {
await page.waitForXPath('//h1[contains(text(), "Updated")]', { timeout: 60000 })
await page.waitForFunction(selector => {
const el = document.querySelector(selector)
return el && el.textContent.includes('Updated')
}, { timeout: 60000 }, 'h1')
} catch (e) {
if (process.env.APPVEYOR && e.message.match('timeout')) {
// AppVeyor VM is so slow that there's a large chance this test cases will time out,
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/generator/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = (api, options) => {
'less-loader': '^5.0.0'
},
stylus: {
'stylus': '^0.54.5',
'stylus': '^0.54.7',
'stylus-loader': '^3.0.2'
}
}
Expand Down
22 changes: 11 additions & 11 deletions packages/@vue/cli-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"@vue/web-component-wrapper": "^1.2.0",
"acorn": "^6.1.1",
"acorn-walk": "^6.1.1",
"address": "^1.1.0",
"address": "^1.1.2",
"autoprefixer": "^9.5.1",
"browserslist": "^4.6.0",
"browserslist": "^4.7.1",
"cache-loader": "^4.1.0",
"case-sensitive-paths-webpack-plugin": "^2.2.0",
"chalk": "^2.4.2",
Expand All @@ -49,9 +49,9 @@
"current-script-polyfill": "^1.0.0",
"debug": "^4.1.1",
"default-gateway": "^5.0.2",
"dotenv": "^8.0.0",
"dotenv": "^8.2.0",
"dotenv-expand": "^5.1.0",
"file-loader": "^4.1.0",
"file-loader": "^4.2.0",
"fs-extra": "^7.0.1",
"globby": "^9.2.0",
"hash-sum": "^1.0.2",
Expand All @@ -63,7 +63,7 @@
"mini-css-extract-plugin": "^0.8.0",
"minimist": "^1.2.0",
"ora": "^3.4.0",
"portfinder": "^1.0.20",
"portfinder": "^1.0.25",
"postcss-loader": "^3.0.0",
"read-pkg": "^5.1.1",
"semver": "^6.1.0",
Expand All @@ -72,14 +72,14 @@
"ssri": "^6.0.1",
"string.prototype.padend": "^3.0.0",
"terser-webpack-plugin": "^2.1.2",
"thread-loader": "^2.1.2",
"url-loader": "^2.1.0",
"thread-loader": "^2.1.3",
"url-loader": "^2.2.0",
"vue-loader": "^15.7.0",
"webpack": "^4.0.0",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-bundle-analyzer": "^3.6.0",
"webpack-chain": "^6.0.0",
"webpack-dev-server": "^3.4.1",
"webpack-merge": "^4.2.1"
"webpack-dev-server": "^3.8.2",
"webpack-merge": "^4.2.2"
},
"peerDependencies": {
"vue-template-compiler": "^2.0.0"
Expand All @@ -89,7 +89,7 @@
"sass": "^1.19.0",
"sass-loader": "^8.0.0",
"vue": "^2.6.10",
"vue-router": "^3.0.6",
"vue-router": "^3.1.3",
"vue-template-compiler": "^2.6.10",
"vuex": "^3.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"fs-extra": "^7.0.1",
"json-server": "^0.14.0",
"puppeteer": "^1.11.0",
"serve-handler": "^6.0.1",
"serve-handler": "^6.1.2",
"strip-ansi": "^5.2.0"
}
}
4 changes: 2 additions & 2 deletions packages/@vue/cli-ui-addon-webpack/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"@vue/cli-plugin-eslint": "^4.0.4",
"@vue/cli-service": "^4.0.4",
"@vue/eslint-config-standard": "^4.0.0",
"core-js": "^3.1.2",
"core-js": "^3.3.2",
"eslint": "^5.16.0",
"stylus": "^0.54.5",
"stylus": "^0.54.7",
"stylus-loader": "^3.0.2",
"vue-progress-path": "^0.0.2",
"vue-template-compiler": "^2.6.10",
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-ui-addon-widgets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"@vue/cli-plugin-eslint": "^4.0.4",
"@vue/cli-service": "^4.0.4",
"@vue/eslint-config-standard": "^4.0.0",
"core-js": "^3.1.2",
"core-js": "^3.3.2",
"eslint": "^5.16.0",
"stylus": "^0.54.5",
"stylus": "^0.54.7",
"stylus-loader": "^3.0.2",
"vue-template-compiler": "^2.6.10"
},
Expand Down
Loading

0 comments on commit 86c500f

Please sign in to comment.