From 5fa12bedd3e74e94ab40843fbf1a92c35f9307ef Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@chromatic.com>
Date: Mon, 11 Apr 2022 11:44:44 +1000
Subject: [PATCH 1/2] Change entrypoints to be ESM

---
 addons/links/react.js | 4 +++-
 lib/core/client.js    | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/links/react.js b/addons/links/react.js
index 9afbe5390225..d0e3270119d6 100644
--- a/addons/links/react.js
+++ b/addons/links/react.js
@@ -1 +1,3 @@
-module.exports = require('./dist/esm/react');
+import LinkTo from './dist/esm/react';
+
+export default LinkTo;
diff --git a/lib/core/client.js b/lib/core/client.js
index 35c555488761..86a0d88ffce5 100644
--- a/lib/core/client.js
+++ b/lib/core/client.js
@@ -1,3 +1,2 @@
 // @storybook/core was split into core-client and core-server.  This file is for backwards-compat.
-// TODO: remove in 7.0
-module.exports = require('./dist/esm/index');
+export * from './dist/esm/index';

From 454b02313f9fa9fd1b12376f070870baa38991ea Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@chromatic.com>
Date: Mon, 11 Apr 2022 11:45:43 +1000
Subject: [PATCH 2/2] Fix up entry points that actually don't work due to
 prebundling

---
 lib/components/html.js | 3 ++-
 lib/router/utils.js    | 3 ++-
 lib/theming/create.js  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/components/html.js b/lib/components/html.js
index ffebae388818..782e7707979c 100644
--- a/lib/components/html.js
+++ b/lib/components/html.js
@@ -1 +1,2 @@
-module.exports = require('./dist/esm/html');
+// eslint-disable-next-line import/no-unresolved
+export * from './dist/esm/html';
diff --git a/lib/router/utils.js b/lib/router/utils.js
index c61f0e64bfc0..55d16ed6dec0 100644
--- a/lib/router/utils.js
+++ b/lib/router/utils.js
@@ -1 +1,2 @@
-module.exports = require('./dist/esm/utils');
+// eslint-disable-next-line import/no-unresolved
+export * from './dist/esm/utils';
diff --git a/lib/theming/create.js b/lib/theming/create.js
index 65d2da89a5b2..87118a8518b2 100644
--- a/lib/theming/create.js
+++ b/lib/theming/create.js
@@ -1 +1,2 @@
-module.exports = require('./dist/esm/create');
+// eslint-disable-next-line import/no-unresolved
+export * from './dist/esm/create';