fix: move generating external

sveltejs · Mar 14, 2022 · 681002c · 681002c
1 parent 78e65f0
commit 681002c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/packages/vite-plugin-svelte/src/index.ts b/packages/vite-plugin-svelte/src/index.ts
@@ -55,7 +55,7 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 			// @ts-expect-error temporarily lend the options variable until fixed in configResolved
 			options = await preResolveOptions(inlineOptions, config, configEnv);
 			// extra vite config
-			const extraViteConfig = buildExtraViteConfig(options, config, configEnv);
+			const extraViteConfig = buildExtraViteConfig(options, config);
 			log.debug('additional vite config', extraViteConfig);
 			return extraViteConfig;
 		},

diff --git a/packages/vite-plugin-svelte/src/utils/options.ts b/packages/vite-plugin-svelte/src/utils/options.ts
@@ -184,8 +184,7 @@ function resolveViteRoot(viteConfig: UserConfig): string | undefined {
 
 export function buildExtraViteConfig(
 	options: PreResolvedOptions,
-	config: UserConfig,
-	configEnv: ConfigEnv
+	config: UserConfig
 ): Partial<UserConfig> {
 	// extra handling for svelte dependencies in the project
 	const svelteDeps = findRootSvelteDependencies(options.root);
@@ -200,7 +199,7 @@ export function buildExtraViteConfig(
 		// knownJsSrcExtensions: options.extensions
 	};
 
-	if (configEnv.command === 'serve') {
+	if (options.isServe) {
 		extraViteConfig.optimizeDeps = buildOptimizeDepsForSvelte(
 			svelteDeps,
 			options,
@@ -209,26 +208,8 @@ export function buildExtraViteConfig(
 	}
 
 	// @ts-ignore
-	extraViteConfig.ssr = buildSSROptionsForSvelte(svelteDeps, options, config);
+	extraViteConfig.ssr = buildSSROptionsForSvelte(svelteDeps, options, config, extraViteConfig);
 
-	if (configEnv.command === 'serve') {
-		// during dev, we have to externalize transitive cjs only dependencies, see https://github.com/sveltejs/vite-plugin-svelte/issues/281
-		const optimizedTransitiveDeps = extraViteConfig.optimizeDeps?.include
-			?.filter((x) => x.includes('>'))
-			.map((x) => x.substring(x.lastIndexOf('>') + 1).trim());
-		if (optimizedTransitiveDeps?.length) {
-			// @ts-expect-error ssr still flagge in vite
-			if (!extraViteConfig.ssr.external) {
-				// @ts-expect-error ssr still flagge in vite
-				extraViteConfig.ssr.external = [];
-			}
-			// @ts-expect-error ssr still flagge in vite
-			extraViteConfig.ssr.external.push(
-				// @ts-expect-error ssr still flagge in vite
-				...optimizedTransitiveDeps.filter((x) => !config.ssr?.noExternal?.includes(x))
-			);
-		}
-	}
 	return extraViteConfig;
 }
 
@@ -305,7 +286,8 @@ function buildOptimizeDepsForSvelte(
 function buildSSROptionsForSvelte(
 	svelteDeps: SvelteDependency[],
 	options: ResolvedOptions,
-	config: UserConfig
+	config: UserConfig,
+	extraViteConfig: UserConfig
 ): any {
 	const noExternal: string[] = [];
 
@@ -327,13 +309,26 @@ function buildSSROptionsForSvelte(
 	// add svelte dependencies to ssr.noExternal unless present in ssr.external or optimizeDeps.include
 	noExternal.push(
 		...Array.from(new Set(svelteDeps.map((s) => s.name))).filter((x) => {
-			// @ts-ignore
+			// @ts-expect-error ssr still flagged in vite
 			return !config.ssr?.external?.includes(x) && !config.optimizeDeps?.include?.includes(x);
 		})
 	);
-	return {
+	const ssr = {
 		noExternal
 	};
+
+	if (options.isServe) {
+		// during dev, we have to externalize transitive cjs only dependencies, see https://github.com/sveltejs/vite-plugin-svelte/issues/281
+		const optimizedTransitiveDeps = extraViteConfig.optimizeDeps?.include
+			?.filter((x) => x.includes('>'))
+			.map((x) => x.substring(x.lastIndexOf('>') + 1).trim());
+		if (optimizedTransitiveDeps?.length) {
+			// @ts-expect-error ssr still flagged in vite
+			ssr.external = optimizedTransitiveDeps.filter((x) => !config.ssr?.noExternal?.includes(x));
+		}
+	}
+
+	return ssr;
 }
 
 export function patchResolvedViteConfig(viteConfig: ResolvedConfig, options: ResolvedOptions) {