2 files changed, 62 insertions, 4 deletions
diff --git a/packages/integrations/solid/src/dependencies.ts b/packages/integrations/solid/src/dependencies.ts
new file mode 100644
index 000000000..bdcfb4c8f
--- /dev/null
+++ b/packages/integrations/solid/src/dependencies.ts
@@ -0,0 +1,57 @@
+// This file is a fork of vite-plugin-solid.
+// Original: https://github.com/solidjs/vite-plugin-solid/blob/03130c8a0a2ceaab9a07e16f1e1df832b996e1b8/src/index.ts#L251-L297
+// License: MIT (https://github.com/solidjs/vite-plugin-solid/blob/03130c8a0a2ceaab9a07e16f1e1df832b996e1b8/package.json#L38)
+
+import fs from 'fs';
+import path from 'path';
+import { createRequire } from 'module';
+import { fileURLToPath } from 'url';
+
+function containsSolidField(fields: Record<string, any>) {
+	const keys = Object.keys(fields);
+	for (let i = 0; i < keys.length; i++) {
+		const key = keys[i];
+		if (key === 'solid') return true;
+		if (typeof fields[key] === 'object' && containsSolidField(fields[key])) return true;
+	}
+	return false;
+}
+
+export function getSolidDeps(root: URL) {
+	const pkgPath = path.join(fileURLToPath(root), 'package.json');
+	if (!fs.existsSync(pkgPath)) {
+		// eslint-disable-next-line no-console
+		console.log('No package.json found at project root');
+		return [];
+	}
+	const require = createRequire(pkgPath);
+	const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+	const deps = [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.devDependencies || {})];
+	const pkgs = deps.map((dep) => {
+		try {
+			return require(`${dep}/package.json`);
+		} catch {
+			try {
+				let dir = path.dirname(require.resolve(dep));
+				while (dir) {
+					const subPkgPath = path.join(dir, 'package.json');
+					if (fs.existsSync(subPkgPath)) {
+						const subPkg = JSON.parse(fs.readFileSync(subPkgPath, 'utf-8'));
+						if (subPkg && subPkg.name === dep) return subPkg;
+					}
+					const parent = path.dirname(dir);
+					if (parent === dir) {
+						break;
+					}
+					dir = parent;
+				}
+			} catch (e) {
+				console.warn("Couldn't find package.json for", dep, e);
+			}
+		}
+	});
+	return deps.reduce<string[]>((acc, dep, i) => {
+		if (pkgs[i] && pkgs[i].exports && containsSolidField(pkgs[i].exports)) acc.push(dep);
+		return acc;
+	}, []);
+}
diff --git a/packages/integrations/solid/src/index.ts b/packages/integrations/solid/src/index.ts
index 20df48297..5241141a9 100644
--- a/packages/integrations/solid/src/index.ts
+++ b/packages/integrations/solid/src/index.ts
@@ -1,4 +1,5 @@
 import type { AstroIntegration, AstroRenderer } from 'astro';
+import { getSolidDeps } from './dependencies.js';
 
 function getRenderer(): AstroRenderer {
 	return {
@@ -23,7 +24,7 @@ function getRenderer(): AstroRenderer {
 	};
 }
 
-function getViteConfiguration(isDev: boolean) {
+function getViteConfiguration(isDev: boolean, root: URL) {
 	// https://github.com/solidjs/vite-plugin-solid
 	// We inject the dev mode only if the user explicitely wants it or if we are in dev (serve) mode
 	const nestedDeps = ['solid-js', 'solid-js/web', 'solid-js/store', 'solid-js/html', 'solid-js/h'];
@@ -45,7 +46,7 @@ function getViteConfiguration(isDev: boolean) {
 		ssr: {
 			external: ['babel-preset-solid'],
 			target: 'node',
-			noExternal: ['solid-js'],
+			noExternal: ['solid-js', ...getSolidDeps(root)],
 		},
 	};
 }
@@ -54,9 +55,9 @@ export default function (): AstroIntegration {
 	return {
 		name: '@astrojs/solid-js',
 		hooks: {
-			'astro:config:setup': ({ command, addRenderer, updateConfig }) => {
+			'astro:config:setup': ({ command, addRenderer, updateConfig, config }) => {
 				addRenderer(getRenderer());
-				updateConfig({ vite: getViteConfiguration(command === 'dev') });
+				updateConfig({ vite: getViteConfiguration(command === 'dev', config.root) });
 			},
 		},
 	};