make svelte config optional

sveltejs · May 29, 2022 · 2d335b7 · 2d335b7
1 parent cc44f11
commit 2d335b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/kit/src/cli.js b/packages/kit/src/cli.js
@@ -69,7 +69,7 @@ prog
 
 			/** @type {import('vite').UserConfig} */
 			const config = {
-				plugins: [...(vite_config.plugins || []), plugins(svelte_config)]
+				plugins: [...(vite_config.plugins || []), await plugins(svelte_config)]
 			};
 			config.server = {};
 

diff --git a/packages/kit/src/vite/plugin.js b/packages/kit/src/vite/plugin.js
@@ -1,7 +1,7 @@
 import { svelte as svelte_plugin } from '@sveltejs/vite-plugin-svelte';
 import path from 'path';
 import { searchForWorkspaceRoot } from 'vite';
-import { print_config_conflicts } from '../core/config/index.js';
+import { load_config, print_config_conflicts } from '../core/config/index.js';
 import { get_aliases, get_runtime_path } from '../core/utils.js';
 import { deep_merge } from '../utils/object.js';
 import { configure_server } from './dev.js';
@@ -99,9 +99,10 @@ const svelte = function (svelte_config) {
 };
 
 /**
- * @param {import('types').ValidatedConfig} svelte_config
- * @return {import('vite').Plugin[]}
+ * @param {import('types').ValidatedConfig} [svelte_config]
+ * @return {Promise<import('vite').Plugin[]>}
  */
-export const plugins = function (svelte_config) {
+export const plugins = async function (svelte_config) {
+	svelte_config = svelte_config || (await load_config());
 	return [...svelte(svelte_config), sveltekit(svelte_config)];
 };