diff --git a/package.json b/package.json
index 833255cfe..b3f44d85a 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@angular/compiler": "10.0.2",
     "@babel/code-frame": "7.10.4",
-    "@babel/parser": "7.10.3",
+    "@babel/parser": "7.10.4",
     "@glimmer/syntax": "0.54.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "3.5.0",
diff --git a/src/language-js/parser-babel.js b/src/language-js/parser-babel.js
index d3acba2d5..2efa38f77 100644
--- a/src/language-js/parser-babel.js
+++ b/src/language-js/parser-babel.js
@@ -82,7 +82,18 @@ function createParse(parseMethod, ...pluginCombinations) {
           babelOptions({ sourceType, extraPlugins })
         )
       );
-    } catch (error) {
+    } catch (_error) {
+      // babel@7.10.4 throws `undefined`, when parsing
+      // ```js
+      // alert(
+      // <!-- comment
+      // 'hello world'
+      // )
+      // ```
+      // #8688
+
+      const error = _error || { message: "Unknown error" };
+
       throw createError(
         // babel error prints (l:c) with cols that are zero indexed
         // so we need our custom error
diff --git a/tests/js/classes-private-fields/__snapshots__/jsfmt.spec.js.snap b/tests/js/classes-private-fields/__snapshots__/jsfmt.spec.js.snap
index 2bbcca8d3..5904bcb64 100644
--- a/tests/js/classes-private-fields/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/classes-private-fields/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,42 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`optional-chaining.js - {"semi":false} format 1`] = `
+====================================options=====================================
+parsers: ["babel"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+// https://github.com/babel/babel/pull/11669
+
+delete obj?.#x.a
+
+=====================================output=====================================
+// https://github.com/babel/babel/pull/11669
+
+delete obj?.#x.a
+
+================================================================================
+`;
+
+exports[`optional-chaining.js format 1`] = `
+====================================options=====================================
+parsers: ["babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// https://github.com/babel/babel/pull/11669
+
+delete obj?.#x.a
+
+=====================================output=====================================
+// https://github.com/babel/babel/pull/11669
+
+delete obj?.#x.a;
+
+================================================================================
+`;
+
 exports[`private_fields.js - {"semi":false} format 1`] = `
 ====================================options=====================================
 parsers: ["babel"]
diff --git a/tests/js/classes-private-fields/optional-chaining.js b/tests/js/classes-private-fields/optional-chaining.js
new file mode 100644
index 000000000..c2881ee2a
--- /dev/null
+++ b/tests/js/classes-private-fields/optional-chaining.js
@@ -0,0 +1,3 @@
+// https://github.com/babel/babel/pull/11669
+
+delete obj?.#x.a
diff --git a/tests/js/record/__snapshots__/jsfmt.spec.js.snap b/tests/js/record/__snapshots__/jsfmt.spec.js.snap
index 7843b99bf..19c846580 100644
--- a/tests/js/record/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/record/__snapshots__/jsfmt.spec.js.snap
@@ -60,6 +60,36 @@ assert(rest.c === 3);
 ================================================================================
 `;
 
+exports[`invalid-record-method.js format 1`] = `
+====================================options=====================================
+parsers: ["babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// Invalid, https://github.com/babel/babel/pull/11652/
+
+#{
+  a() {},
+  async b() {},
+  get c() {},
+  set d(_) {},
+  *e() {}
+}
+
+=====================================output=====================================
+// Invalid, https://github.com/babel/babel/pull/11652/
+
+#{
+  a() {},
+  async b() {},
+  get c() {},
+  set d(_) {},
+  *e() {},
+};
+
+================================================================================
+`;
+
 exports[`record.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel"]
diff --git a/tests/js/record/invalid-record-method.js b/tests/js/record/invalid-record-method.js
new file mode 100644
index 000000000..4c3b8187e
--- /dev/null
+++ b/tests/js/record/invalid-record-method.js
@@ -0,0 +1,9 @@
+// Invalid, https://github.com/babel/babel/pull/11652/
+
+#{
+  a() {},
+  async b() {},
+  get c() {},
+  set d(_) {},
+  *e() {}
+}
diff --git a/tests/js/tuple/__snapshots__/jsfmt.spec.js.snap b/tests/js/tuple/__snapshots__/jsfmt.spec.js.snap
index 296f9e84a..b4f545548 100644
--- a/tests/js/tuple/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/tuple/__snapshots__/jsfmt.spec.js.snap
@@ -30,6 +30,20 @@ assert(rest[1] === 3);
 ================================================================================
 `;
 
+exports[`invalid-tuple-holes.js format 1`] = `
+====================================options=====================================
+parsers: ["babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+#[,]
+
+=====================================output=====================================
+#[,];
+
+================================================================================
+`;
+
 exports[`syntax.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel"]
@@ -93,3 +107,17 @@ assert(tuple5 === #[2, 2, 3, 4]);
 
 ================================================================================
 `;
+
+exports[`tuple-trailing-comma.js format 1`] = `
+====================================options=====================================
+parsers: ["babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+#[1,]
+
+=====================================output=====================================
+#[1];
+
+================================================================================
+`;
diff --git a/tests/js/tuple/invalid-tuple-holes.js b/tests/js/tuple/invalid-tuple-holes.js
new file mode 100644
index 000000000..621be6b2e
--- /dev/null
+++ b/tests/js/tuple/invalid-tuple-holes.js
@@ -0,0 +1 @@
+#[,]
diff --git a/tests/js/tuple/tuple-trailing-comma.js b/tests/js/tuple/tuple-trailing-comma.js
new file mode 100644
index 000000000..3e938abaf
--- /dev/null
+++ b/tests/js/tuple/tuple-trailing-comma.js
@@ -0,0 +1 @@
+#[1,]
diff --git a/tests/misc/errors/js/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/js/__snapshots__/jsfmt.spec.js.snap
index 66d639967..c0e574acb 100644
--- a/tests/misc/errors/js/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/js/__snapshots__/jsfmt.spec.js.snap
@@ -1,14 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`html-like-comments.js error test 1`] = `
-"Unexpected token (3:1)
+"Unknown error (0:0)
   1 | // Only support HTML-like comment in HTML
   2 | alert(
-> 3 | <!-- comment
-    | ^
-  4 | 'hello world'
-  5 | )
-  6 | "
+  3 | <!-- comment"
 `;
 
 exports[`module-attributes.js error test 1`] = `
diff --git a/yarn.lock b/yarn.lock
index c90f159bb..7124b1dcd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -266,12 +266,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.3.tgz#7e71d892b0d6e7d04a1af4c3c79d72c1f10f5315"
-  integrity sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.7.5":
+"@babel/parser@7.10.4", "@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.7.5":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.4.tgz#9eedf27e1998d87739fb5028a5120557c06a1a64"
   integrity sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==