diff --git a/addons/links/react.js b/addons/links/react.js
index 9afbe539022..d0e3270119d 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/components/html.js b/lib/components/html.js
index ffebae38881..782e7707979 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/core/client.js b/lib/core/client.js
index 35c55548876..86a0d88ffce 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';
diff --git a/lib/router/utils.js b/lib/router/utils.js
index c61f0e64bfc..55d16ed6dec 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 65d2da89a5b..87118a8518b 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';