From a48275523377cc0da2be7eac1875ed83281ff9b2 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 6 Apr 2023 11:29:40 -0700
Subject: [PATCH 1/2] chore: remove unused dependencies

---
 code/addons/docs/package.json    | 2 --
 code/lib/docs-tools/package.json | 2 +-
 code/yarn.lock                   | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json
index de6129b5cecc..7f170a6e5ac6 100644
--- a/code/addons/docs/package.json
+++ b/code/addons/docs/package.json
@@ -99,8 +99,6 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@babel/core": "^7.20.2",
-    "@babel/plugin-transform-react-jsx": "^7.19.0",
     "@jest/transform": "^29.3.1",
     "@mdx-js/react": "^2.1.5",
     "@storybook/blocks": "7.1.0-alpha.0",
diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json
index 8eb06b681a8f..a689cda1925d 100644
--- a/code/lib/docs-tools/package.json
+++ b/code/lib/docs-tools/package.json
@@ -43,7 +43,6 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@babel/core": "^7.12.10",
     "@storybook/core-common": "7.1.0-alpha.0",
     "@storybook/preview-api": "7.1.0-alpha.0",
     "@storybook/types": "7.1.0-alpha.0",
@@ -52,6 +51,7 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
+    "@babel/core": "^7.12.10",
     "jest-specific-snapshot": "^7.0.0",
     "require-from-string": "^2.0.2",
     "typescript": "~4.9.3"
diff --git a/code/yarn.lock b/code/yarn.lock
index 9161a163c709..f55a9659e8a5 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -5191,8 +5191,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/addon-docs@workspace:addons/docs"
   dependencies:
-    "@babel/core": ^7.20.2
-    "@babel/plugin-transform-react-jsx": ^7.19.0
     "@jest/transform": ^29.3.1
     "@mdx-js/react": ^2.1.5
     "@storybook/blocks": 7.1.0-alpha.0

From 03182cbc5989c4f16e77a5877308cd7e36ab86b4 Mon Sep 17 00:00:00 2001
From: Jeppe Reinhold <jeppe@chromatic.com>
Date: Fri, 14 Apr 2023 10:40:59 +0200
Subject: [PATCH 2/2] Fix bad merge conflict resolution

---
 code/lib/docs-tools/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json
index bc2db6ec1853..5f3bb6b33dd7 100644
--- a/code/lib/docs-tools/package.json
+++ b/code/lib/docs-tools/package.json
@@ -43,9 +43,9 @@
     "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/core-common": "7.1.0-alpha.0",
-    "@storybook/preview-api": "7.1.0-alpha.0",
-    "@storybook/types": "7.1.0-alpha.0",
+    "@storybook/core-common": "7.1.0-alpha.3",
+    "@storybook/preview-api": "7.1.0-alpha.3",
+    "@storybook/types": "7.1.0-alpha.3",
     "@types/doctrine": "^0.0.3",
     "doctrine": "^3.0.0",
     "lodash": "^4.17.21"