From 469b938f2eaeb14bc5cd1ddd02e3fdf0e7637733 Mon Sep 17 00:00:00 2001
From: Leah <github.leah@hrmny.sh>
Date: Mon, 30 Jan 2023 16:47:22 +0100
Subject: [PATCH] address comments

---
 crates/next-core/src/next_server/resolve.rs | 9 ++++++++-
 crates/turbopack-core/src/resolve/mod.rs    | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/next-core/src/next_server/resolve.rs b/crates/next-core/src/next_server/resolve.rs
index bc80a9f52d889..27d249ae8ef2d 100644
--- a/crates/next-core/src/next_server/resolve.rs
+++ b/crates/next-core/src/next_server/resolve.rs
@@ -39,9 +39,16 @@ impl ResolvePlugin for ExternalCjsModulesResolvePlugin {
         fs_path: FileSystemPathVc,
         _request: RequestVc,
     ) -> Result<ResolveResultOptionVc> {
+        let raw_fs_path = &*fs_path.await?;
+
         // always bundle transpiled modules
         let transpiled_glob = packages_glob(self.transpiled_packages).await?;
-        if transpiled_glob.execute(&fs_path.await?.path) {
+        if transpiled_glob.execute(&raw_fs_path.path) {
+            return Ok(ResolveResultOptionVc::none());
+        }
+
+        // mjs -> esm module
+        if Some("mjs") == raw_fs_path.extension() {
             return Ok(ResolveResultOptionVc::none());
         }
 
diff --git a/crates/turbopack-core/src/resolve/mod.rs b/crates/turbopack-core/src/resolve/mod.rs
index ad8aa593461ee..ac5ad07876131 100644
--- a/crates/turbopack-core/src/resolve/mod.rs
+++ b/crates/turbopack-core/src/resolve/mod.rs
@@ -162,6 +162,7 @@ impl ResolveResult {
                     list.extend(list2.iter().cloned());
                 }
                 _ => {
+                    list.extend(other.get_references().iter().cloned());
                     *self = ResolveResult::Unresolveable(take(list));
                 }
             },