From 158a6d5ffeda7311da565a3876e3e0cd94f82476 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Fri, 17 Nov 2023 21:24:27 +0800
Subject: [PATCH] Fix optional parameter types (#797)

* Fix optional parameter types

* fix: ensure generated types match eslint and prettier

* refactor: instead of formatting generated types, ignore them in eslint

---------

Co-authored-by: dominikg <dominik.goepel@gmx.de>
---
 .changeset/orange-dryers-hear.md                            | 5 +++++
 .eslintrc.cjs                                               | 3 ++-
 packages/vite-plugin-svelte/src/preprocess.js               | 2 +-
 packages/vite-plugin-svelte/src/utils/load-svelte-config.js | 4 ++--
 packages/vite-plugin-svelte/types/index.d.ts                | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/orange-dryers-hear.md

diff --git a/.changeset/orange-dryers-hear.md b/.changeset/orange-dryers-hear.md
new file mode 100644
index 000000000..e1d37be11
--- /dev/null
+++ b/.changeset/orange-dryers-hear.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/vite-plugin-svelte': patch
+---
+
+Fix optional parameter types
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 15b757e0b..28adaf37c 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -190,5 +190,6 @@ module.exports = {
 				'no-unused-vars': 'off'
 			}
 		}
-	]
+	],
+	ignorePatterns: ['packages/*/types/index.d.ts', 'packages/*/types/index.d.ts.map']
 };
diff --git a/packages/vite-plugin-svelte/src/preprocess.js b/packages/vite-plugin-svelte/src/preprocess.js
index 863ccd530..1753af5b3 100644
--- a/packages/vite-plugin-svelte/src/preprocess.js
+++ b/packages/vite-plugin-svelte/src/preprocess.js
@@ -10,7 +10,7 @@ const supportedScriptLangs = ['ts'];
 export const lang_sep = '.vite-preprocess';
 
 /**
- * @param {import('./public.d.ts').VitePreprocessOptions} opts
+ * @param {import('./public.d.ts').VitePreprocessOptions} [opts]
  * @returns {import('svelte/compiler').PreprocessorGroup}
  */
 export function vitePreprocess(opts) {
diff --git a/packages/vite-plugin-svelte/src/utils/load-svelte-config.js b/packages/vite-plugin-svelte/src/utils/load-svelte-config.js
index cb8a41b23..7a9f92cb6 100644
--- a/packages/vite-plugin-svelte/src/utils/load-svelte-config.js
+++ b/packages/vite-plugin-svelte/src/utils/load-svelte-config.js
@@ -25,8 +25,8 @@ async function dynamicImportDefault(filePath, timestamp) {
 }
 
 /**
- * @param {import('vite').UserConfig} viteConfig
- * @param {Partial<import('../public.d.ts').Options>} inlineOptions
+ * @param {import('vite').UserConfig} [viteConfig]
+ * @param {Partial<import('../public.d.ts').Options>} [inlineOptions]
  * @returns {Promise<Partial<import('../public.d.ts').SvelteConfig> | undefined>}
  */
 export async function loadSvelteConfig(viteConfig, inlineOptions) {
diff --git a/packages/vite-plugin-svelte/types/index.d.ts b/packages/vite-plugin-svelte/types/index.d.ts
index 26993ba00..71c4724d1 100644
--- a/packages/vite-plugin-svelte/types/index.d.ts
+++ b/packages/vite-plugin-svelte/types/index.d.ts
@@ -190,8 +190,8 @@ declare module '@sveltejs/vite-plugin-svelte' {
 		style?: boolean | InlineConfig | ResolvedConfig;
 	}
 	export function svelte(inlineOptions?: Partial<Options> | undefined): import('vite').Plugin[];
-	export function vitePreprocess(opts: VitePreprocessOptions): import('svelte/compiler').PreprocessorGroup;
-	export function loadSvelteConfig(viteConfig: import('vite').UserConfig, inlineOptions: Partial<Options>): Promise<Partial<SvelteConfig> | undefined>;
+	export function vitePreprocess(opts?: VitePreprocessOptions | undefined): import('svelte/compiler').PreprocessorGroup;
+	export function loadSvelteConfig(viteConfig?: import("vite").UserConfig | undefined, inlineOptions?: Partial<Options> | undefined): Promise<Partial<SvelteConfig> | undefined>;
 }
 
 //# sourceMappingURL=index.d.ts.map
\ No newline at end of file