Use better checks

packages/astro/src/core/build/plugins/plugin-scripts.ts

@@ -17,19 +17,31 @@ export function vitePluginScripts(internals: BuildInternals): VitePlugin {
 		},
 
 		async generateBundle(_options, bundle) {
-			for (const [id, output] of Object.entries(bundle)) {
+			const outputs = Object.values(bundle);
+
+			// Track ids that are imported by chunks so we don't inline scripts that are imported
+			const importedIds = new Set<string>();
+			for (const output of outputs) {
+				if (output.type === 'chunk') {
+					for (const id of output.imports) {
+						importedIds.add(id);
+					}
+				}
+			}
+
+			for (const output of outputs) {
 				// Try to inline scripts that don't import anything as is within the inline limit
 				if (
 					output.type === 'chunk' &&
 					output.facadeModuleId &&
 					internals.discoveredScripts.has(output.facadeModuleId) &&
+					!importedIds.has(output.fileName) &&
 					output.imports.length === 0 &&
-					output.exports.length === 0 &&
 					output.dynamicImports.length === 0 &&
 					shouldInlineAsset(output.code, output.fileName, assetInlineLimit)
 				) {
 					internals.inlinedScripts.set(output.facadeModuleId, output.code.trim());
-					delete bundle[id];
+					delete bundle[output.fileName];
 				}
 			}
 		},

packages/astro/test/fixtures/hoisted-imports/src/components/shared-scripts/A.astro

@@ -0,0 +1 @@
+<script src="./script.ts"></script>

packages/astro/test/fixtures/hoisted-imports/src/components/shared-scripts/B.astro

@@ -0,0 +1,4 @@
+<script>
+  import './script.ts';
+  console.log('shared-script B');
+</script>

packages/astro/test/fixtures/hoisted-imports/src/components/shared-scripts/script.ts

@@ -0,0 +1 @@
+console.log('shared-scripts');

packages/astro/test/fixtures/hoisted-imports/src/pages/no-inline-if-shared.astro

@@ -0,0 +1,7 @@
+---
+import A from '../components/shared-scripts/A.astro'
+import B from '../components/shared-scripts/B.astro'
+---
+
+<A />
+<B />

packages/astro/test/hoisted-imports.test.js

@@ -79,12 +79,13 @@ describe('Hoisted Imports', () => {
 			assert.ok(scripts[0].attribs.src);
 		});
 
-		it('does not inline if script ihas exports', async () => {
-			const html = await fixture.readFile('/no-inline-if-exports/index.html');
+		it('does not inline if script it has shared chunks', async () => {
+			const html = await fixture.readFile('/no-inline-if-shared/index.html');
 			const $ = cheerio.load(html);
 			const scripts = $('script');
-			assert.equal(scripts.length, 1);
+			assert.equal(scripts.length, 2);
 			assert.ok(scripts[0].attribs.src);
+			assert.ok(scripts[1].attribs.src);
 		});
 	});
 });