Merge pull request #17875 from storybookjs/core-client

Core: Avoid framework imports from core/client
storybookjs · Apr 6, 2022 · 5698bd5 · 5698bd5
2 parents 32419be + 2d5b3a3
commit 5698bd5
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 11 deletions.
diff --git a/app/angular/src/client/preview/index.ts b/app/angular/src/client/preview/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
 import type { ClientStoryApi, Loadable } from '@storybook/addons';
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import './globals';
 import { renderToDOM, render } from './render';
 import decorateStory from './decorateStory';

diff --git a/app/ember/src/client/preview/index.ts b/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';

diff --git a/app/html/src/client/preview/index.ts b/app/html/src/client/preview/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import type { ClientStoryApi, Loadable } from '@storybook/addons';
 import { HtmlFramework } from './types-6-0';
 

diff --git a/app/preact/src/client/preview/index.ts b/app/preact/src/client/preview/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';

diff --git a/app/react/src/client/preview/index.tsx b/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';

diff --git a/app/server/src/client/preview/index.ts b/app/server/src/client/preview/index.ts
@@ -1,4 +1,4 @@
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';

diff --git a/app/svelte/src/client/preview/index.ts b/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';

diff --git a/app/vue/src/client/preview/index.ts b/app/vue/src/client/preview/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';

diff --git a/app/vue3/src/client/preview/index.ts b/app/vue3/src/client/preview/index.ts
@@ -1,5 +1,5 @@
 import type { App } from 'vue';
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';

diff --git a/app/web-components/src/client/preview/index.ts b/app/web-components/src/client/preview/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-destructuring */
-import { start } from '@storybook/core/client';
+import { start } from '@storybook/core';
 import type { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';

diff --git a/docs/snippets/common/storybook-client-preview.ts.mdx b/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';
 

diff --git a/lib/core/client.js b/lib/core/client.js
@@ -1 +1,3 @@
+// @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');