chore: simplify output of hoisted declarations (#12675)

sveltejs · Sep 13, 2024 · fa031ef · fa031ef
1 parent 899eede
commit fa031ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/packages/enhanced-img/src/preprocessor.js b/packages/enhanced-img/src/preprocessor.js
@@ -137,33 +137,27 @@ export function image(opts) {
 				}
 			});
 
-			// add imports
+			// add imports and consts to <script module> block
+			let text = '';
 			if (imports.size) {
-				let text = '';
 				for (const [path, import_name] of imports.entries()) {
-					text += `import ${import_name} from "${path}";`;
-				}
-				if (ast.instance) {
-					// @ts-ignore
-					s.appendLeft(ast.instance.content.start, text);
-				} else {
-					s.prepend(`<script>${text}</script>`);
+					text += `\timport ${import_name} from "${path}";\n`;
 				}
 			}
 
 			if (consts.size) {
-				let text = '';
 				for (const [vite_name, declaration_name] of consts.entries()) {
 					text += `\tconst ${declaration_name} = "${vite_name}";\n`;
 				}
-				if (ast.module) {
-					// @ts-ignore
-					s.appendLeft(ast.module.content.start, text);
-				} else {
-					s.prepend(
-						`<script ${VERSION.startsWith('4') ? 'context="module"' : 'module'}>\n${text}</script>\n`
-					);
-				}
+			}
+
+			if (ast.module) {
+				// @ts-ignore
+				s.appendLeft(ast.module.content.start, text);
+			} else {
+				s.prepend(
+					`<script ${VERSION.startsWith('4') ? 'context="module"' : 'module'}>${text}</script>\n`
+				);
 			}
 
 			return {

diff --git a/packages/enhanced-img/test/Output.svelte b/packages/enhanced-img/test/Output.svelte
@@ -1,11 +1,11 @@
-<script context="module">
+<script context="module">	
+	import __IMPORTED_ASSET_0__ from "./foo.svg";
 	const __DECLARED_ASSET_0__ = "__VITE_ASSET__2AM7_y_a__ 1440w, __VITE_ASSET__2AM7_y_b__ 960w";
 	const __DECLARED_ASSET_1__ = "__VITE_ASSET__2AM7_y_c__ 1440w, __VITE_ASSET__2AM7_y_d__ 960w";
 	const __DECLARED_ASSET_2__ = "__VITE_ASSET__2AM7_y_e__ 1440w, __VITE_ASSET__2AM7_y_f__ 960w";
 	const __DECLARED_ASSET_3__ = "__VITE_ASSET__2AM7_y_g__";
 </script>
 <script lang="ts">
-	import __IMPORTED_ASSET_0__ from "./foo.svg";
 	
 	import manual_image1 from './no.png';