final cleanup

code/core/scripts/dts.ts

@@ -16,22 +16,7 @@ const external = [
   ...nodeInternals,
   'typescript',
   '@storybook/core',
-  '@storybook/core/dist/builder-manager',
-  '@storybook/core/dist/channels',
-  '@storybook/core/dist/client-logger',
-  '@storybook/core/dist/common',
-  '@storybook/core/dist/components',
-  '@storybook/core/dist/core-events',
-  '@storybook/core/dist/core-server',
-  '@storybook/core/dist/csf-tools',
-  '@storybook/core/dist/docs-tools',
-  '@storybook/core/dist/manager-api',
-  '@storybook/core/dist/node-logger',
-  '@storybook/core/dist/preview-api',
-  '@storybook/core/dist/router',
-  '@storybook/core/dist/telemetry',
-  '@storybook/core/dist/theming',
-  '@storybook/core/dist/types',
+
   '@storybook/core/builder-manager',
   '@storybook/core/channels',
   '@storybook/core/client-logger',

code/core/scripts/helpers/sourcefiles.ts

@@ -123,7 +123,6 @@ async function generateExportsFile(prettierConfig: prettier.Options | null): Pro
               drop: ['console'],
               outfile: l,
               alias: {
-                '@storybook/core/dist': join(import.meta.dirname, '..', '..', 'src'),
                 '@storybook/core': join(import.meta.dirname, '..', '..', 'src'),
               },
               legalComments: 'none',

code/core/scripts/prep.ts

@@ -193,7 +193,6 @@ async function generateDistFiles() {
               assert: require.resolve('browser-assert'),
               util: require.resolve('util/util.js'),
               '@storybook/core': join(cwd, 'src'),
-              '@storybook/core/dist': join(cwd, 'src'),
               react: dirname(require.resolve('react/package.json')),
               'react-dom': dirname(require.resolve('react-dom/package.json')),
             },
@@ -221,7 +220,6 @@ async function generateDistFiles() {
             },
             plugins: [globalExternals(globalsModuleInfoMap)],
             alias: {
-              '@storybook/core/dist': join(cwd, 'src'),
               '@storybook/core': join(cwd, 'src'),
               react: dirname(require.resolve('react/package.json')),
               'react-dom/client': join(

code/core/template/stories/argMapping.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 
 const arrows = {

code/core/template/stories/argTypes.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { expect, within } from '@storybook/test';
 
 export default {

code/core/template/stories/args.stories.ts

@@ -1,12 +1,12 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 import pick from 'lodash/pick';
 import {
   STORY_ARGS_UPDATED,
   UPDATE_STORY_ARGS,
   RESET_STORY_ARGS,
-} from '@storybook/core/dist/core-events';
+} from '@storybook/core/core-events';
 
 export default {
   component: globalThis.Components.Pre,

code/core/template/stories/autotitle.stories.ts

@@ -1,6 +1,6 @@
 import { global as globalThis } from '@storybook/global';
 import { expect } from '@storybook/test';
-import type { PlayFunctionContext } from '@storybook/core/dist/types';
+import type { PlayFunctionContext } from '@storybook/core/types';
 
 export default {
   component: globalThis.Components.Pre,

code/core/template/stories/component-play.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 
 export default {

code/core/template/stories/decorators.stories.ts

@@ -4,14 +4,14 @@ import type {
   PartialStoryFn,
   PlayFunctionContext,
   StoryContext,
-} from '@storybook/core/dist/types';
+} from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
-import { useEffect } from '@storybook/core/dist/preview-api';
+import { useEffect } from '@storybook/core/preview-api';
 import {
   STORY_ARGS_UPDATED,
   UPDATE_STORY_ARGS,
   RESET_STORY_ARGS,
-} from '@storybook/core/dist/core-events';
+} from '@storybook/core/core-events';
 
 export default {
   component: globalThis.Components.Pre,

code/core/template/stories/globals.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 
 export default {

code/core/template/stories/hooks.stories.ts

@@ -1,6 +1,6 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext } from '@storybook/core/dist/types';
-import { useEffect, useState } from '@storybook/core/dist/preview-api';
+import type { PartialStoryFn, PlayFunctionContext } from '@storybook/core/types';
+import { useEffect, useState } from '@storybook/core/preview-api';
 import { within, userEvent } from '@storybook/test';
 
 export default {

code/core/template/stories/indexer.stories.ts

@@ -1,6 +1,6 @@
 import { expect } from '@storybook/test';
 import { global as globalThis } from '@storybook/global';
-import type { PlayFunctionContext } from '@storybook/core/dist/types';
+import type { PlayFunctionContext } from '@storybook/core/types';
 
 export default {
   component: globalThis.Components.Pre,

code/core/template/stories/loaders.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 
 export default {

code/core/template/stories/names.stories.ts

@@ -1,6 +1,6 @@
 import { global as globalThis } from '@storybook/global';
 import { expect } from '@storybook/test';
-import type { PlayFunctionContext } from '@storybook/core/dist/types';
+import type { PlayFunctionContext } from '@storybook/core/types';
 
 export default {
   component: globalThis.Components.Pre,

code/core/template/stories/parameters.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 
 export default {

code/core/template/stories/preview.ts

@@ -1,4 +1,4 @@
-import type { PartialStoryFn, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, StoryContext } from '@storybook/core/types';
 
 export const parameters = {
   projectParameter: 'projectParameter',

code/core/template/stories/rendering.stories.ts

@@ -1,12 +1,12 @@
 import { global as globalThis } from '@storybook/global';
-import type { PlayFunctionContext } from '@storybook/core/dist/types';
+import type { PlayFunctionContext } from '@storybook/core/types';
 import { within, waitFor, expect } from '@storybook/test';
 import {
   FORCE_REMOUNT,
   RESET_STORY_ARGS,
   STORY_ARGS_UPDATED,
   UPDATE_STORY_ARGS,
-} from '@storybook/core/dist/core-events';
+} from '@storybook/core/core-events';
 
 export default {
   component: globalThis.Components.Button,

code/core/template/stories/shortcuts.stories.ts

@@ -1,6 +1,6 @@
 import { global as globalThis } from '@storybook/global';
 import { userEvent, within, expect, fn } from '@storybook/test';
-import { PREVIEW_KEYDOWN } from '@storybook/core/dist/core-events';
+import { PREVIEW_KEYDOWN } from '@storybook/core/core-events';
 import type { PlayFunctionContext } from '@storybook/csf';
 
 export default {

code/core/template/stories/tags-add.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 
 export default {

code/core/template/stories/tags-config.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 
 export default {

code/core/template/stories/tags-remove.stories.ts

@@ -1,5 +1,5 @@
 import { global as globalThis } from '@storybook/global';
-import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/dist/types';
+import type { PartialStoryFn, PlayFunctionContext, StoryContext } from '@storybook/core/types';
 import { within, expect } from '@storybook/test';
 
 export default {

code/core/template/stories/title.stories.ts

@@ -1,6 +1,6 @@
 import { global as globalThis } from '@storybook/global';
 import { expect } from '@storybook/test';
-import type { PlayFunctionContext } from '@storybook/core/dist/types';
+import type { PlayFunctionContext } from '@storybook/core/types';
 
 export default {
   component: globalThis.Components.Pre,

code/deprecated/builder-manager/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/builder-manager';
-export type * from '@storybook/core/dist/builder-manager';
+export * from '@storybook/core/builder-manager';
+export type * from '@storybook/core/builder-manager';

code/deprecated/builder-manager/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/builder-manager');
+module.exports = require('@storybook/core/builder-manager');

code/deprecated/builder-manager/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/builder-manager';
+export * from '@storybook/core/builder-manager';

code/deprecated/channels/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/channels';
-export type * from '@storybook/core/dist/channels';
+export * from '@storybook/core/channels';
+export type * from '@storybook/core/channels';

code/deprecated/channels/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/channels');
+module.exports = require('@storybook/core/channels');

code/deprecated/channels/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/channels';
+export * from '@storybook/core/channels';

code/deprecated/client-logger/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/core-events';
-export type * from '@storybook/core/dist/core-events';
+export * from '@storybook/core/core-events';
+export type * from '@storybook/core/core-events';

code/deprecated/client-logger/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/client-logger');
+module.exports = require('@storybook/core/client-logger');

code/deprecated/client-logger/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/client-logger';
+export * from '@storybook/core/client-logger';

code/deprecated/components/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/components';
-export type * from '@storybook/core/dist/components';
+export * from '@storybook/core/components';
+export type * from '@storybook/core/components';

code/deprecated/components/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/components');
+module.exports = require('@storybook/core/components');

code/deprecated/components/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/components';
+export * from '@storybook/core/components';

code/deprecated/core-common/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/common';
-export type * from '@storybook/core/dist/common';
+export * from '@storybook/core/common';
+export type * from '@storybook/core/common';

code/deprecated/core-common/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/common');
+module.exports = require('@storybook/core/common');

code/deprecated/core-common/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/common';
+export * from '@storybook/core/common';

code/deprecated/core-events/manager-errors.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/manager-errors';
-export type * from '@storybook/core/dist/manager-errors';
+export * from '@storybook/core/manager-errors';
+export type * from '@storybook/core/manager-errors';

code/deprecated/core-events/manager-errors.js

@@ -3,4 +3,4 @@
 // An error like this will occur:
 // ENOENT: no such file or directory, open '/xyz/node_modules/@storybook/core-events/manager-errors.js'
 // https://github.com/storybookjs/storybook/pull/24038#issuecomment-1704684432
-module.exports = require('@storybook/core/dist/manager-errors');
+module.exports = require('@storybook/core/manager-errors');

code/deprecated/core-events/manager-errors.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/manager-errors';
+export * from '@storybook/core/manager-errors';

code/deprecated/core-events/preview-errors.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/preview-errors';
-export type * from '@storybook/core/dist/preview-errors';
+export * from '@storybook/core/preview-errors';
+export type * from '@storybook/core/preview-errors';

code/deprecated/core-events/preview-errors.js

@@ -3,4 +3,4 @@
 // An error like this will occur:
 // ENOENT: no such file or directory, open '/xyz/node_modules/@storybook/core-events/preview-errors.js'
 // https://github.com/storybookjs/storybook/pull/24038#issuecomment-1704684432
-module.exports = require('@storybook/core/dist/preview-errors');
+module.exports = require('@storybook/core/preview-errors');

code/deprecated/core-events/preview-errors.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/preview-errors';
+export * from '@storybook/core/preview-errors';

code/deprecated/core-events/server-errors.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/server-errors';
-export type * from '@storybook/core/dist/server-errors';
+export * from '@storybook/core/server-errors';
+export type * from '@storybook/core/server-errors';

code/deprecated/core-events/server-errors.js

@@ -3,4 +3,4 @@
 // An error like this will occur:
 // ENOENT: no such file or directory, open '/xyz/node_modules/@storybook/core-events/server-errors.js'
 // https://github.com/storybookjs/storybook/pull/24038#issuecomment-1704684432
-module.exports = require('@storybook/core/dist/server-errors');
+module.exports = require('@storybook/core/server-errors');

code/deprecated/core-events/server-errors.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/server-errors';
+export * from '@storybook/core/server-errors';

code/deprecated/core-events/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/core-events';
-export type * from '@storybook/core/dist/core-events';
+export * from '@storybook/core/core-events';
+export type * from '@storybook/core/core-events';

code/deprecated/core-events/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/core-events');
+module.exports = require('@storybook/core/core-events');

code/deprecated/core-events/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/core-events';
+export * from '@storybook/core/core-events';

code/deprecated/core-server/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/core-server';
-export type * from '@storybook/core/dist/core-server';
+export * from '@storybook/core/core-server';
+export type * from '@storybook/core/core-server';

code/deprecated/core-server/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/core-server');
+module.exports = require('@storybook/core/core-server');

code/deprecated/core-server/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/core-server';
+export * from '@storybook/core/core-server';

code/deprecated/csf-tools/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/csf-tools';
-export type * from '@storybook/core/dist/csf-tools';
+export * from '@storybook/core/csf-tools';
+export type * from '@storybook/core/csf-tools';

code/deprecated/csf-tools/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/csf-tools');
+module.exports = require('@storybook/core/csf-tools');

code/deprecated/csf-tools/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/csf-tools';
+export * from '@storybook/core/csf-tools';

code/deprecated/docs-tools/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/docs-tools';
-export type * from '@storybook/core/dist/docs-tools';
+export * from '@storybook/core/docs-tools';
+export type * from '@storybook/core/docs-tools';

code/deprecated/docs-tools/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/docs-tools');
+module.exports = require('@storybook/core/docs-tools');

code/deprecated/manager-api/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/manager-api';
-export type * from '@storybook/core/dist/manager-api';
+export * from '@storybook/core/manager-api';
+export type * from '@storybook/core/manager-api';

code/deprecated/manager-api/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/manager-api');
+module.exports = require('@storybook/core/manager-api');

code/deprecated/manager-api/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/manager-api';
+export * from '@storybook/core/manager-api';

code/deprecated/node-logger/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/node-logger';
-export type * from '@storybook/core/dist/node-logger';
+export * from '@storybook/core/node-logger';
+export type * from '@storybook/core/node-logger';

code/deprecated/node-logger/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/node-logger');
+module.exports = require('@storybook/core/node-logger');

code/deprecated/preview-api/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/preview-api';
-export type * from '@storybook/core/dist/preview-api';
+export * from '@storybook/core/preview-api';
+export type * from '@storybook/core/preview-api';

code/deprecated/preview-api/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/preview-api');
+module.exports = require('@storybook/core/preview-api');

code/deprecated/preview-api/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/preview-api';
+export * from '@storybook/core/preview-api';

code/deprecated/router/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/theming';
-export type * from '@storybook/core/dist/theming';
+export * from '@storybook/core/theming';
+export type * from '@storybook/core/theming';

code/deprecated/router/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/router');
+module.exports = require('@storybook/core/router');

code/deprecated/router/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/router';
+export * from '@storybook/core/router';

code/deprecated/router/utils.js

@@ -1 +1 @@
-export * from '@storybook/core/dist/router';
+export * from '@storybook/core/router';

code/deprecated/telemetry/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/telemetry';
-export type * from '@storybook/core/dist/telemetry';
+export * from '@storybook/core/telemetry';
+export type * from '@storybook/core/telemetry';

code/deprecated/telemetry/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/telemetry');
+module.exports = require('@storybook/core/telemetry');

code/deprecated/telemetry/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/telemetry';
+export * from '@storybook/core/telemetry';

code/deprecated/theming/create.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/theming/create';
-export type * from '@storybook/core/dist/theming/create';
+export * from '@storybook/core/theming/create';
+export type * from '@storybook/core/theming/create';

code/deprecated/theming/create.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/theming/create');
+module.exports = require('@storybook/core/theming/create');

code/deprecated/theming/create.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/theming/create';
+export * from '@storybook/core/theming/create';

code/deprecated/theming/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/theming';
-export type * from '@storybook/core/dist/theming';
+export * from '@storybook/core/theming';
+export type * from '@storybook/core/theming';

code/deprecated/theming/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/theming');
+module.exports = require('@storybook/core/theming');

code/deprecated/theming/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/theming';
+export * from '@storybook/core/theming';

code/deprecated/types/shim.d.ts

@@ -1,2 +1,2 @@
-export * from '@storybook/core/dist/types';
-export type * from '@storybook/core/dist/types';
+export * from '@storybook/core/types';
+export type * from '@storybook/core/types';

code/deprecated/types/shim.js

@@ -1 +1 @@
-module.exports = require('@storybook/core/dist/types');
+module.exports = require('@storybook/core/types');

code/deprecated/types/shim.mjs

@@ -1 +1 @@
-export * from '@storybook/core/dist/types';
+export * from '@storybook/core/types';