address comments

vercel · Jan 30, 2023 · 469b938 · 469b938
1 parent 3db1d52
commit 469b938
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -162,6 +162,7 @@ impl ResolveResult {
                     list.extend(list2.iter().cloned());
                 }
                 _ => {
+                    list.extend(other.get_references().iter().cloned());
                     *self = ResolveResult::Unresolveable(take(list));
                 }
             },