setup(all): update tsconfigs to run eslint on all files including not…

… src
daotl · Dec 20, 2023 · 34ed1c5 · 34ed1c5
1 parent 0762a43
commit 34ed1c5
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 39 deletions.
diff --git a/apps/desktop/eslint.config.js b/apps/desktop/eslint.config.js
@@ -5,16 +5,8 @@ export default config(
   {
     languageOptions: {
       parserOptions: {
-        project: ['tsconfig.build.json'],
-      }
-    }
-  },
-  {
-    files: ["**/*.spec.ts"],
-    languageOptions: {
-      parserOptions: {
-        project: ['tsconfig.spec.json'],
-      }
-    }
+        project: ['tsconfig.root.json', 'tsconfig.src.json', 'tsconfig.spec.json'],
+      },
+    },
   },
 )
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
@@ -3,14 +3,17 @@
   "compilerOptions": {
     "baseUrl": "."
   },
-  "files": [],
-  "include": [],
   "references": [
     {
-      "path": "./tsconfig.build.json"
+      "path": "./tsconfig.root.json"
+    },
+    {
+      "path": "./tsconfig.src.json"
     },
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "files": [],
+  "include": []
 }
diff --git a/apps/desktop/tsconfig.root.json b/apps/desktop/tsconfig.root.json
@@ -0,0 +1,21 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declaration": true
+  },
+  "include": [".*.cjs", "**/*.ts", "**/*.cts", "**/*.tsx", "**/*.js", "**/*.cjs", "**/*.jsx", "**/*.vue"],
+  "exclude": [
+    "src/**/*",
+    "vite.config.ts",
+    "vitest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/apps/web/tsconfig.build.json → apps/desktop/tsconfig.src.json b/apps/web/tsconfig.build.json → apps/desktop/tsconfig.src.json
@@ -1,8 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "declaration": true,
-    "types": ["node"]
+    "types": ["node"],
+    "declaration": true
   },
   "include": ["src/**/*.ts"],
   "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"]

diff --git a/apps/web/eslint.config.js b/apps/web/eslint.config.js
@@ -5,16 +5,8 @@ export default config(
   {
     languageOptions: {
       parserOptions: {
-        project: ['tsconfig.build.json'],
-      }
-    }
-  },
-  {
-    files: ["**/*.spec.ts"],
-    languageOptions: {
-      parserOptions: {
-        project: ['tsconfig.spec.json'],
-      }
-    }
+        project: ['tsconfig.root.json', 'tsconfig.src.json', 'tsconfig.spec.json'],
+      },
+    },
   },
 )
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
@@ -3,14 +3,17 @@
   "compilerOptions": {
     "baseUrl": "."
   },
-  "files": [],
-  "include": [],
   "references": [
     {
-      "path": "./tsconfig.build.json"
+      "path": "./tsconfig.root.json"
+    },
+    {
+      "path": "./tsconfig.src.json"
     },
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "files": [],
+  "include": []
 }
diff --git a/apps/web/tsconfig.root.json b/apps/web/tsconfig.root.json
@@ -0,0 +1,21 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declaration": true
+  },
+  "include": [".*.cjs", "**/*.ts", "**/*.cts", "**/*.tsx", "**/*.js", "**/*.cjs", "**/*.jsx", "**/*.vue"],
+  "exclude": [
+    "src/**/*",
+    "vite.config.ts",
+    "vitest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/libs/myutil/tsconfig.build.json → apps/web/tsconfig.src.json b/libs/myutil/tsconfig.build.json → apps/web/tsconfig.src.json
@@ -1,8 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "declaration": true,
-    "types": ["node"]
+    "types": ["node"],
+    "declaration": true
   },
   "include": ["src/**/*.ts"],
   "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"]

diff --git a/libs/myutil/tsconfig.json b/libs/myutil/tsconfig.json
@@ -7,7 +7,10 @@
   "include": [],
   "references": [
     {
-      "path": "./tsconfig.build.json"
+      "path": "./tsconfig.root.json"
+    },
+    {
+      "path": "./tsconfig.src.json"
     },
     {
       "path": "./tsconfig.spec.json"

diff --git a/libs/myutil/tsconfig.root.json b/libs/myutil/tsconfig.root.json
@@ -0,0 +1,21 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declaration": true
+  },
+  "include": [".*.cjs", "**/*.ts", "**/*.cts", "**/*.tsx", "**/*.js", "**/*.cjs", "**/*.jsx","**/*.vue"],
+  "exclude": [
+    "src/**/*",
+    "vite.config.ts",
+    "vitest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ],
+}
diff --git a/apps/desktop/tsconfig.build.json → libs/myutil/tsconfig.src.json b/apps/desktop/tsconfig.build.json → libs/myutil/tsconfig.src.json
diff --git a/nx.js b/nx.js
@@ -36,7 +36,7 @@ const config = {
       options: {
         clean: false,
         main: '{projectRoot}/src/index.ts',
-        tsConfig: '{projectRoot}/tsconfig.build.json',
+        tsConfig: '{projectRoot}/tsconfig.src.json',
       },
       configurations: {
         ci: {
@@ -111,7 +111,7 @@ const config = {
       executor: 'nx:run-commands',
       options: {
         cwd: '{projectRoot}',
-        command: 'FIX={args.fix}; eslint src --fix=${FIX:-false}',
+        command: 'FIX={args.fix}; eslint . --fix=${FIX:-false}',
       },
     },
     stylelint: {

diff --git a/nx.json b/nx.json
@@ -37,7 +37,7 @@
       "options": {
         "clean": false,
         "main": "{projectRoot}/src/index.ts",
-        "tsConfig": "{projectRoot}/tsconfig.build.json"
+        "tsConfig": "{projectRoot}/tsconfig.src.json"
       },
       "configurations": {
         "ci": {
@@ -164,4 +164,4 @@
       ]
     }
   }
-}
+}