Drop babel, not actually used.

matrix-org · Nov 28, 2024 · 5351a02 · 5351a02
1 parent e8f142b
commit 5351a02
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 20 deletions.
diff --git a/babel.config.js b/babel.config.js
diff --git a/package.json b/package.json
@@ -82,8 +82,6 @@
     "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
-    "@babel/preset-env": "^7.26.0",
     "@codemirror/lang-javascript": "^6.0.2",
     "@eslint/eslintrc": "^3.2.0",
     "@eslint/js": "^9.15.0",

diff --git a/tests/IntentUtilsTest.ts b/tests/IntentUtilsTest.ts
@@ -25,11 +25,7 @@ describe("IntentUtils", () => {
                     return;
                 }
                 expect(roomId).to.equal(ROOM_ID);
-<<<<<<< HEAD
                 throw new MatrixError({ errcode: "M_FORBIDDEN", error: "Test forced error"}, 401, {})
-=======
-                throw new MatrixError({ errcode: "M_FORBIDDEN", error: "Test forced error"}, 401, { })
->>>>>>> origin/main
             };
 
             // This should invite the puppet user.

diff --git a/tests/connections/GenericHookTest.ts b/tests/connections/GenericHookTest.ts
@@ -321,11 +321,7 @@ describe("GenericHookConnection", () => {
                 return roomId;
             }
             expect(roomId).to.equal(ROOM_ID);
-<<<<<<< HEAD
-            throw new MatrixError({ errcode: "M_FORBIDDEN", error: "Test forced error"}, 401, {})
-=======
             throw new MatrixError({ errcode: "M_FORBIDDEN", error: "Test forced error"}, 401, { })
->>>>>>> origin/main
         };
 
         // This should invite the puppet user.
@@ -348,11 +344,7 @@ describe("GenericHookConnection", () => {
 
         // This should fail the first time, then pass once we've tried to invite the user
         intent.ensureJoined = () => {
-<<<<<<< HEAD
-            throw new MatrixError({ errcode: "FORCED_FAILURE", error: "Test forced error"}, 500, {})
-=======
             throw new MatrixError({ errcode: "FORCED_FAILURE", error: "Test forced error"}, 500, { })
->>>>>>> origin/main
         };
         try {
             // regression test covering https://github.com/matrix-org/matrix-hookshot/issues/625