From bd4cc6515dc486e5190a55c802cd5ec5ecbce52a Mon Sep 17 00:00:00 2001 From: Wonsuk Choi Date: Wed, 4 Nov 2026 16:05:17 +0900 Subject: [PATCH] chore(*): move Svelte config from 'svelte.config.js' into 'vite.config.ts' (#12519) * chore(*): move Svelte config from 'svelte.config.js' into 'vite.config.ts' in examples and integrations * chore(svelte-query*): move Svelte config from 'svelte.config.js' into 'vite.config.ts' --- examples/svelte/algolia/eslint.config.js | 2 -- examples/svelte/algolia/svelte.config.js | 9 --------- examples/svelte/algolia/vite.config.ts | 11 ++++++++-- .../eslint.config.js | 2 -- .../svelte.config.js | 20 ------------------- .../auto-refetching-sveltekit/vite.config.ts | 17 +++++++++++++++- .../basic-graphql-request/eslint.config.js | 2 -- .../basic-graphql-request/svelte.config.js | 9 --------- .../basic-graphql-request/vite.config.ts | 11 ++++++++-- .../svelte/basic-sveltekit/eslint.config.js | 2 -- .../svelte/basic-sveltekit/svelte.config.js | 20 ------------------- .../svelte/basic-sveltekit/vite.config.ts | 17 +++++++++++++++- examples/svelte/batching/eslint.config.js | 2 -- examples/svelte/batching/svelte.config.js | 9 --------- examples/svelte/batching/vite.config.ts | 11 ++++++++-- examples/svelte/chat/eslint.config.js | 2 -- examples/svelte/chat/svelte.config.js | 9 --------- examples/svelte/chat/vite.config.ts | 12 +++++++++-- .../default-query-function/eslint.config.js | 2 -- .../default-query-function/svelte.config.js | 9 --------- .../default-query-function/vite.config.ts | 11 ++++++++-- .../eslint.config.js | 2 -- .../svelte.config.js | 20 ------------------- .../vite.config.ts | 17 +++++++++++++++- .../eslint.config.js | 2 -- .../svelte.config.js | 20 ------------------- .../vite.config.ts | 17 +++++++++++++++- .../svelte/offline-sveltekit/eslint.config.js | 2 -- .../svelte/offline-sveltekit/svelte.config.js | 20 ------------------- .../svelte/offline-sveltekit/vite.config.ts | 17 +++++++++++++++- .../eslint.config.js | 2 -- .../svelte.config.js | 20 ------------------- .../vite.config.ts | 17 +++++++++++++++- .../pagination-sveltekit/eslint.config.js | 2 -- .../pagination-sveltekit/svelte.config.js | 20 ------------------- .../pagination-sveltekit/vite.config.ts | 17 +++++++++++++++- .../playground-sveltekit/eslint.config.js | 2 -- .../playground-sveltekit/svelte.config.js | 20 ------------------- .../playground-sveltekit/vite.config.ts | 17 +++++++++++++++- .../prefetching-sveltekit/eslint.config.js | 2 -- .../prefetching-sveltekit/svelte.config.js | 20 ------------------- .../prefetching-sveltekit/vite.config.ts | 17 +++++++++++++++- .../rick-morty-sveltekit/eslint.config.js | 2 -- .../rick-morty-sveltekit/svelte.config.js | 20 ------------------- .../rick-morty-sveltekit/vite.config.ts | 18 ++++++++++++++++- examples/svelte/shadow-dom/eslint.config.js | 2 -- examples/svelte/shadow-dom/svelte.config.js | 9 --------- examples/svelte/shadow-dom/vite.config.ts | 11 ++++++++-- examples/svelte/simple/eslint.config.js | 2 -- examples/svelte/simple/svelte.config.js | 9 --------- examples/svelte/simple/vite.config.ts | 11 ++++++++-- .../svelte/ssr-sveltekit/eslint.config.js | 2 -- .../svelte/ssr-sveltekit/svelte.config.js | 20 ------------------- examples/svelte/ssr-sveltekit/vite.config.ts | 17 +++++++++++++++- .../star-wars-sveltekit/eslint.config.js | 2 -- .../star-wars-sveltekit/svelte.config.js | 20 ------------------- .../svelte/star-wars-sveltekit/vite.config.ts | 18 ++++++++++++++++- examples/svelte/sveltekit/eslint.config.js | 2 -- examples/svelte/sveltekit/svelte.config.js | 20 ------------------- examples/svelte/sveltekit/vite.config.ts | 17 +++++++++++++++- .../svelte/sveltekit-2/svelte.config.js | 12 ----------- .../svelte/sveltekit-2/vite.config.ts | 9 ++++++++- integrations/svelte/vite/svelte.config.js | 5 ----- integrations/svelte/vite/vite.config.ts | 8 ++++++-- .../svelte-query-devtools/eslint.config.js | 2 -- .../svelte-query-devtools/svelte.config.js | 11 ---------- packages/svelte-query-devtools/vite.config.ts | 12 +++++++++-- .../eslint.config.js | 2 -- .../svelte.config.js | 11 ---------- .../vite.config.ts | 12 +++++++++-- packages/svelte-query/eslint.config.js | 2 -- packages/svelte-query/svelte.config.js | 11 ---------- packages/svelte-query/vite.config.ts | 12 +++++++++-- 73 files changed, 318 insertions(+), 455 deletions(-) delete mode 100644 examples/svelte/algolia/svelte.config.js delete mode 100644 examples/svelte/auto-refetching-sveltekit/svelte.config.js delete mode 100644 examples/svelte/basic-graphql-request/svelte.config.js delete mode 100644 examples/svelte/basic-sveltekit/svelte.config.js delete mode 100644 examples/svelte/batching/svelte.config.js delete mode 100644 examples/svelte/chat/svelte.config.js delete mode 100644 examples/svelte/default-query-function/svelte.config.js delete mode 100644 examples/svelte/infinite-query-with-max-pages-sveltekit/svelte.config.js delete mode 100644 examples/svelte/load-more-infinite-scroll-sveltekit/svelte.config.js delete mode 100644 examples/svelte/offline-sveltekit/svelte.config.js delete mode 100644 examples/svelte/optimistic-updates-sveltekit/svelte.config.js delete mode 100644 examples/svelte/pagination-sveltekit/svelte.config.js delete mode 100644 examples/svelte/playground-sveltekit/svelte.config.js delete mode 100644 examples/svelte/prefetching-sveltekit/svelte.config.js delete mode 100644 examples/svelte/rick-morty-sveltekit/svelte.config.js delete mode 100644 examples/svelte/shadow-dom/svelte.config.js delete mode 100644 examples/svelte/simple/svelte.config.js delete mode 100644 examples/svelte/ssr-sveltekit/svelte.config.js delete mode 100644 examples/svelte/star-wars-sveltekit/svelte.config.js delete mode 100644 examples/svelte/sveltekit/svelte.config.js delete mode 100644 integrations/svelte/sveltekit-2/svelte.config.js delete mode 100644 integrations/svelte/vite/svelte.config.js delete mode 100644 packages/svelte-query-devtools/svelte.config.js delete mode 100644 packages/svelte-query-persist-client/svelte.config.js delete mode 100644 packages/svelte-query/svelte.config.js diff --git a/examples/svelte/algolia/eslint.config.js b/examples/svelte/algolia/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/algolia/eslint.config.js +++ b/examples/svelte/algolia/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/algolia/svelte.config.js b/examples/svelte/algolia/svelte.config.js deleted file mode 100644 index 21d2781857..0000000000 --- a/examples/svelte/algolia/svelte.config.js +++ /dev/null @@ -1,9 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -export default { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} diff --git a/examples/svelte/algolia/vite.config.ts b/examples/svelte/algolia/vite.config.ts index 951a9ba4b6..53d438ed4f 100644 --- a/examples/svelte/algolia/vite.config.ts +++ b/examples/svelte/algolia/vite.config.ts @@ -1,6 +1,13 @@ import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' export default defineConfig({ - plugins: [svelte()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/auto-refetching-sveltekit/eslint.config.js b/examples/svelte/auto-refetching-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/auto-refetching-sveltekit/eslint.config.js +++ b/examples/svelte/auto-refetching-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/auto-refetching-sveltekit/svelte.config.js b/examples/svelte/auto-refetching-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/auto-refetching-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/auto-refetching-sveltekit/vite.config.ts b/examples/svelte/auto-refetching-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/auto-refetching-sveltekit/vite.config.ts +++ b/examples/svelte/auto-refetching-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/basic-graphql-request/eslint.config.js b/examples/svelte/basic-graphql-request/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/basic-graphql-request/eslint.config.js +++ b/examples/svelte/basic-graphql-request/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/basic-graphql-request/svelte.config.js b/examples/svelte/basic-graphql-request/svelte.config.js deleted file mode 100644 index 21d2781857..0000000000 --- a/examples/svelte/basic-graphql-request/svelte.config.js +++ /dev/null @@ -1,9 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -export default { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} diff --git a/examples/svelte/basic-graphql-request/vite.config.ts b/examples/svelte/basic-graphql-request/vite.config.ts index 951a9ba4b6..53d438ed4f 100644 --- a/examples/svelte/basic-graphql-request/vite.config.ts +++ b/examples/svelte/basic-graphql-request/vite.config.ts @@ -1,6 +1,13 @@ import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' export default defineConfig({ - plugins: [svelte()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/basic-sveltekit/eslint.config.js b/examples/svelte/basic-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/basic-sveltekit/eslint.config.js +++ b/examples/svelte/basic-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/basic-sveltekit/svelte.config.js b/examples/svelte/basic-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/basic-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/basic-sveltekit/vite.config.ts b/examples/svelte/basic-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/basic-sveltekit/vite.config.ts +++ b/examples/svelte/basic-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/batching/eslint.config.js b/examples/svelte/batching/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/batching/eslint.config.js +++ b/examples/svelte/batching/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/batching/svelte.config.js b/examples/svelte/batching/svelte.config.js deleted file mode 100644 index 21d2781857..0000000000 --- a/examples/svelte/batching/svelte.config.js +++ /dev/null @@ -1,9 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -export default { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} diff --git a/examples/svelte/batching/vite.config.ts b/examples/svelte/batching/vite.config.ts index 951a9ba4b6..53d438ed4f 100644 --- a/examples/svelte/batching/vite.config.ts +++ b/examples/svelte/batching/vite.config.ts @@ -1,6 +1,13 @@ import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' export default defineConfig({ - plugins: [svelte()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/chat/eslint.config.js b/examples/svelte/chat/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/chat/eslint.config.js +++ b/examples/svelte/chat/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/chat/svelte.config.js b/examples/svelte/chat/svelte.config.js deleted file mode 100644 index 21d2781857..0000000000 --- a/examples/svelte/chat/svelte.config.js +++ /dev/null @@ -1,9 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -export default { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} diff --git a/examples/svelte/chat/vite.config.ts b/examples/svelte/chat/vite.config.ts index 7d122c4d42..bd005cb4b0 100644 --- a/examples/svelte/chat/vite.config.ts +++ b/examples/svelte/chat/vite.config.ts @@ -1,7 +1,15 @@ import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' import tailwindcss from '@tailwindcss/vite' export default defineConfig({ - plugins: [tailwindcss(), svelte()], + plugins: [ + tailwindcss(), + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/default-query-function/eslint.config.js b/examples/svelte/default-query-function/eslint.config.js index 8be0b4d0a9..002e3712f6 100644 --- a/examples/svelte/default-query-function/eslint.config.js +++ b/examples/svelte/default-query-function/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/default-query-function/svelte.config.js b/examples/svelte/default-query-function/svelte.config.js deleted file mode 100644 index 21d2781857..0000000000 --- a/examples/svelte/default-query-function/svelte.config.js +++ /dev/null @@ -1,9 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -export default { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} diff --git a/examples/svelte/default-query-function/vite.config.ts b/examples/svelte/default-query-function/vite.config.ts index 951a9ba4b6..53d438ed4f 100644 --- a/examples/svelte/default-query-function/vite.config.ts +++ b/examples/svelte/default-query-function/vite.config.ts @@ -1,6 +1,13 @@ import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' export default defineConfig({ - plugins: [svelte()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/infinite-query-with-max-pages-sveltekit/eslint.config.js b/examples/svelte/infinite-query-with-max-pages-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/infinite-query-with-max-pages-sveltekit/eslint.config.js +++ b/examples/svelte/infinite-query-with-max-pages-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/infinite-query-with-max-pages-sveltekit/svelte.config.js b/examples/svelte/infinite-query-with-max-pages-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/infinite-query-with-max-pages-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/infinite-query-with-max-pages-sveltekit/vite.config.ts b/examples/svelte/infinite-query-with-max-pages-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/infinite-query-with-max-pages-sveltekit/vite.config.ts +++ b/examples/svelte/infinite-query-with-max-pages-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/load-more-infinite-scroll-sveltekit/eslint.config.js b/examples/svelte/load-more-infinite-scroll-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/load-more-infinite-scroll-sveltekit/eslint.config.js +++ b/examples/svelte/load-more-infinite-scroll-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/load-more-infinite-scroll-sveltekit/svelte.config.js b/examples/svelte/load-more-infinite-scroll-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/load-more-infinite-scroll-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/load-more-infinite-scroll-sveltekit/vite.config.ts b/examples/svelte/load-more-infinite-scroll-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/load-more-infinite-scroll-sveltekit/vite.config.ts +++ b/examples/svelte/load-more-infinite-scroll-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/offline-sveltekit/eslint.config.js b/examples/svelte/offline-sveltekit/eslint.config.js index 52da53973b..f4f3576a52 100644 --- a/examples/svelte/offline-sveltekit/eslint.config.js +++ b/examples/svelte/offline-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/offline-sveltekit/svelte.config.js b/examples/svelte/offline-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/offline-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/offline-sveltekit/vite.config.ts b/examples/svelte/offline-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/offline-sveltekit/vite.config.ts +++ b/examples/svelte/offline-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/optimistic-updates-sveltekit/eslint.config.js b/examples/svelte/optimistic-updates-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/optimistic-updates-sveltekit/eslint.config.js +++ b/examples/svelte/optimistic-updates-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/optimistic-updates-sveltekit/svelte.config.js b/examples/svelte/optimistic-updates-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/optimistic-updates-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/optimistic-updates-sveltekit/vite.config.ts b/examples/svelte/optimistic-updates-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/optimistic-updates-sveltekit/vite.config.ts +++ b/examples/svelte/optimistic-updates-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/pagination-sveltekit/eslint.config.js b/examples/svelte/pagination-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/pagination-sveltekit/eslint.config.js +++ b/examples/svelte/pagination-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/pagination-sveltekit/svelte.config.js b/examples/svelte/pagination-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/pagination-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/pagination-sveltekit/vite.config.ts b/examples/svelte/pagination-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/pagination-sveltekit/vite.config.ts +++ b/examples/svelte/pagination-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/playground-sveltekit/eslint.config.js b/examples/svelte/playground-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/playground-sveltekit/eslint.config.js +++ b/examples/svelte/playground-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/playground-sveltekit/svelte.config.js b/examples/svelte/playground-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/playground-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/playground-sveltekit/vite.config.ts b/examples/svelte/playground-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/playground-sveltekit/vite.config.ts +++ b/examples/svelte/playground-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/prefetching-sveltekit/eslint.config.js b/examples/svelte/prefetching-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/prefetching-sveltekit/eslint.config.js +++ b/examples/svelte/prefetching-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/prefetching-sveltekit/svelte.config.js b/examples/svelte/prefetching-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/prefetching-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/prefetching-sveltekit/vite.config.ts b/examples/svelte/prefetching-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/prefetching-sveltekit/vite.config.ts +++ b/examples/svelte/prefetching-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/rick-morty-sveltekit/eslint.config.js b/examples/svelte/rick-morty-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/rick-morty-sveltekit/eslint.config.js +++ b/examples/svelte/rick-morty-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/rick-morty-sveltekit/svelte.config.js b/examples/svelte/rick-morty-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/rick-morty-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/rick-morty-sveltekit/vite.config.ts b/examples/svelte/rick-morty-sveltekit/vite.config.ts index c7517b4f49..298344e5d6 100644 --- a/examples/svelte/rick-morty-sveltekit/vite.config.ts +++ b/examples/svelte/rick-morty-sveltekit/vite.config.ts @@ -1,7 +1,23 @@ import { defineConfig } from 'vite' +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import tailwindcss from '@tailwindcss/vite' export default defineConfig({ - plugins: [tailwindcss(), sveltekit()], + plugins: [ + tailwindcss(), + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/shadow-dom/eslint.config.js b/examples/svelte/shadow-dom/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/shadow-dom/eslint.config.js +++ b/examples/svelte/shadow-dom/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/shadow-dom/svelte.config.js b/examples/svelte/shadow-dom/svelte.config.js deleted file mode 100644 index 21d2781857..0000000000 --- a/examples/svelte/shadow-dom/svelte.config.js +++ /dev/null @@ -1,9 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -export default { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} diff --git a/examples/svelte/shadow-dom/vite.config.ts b/examples/svelte/shadow-dom/vite.config.ts index 951a9ba4b6..53d438ed4f 100644 --- a/examples/svelte/shadow-dom/vite.config.ts +++ b/examples/svelte/shadow-dom/vite.config.ts @@ -1,6 +1,13 @@ import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' export default defineConfig({ - plugins: [svelte()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/simple/eslint.config.js b/examples/svelte/simple/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/simple/eslint.config.js +++ b/examples/svelte/simple/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/simple/svelte.config.js b/examples/svelte/simple/svelte.config.js deleted file mode 100644 index 21d2781857..0000000000 --- a/examples/svelte/simple/svelte.config.js +++ /dev/null @@ -1,9 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -export default { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} diff --git a/examples/svelte/simple/vite.config.ts b/examples/svelte/simple/vite.config.ts index 951a9ba4b6..53d438ed4f 100644 --- a/examples/svelte/simple/vite.config.ts +++ b/examples/svelte/simple/vite.config.ts @@ -1,6 +1,13 @@ import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' export default defineConfig({ - plugins: [svelte()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/ssr-sveltekit/eslint.config.js b/examples/svelte/ssr-sveltekit/eslint.config.js index 52da53973b..f4f3576a52 100644 --- a/examples/svelte/ssr-sveltekit/eslint.config.js +++ b/examples/svelte/ssr-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/ssr-sveltekit/svelte.config.js b/examples/svelte/ssr-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/ssr-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/ssr-sveltekit/vite.config.ts b/examples/svelte/ssr-sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/ssr-sveltekit/vite.config.ts +++ b/examples/svelte/ssr-sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/star-wars-sveltekit/eslint.config.js b/examples/svelte/star-wars-sveltekit/eslint.config.js index 419e8697cc..5a147cf29e 100644 --- a/examples/svelte/star-wars-sveltekit/eslint.config.js +++ b/examples/svelte/star-wars-sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/star-wars-sveltekit/svelte.config.js b/examples/svelte/star-wars-sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/star-wars-sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/star-wars-sveltekit/vite.config.ts b/examples/svelte/star-wars-sveltekit/vite.config.ts index c7517b4f49..298344e5d6 100644 --- a/examples/svelte/star-wars-sveltekit/vite.config.ts +++ b/examples/svelte/star-wars-sveltekit/vite.config.ts @@ -1,7 +1,23 @@ import { defineConfig } from 'vite' +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import tailwindcss from '@tailwindcss/vite' export default defineConfig({ - plugins: [tailwindcss(), sveltekit()], + plugins: [ + tailwindcss(), + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/examples/svelte/sveltekit/eslint.config.js b/examples/svelte/sveltekit/eslint.config.js index 52da53973b..f4f3576a52 100644 --- a/examples/svelte/sveltekit/eslint.config.js +++ b/examples/svelte/sveltekit/eslint.config.js @@ -5,7 +5,6 @@ import pluginQuery from '@tanstack/eslint-plugin-query' import pluginSvelte from 'eslint-plugin-svelte' import tsParser from '@typescript-eslint/parser' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' export default defineConfig([ ...tanstackConfig, @@ -17,7 +16,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/examples/svelte/sveltekit/svelte.config.js b/examples/svelte/sveltekit/svelte.config.js deleted file mode 100644 index e36724c3ed..0000000000 --- a/examples/svelte/sveltekit/svelte.config.js +++ /dev/null @@ -1,20 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - typescript: { - config: (tsconfig) => { - tsconfig.include.push('../eslint.config.js', '../svelte.config.js') - }, - }, - }, - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/examples/svelte/sveltekit/vite.config.ts b/examples/svelte/sveltekit/vite.config.ts index dd1b8b7fa1..3f07beebf5 100644 --- a/examples/svelte/sveltekit/vite.config.ts +++ b/examples/svelte/sveltekit/vite.config.ts @@ -1,6 +1,21 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + typescript: { + config: (tsconfig) => { + tsconfig.include.push('../eslint.config.js') + }, + }, + compilerOptions: { + runes: true, + }, + }), + ], }) diff --git a/integrations/svelte/sveltekit-2/svelte.config.js b/integrations/svelte/sveltekit-2/svelte.config.js deleted file mode 100644 index 3ddb57f8c4..0000000000 --- a/integrations/svelte/sveltekit-2/svelte.config.js +++ /dev/null @@ -1,12 +0,0 @@ -import adapter from '@sveltejs/adapter-auto' -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - }, -} - -export default config diff --git a/integrations/svelte/sveltekit-2/vite.config.ts b/integrations/svelte/sveltekit-2/vite.config.ts index dd1b8b7fa1..5e576114db 100644 --- a/integrations/svelte/sveltekit-2/vite.config.ts +++ b/integrations/svelte/sveltekit-2/vite.config.ts @@ -1,6 +1,13 @@ +import adapter from '@sveltejs/adapter-auto' import { sveltekit } from '@sveltejs/kit/vite' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' export default defineConfig({ - plugins: [sveltekit()], + plugins: [ + sveltekit({ + preprocess: vitePreprocess(), + adapter: adapter(), + }), + ], }) diff --git a/integrations/svelte/vite/svelte.config.js b/integrations/svelte/vite/svelte.config.js deleted file mode 100644 index 8abe4369b8..0000000000 --- a/integrations/svelte/vite/svelte.config.js +++ /dev/null @@ -1,5 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -export default { - preprocess: vitePreprocess(), -} diff --git a/integrations/svelte/vite/vite.config.ts b/integrations/svelte/vite/vite.config.ts index 951a9ba4b6..8a5ee33c01 100644 --- a/integrations/svelte/vite/vite.config.ts +++ b/integrations/svelte/vite/vite.config.ts @@ -1,6 +1,10 @@ import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' export default defineConfig({ - plugins: [svelte()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + }), + ], }) diff --git a/packages/svelte-query-devtools/eslint.config.js b/packages/svelte-query-devtools/eslint.config.js index 4f38a850e3..08396c520e 100644 --- a/packages/svelte-query-devtools/eslint.config.js +++ b/packages/svelte-query-devtools/eslint.config.js @@ -3,7 +3,6 @@ import tsParser from '@typescript-eslint/parser' import pluginSvelte from 'eslint-plugin-svelte' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' // Only the Svelte rules, which need the component template; everything else is linted by Oxlint export default defineConfig([ @@ -14,7 +13,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/packages/svelte-query-devtools/svelte.config.js b/packages/svelte-query-devtools/svelte.config.js deleted file mode 100644 index f04c18e252..0000000000 --- a/packages/svelte-query-devtools/svelte.config.js +++ /dev/null @@ -1,11 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -const config = { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/packages/svelte-query-devtools/vite.config.ts b/packages/svelte-query-devtools/vite.config.ts index 1c79a7b61c..42a42ac465 100644 --- a/packages/svelte-query-devtools/vite.config.ts +++ b/packages/svelte-query-devtools/vite.config.ts @@ -1,11 +1,19 @@ -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vitest/config' import { svelteTesting } from '@testing-library/svelte/vite' import packageJson from './package.json' export default defineConfig({ - plugins: [svelte(), svelteTesting()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + svelteTesting(), + ], // fix from https://github.com/vitest-dev/vitest/issues/6992#issuecomment-2509408660 resolve: { conditions: ['@tanstack/custom-condition'], diff --git a/packages/svelte-query-persist-client/eslint.config.js b/packages/svelte-query-persist-client/eslint.config.js index 4f38a850e3..08396c520e 100644 --- a/packages/svelte-query-persist-client/eslint.config.js +++ b/packages/svelte-query-persist-client/eslint.config.js @@ -3,7 +3,6 @@ import tsParser from '@typescript-eslint/parser' import pluginSvelte from 'eslint-plugin-svelte' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' // Only the Svelte rules, which need the component template; everything else is linted by Oxlint export default defineConfig([ @@ -14,7 +13,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/packages/svelte-query-persist-client/svelte.config.js b/packages/svelte-query-persist-client/svelte.config.js deleted file mode 100644 index f04c18e252..0000000000 --- a/packages/svelte-query-persist-client/svelte.config.js +++ /dev/null @@ -1,11 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -const config = { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/packages/svelte-query-persist-client/vite.config.ts b/packages/svelte-query-persist-client/vite.config.ts index 1c79a7b61c..42a42ac465 100644 --- a/packages/svelte-query-persist-client/vite.config.ts +++ b/packages/svelte-query-persist-client/vite.config.ts @@ -1,11 +1,19 @@ -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vitest/config' import { svelteTesting } from '@testing-library/svelte/vite' import packageJson from './package.json' export default defineConfig({ - plugins: [svelte(), svelteTesting()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + svelteTesting(), + ], // fix from https://github.com/vitest-dev/vitest/issues/6992#issuecomment-2509408660 resolve: { conditions: ['@tanstack/custom-condition'], diff --git a/packages/svelte-query/eslint.config.js b/packages/svelte-query/eslint.config.js index 4f38a850e3..08396c520e 100644 --- a/packages/svelte-query/eslint.config.js +++ b/packages/svelte-query/eslint.config.js @@ -3,7 +3,6 @@ import tsParser from '@typescript-eslint/parser' import pluginSvelte from 'eslint-plugin-svelte' import { defineConfig } from 'eslint/config' -import svelteConfig from './svelte.config.js' // Only the Svelte rules, which need the component template; everything else is linted by Oxlint export default defineConfig([ @@ -14,7 +13,6 @@ export default defineConfig([ parserOptions: { parser: tsParser, extraFileExtensions: ['.svelte'], - svelteConfig, }, }, }, diff --git a/packages/svelte-query/svelte.config.js b/packages/svelte-query/svelte.config.js deleted file mode 100644 index f04c18e252..0000000000 --- a/packages/svelte-query/svelte.config.js +++ /dev/null @@ -1,11 +0,0 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' - -/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ -const config = { - preprocess: vitePreprocess(), - compilerOptions: { - runes: true, - }, -} - -export default config diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts index 1c79a7b61c..42a42ac465 100644 --- a/packages/svelte-query/vite.config.ts +++ b/packages/svelte-query/vite.config.ts @@ -1,11 +1,19 @@ -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vitest/config' import { svelteTesting } from '@testing-library/svelte/vite' import packageJson from './package.json' export default defineConfig({ - plugins: [svelte(), svelteTesting()], + plugins: [ + svelte({ + preprocess: vitePreprocess(), + compilerOptions: { + runes: true, + }, + }), + svelteTesting(), + ], // fix from https://github.com/vitest-dev/vitest/issues/6992#issuecomment-2509408660 resolve: { conditions: ['@tanstack/custom-condition'],