From 96d522a7db72178cb4e85589c7b5c9c7fb713edb Mon Sep 17 00:00:00 2001
From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Date: Fri, 14 Apr 2023 22:09:48 -0700
Subject: [PATCH] +6 more passing tests

---
 src/bundler/bundle_v2.zig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/bundler/bundle_v2.zig b/src/bundler/bundle_v2.zig
index 380f44a83a..f5622114a2 100644
--- a/src/bundler/bundle_v2.zig
+++ b/src/bundler/bundle_v2.zig
@@ -2883,6 +2883,10 @@ const LinkerContext = struct {
                             &imports_to_bind[id],
                             source_index,
                         );
+
+                        if (this.log.errors > 0) {
+                            return error.ImportResolutionFailed;
+                        }
                     }
                     const export_kind = exports_kind[id];
                     var flag = flags[id];
@@ -6890,7 +6894,7 @@ const LinkerContext = struct {
                     if (status == .external and c.options.output_format.keepES6ImportExportSyntax()) {
                         // Imports from external modules should not be converted to CommonJS
                         // if the output format preserves the original ES6 import statements
-                        break;
+                        continue;
                     }
 
                     // If it's a CommonJS or external file, rewrite the import to a
@@ -6980,9 +6984,8 @@ const LinkerContext = struct {
                             source,
                             r,
                             c.allocator,
-                            "No matching export \"{s}\" in \"{s}\" for import \"{s}\"",
+                            "No matching export in \"{s}\" for import \"{s}\"",
                             .{
-                                named_import.alias.?,
                                 next_source.path.pretty,
                                 named_import.alias.?,
                             },