From c1942c9bcb78335b0e5a90e2175ce8244be1e27a Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 18 Oct 2022 16:49:23 -0700
Subject: [PATCH] Do not assume imports are ESM (#8555)

---
 packages/transformers/js/src/JSTransformer.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/transformers/js/src/JSTransformer.js b/packages/transformers/js/src/JSTransformer.js
index 62f0bc4e0de..e19a9259237 100644
--- a/packages/transformers/js/src/JSTransformer.js
+++ b/packages/transformers/js/src/JSTransformer.js
@@ -856,8 +856,18 @@ export default (new Transformer({
           }
         }
 
-        for (let {source, local, imported, loc} of symbol_result.imports) {
-          let dep = deps.get(source + 'esm');
+        for (let {
+          source,
+          local,
+          imported,
+          kind,
+          loc,
+        } of symbol_result.imports) {
+          let specifierType = '';
+          if (kind === 'Import' || kind === 'Export') {
+            specifierType = 'esm';
+          }
+          let dep = deps.get(source + specifierType);
           if (!dep) continue;
           dep.symbols.ensure();
           dep.symbols.set(imported, local, convertLoc(loc));