fix(): fix tsconfig vite and vitest config

platanus · Jun 16, 2023 · 5fb9c81 · 5fb9c81
1 parent 394ad72
commit 5fb9c81
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/lib/potassium/assets/.eslintrc.json b/lib/potassium/assets/.eslintrc.json
@@ -3,7 +3,6 @@
     "browser": true,
     "es2021": true,
     "node": true,
-    "vi": true,
     "vue/setup-compiler-macros": true
   },
   "parserOptions": {

diff --git a/lib/potassium/assets/tsconfig.config.json b/lib/potassium/assets/tsconfig.config.json
@@ -1,8 +1,18 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.node.json",
-  "include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "playwright.config.*"],
+  "extends": [
+    "@tsconfig/node14/tsconfig.json",
+    "@vue/tsconfig/tsconfig.json"
+  ],
+  "include": [
+    "vite.config.*",
+    "vitest.config.*",
+    "cypress.config.*",
+    "playwright.config.*"
+  ],
   "compilerOptions": {
     "composite": true,
-    "types": ["node", "vitest/globals"]
+    "types": [
+      "node"
+    ]
   }
 }
diff --git a/lib/potassium/assets/tsconfig.json b/lib/potassium/assets/tsconfig.json
@@ -1,13 +1,19 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.web.json",
-  "include": ["env.d.ts", "app/**/*", "app/**/*.vue"],
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "include": [
+    "env.d.ts",
+    "app/**/*",
+    "app/**/*.vue"
+  ],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./app/frontend/*"]
-    }
+      "@/*": [
+        "./app/frontend/*"
+      ]
+    },
+    "types": ["vitest/globals", "vite/client"]
   },
-
   "references": [
     {
       "path": "./tsconfig.config.json"

diff --git a/lib/potassium/recipes/front_end_vite.rb b/lib/potassium/recipes/front_end_vite.rb
@@ -23,6 +23,7 @@ class Recipes::FrontEndVite < Rails::AppBuilder
       "vue@#{VUE_VERSION}"
     ],
     vue_dev: [
+      "@tsconfig/node14",
       "@vitejs/plugin-vue",
       "@vue/tsconfig",
       "vue-tsc"