From d46274b6d3e62a7609b5e22328b1799622f1b5f7 Mon Sep 17 00:00:00 2001
From: David Wheatley <hi@davwheat.dev>
Date: Thu, 4 Nov 2021 20:06:18 +0000
Subject: [PATCH] fix: remove package from old typescript shim

---
 js/package.json | 3 +--
 js/yarn.lock    | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/js/package.json b/js/package.json
index ca289f0b7..2f3eb8108 100644
--- a/js/package.json
+++ b/js/package.json
@@ -18,7 +18,6 @@
     "throttle-debounce": "^3.0.1"
   },
   "devDependencies": {
-    "@babel/preset-typescript": "^7.16.0",
     "@flarum/prettier-config": "^1.0.0",
     "@types/jquery": "^3.5.8",
     "@types/mithril": "^2.0.8",
@@ -28,7 +27,7 @@
     "cross-env": "^7.0.3",
     "expose-loader": "^3.1.0",
     "flarum-tsconfig": "^1.0.2",
-    "flarum-webpack-config": "2.0.0",
+    "flarum-webpack-config": "^2.0.0",
     "prettier": "^2.4.1",
     "typescript": "^4.4.4",
     "webpack": "^5.61.0",
diff --git a/js/yarn.lock b/js/yarn.lock
index fa6c84622..f0cfb1428 100644
--- a/js/yarn.lock
+++ b/js/yarn.lock
@@ -1308,7 +1308,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:^7.13.0, @babel/preset-typescript@npm:^7.16.0":
+"@babel/preset-typescript@npm:^7.13.0":
   version: 7.16.0
   resolution: "@babel/preset-typescript@npm:7.16.0"
   dependencies:
@@ -1380,7 +1380,6 @@ __metadata:
   resolution: "@flarum/core@workspace:."
   dependencies:
     "@askvortsov/rich-icu-message-formatter": ^0.2.1
-    "@babel/preset-typescript": ^7.16.0
     "@flarum/prettier-config": ^1.0.0
     "@types/jquery": ^3.5.8
     "@types/mithril": ^2.0.8
@@ -1395,7 +1394,7 @@ __metadata:
     dayjs: ^1.10.7
     expose-loader: ^3.1.0
     flarum-tsconfig: ^1.0.2
-    flarum-webpack-config: 2.0.0
+    flarum-webpack-config: ^2.0.0
     jquery: ^3.6.0
     jquery.hotkeys: ^0.1.0
     mithril: ^2.0.4
@@ -2371,7 +2370,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flarum-webpack-config@npm:2.0.0":
+"flarum-webpack-config@npm:^2.0.0":
   version: 2.0.0
   resolution: "flarum-webpack-config@npm:2.0.0"
   dependencies: