Merge pull request #17875 from storybookjs/core-client

Core: Avoid framework imports from core/client

app/angular/src/client/preview/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
-import { ClientStoryApi, Loadable } from '@storybook/addons';
-import { start } from '@storybook/core/client';
+import type { ClientStoryApi, Loadable } from '@storybook/addons';
+import { start } from '@storybook/core';
 import './globals';
 import { renderToDOM, render } from './render';
 import decorateStory from './decorateStory';

app/ember/src/client/preview/index.ts

@@ -1,4 +1,4 @@
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 
 import './globals';
 import { renderToDOM } from './render';

app/html/src/client/preview/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
-import { ClientStoryApi, Loadable } from '@storybook/addons';
+import { start } from '@storybook/core';
+import type { ClientStoryApi, Loadable } from '@storybook/addons';
 import { HtmlFramework } from './types-6-0';
 
 import './globals';

app/preact/src/client/preview/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
-import { ClientStoryApi, Loadable } from '@storybook/addons';
+import { start } from '@storybook/core';
+import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import { renderToDOM } from './render';

app/react/src/client/preview/index.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';

app/server/src/client/preview/index.ts

@@ -1,5 +1,5 @@
-import { start } from '@storybook/core/client';
-import { ClientStoryApi, Loadable } from '@storybook/addons';
+import { start } from '@storybook/core';
+import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import { renderToDOM, render } from './render';

app/svelte/src/client/preview/index.ts

@@ -1,4 +1,4 @@
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import { decorateStory } from './decorators';
 
 import './globals';

app/vue/src/client/preview/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
-import { ClientStoryApi, Loadable } from '@storybook/addons';
+import { start } from '@storybook/core';
+import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import { IStorybookSection } from './types';

app/vue3/src/client/preview/index.ts

@@ -1,6 +1,6 @@
 import type { App } from 'vue';
-import { start } from '@storybook/core/client';
-import { ClientStoryApi, Loadable } from '@storybook/addons';
+import { start } from '@storybook/core';
+import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import { IStorybookSection } from './types';

app/web-components/src/client/preview/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
-import { ClientStoryApi, Loadable } from '@storybook/addons';
+import { start } from '@storybook/core';
+import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import { renderToDOM } from './render';

docs/snippets/common/storybook-client-preview.ts.mdx

@@ -1,7 +1,7 @@
 ```ts
 // your-framework/src/client/preview/index.ts
 
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 
 import './globals';
 

lib/core/client.js

@@ -1 +1,3 @@
-module.exports = require('./dist/cjs/index');
+// @storybook/core was split into core-client and core-server.  This file is for backwards-compat.
+// TODO: remove in 7.0
+module.exports = require('./dist/esm/index');