From 9535c1786d77b71fe6d686c38d1dfd63edeebe91 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 6 Aug 2020 17:41:38 +0800
Subject: [PATCH] fix: fix webdriverio ts setup

---
 packages/@vue/cli-plugin-typescript/generator/convert.js    | 6 +++++-
 packages/@vue/cli-plugin-typescript/generator/index.js      | 3 ++-
 .../cli-plugin-typescript/generator/template/tsconfig.json  | 6 +++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/@vue/cli-plugin-typescript/generator/convert.js b/packages/@vue/cli-plugin-typescript/generator/convert.js
index c024aaaa8..37f93e820 100644
--- a/packages/@vue/cli-plugin-typescript/generator/convert.js
+++ b/packages/@vue/cli-plugin-typescript/generator/convert.js
@@ -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) {
diff --git a/packages/@vue/cli-plugin-typescript/generator/index.js b/packages/@vue/cli-plugin-typescript/generator/index.js
index b555e2308..7521fc999 100644
--- a/packages/@vue/cli-plugin-typescript/generator/index.js
+++ b/packages/@vue/cli-plugin-typescript/generator/index.js
@@ -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) {
diff --git a/packages/@vue/cli-plugin-typescript/generator/template/tsconfig.json b/packages/@vue/cli-plugin-typescript/generator/template/tsconfig.json
index 669c746c3..5158c8700 100644
--- a/packages/@vue/cli-plugin-typescript/generator/template/tsconfig.json
+++ b/packages/@vue/cli-plugin-typescript/generator/template/tsconfig.json
@@ -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"