Merge 7acbcdc into 5b7c53f

vercel · Feb 3, 2023 · da6bfbb · da6bfbb
2 parents 5b7c53f + 7acbcdc
commit da6bfbb
Show file tree

Hide file tree

Showing 13 changed files with 3,269 additions and 3 deletions.
diff --git a/crates/turbopack-ecmascript/src/analyzer/graph.rs b/crates/turbopack-ecmascript/src/analyzer/graph.rs
@@ -306,6 +306,8 @@ impl EvalContext {
                 SyntaxContext::empty(),
             )),
 
+            Expr::Await(AwaitExpr { arg, .. }) => self.eval(arg),
+
             Expr::New(..) => JsValue::Unknown(None, "unknown new expression"),
 
             Expr::Seq(e) => {

diff --git a/crates/turbopack-ecmascript/src/analyzer/well_known.rs b/crates/turbopack-ecmascript/src/analyzer/well_known.rs
@@ -389,9 +389,9 @@ pub async fn well_known_object_member(
         WellKnownObjectKind::PathModule | WellKnownObjectKind::PathModuleDefault => {
             path_module_member(kind, prop)
         }
-        WellKnownObjectKind::FsModule | WellKnownObjectKind::FsModuleDefault => {
-            fs_module_member(kind, prop)
-        }
+        WellKnownObjectKind::FsModule
+        | WellKnownObjectKind::FsModuleDefault
+        | WellKnownObjectKind::FsModulePromises => fs_module_member(kind, prop),
         WellKnownObjectKind::UrlModule | WellKnownObjectKind::UrlModuleDefault => {
             url_module_member(kind, prop)
         }

diff --git a/crates/turbopack-ecmascript/src/utils.rs b/crates/turbopack-ecmascript/src/utils.rs
@@ -17,6 +17,9 @@ pub fn unparen(expr: &Expr) -> &Expr {
     if let Some(expr) = expr.as_paren() {
         return unparen(&expr.expr);
     }
+    if let Expr::Seq(seq) = expr {
+        return unparen(&seq.exprs.last().unwrap());
+    }
     expr
 }