mirror/vue-cli
1
0
Fork 0
mirror of https://github.com/vuejs/vue-cli.git synced 2026-01-13 19:01:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix webdriverio ts setup

Browse Source
This commit is contained in:
Haoqun Jiang
2020-08-06 17:41:38 +08:00
parent 56bb3e03ae
commit 9535c1786d
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/@vue/cli-plugin-typescript/generator/convert.js
View File

@@ -1,6 +1,10 @@
module.exports = (api, { tsLint = false, convertJsToTs = true } = {}) => {
const jsRE = /\.js$/
const excludeRE = /^tests\/e2e\/|(\.config|rc)\.js$/
let excludeRE = /^tests\/e2e\/|(\.config|rc)\.js$/
if (api.hasPlugin('e2e-webdriverio')) {
excludeRE = /(\.config|rc)\.js$/
}
const convertLintFlags = require('../lib/convertLintFlags')
api.postProcessFiles(files => {
if (convertJsToTs) {

3
packages/@vue/cli-plugin-typescript/generator/index.js
View File

@@ -93,7 +93,8 @@ module.exports = (api, {
api.render('./template', {
skipLibCheck,
hasMocha: api.hasPlugin('unit-mocha'),
hasJest: api.hasPlugin('unit-jest')
hasJest: api.hasPlugin('unit-jest'),
hasWebDriverIO: api.hasPlugin('e2e-webdriverio')
})
if (isVue3) {

6
packages/@vue/cli-plugin-typescript/generator/template/tsconfig.json
View File

@@ -20,7 +20,11 @@
"sourceMap": true,
"baseUrl": ".",
"types": [
"webpack-env"<% if (hasMocha || hasJest) { %>,<% } %>
"webpack-env"<% if (hasMocha || hasJest || hasWebDriverIO) { %>,<% } %>
<%_ if (hasWebDriverIO) { _%>
"@wdio/mocha-framework",
"@wdio/sync"<% if (hasMocha || hasJest) { %>,<% } %>
<%_ } _%>
<%_ if (hasMocha) { _%>
"mocha",
"chai"