Merge branch 'future/pbm/stage0' into future/type-checking-script

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';

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';
 

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';
 

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';

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';
 

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(
   () => {},

addons/links/src/index.ts

@@ -1,4 +1,4 @@
-import dedent from 'ts-dedent';
+import { dedent } from 'ts-dedent';
 
 let hasWarned = false;
 

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

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__',

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;
 

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
 

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';
 

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

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';

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';

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';
 

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;

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';

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';

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';

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,

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';

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';

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';

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(

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';
 

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';

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",

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(),

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';
 

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';

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;
 

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';

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';

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';

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';
 

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';
 

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';

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';
 

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';

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';

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';

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';

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 {

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';

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';

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';

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

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(

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';
 

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) => {

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,

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';
 

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';
 

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';
 

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';
 

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';

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';

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) => {

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';

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');
 

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';
 

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 },

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';
 

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({

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';
 

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';

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', () => {

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;

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 {

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,

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';

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';

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;

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';

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';
 

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 => {

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

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';

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';
 

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';

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';

lib/theming/create.js

@@ -1 +0,0 @@
-export * from './dist/esm';

lib/theming/paths.js

@@ -1,2 +0,0 @@
-// We used to alias paths, but now that we are bundling dependencies, we do not need to
-module.exports = {};

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';

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',
+    'IconButtonSkeleton',
-    'IconItem',
     'Icons',
     'Img',
     'LI',
     'Link',
     'Loader',
-    'NoControlsWarning',
-    'NumberControl',
     'OL',
-    'ObjectControl',
-    'OptionsControl',
     'P',
     'Placeholder',
     'Pre',
-    'Preview',
+    'ResetWrapper',
-    'PreviewSkeleton',
-    'RangeControl',
     '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',
+    'createCopyToClipboardFunction',
-    'formatDate',
-    'formatTime',
     'getStoryHref',
     'interleaveSeparators',
     'nameSpaceClassNames',
-    'parse',
-    'parseDate',
-    'parseTime',
     'resetComponents',
+    'withReset',
   ],
   '@storybook/channels': ['Channel'],
   '@storybook/core-events': [

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');

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';

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';
 

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';

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';
 

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';

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: {

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';

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;

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';

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';

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

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';

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