diff --git a/addons/a11y/src/index.ts b/addons/a11y/src/index.ts
index 6bb2d2d21dc..1563fe0c340 100644
--- a/addons/a11y/src/index.ts
+++ b/addons/a11y/src/index.ts
@@ -1,6 +1,6 @@
 import type { AnyFramework, DecoratorFunction } from '@storybook/csf';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 export { PARAM_KEY } from './constants';
 export * from './params';
diff --git a/addons/actions/src/preview/decorateAction.ts b/addons/actions/src/preview/decorateAction.ts
index b84f49bdb20..67306c1c5c1 100644
--- a/addons/actions/src/preview/decorateAction.ts
+++ b/addons/actions/src/preview/decorateAction.ts
@@ -1,5 +1,5 @@
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { DecoratorFunction } from '../models';
 
diff --git a/addons/actions/src/preview/withActions.ts b/addons/actions/src/preview/withActions.ts
index 6bf5cb14e24..c6e2c265a91 100644
--- a/addons/actions/src/preview/withActions.ts
+++ b/addons/actions/src/preview/withActions.ts
@@ -2,7 +2,7 @@
 import global from 'global';
 import { useEffect, makeDecorator } from '@storybook/addons';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { actions } from './actions';
 
diff --git a/addons/backgrounds/src/decorators/withGrid.ts b/addons/backgrounds/src/decorators/withGrid.ts
index 35ba05383ff..7634c221d4e 100644
--- a/addons/backgrounds/src/decorators/withGrid.ts
+++ b/addons/backgrounds/src/decorators/withGrid.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import deprecate from 'util-deprecate';
 import { useMemo, useEffect } from '@storybook/addons';
 import type { AnyFramework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/csf';
diff --git a/addons/backgrounds/src/helpers/index.ts b/addons/backgrounds/src/helpers/index.ts
index 9b35c8acea8..464cb0d7c02 100644
--- a/addons/backgrounds/src/helpers/index.ts
+++ b/addons/backgrounds/src/helpers/index.ts
@@ -1,5 +1,5 @@
 import global from 'global';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { logger } from '@storybook/client-logger';
 
diff --git a/addons/docs/blocks.js b/addons/docs/blocks.js
index e29483b319c..f329c6d615a 100644
--- a/addons/docs/blocks.js
+++ b/addons/docs/blocks.js
@@ -1,5 +1,5 @@
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 const warnBlocksImport = deprecate(
   () => {},
diff --git a/addons/links/src/index.ts b/addons/links/src/index.ts
index a41227513de..e9c50d0217c 100644
--- a/addons/links/src/index.ts
+++ b/addons/links/src/index.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 let hasWarned = false;
 
diff --git a/addons/outline/src/outlineCSS.ts b/addons/outline/src/outlineCSS.ts
index 94bbeee7357..502ecd884b8 100644
--- a/addons/outline/src/outlineCSS.ts
+++ b/addons/outline/src/outlineCSS.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 /*
   From pesticide v1.3.0 . @mrmrs . MIT
diff --git a/addons/storyshots/storyshots-core/src/Stories2SnapsConverter.ts b/addons/storyshots/storyshots-core/src/Stories2SnapsConverter.ts
index 85425bae4d7..527a946847c 100644
--- a/addons/storyshots/storyshots-core/src/Stories2SnapsConverter.ts
+++ b/addons/storyshots/storyshots-core/src/Stories2SnapsConverter.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 const defaultOptions: Stories2SnapsConverterOptions = {
   snapshotsDirName: '__snapshots__',
diff --git a/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.ts b/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.ts
index 3a8c0d1c10b..d2b13d5e958 100644
--- a/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.ts
+++ b/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.ts
@@ -2,7 +2,7 @@
 import fs from 'fs';
 import glob from 'glob';
 import global from 'global';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 const { describe, it } = global;
 
diff --git a/docs/snippets/common/component-story-mdx-dedent.mdx.mdx b/docs/snippets/common/component-story-mdx-dedent.mdx.mdx
index d66d3d240e5..9a1df24185b 100644
--- a/docs/snippets/common/component-story-mdx-dedent.mdx.mdx
+++ b/docs/snippets/common/component-story-mdx-dedent.mdx.mdx
@@ -3,7 +3,7 @@
 
 import { Source } from '@storybook/addon-docs';
 
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 ## With code snippet
 
diff --git a/docs/snippets/common/component-story-mdx-description.mdx.mdx b/docs/snippets/common/component-story-mdx-description.mdx.mdx
index 4df1230a41f..94495306e2d 100644
--- a/docs/snippets/common/component-story-mdx-description.mdx.mdx
+++ b/docs/snippets/common/component-story-mdx-description.mdx.mdx
@@ -3,7 +3,7 @@
 
 import { Description } from '@storybook/addon-docs';
 
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { Button } from './Button';
 
diff --git a/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts b/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts
index 126ad4836c2..639927540d9 100644
--- a/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts
+++ b/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts
@@ -1,5 +1,5 @@
 import { logger, instance as npmLog } from '@storybook/node-logger';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 export const buildStandaloneErrorHandler = (error: any): any => {
   // Duplicate code for Standalone error handling
diff --git a/frameworks/angular/src/client/angular-beta/StorybookModule.ts b/frameworks/angular/src/client/angular-beta/StorybookModule.ts
index cebbb992938..ab98bc7fb37 100644
--- a/frameworks/angular/src/client/angular-beta/StorybookModule.ts
+++ b/frameworks/angular/src/client/angular-beta/StorybookModule.ts
@@ -1,6 +1,6 @@
 import { NgModule, Type } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { Subject } from 'rxjs';
 import deprecate from 'util-deprecate';
diff --git a/frameworks/angular/src/server/framework-preset-angular-cli.ts b/frameworks/angular/src/server/framework-preset-angular-cli.ts
index 73ec00afd42..584b8607482 100644
--- a/frameworks/angular/src/server/framework-preset-angular-cli.ts
+++ b/frameworks/angular/src/server/framework-preset-angular-cli.ts
@@ -4,7 +4,7 @@ import { logger } from '@storybook/node-logger';
 import { targetFromTargetString, BuilderContext, Target } from '@angular-devkit/architect';
 import { sync as findUpSync } from 'find-up';
 import semver from '@storybook/semver';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { logging, JsonObject } from '@angular-devkit/core';
 import { moduleIsAvailable } from './utils/module-is-available';
diff --git a/frameworks/ember/src/client/preview/render.ts b/frameworks/ember/src/client/preview/render.ts
index 77dda1b3d5f..6f0318f4259 100644
--- a/frameworks/ember/src/client/preview/render.ts
+++ b/frameworks/ember/src/client/preview/render.ts
@@ -1,5 +1,5 @@
 import global from 'global';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { RenderContext } from '@storybook/store';
 import { OptionsArgs, EmberFramework } from './types';
 
diff --git a/frameworks/svelte-webpack5/templates/PreviewRender.svelte b/frameworks/svelte-webpack5/templates/PreviewRender.svelte
index 40c027d6c80..84fe3707a42 100644
--- a/frameworks/svelte-webpack5/templates/PreviewRender.svelte
+++ b/frameworks/svelte-webpack5/templates/PreviewRender.svelte
@@ -1,6 +1,6 @@
 <script>
   import SlotDecorator from './SlotDecorator.svelte';
-  import dedent from 'ts-dedent';
+  import { dedent } from 'ts-dedent';
 
   export let name;
   export let kind;
diff --git a/lib/api/src/lib/stories.ts b/lib/api/src/lib/stories.ts
index 6b6db158fc8..472ec84df6a 100644
--- a/lib/api/src/lib/stories.ts
+++ b/lib/api/src/lib/stories.ts
@@ -1,7 +1,7 @@
 import memoize from 'memoizerific';
 import React from 'react';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import mapValues from 'lodash/mapValues';
 import countBy from 'lodash/countBy';
 import global from 'global';
diff --git a/lib/api/src/modules/addons.ts b/lib/api/src/modules/addons.ts
index 92edf0ace21..5fb8deb9532 100644
--- a/lib/api/src/modules/addons.ts
+++ b/lib/api/src/modules/addons.ts
@@ -1,7 +1,7 @@
 import type { ReactElement } from 'react';
 import type { RenderData } from '@storybook/router';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { ModuleFn } from '../index';
 import { Options } from '../store';
diff --git a/lib/api/src/modules/layout.ts b/lib/api/src/modules/layout.ts
index 765b20d9640..07707dbdc40 100644
--- a/lib/api/src/modules/layout.ts
+++ b/lib/api/src/modules/layout.ts
@@ -4,7 +4,7 @@ import deepEqual from 'fast-deep-equal';
 import { themes } from '@storybook/theming';
 import type { ThemeVars } from '@storybook/theming';
 import { once } from '@storybook/client-logger';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import merge from '../lib/merge';
 import type { State, ModuleFn } from '../index';
diff --git a/lib/api/src/modules/refs.ts b/lib/api/src/modules/refs.ts
index 8a1e9d9d3bf..10f4923b75c 100644
--- a/lib/api/src/modules/refs.ts
+++ b/lib/api/src/modules/refs.ts
@@ -1,5 +1,5 @@
 import global from 'global';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import {
   transformSetStoriesStoryDataToStoriesHash,
   SetStoriesStory,
diff --git a/lib/api/src/modules/url.ts b/lib/api/src/modules/url.ts
index 6db012a2e92..49ecc8097e9 100644
--- a/lib/api/src/modules/url.ts
+++ b/lib/api/src/modules/url.ts
@@ -11,7 +11,7 @@ import { queryFromLocation, buildArgsParam } from '@storybook/router';
 import { toId, sanitize } from '@storybook/csf';
 import deepEqual from 'fast-deep-equal';
 import global from 'global';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { ModuleArgs, ModuleFn } from '../index';
 import { Layout, UI } from './layout';
diff --git a/lib/blocks/src/blocks/DocsContainer.tsx b/lib/blocks/src/blocks/DocsContainer.tsx
index 7e0febccf41..8e2558b1022 100644
--- a/lib/blocks/src/blocks/DocsContainer.tsx
+++ b/lib/blocks/src/blocks/DocsContainer.tsx
@@ -1,7 +1,7 @@
 import React, { FunctionComponent, useEffect } from 'react';
 import global from 'global';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { MDXProvider } from '@mdx-js/react';
 import { ThemeProvider, ensure as ensureTheme } from '@storybook/theming';
 import { components as htmlComponents } from '@storybook/components';
diff --git a/lib/blocks/src/blocks/DocsStory.tsx b/lib/blocks/src/blocks/DocsStory.tsx
index 7b45c7e9188..30fd550a29f 100644
--- a/lib/blocks/src/blocks/DocsStory.tsx
+++ b/lib/blocks/src/blocks/DocsStory.tsx
@@ -1,6 +1,6 @@
 import React, { FunctionComponent } from 'react';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { Subheading } from './Subheading';
 import { DocsStoryProps } from './types';
 import { Anchor } from './Anchor';
diff --git a/lib/blocks/src/blocks/Preview.tsx b/lib/blocks/src/blocks/Preview.tsx
index 94bb226fa0f..d3ac6ff312d 100644
--- a/lib/blocks/src/blocks/Preview.tsx
+++ b/lib/blocks/src/blocks/Preview.tsx
@@ -1,6 +1,6 @@
 import React, { ComponentProps } from 'react';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { Canvas } from './Canvas';
 
 export const Preview = deprecate(
diff --git a/lib/blocks/src/blocks/Props.tsx b/lib/blocks/src/blocks/Props.tsx
index f251ed3575b..baefb284427 100644
--- a/lib/blocks/src/blocks/Props.tsx
+++ b/lib/blocks/src/blocks/Props.tsx
@@ -1,6 +1,6 @@
 import React, { ComponentProps } from 'react';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { ArgsTable } from './ArgsTable';
 import { CURRENT_SELECTION } from './types';
 
diff --git a/lib/blocks/src/controls/options/Options.tsx b/lib/blocks/src/controls/options/Options.tsx
index 26a86b4b09d..2468bacc5ab 100644
--- a/lib/blocks/src/controls/options/Options.tsx
+++ b/lib/blocks/src/controls/options/Options.tsx
@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { once } from '@storybook/client-logger';
 
 import { CheckboxControl } from './Checkbox';
diff --git a/lib/builder-manager/package.json b/lib/builder-manager/package.json
index 2e3fa7307c5..738efb6a275 100644
--- a/lib/builder-manager/package.json
+++ b/lib/builder-manager/package.json
@@ -47,6 +47,7 @@
     "@storybook/ui": "7.0.0-alpha.8",
     "@types/ejs": "^3.1.1",
     "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10",
+    "browser-assert": "^1.2.1",
     "chalk": "^4.1.0",
     "ejs": "^3.1.8",
     "esbuild": "^0.14.47",
diff --git a/lib/builder-manager/src/index.ts b/lib/builder-manager/src/index.ts
index 1298dfbd8e1..9ae2a6e61a9 100644
--- a/lib/builder-manager/src/index.ts
+++ b/lib/builder-manager/src/index.ts
@@ -37,12 +37,13 @@ export const getConfig: ManagerBuilder['getConfig'] = async (options) => {
     bundle: true,
     minify: false,
     sourcemap: true,
+
     legalComments: 'external',
     plugins: [
       aliasPlugin({
         process: require.resolve('rollup-plugin-node-polyfills/polyfills/process-es6.js'),
         util: require.resolve('rollup-plugin-node-polyfills/polyfills/util.js'),
-        assert: require.resolve('rollup-plugin-node-polyfills/polyfills/assert.js'),
+        assert: require.resolve('browser-assert'),
       }),
       globalExternals(definitions),
       pnpPlugin(),
diff --git a/lib/builder-webpack5/src/presets/custom-webpack-preset.ts b/lib/builder-webpack5/src/presets/custom-webpack-preset.ts
index 4e90f7bcea0..879dcc59810 100644
--- a/lib/builder-webpack5/src/presets/custom-webpack-preset.ts
+++ b/lib/builder-webpack5/src/presets/custom-webpack-preset.ts
@@ -3,7 +3,7 @@ import { logger } from '@storybook/node-logger';
 import type { Options, CoreConfig } from '@storybook/core-common';
 import type { Configuration } from 'webpack';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { loadCustomWebpackConfig } from '@storybook/core-webpack';
 import { createDefaultWebpackConfig } from '../preview/base-webpack.config';
 
diff --git a/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
index 77ffe9fc827..479da574dcd 100644
--- a/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
+++ b/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { DefinePlugin, HotModuleReplacementPlugin, ProgressPlugin, ProvidePlugin } from 'webpack';
 import type { Configuration } from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
diff --git a/lib/channels/src/index.ts b/lib/channels/src/index.ts
index a28ba2ece04..1745cff21b5 100644
--- a/lib/channels/src/index.ts
+++ b/lib/channels/src/index.ts
@@ -1,7 +1,7 @@
 /// <reference types="node" />
 
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 export type ChannelHandler = (event: ChannelEvent) => void;
 
diff --git a/lib/cli/src/automigrate/fixes/angular12.ts b/lib/cli/src/automigrate/fixes/angular12.ts
index 2ee7ada4930..15afbbda883 100644
--- a/lib/cli/src/automigrate/fixes/angular12.ts
+++ b/lib/cli/src/automigrate/fixes/angular12.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import semver from '@storybook/semver';
 import { ConfigFile } from '@storybook/csf-tools';
 import { Fix } from '../types';
diff --git a/lib/cli/src/automigrate/fixes/builder-vite.ts b/lib/cli/src/automigrate/fixes/builder-vite.ts
index 9c8d382b721..df264724180 100644
--- a/lib/cli/src/automigrate/fixes/builder-vite.ts
+++ b/lib/cli/src/automigrate/fixes/builder-vite.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { ConfigFile, readConfig, writeConfig } from '@storybook/csf-tools';
 import { getStorybookInfo } from '@storybook/core-common';
diff --git a/lib/cli/src/automigrate/fixes/cra5.ts b/lib/cli/src/automigrate/fixes/cra5.ts
index 29d08dd9adf..66b286ee2d8 100644
--- a/lib/cli/src/automigrate/fixes/cra5.ts
+++ b/lib/cli/src/automigrate/fixes/cra5.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import semver from '@storybook/semver';
 import { ConfigFile } from '@storybook/csf-tools';
 import { Fix } from '../types';
diff --git a/lib/cli/src/automigrate/fixes/eslint-plugin.test.ts b/lib/cli/src/automigrate/fixes/eslint-plugin.test.ts
index b8785637547..f5022873084 100644
--- a/lib/cli/src/automigrate/fixes/eslint-plugin.test.ts
+++ b/lib/cli/src/automigrate/fixes/eslint-plugin.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import path from 'path';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { JsPackageManager } from '../../js-package-manager';
 import { eslintPlugin } from './eslint-plugin';
 
diff --git a/lib/cli/src/automigrate/fixes/eslint-plugin.ts b/lib/cli/src/automigrate/fixes/eslint-plugin.ts
index 431038bc413..668349594cc 100644
--- a/lib/cli/src/automigrate/fixes/eslint-plugin.ts
+++ b/lib/cli/src/automigrate/fixes/eslint-plugin.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { ConfigFile, readConfig, writeConfig } from '@storybook/csf-tools';
 import { getStorybookInfo } from '@storybook/core-common';
 
diff --git a/lib/cli/src/automigrate/fixes/mainjsFramework.ts b/lib/cli/src/automigrate/fixes/mainjsFramework.ts
index 15a67e3ac67..935f134367f 100644
--- a/lib/cli/src/automigrate/fixes/mainjsFramework.ts
+++ b/lib/cli/src/automigrate/fixes/mainjsFramework.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import semver from '@storybook/semver';
 import { ConfigFile, readConfig, writeConfig } from '@storybook/csf-tools';
diff --git a/lib/cli/src/automigrate/fixes/npm7.ts b/lib/cli/src/automigrate/fixes/npm7.ts
index 74f40e6723d..8bc1e18503c 100644
--- a/lib/cli/src/automigrate/fixes/npm7.ts
+++ b/lib/cli/src/automigrate/fixes/npm7.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { Fix } from '../types';
 import { NPMProxy } from '../../js-package-manager/NPMProxy';
 
diff --git a/lib/cli/src/automigrate/fixes/vue3.ts b/lib/cli/src/automigrate/fixes/vue3.ts
index 15a066432db..0f297b8d5f3 100644
--- a/lib/cli/src/automigrate/fixes/vue3.ts
+++ b/lib/cli/src/automigrate/fixes/vue3.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import semver from '@storybook/semver';
 import { ConfigFile } from '@storybook/csf-tools';
 import { Fix } from '../types';
diff --git a/lib/cli/src/automigrate/fixes/webpack5.ts b/lib/cli/src/automigrate/fixes/webpack5.ts
index f8aa7e2e2e7..45d65a1fd60 100644
--- a/lib/cli/src/automigrate/fixes/webpack5.ts
+++ b/lib/cli/src/automigrate/fixes/webpack5.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import semver from '@storybook/semver';
 import { ConfigFile, readConfig, writeConfig } from '@storybook/csf-tools';
 import { getStorybookInfo } from '@storybook/core-common';
diff --git a/lib/cli/src/dev.ts b/lib/cli/src/dev.ts
index 9f2d5c5a626..922b2f14664 100644
--- a/lib/cli/src/dev.ts
+++ b/lib/cli/src/dev.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { sync as readUpSync } from 'read-pkg-up';
 import { logger, instance as npmLog } from '@storybook/node-logger';
 import { buildDevStandalone } from '@storybook/core-server';
diff --git a/lib/cli/src/generators/baseGenerator.ts b/lib/cli/src/generators/baseGenerator.ts
index 3a9f82e4685..9421ddf4bf0 100644
--- a/lib/cli/src/generators/baseGenerator.ts
+++ b/lib/cli/src/generators/baseGenerator.ts
@@ -1,5 +1,5 @@
 import fse from 'fs-extra';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { NpmOptions } from '../NpmOptions';
 import { SupportedRenderers, Builder, CoreBuilder } from '../project_types';
 import { getBabelDependencies, copyComponents } from '../helpers';
diff --git a/lib/cli/src/generators/configure.ts b/lib/cli/src/generators/configure.ts
index 833e61c1b1c..15d105adefc 100644
--- a/lib/cli/src/generators/configure.ts
+++ b/lib/cli/src/generators/configure.ts
@@ -1,5 +1,5 @@
 import fse from 'fs-extra';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { SupportedRenderers } from '../project_types';
 
 interface ConfigureMainOptions {
diff --git a/lib/cli/src/repro.ts b/lib/cli/src/repro.ts
index 1c7fa65229b..fd3211a4148 100644
--- a/lib/cli/src/repro.ts
+++ b/lib/cli/src/repro.ts
@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
 import boxen from 'boxen';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { createAndInit, exec } from './repro-generators/scripts';
 import * as configs from './repro-generators/configs';
 import type { Parameters } from './repro-generators/configs';
diff --git a/lib/client-api/src/ClientApi.ts b/lib/client-api/src/ClientApi.ts
index 5e065fdcfd1..9f3b0d93a95 100644
--- a/lib/client-api/src/ClientApi.ts
+++ b/lib/client-api/src/ClientApi.ts
@@ -1,7 +1,7 @@
 /// <reference types="webpack-env" />
 
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import global from 'global';
 import { logger } from '@storybook/client-logger';
 import { toId, sanitize } from '@storybook/csf';
diff --git a/lib/client-api/src/StoryStoreFacade.ts b/lib/client-api/src/StoryStoreFacade.ts
index ce2b6ebf73d..0499f1520b4 100644
--- a/lib/client-api/src/StoryStoreFacade.ts
+++ b/lib/client-api/src/StoryStoreFacade.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import global from 'global';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { SynchronousPromise } from 'synchronous-promise';
 import { toId, isExportStory, storyNameFromExport } from '@storybook/csf';
 import type { StoryId, AnyFramework, Parameters, StoryFn } from '@storybook/csf';
diff --git a/lib/codemod/src/transforms/__tests__/csf-2-to-3.test.ts b/lib/codemod/src/transforms/__tests__/csf-2-to-3.test.ts
index 5ffa743b98e..276d5beefcd 100644
--- a/lib/codemod/src/transforms/__tests__/csf-2-to-3.test.ts
+++ b/lib/codemod/src/transforms/__tests__/csf-2-to-3.test.ts
@@ -1,5 +1,5 @@
 import { describe } from '@jest/globals';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import _transform from '../csf-2-to-3';
 
 // @ts-ignore
diff --git a/lib/components/src/html.tsx b/lib/components/src/html.tsx
index 47480e067a4..09d0997d07d 100644
--- a/lib/components/src/html.tsx
+++ b/lib/components/src/html.tsx
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import deprecate from 'util-deprecate';
 
 const deprecatedHtmlEndpoint = deprecate(
diff --git a/lib/components/src/syntaxhighlighter/formatter.test.ts b/lib/components/src/syntaxhighlighter/formatter.test.ts
index 9546e098fe9..e81f5468ff7 100644
--- a/lib/components/src/syntaxhighlighter/formatter.test.ts
+++ b/lib/components/src/syntaxhighlighter/formatter.test.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { formatter } from './formatter';
 
diff --git a/lib/components/src/syntaxhighlighter/formatter.ts b/lib/components/src/syntaxhighlighter/formatter.ts
index 6b00dbe5fb3..7289b655afb 100644
--- a/lib/components/src/syntaxhighlighter/formatter.ts
+++ b/lib/components/src/syntaxhighlighter/formatter.ts
@@ -2,7 +2,7 @@ import memoize from 'memoizerific';
 
 import prettierHtml from 'prettier/parser-html';
 import prettier from 'prettier/standalone';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { SyntaxHighlighterFormatTypes } from './syntaxhighlighter-types';
 
 export const formatter = memoize(2)((type: SyntaxHighlighterFormatTypes, source: string) => {
diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts
index a55a91d82a8..7cb7fecf3b9 100644
--- a/lib/core-common/src/presets.ts
+++ b/lib/core-common/src/presets.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { logger } from '@storybook/node-logger';
 import {
   CLIOptions,
diff --git a/lib/core-common/src/utils/__tests__/normalize-stories.test.ts b/lib/core-common/src/utils/__tests__/normalize-stories.test.ts
index f63c4f99df7..7a8f8faed03 100644
--- a/lib/core-common/src/utils/__tests__/normalize-stories.test.ts
+++ b/lib/core-common/src/utils/__tests__/normalize-stories.test.ts
@@ -1,7 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/triple-slash-reference
 /// <reference path="../../test-typings.d.ts" />
 
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { normalizeStoriesEntry } from '../normalize-stories';
 
diff --git a/lib/core-common/src/utils/load-manager-or-addons-file.ts b/lib/core-common/src/utils/load-manager-or-addons-file.ts
index e89c8b04ea3..4e27f68a27d 100644
--- a/lib/core-common/src/utils/load-manager-or-addons-file.ts
+++ b/lib/core-common/src/utils/load-manager-or-addons-file.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 import { logger } from '@storybook/node-logger';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { getInterpretedFile } from './interpret-files';
 
diff --git a/lib/core-common/src/utils/load-preview-or-config-file.ts b/lib/core-common/src/utils/load-preview-or-config-file.ts
index b15e3827a05..27edc691b9b 100644
--- a/lib/core-common/src/utils/load-preview-or-config-file.ts
+++ b/lib/core-common/src/utils/load-preview-or-config-file.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import { getInterpretedFile } from './interpret-files';
 
diff --git a/lib/core-common/src/utils/normalize-stories.ts b/lib/core-common/src/utils/normalize-stories.ts
index 6b34a1e5946..2346aaf2adf 100644
--- a/lib/core-common/src/utils/normalize-stories.ts
+++ b/lib/core-common/src/utils/normalize-stories.ts
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { scan } from 'picomatch';
 import slash from 'slash';
 
diff --git a/lib/core-common/src/utils/validate-configuration-files.ts b/lib/core-common/src/utils/validate-configuration-files.ts
index b6c30a2414b..36016a01b26 100644
--- a/lib/core-common/src/utils/validate-configuration-files.ts
+++ b/lib/core-common/src/utils/validate-configuration-files.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import deprecate from 'util-deprecate';
 import glob from 'glob';
 import path from 'path';
diff --git a/lib/core-server/src/build-static.ts b/lib/core-server/src/build-static.ts
index b7334c72630..2fcd6cc6745 100644
--- a/lib/core-server/src/build-static.ts
+++ b/lib/core-server/src/build-static.ts
@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { copy, emptyDir, ensureDir } from 'fs-extra';
 import path, { dirname, join } from 'path';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import global from 'global';
 
 import { logger } from '@storybook/node-logger';
diff --git a/lib/core-server/src/utils/open-in-browser.ts b/lib/core-server/src/utils/open-in-browser.ts
index 779f72b487c..82af2bedd10 100644
--- a/lib/core-server/src/utils/open-in-browser.ts
+++ b/lib/core-server/src/utils/open-in-browser.ts
@@ -4,7 +4,7 @@ import betterOpn from 'better-opn'; // betterOpn alias used because also loading
 import open from 'open';
 // @ts-ignore
 import getDefaultBrowser from 'x-default-browser';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 export function openInBrowser(address: string) {
   getDefaultBrowser(async (err: any, res: any) => {
diff --git a/lib/core-server/src/utils/output-startup-information.ts b/lib/core-server/src/utils/output-startup-information.ts
index 16b6090c2c1..3354669423b 100644
--- a/lib/core-server/src/utils/output-startup-information.ts
+++ b/lib/core-server/src/utils/output-startup-information.ts
@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { colors } from '@storybook/node-logger';
 import boxen from 'boxen';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import Table from 'cli-table3';
 import prettyTime from 'pretty-hrtime';
 import type { VersionCheck } from '@storybook/core-common';
diff --git a/lib/core-server/src/utils/server-statics.ts b/lib/core-server/src/utils/server-statics.ts
index fc2b110ef25..585529cd142 100644
--- a/lib/core-server/src/utils/server-statics.ts
+++ b/lib/core-server/src/utils/server-statics.ts
@@ -7,7 +7,7 @@ import { pathExists } from 'fs-extra';
 import path from 'path';
 import favicon from 'serve-favicon';
 
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 const defaultFavIcon = require.resolve('@storybook/core-server/public/favicon.ico');
 
diff --git a/lib/core-server/src/utils/update-check.ts b/lib/core-server/src/utils/update-check.ts
index b9010092702..5b3b0704882 100644
--- a/lib/core-server/src/utils/update-check.ts
+++ b/lib/core-server/src/utils/update-check.ts
@@ -2,7 +2,7 @@ import fetch from 'node-fetch';
 import chalk from 'chalk';
 import { colors } from '@storybook/node-logger';
 import semver from '@storybook/semver';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { cache } from '@storybook/core-common';
 import type { VersionCheck } from '@storybook/core-common';
 
diff --git a/lib/core-webpack/src/check-webpack-version.ts b/lib/core-webpack/src/check-webpack-version.ts
index b1e289922b2..72e424295fd 100644
--- a/lib/core-webpack/src/check-webpack-version.ts
+++ b/lib/core-webpack/src/check-webpack-version.ts
@@ -1,5 +1,5 @@
 import { logger } from '@storybook/node-logger';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 export const checkWebpackVersion = (
   webpack: { version?: string },
diff --git a/lib/core-webpack/src/to-importFn.ts b/lib/core-webpack/src/to-importFn.ts
index 637fcd5d9b3..f425e36a4b3 100644
--- a/lib/core-webpack/src/to-importFn.ts
+++ b/lib/core-webpack/src/to-importFn.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import type { NormalizedStoriesSpecifier } from '@storybook/core-common';
 import { globToRegexp } from '@storybook/core-common';
 
diff --git a/lib/csf-tools/src/ConfigFile.test.ts b/lib/csf-tools/src/ConfigFile.test.ts
index edaa9adcb05..04851d32a91 100644
--- a/lib/csf-tools/src/ConfigFile.test.ts
+++ b/lib/csf-tools/src/ConfigFile.test.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { formatConfig, loadConfig } from './ConfigFile';
 
 expect.addSnapshotSerializer({
diff --git a/lib/csf-tools/src/CsfFile.test.ts b/lib/csf-tools/src/CsfFile.test.ts
index 976b99385e6..8b0d48a33f9 100644
--- a/lib/csf-tools/src/CsfFile.test.ts
+++ b/lib/csf-tools/src/CsfFile.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-underscore-dangle */
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import yaml from 'js-yaml';
 import { loadCsf } from './CsfFile';
 
diff --git a/lib/csf-tools/src/CsfFile.ts b/lib/csf-tools/src/CsfFile.ts
index 7ef07d0020a..c345b32fe56 100644
--- a/lib/csf-tools/src/CsfFile.ts
+++ b/lib/csf-tools/src/CsfFile.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import fs from 'fs-extra';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import * as t from '@babel/types';
 import generate from '@babel/generator';
 import traverse from '@babel/traverse';
diff --git a/lib/csf-tools/src/getStorySortParameter.test.ts b/lib/csf-tools/src/getStorySortParameter.test.ts
index 02a1ab89886..6ca1e8a05ee 100644
--- a/lib/csf-tools/src/getStorySortParameter.test.ts
+++ b/lib/csf-tools/src/getStorySortParameter.test.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { getStorySortParameter } from './getStorySortParameter';
 
 describe('getStorySortParameter', () => {
diff --git a/lib/csf-tools/src/getStorySortParameter.ts b/lib/csf-tools/src/getStorySortParameter.ts
index 7eafebb68e9..26ca936b585 100644
--- a/lib/csf-tools/src/getStorySortParameter.ts
+++ b/lib/csf-tools/src/getStorySortParameter.ts
@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import traverse from '@babel/traverse';
 import generate from '@babel/generator';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { babelParse } from './babelParse';
 
 const logger = console;
diff --git a/lib/preview-web/src/Preview.tsx b/lib/preview-web/src/Preview.tsx
index a179c022939..b518affc932 100644
--- a/lib/preview-web/src/Preview.tsx
+++ b/lib/preview-web/src/Preview.tsx
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import global from 'global';
 import { SynchronousPromise } from 'synchronous-promise';
 import {
diff --git a/lib/preview-web/src/PreviewWeb.tsx b/lib/preview-web/src/PreviewWeb.tsx
index d52e65fbb74..98bbce77529 100644
--- a/lib/preview-web/src/PreviewWeb.tsx
+++ b/lib/preview-web/src/PreviewWeb.tsx
@@ -1,5 +1,5 @@
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import global from 'global';
 import {
   CURRENT_STORY_WAS_SET,
diff --git a/lib/preview-web/src/WebView.ts b/lib/preview-web/src/WebView.ts
index eb43347b310..aee66d07db8 100644
--- a/lib/preview-web/src/WebView.ts
+++ b/lib/preview-web/src/WebView.ts
@@ -1,7 +1,7 @@
 import global from 'global';
 import { logger } from '@storybook/client-logger';
 import AnsiToHtml from 'ansi-to-html';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import qs from 'qs';
 
 import type { Story } from '@storybook/store';
diff --git a/lib/preview-web/src/parseArgsParam.ts b/lib/preview-web/src/parseArgsParam.ts
index 2aa9d53f2c8..a45371d1bea 100644
--- a/lib/preview-web/src/parseArgsParam.ts
+++ b/lib/preview-web/src/parseArgsParam.ts
@@ -1,5 +1,5 @@
 import qs from 'qs';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import type { Args } from '@storybook/addons';
 import { once } from '@storybook/client-logger';
 import isPlainObject from 'lodash/isPlainObject';
diff --git a/lib/router/src/utils.ts b/lib/router/src/utils.ts
index ed84228bfa9..02c3a4d585a 100644
--- a/lib/router/src/utils.ts
+++ b/lib/router/src/utils.ts
@@ -3,7 +3,7 @@ import deepEqual from 'fast-deep-equal';
 import isPlainObject from 'lodash/isPlainObject';
 import memoize from 'memoizerific';
 import qs, { IStringifyOptions } from 'qs';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 export interface StoryData {
   viewMode?: string;
diff --git a/lib/store/src/GlobalsStore.ts b/lib/store/src/GlobalsStore.ts
index 219ba6832ae..d764951db12 100644
--- a/lib/store/src/GlobalsStore.ts
+++ b/lib/store/src/GlobalsStore.ts
@@ -1,5 +1,5 @@
 import deprecate from 'util-deprecate';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import type { Globals, GlobalTypes } from '@storybook/csf';
 
 import { deepDiff, DEEPLY_EQUAL } from './args';
diff --git a/lib/store/src/StoryIndexStore.ts b/lib/store/src/StoryIndexStore.ts
index 342b74fa76f..83b683b09ad 100644
--- a/lib/store/src/StoryIndexStore.ts
+++ b/lib/store/src/StoryIndexStore.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import type { StoryId } from '@storybook/csf';
 import memoize from 'memoizerific';
 
diff --git a/lib/store/src/args.ts b/lib/store/src/args.ts
index d635a04fdce..034945ae8f3 100644
--- a/lib/store/src/args.ts
+++ b/lib/store/src/args.ts
@@ -2,7 +2,7 @@ import deepEqual from 'fast-deep-equal';
 import type { SBType, Args, InputType, ArgTypes, StoryContext, AnyFramework } from '@storybook/csf';
 import { once } from '@storybook/client-logger';
 import isPlainObject from 'lodash/isPlainObject';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 const INCOMPATIBLE = Symbol('incompatible');
 const map = (arg: unknown, argType: InputType): any => {
diff --git a/lib/store/src/autoTitle.ts b/lib/store/src/autoTitle.ts
index 2e98306b7c7..a7885371b92 100644
--- a/lib/store/src/autoTitle.ts
+++ b/lib/store/src/autoTitle.ts
@@ -1,5 +1,5 @@
 import slash from 'slash';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { once } from '@storybook/client-logger';
 
 // FIXME: types duplicated type from `core-common', to be
diff --git a/lib/store/src/csf/normalizeStory.ts b/lib/store/src/csf/normalizeStory.ts
index 8db9c7b7872..13401e3a627 100644
--- a/lib/store/src/csf/normalizeStory.ts
+++ b/lib/store/src/csf/normalizeStory.ts
@@ -7,7 +7,7 @@ import type {
   ArgTypes,
 } from '@storybook/csf';
 import { storyNameFromExport, toId } from '@storybook/csf';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { logger } from '@storybook/client-logger';
 import deprecate from 'util-deprecate';
 import type { NormalizedComponentAnnotations, NormalizedStoryAnnotations } from '../types';
diff --git a/lib/store/src/csf/prepareStory.ts b/lib/store/src/csf/prepareStory.ts
index 8ff1e5d2ccc..8bc5c3ac661 100644
--- a/lib/store/src/csf/prepareStory.ts
+++ b/lib/store/src/csf/prepareStory.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import deprecate from 'util-deprecate';
 import global from 'global';
 
diff --git a/lib/store/src/inferArgTypes.ts b/lib/store/src/inferArgTypes.ts
index ccc4ecc258b..3cdb5433666 100644
--- a/lib/store/src/inferArgTypes.ts
+++ b/lib/store/src/inferArgTypes.ts
@@ -1,5 +1,5 @@
 import mapValues from 'lodash/mapValues';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { logger } from '@storybook/client-logger';
 import type { AnyFramework, SBType, ArgTypesEnhancer } from '@storybook/csf';
 import { combineParameters } from './parameters';
diff --git a/lib/store/src/sortStories.ts b/lib/store/src/sortStories.ts
index a574022dee2..bcc8a7222b6 100644
--- a/lib/store/src/sortStories.ts
+++ b/lib/store/src/sortStories.ts
@@ -1,5 +1,5 @@
 import stable from 'stable';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import type { Comparator, StorySortParameter, StorySortParameterV7 } from '@storybook/addons';
 import { storySort } from './storySort';
 import type { Story, StoryIndexEntry, IndexEntry, Path, Parameters } from './types';
diff --git a/lib/theming/create.js b/lib/theming/create.js
deleted file mode 100644
index c66ea93e898..00000000000
--- a/lib/theming/create.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './dist/esm';
diff --git a/lib/theming/paths.js b/lib/theming/paths.js
deleted file mode 100644
index 2e132e739e7..00000000000
--- a/lib/theming/paths.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// We used to alias paths, but now that we are bundling dependencies, we do not need to
-module.exports = {};
diff --git a/lib/theming/src/ensure.ts b/lib/theming/src/ensure.ts
index 586852e106c..b2e6cefe535 100644
--- a/lib/theming/src/ensure.ts
+++ b/lib/theming/src/ensure.ts
@@ -1,7 +1,7 @@
 import { logger } from '@storybook/client-logger';
 
 import { deletedDiff } from 'deep-object-diff';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 import light from './themes/light';
 import { Theme, ThemeVars } from './types';
diff --git a/lib/ui/src/globals/exports.ts b/lib/ui/src/globals/exports.ts
index fe53afff4ae..6fffbdd61b4 100644
--- a/lib/ui/src/globals/exports.ts
+++ b/lib/ui/src/globals/exports.ts
@@ -48,26 +48,14 @@ export default {
     'A',
     'ActionBar',
     'AddonPanel',
-    'ArgsTable',
-    'ArgsTableError',
     'Badge',
     'Bar',
     'Blockquote',
-    'BooleanControl',
     'Button',
     'Code',
-    'ColorControl',
-    'ColorItem',
-    'ColorPalette',
     'DL',
-    'DateControl',
-    'Description',
     'Div',
-    'DocsContent',
-    'DocsPageWrapper',
-    'DocsWrapper',
     'DocumentWrapper',
-    'FilesControl',
     'FlexBar',
     'Form',
     'H1',
@@ -77,72 +65,48 @@ export default {
     'H5',
     'H6',
     'HR',
-    'IFrame',
     'IconButton',
-    'IconGallery',
-    'IconItem',
+    'IconButtonSkeleton',
     'Icons',
     'Img',
     'LI',
     'Link',
     'Loader',
-    'NoControlsWarning',
-    'NumberControl',
     'OL',
-    'ObjectControl',
-    'OptionsControl',
     'P',
     'Placeholder',
     'Pre',
-    'Preview',
-    'PreviewSkeleton',
-    'RangeControl',
+    'ResetWrapper',
     'ScrollArea',
     'Separator',
-    'Source',
-    'SourceError',
     'Spaced',
     'Span',
-    'Story',
-    'StoryError',
-    'StorySkeleton',
     'StorybookIcon',
     'StorybookLogo',
-    'StyledSyntaxHighlighter',
-    'Subtitle',
     'Symbols',
     'SyntaxHighlighter',
     'TT',
     'TabBar',
     'TabButton',
     'TabWrapper',
-    'TabbedArgsTable',
     'Table',
-    'TableWrapper',
     'Tabs',
     'TabsState',
-    'TextControl',
-    'Title',
     'TooltipLinkList',
     'TooltipMessage',
     'TooltipNote',
-    'Typeset',
     'UL',
     'WithTooltip',
     'WithTooltipPure',
     'Zoom',
-    'argsTableLoadingData',
+    'codeCommon',
     'components',
-    'format',
-    'formatDate',
-    'formatTime',
+    'createCopyToClipboardFunction',
     'getStoryHref',
     'interleaveSeparators',
     'nameSpaceClassNames',
-    'parse',
-    'parseDate',
-    'parseTime',
     'resetComponents',
+    'withReset',
   ],
   '@storybook/channels': ['Channel'],
   '@storybook/core-events': [
diff --git a/presets/server-webpack/src/lib/compiler/stringifier.ts b/presets/server-webpack/src/lib/compiler/stringifier.ts
index 48cbbd7e98e..f6fd64f6d0c 100644
--- a/presets/server-webpack/src/lib/compiler/stringifier.ts
+++ b/presets/server-webpack/src/lib/compiler/stringifier.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { StorybookStory, StorybookSection } from './types';
 
 const { identifier } = require('safe-identifier');
diff --git a/presets/svelte-webpack/src/svelte-docgen-loader.ts b/presets/svelte-webpack/src/svelte-docgen-loader.ts
index 5146972ac28..f02a8646b1c 100644
--- a/presets/svelte-webpack/src/svelte-docgen-loader.ts
+++ b/presets/svelte-webpack/src/svelte-docgen-loader.ts
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 import svelteDoc from 'sveltedoc-parser';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import * as path from 'path';
 import * as fs from 'fs';
 import { preprocess } from 'svelte/compiler';
diff --git a/renderers/html/src/docs/sourceDecorator.ts b/renderers/html/src/docs/sourceDecorator.ts
index 609c8913ab6..65f4f1c0d85 100644
--- a/renderers/html/src/docs/sourceDecorator.ts
+++ b/renderers/html/src/docs/sourceDecorator.ts
@@ -3,7 +3,7 @@
 import { SNIPPET_RENDERED, SourceType } from '@storybook/docs-tools';
 import { addons, useEffect } from '@storybook/addons';
 import type { PartialStoryFn } from '@storybook/csf';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { HtmlFramework, StoryContext } from '../types';
 import { StoryFn } from '../public-types';
 
diff --git a/renderers/html/src/render.ts b/renderers/html/src/render.ts
index 4221aa74db3..dff9b49ea7f 100644
--- a/renderers/html/src/render.ts
+++ b/renderers/html/src/render.ts
@@ -2,7 +2,7 @@
 // @ts-ignore
 import global from 'global';
 
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { simulatePageLoad, simulateDOMContentLoaded } from '@storybook/preview-web';
 import type { RenderContext } from '@storybook/store';
 import type { HtmlFramework } from './types';
diff --git a/renderers/preact/src/render.tsx b/renderers/preact/src/render.tsx
index 6137532cd8e..fa587c68b17 100644
--- a/renderers/preact/src/render.tsx
+++ b/renderers/preact/src/render.tsx
@@ -1,5 +1,5 @@
 import * as preact from 'preact';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import type { RenderContext } from '@storybook/store';
 import type { StoryFnPreactReturnType, PreactFramework } from './types';
 
diff --git a/renderers/react/src/docs/jsxDecorator.tsx b/renderers/react/src/docs/jsxDecorator.tsx
index 4f513c7a837..4920941eb62 100644
--- a/renderers/react/src/docs/jsxDecorator.tsx
+++ b/renderers/react/src/docs/jsxDecorator.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 import React, { createElement, ReactElement } from 'react';
 import reactElementToJSXString, { Options } from 'react-element-to-jsx-string';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import deprecate from 'util-deprecate';
 
 import { addons, useEffect } from '@storybook/addons';
diff --git a/renderers/react/src/docs/lib/generateCode.ts b/renderers/react/src/docs/lib/generateCode.ts
index bcf82756ca3..565b5e79aa4 100644
--- a/renderers/react/src/docs/lib/generateCode.ts
+++ b/renderers/react/src/docs/lib/generateCode.ts
@@ -1,5 +1,5 @@
 import { generate } from 'escodegen';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 const BASIC_OPTIONS = {
   format: {
diff --git a/renderers/server/src/render.ts b/renderers/server/src/render.ts
index 2d9935fd3da..158d483036d 100644
--- a/renderers/server/src/render.ts
+++ b/renderers/server/src/render.ts
@@ -2,7 +2,7 @@
 // @ts-ignore
 import global from 'global';
 
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import type { RenderContext } from '@storybook/store';
 import { simulatePageLoad, simulateDOMContentLoaded } from '@storybook/preview-web';
 import type { StoryFn, Args, ArgTypes } from './public-types';
diff --git a/renderers/svelte/templates/PreviewRender.svelte b/renderers/svelte/templates/PreviewRender.svelte
index 40c027d6c80..84fe3707a42 100644
--- a/renderers/svelte/templates/PreviewRender.svelte
+++ b/renderers/svelte/templates/PreviewRender.svelte
@@ -1,6 +1,6 @@
 <script>
   import SlotDecorator from './SlotDecorator.svelte';
-  import dedent from 'ts-dedent';
+  import { dedent } from 'ts-dedent';
 
   export let name;
   export let kind;
diff --git a/renderers/vue/src/render.ts b/renderers/vue/src/render.ts
index b0c1cca3d71..9fa2f5ab21d 100644
--- a/renderers/vue/src/render.ts
+++ b/renderers/vue/src/render.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-underscore-dangle */
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import Vue from 'vue';
 import type { RenderContext } from '@storybook/store';
 import type { ArgsStoryFn } from '@storybook/csf';
diff --git a/renderers/vue3/src/render.ts b/renderers/vue3/src/render.ts
index 901e4eaa8f2..94e1158583e 100644
--- a/renderers/vue3/src/render.ts
+++ b/renderers/vue3/src/render.ts
@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { createApp, h } from 'vue';
 import type { RenderContext } from '@storybook/store';
 import type { ArgsStoryFn } from '@storybook/csf';
diff --git a/renderers/web-components/src/render.ts b/renderers/web-components/src/render.ts
index 1cd9cb0d78b..795706a972c 100644
--- a/renderers/web-components/src/render.ts
+++ b/renderers/web-components/src/render.ts
@@ -2,7 +2,7 @@
 // @ts-ignore
 import global from 'global';
 
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import { render } from 'lit-html';
 // Keep `.js` extension to avoid issue with Webpack (related to export map?)
 // eslint-disable-next-line import/extensions
diff --git a/scripts/run-registry.ts b/scripts/run-registry.ts
index 313c828afda..4e62d3358ff 100755
--- a/scripts/run-registry.ts
+++ b/scripts/run-registry.ts
@@ -4,7 +4,7 @@ import chalk from 'chalk';
 import path from 'path';
 import program from 'commander';
 import detectFreePort from 'detect-port';
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 import fs from 'fs';
 import yaml from 'js-yaml';
 import nodeCleanup from 'node-cleanup';
diff --git a/yarn.lock b/yarn.lock
index ed08dab5ac1..4f6e9aad641 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7837,6 +7837,7 @@ __metadata:
     "@storybook/ui": 7.0.0-alpha.8
     "@types/ejs": ^3.1.1
     "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10
+    browser-assert: ^1.2.1
     chalk: ^4.1.0
     ejs: ^3.1.8
     esbuild: ^0.14.47