3 files changed, 53 insertions, 25 deletions
diff --git a/src/codegen/index.ts b/src/codegen/index.ts
index 4cba263df..725546f51 100644
--- a/src/codegen/index.ts
+++ b/src/codegen/index.ts
@@ -146,8 +146,8 @@ function getComponentWrapper(_name: string, { type, url }: { type: string; url:
   throw new Error('Unknown Component Type: ' + name);
 }
 
-function compileScriptSafe(raw: string, loader: 'jsx' | 'tsx'): string {
-  let compiledCode = compileExpressionSafe(raw, loader);
+function compileScriptSafe(raw: string): string {
+  let compiledCode = compileExpressionSafe(raw);
   // esbuild treeshakes unused imports. In our case these are components, so let's keep them.
   const imports = eslexer
     .parse(raw)[0]
@@ -161,9 +161,9 @@ function compileScriptSafe(raw: string, loader: 'jsx' | 'tsx'): string {
   return compiledCode;
 }
 
-function compileExpressionSafe(raw: string, loader: 'jsx' | 'tsx'): string {
+function compileExpressionSafe(raw: string): string {
   let { code } = transformSync(raw, {
-    loader,
+    loader: 'tsx',
     jsxFactory: 'h',
     jsxFragment: 'Fragment',
     charset: 'utf8',
@@ -175,7 +175,7 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
   await eslexer.init;
 
   // Compile scripts as TypeScript, always
-  const script = compileScriptSafe(ast.module ? ast.module.content : '', 'tsx');
+  const script = compileScriptSafe(ast.module ? ast.module.content : '');
 
   // Todo: Validate that `h` and `Fragment` aren't defined in the script
   const [scriptImports] = eslexer.parse(script, 'optional-sourcename');
@@ -198,7 +198,7 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
     enter(node: TemplateNode) {
       switch (node.type) {
         case 'MustacheTag':
-          let code = compileExpressionSafe(node.expression, 'jsx');
+          let code = compileExpressionSafe(node.expression);
 
           let matches: RegExpExecArray[] = [];
           let match: RegExpExecArray | null | undefined;
diff --git a/src/compiler/parse/acorn.ts b/src/compiler/parse/acorn.ts
index 966a13792..b88454151 100644
--- a/src/compiler/parse/acorn.ts
+++ b/src/compiler/parse/acorn.ts
@@ -1,20 +1,49 @@
-import { Node } from 'acorn';
-import acorn from 'acorn';
-// @ts-ignore
-import jsx from 'acorn-jsx';
+import type { Node } from 'acorn';
+import { parseExpression } from '@babel/parser';
+// import acorn from 'acorn';
+// // @ts-ignore
+// import jsx from 'acorn-jsx';
+// const acornJsx = acorn.Parser.extend(jsx());
 
-const acornJsx = acorn.Parser.extend(jsx());
+export const parse = (source: string): Node => {
+  throw new Error('No longer used.');
+  // acorn.parse(source, {
+  //   sourceType: 'module',
+  //   ecmaVersion: 2020,
+  //   locations: true,
+  // });
+};
 
-export const parse = (source: string): Node =>
-  acorn.parse(source, {
-    sourceType: 'module',
-    ecmaVersion: 2020,
-    locations: true,
-  });
-
-export const parse_expression_at = (source: string, index: number): Node =>
-  acornJsx.parseExpressionAt(source, index, {
-    sourceType: 'module',
-    ecmaVersion: 2020,
-    locations: true,
-  });
+export const parse_expression_at = (source: string, index: number) => {
+  // TODO: Clean up after acorn -> @babel/parser move
+  try {
+    parseExpression(source.slice(index), {
+      sourceType: 'module',
+      plugins: ['jsx', 'typescript'],
+    });
+    throw new Error('Parse error.'); // Expected to fail.
+  } catch (err) {
+    if (!err.pos) {
+      throw err;
+    }
+    try {
+      const result = parseExpression(source.slice(index, index + err.pos), {
+        sourceType: 'module',
+        plugins: ['jsx', 'typescript'],
+      });
+      result.start = index;
+      result.end = index + err.pos;
+      return result;
+    } catch (err2) {
+      if (err2.pos) {
+        err2.pos = index + err2.pos;
+      }
+      throw err2;
+    }
+  }
+};
+// acornJsx.parseExpressionAt(source, index, {
+//   sourceType: 'module',
+//   ecmaVersion: 2020,
+//   locations: true,
+// });
diff --git a/src/compiler/parse/read/expression.ts b/src/compiler/parse/read/expression.ts
index 56e79265d..827a29721 100644
--- a/src/compiler/parse/read/expression.ts
+++ b/src/compiler/parse/read/expression.ts
@@ -8,7 +8,6 @@ import { whitespace } from '../../utils/patterns.js';
 export default function read_expression(parser: Parser): string {
   try {
     const node = parse_expression_at(parser.template, parser.index);
-
     let num_parens = 0;
 
     for (let i = parser.index; i < node.start; i += 1) {