diff --git a/code/addons/a11y/src/index.ts b/code/addons/a11y/src/index.ts
index 1563fe0c340a..6303d598f490 100644
--- a/code/addons/a11y/src/index.ts
+++ b/code/addons/a11y/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference types="webpack-env" />
+
 import type { AnyFramework, DecoratorFunction } from '@storybook/csf';
 import deprecate from 'util-deprecate';
 import { dedent } from 'ts-dedent';
diff --git a/code/addons/actions/src/index.ts b/code/addons/actions/src/index.ts
index 8eeba5a84f10..221afdabf34f 100644
--- a/code/addons/actions/src/index.ts
+++ b/code/addons/actions/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference types="webpack-env" />
+
 export * from './constants';
 export * from './models';
 export * from './preview';
diff --git a/code/addons/backgrounds/src/index.ts b/code/addons/backgrounds/src/index.ts
index 644402abb41c..d6968d6ab3e3 100644
--- a/code/addons/backgrounds/src/index.ts
+++ b/code/addons/backgrounds/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference types="webpack-env" />
+
 if (module && module.hot && module.hot.decline) {
   module.hot.decline();
 }
diff --git a/code/addons/jest/src/index.ts b/code/addons/jest/src/index.ts
index 08398c74c7c2..2e8b0715121d 100644
--- a/code/addons/jest/src/index.ts
+++ b/code/addons/jest/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference types="webpack-env" />
+
 import { addons } from '@storybook/addons';
 import { normalize, sep } from 'upath';
 import { ADD_TESTS, defineJestParameter } from './shared';
diff --git a/code/addons/links/src/index.ts b/code/addons/links/src/index.ts
index e9c50d0217c8..071b1de97b79 100644
--- a/code/addons/links/src/index.ts
+++ b/code/addons/links/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference types="webpack-env" />
+
 import { dedent } from 'ts-dedent';
 
 let hasWarned = false;
diff --git a/code/addons/measure/src/index.ts b/code/addons/measure/src/index.ts
index 644402abb41c..d6968d6ab3e3 100644
--- a/code/addons/measure/src/index.ts
+++ b/code/addons/measure/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference types="webpack-env" />
+
 if (module && module.hot && module.hot.decline) {
   module.hot.decline();
 }
diff --git a/code/addons/outline/src/index.ts b/code/addons/outline/src/index.ts
index 644402abb41c..d6968d6ab3e3 100644
--- a/code/addons/outline/src/index.ts
+++ b/code/addons/outline/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference types="webpack-env" />
+
 if (module && module.hot && module.hot.decline) {
   module.hot.decline();
 }
diff --git a/code/addons/storysource/src/index.ts b/code/addons/storysource/src/index.ts
index a5cd9202f547..5edaf4114ea1 100644
--- a/code/addons/storysource/src/index.ts
+++ b/code/addons/storysource/src/index.ts
@@ -1,3 +1,5 @@
+/// <reference types="webpack-env" />
+
 import { ADDON_ID, PANEL_ID } from './events';
 
 export { ADDON_ID, PANEL_ID };
diff --git a/code/lib/addons/package.json b/code/lib/addons/package.json
index 2f516c169138..7c7a1a6e1e8c 100644
--- a/code/lib/addons/package.json
+++ b/code/lib/addons/package.json
@@ -20,9 +20,17 @@
   },
   "license": "MIT",
   "sideEffects": false,
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist/**/*",
     "README.md",
@@ -31,7 +39,7 @@
   ],
   "scripts": {
     "check": "../../../scripts/node_modules/.bin/tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prep": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
     "@storybook/api": "7.0.0-alpha.34",
@@ -50,5 +58,10 @@
   "publishConfig": {
     "access": "public"
   },
+  "bundler": {
+    "entries": [
+      "./src/index.ts"
+    ]
+  },
   "gitHead": "fc90fc875462421c1faa35862ac4bc436de8e75f"
 }
diff --git a/code/lib/ui/src/globals/exports.ts b/code/lib/ui/src/globals/exports.ts
index d53ee16e4d63..441fb4b6d668 100644
--- a/code/lib/ui/src/globals/exports.ts
+++ b/code/lib/ui/src/globals/exports.ts
@@ -215,13 +215,13 @@ export default {
   '@storybook/addons': [
     'AddonStore',
     'Channel',
+    'HooksContext',
     'addons',
-    'makeDecorator',
+    'applyHooks',
     'isSupportedType',
-    'types',
+    'makeDecorator',
     'mockChannel',
-    'HooksContext',
-    'applyHooks',
+    'types',
     'useArgs',
     'useCallback',
     'useChannel',