2 files changed, 12 insertions, 1 deletions
diff --git a/src/build.ts b/src/build.ts
index 93314da7a..219c36919 100644
--- a/src/build.ts
+++ b/src/build.ts
@@ -181,6 +181,7 @@ export async function build(astroConfig: AstroConfig): Promise<0 | 1> {
     );
   } catch (err) {
     error(logging, 'generate', err);
+    await runtime.shutdown();
     return 1;
   }
 
@@ -189,7 +190,13 @@ export async function build(astroConfig: AstroConfig): Promise<0 | 1> {
   }
 
   if (imports.size > 0) {
-    await bundle(imports, { dist, runtime, astroConfig });
+    try {
+      await bundle(imports, { dist, runtime, astroConfig });
+    } catch(err) {
+      error(logging, 'generate', err);
+      await runtime.shutdown();
+      return 1;
+    }
   }
 
   for (let url of statics) {
diff --git a/src/build/bundle.ts b/src/build/bundle.ts
index 681bea3b2..49d8b6686 100644
--- a/src/build/bundle.ts
+++ b/src/build/bundle.ts
@@ -173,6 +173,10 @@ export async function collectDynamicImports(filename: URL, { astroConfig, loggin
         rel = rel.replace(/\.[^.]+$/, '.vue.js');
         break;
       }
+      case 'svelte': {
+        rel = rel.replace(/\.[^.]+$/, '.svelte.js');
+        break;
+      }
     }
 
     imports.add(`/_astro/${rel}`);