From 952477dfc6a12e50c8f2d4d3994e88f5ebadfcce Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Fri, 3 Jun 2022 16:19:21 +0800
Subject: [PATCH] fix: clean up Cypress tsconfigs

---
 playground                                               | 2 +-
 template/config/cypress/cypress/e2e/jsconfig.json        | 2 +-
 .../tsconfig/cypress/cypress/{ => e2e}/tsconfig.json     | 2 +-
 template/tsconfig/cypress/cypress/plugins/tsconfig.json  | 9 ---------
 4 files changed, 3 insertions(+), 12 deletions(-)
 rename template/tsconfig/cypress/cypress/{ => e2e}/tsconfig.json (76%)
 delete mode 100644 template/tsconfig/cypress/cypress/plugins/tsconfig.json

diff --git a/playground b/playground
index ee46c900..f102fa46 160000
--- a/playground
+++ b/playground
@@ -1 +1 @@
-Subproject commit ee46c9004e0f8e03bee3b2239efb364cb75f5ee6
+Subproject commit f102fa46a9d6b48483c2c5986d003d3d22052980
diff --git a/template/config/cypress/cypress/e2e/jsconfig.json b/template/config/cypress/cypress/e2e/jsconfig.json
index c33dbde1..c790a70d 100644
--- a/template/config/cypress/cypress/e2e/jsconfig.json
+++ b/template/config/cypress/cypress/e2e/jsconfig.json
@@ -4,5 +4,5 @@
     "lib": ["es5", "dom"],
     "types": ["cypress"]
   },
-  "include": ["./**/*", "../support/e2e.*"]
+  "include": ["./**/*", "../support/**/*"]
 }
diff --git a/template/tsconfig/cypress/cypress/tsconfig.json b/template/tsconfig/cypress/cypress/e2e/tsconfig.json
similarity index 76%
rename from template/tsconfig/cypress/cypress/tsconfig.json
rename to template/tsconfig/cypress/cypress/e2e/tsconfig.json
index a2dbf9e3..be213aef 100644
--- a/template/tsconfig/cypress/cypress/tsconfig.json
+++ b/template/tsconfig/cypress/cypress/e2e/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "@vue/tsconfig/tsconfig.web.json",
-  "include": ["./integration/**/*", "./support/**/*"],
+  "include": ["./**/*", "../support/**/*"],
   "compilerOptions": {
     "isolatedModules": false,
     "target": "es5",
diff --git a/template/tsconfig/cypress/cypress/plugins/tsconfig.json b/template/tsconfig/cypress/cypress/plugins/tsconfig.json
deleted file mode 100644
index b5aedd53..00000000
--- a/template/tsconfig/cypress/cypress/plugins/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.node.json",
-  "include": ["./**/*"],
-  "compilerOptions": {
-    "module": "CommonJS",
-    "preserveValueImports": false,
-    "types": ["node", "cypress/types/cypress"]
-  }
-}
-- 
2.39.5