chore: Improve eslint/tsconfig setup in svelte packages (#5438)

TanStack · May 20, 2023 · 19004e8 · 19004e8
1 parent 156bd96
commit 19004e8
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 43 deletions.
diff --git a/packages/svelte-query-devtools/.eslintrc.cjs b/packages/svelte-query-devtools/.eslintrc.cjs
@@ -1,19 +1,17 @@
-// @ts-check
-
 /** @type {import('eslint').Linter.Config} */
 const config = {
   parser: '@typescript-eslint/parser',
   parserOptions: {
     tsconfigRootDir: __dirname,
-    project: './tsconfig.eslint.json',
+    project: './tsconfig.json',
     sourceType: 'module',
     extraFileExtensions: ['.svelte'],
   },
   rules: {
     'react-hooks/rules-of-hooks': 'off',
   },
   extends: ['plugin:svelte/recommended', '../../.eslintrc'],
-  ignorePatterns: ['*.config.*', '**/build/*', '**/.svelte-kit/*'],
+  ignorePatterns: ['*.config.*', '*.setup.*', '**/build/*'],
   overrides: [
     {
       files: ['*.svelte'],

diff --git a/packages/svelte-query-devtools/tsconfig.eslint.json b/packages/svelte-query-devtools/tsconfig.eslint.json
diff --git a/packages/svelte-query-devtools/tsconfig.json b/packages/svelte-query-devtools/tsconfig.json
@@ -26,5 +26,5 @@
     "target": "esnext",
     "tsBuildInfoFile": "./build/.tsbuildinfo"
   },
-  "include": ["src", "src/**/*.svelte"]
+  "include": ["src/**/*.js", "src/**/*.ts", "src/**/*.svelte", ".eslintrc.cjs", "vite.config.ts"]
 }
diff --git a/packages/svelte-query-devtools/vite.config.ts b/packages/svelte-query-devtools/vite.config.ts
@@ -1,8 +1,8 @@
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import path from 'path';
-import type { UserConfig } from 'vite';
+import { defineConfig } from 'vite';
 
-const config: UserConfig = {
+export default defineConfig({
   plugins: [svelte()],
   resolve: {
     alias: {
@@ -11,6 +11,4 @@ const config: UserConfig = {
       "@tanstack/svelte-query": path.resolve(__dirname, '..', 'svelte-query', 'src'),
     }
   }
-};
-
-export default config;
+});
diff --git a/packages/svelte-query/.eslintrc.cjs b/packages/svelte-query/.eslintrc.cjs
@@ -1,19 +1,17 @@
-// @ts-check
-
 /** @type {import('eslint').Linter.Config} */
 const config = {
   parser: '@typescript-eslint/parser',
   parserOptions: {
     tsconfigRootDir: __dirname,
-    project: './tsconfig.eslint.json',
+    project: './tsconfig.json',
     sourceType: 'module',
     extraFileExtensions: ['.svelte'],
   },
   rules: {
     'react-hooks/rules-of-hooks': 'off',
   },
   extends: ['plugin:svelte/recommended', '../../.eslintrc'],
-  ignorePatterns: ['*.config.*', '**/build/*', '**/.svelte-kit/*'],
+  ignorePatterns: ['*.config.*', '*.setup.*', '**/build/*'],
   overrides: [
     {
       files: ['*.svelte'],

diff --git a/packages/svelte-query/.gitignore b/packages/svelte-query/.gitignore
diff --git a/packages/svelte-query/tsconfig.eslint.json b/packages/svelte-query/tsconfig.eslint.json
diff --git a/packages/svelte-query/tsconfig.json b/packages/svelte-query/tsconfig.json
@@ -27,5 +27,5 @@
     "tsBuildInfoFile": "./build/.tsbuildinfo",
     "types": ["vitest/globals", "@testing-library/jest-dom"]
   },
-  "include": ["src", "src/**/*.svelte"]
+  "include": ["src/**/*.js", "src/**/*.ts", "src/**/*.svelte", ".eslintrc.cjs", "vite.config.ts"]
 }
diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts
@@ -1,8 +1,8 @@
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import path from 'path';
-import type { UserConfig } from 'vite';
+import { defineConfig } from 'vite';
 
-const config: UserConfig = {
+export default defineConfig({
   plugins: [svelte()],
   resolve: {
     alias: {
@@ -17,6 +17,4 @@ const config: UserConfig = {
     include: ['src/**/*.{test,spec}.{js,ts}'],
     setupFiles: ['vitest.setup.ts']
   }
-};
-
-export default config;
+});