From e957ea220a00b7ee012b91cb1de8c94b62df722d Mon Sep 17 00:00:00 2001
From: Ian VanSchooten <ian.vanschooten@gmail.com>
Date: Mon, 4 Apr 2022 08:25:28 -0400
Subject: [PATCH 1/2] Avoid forcing CJS import from core/client

---
 app/angular/src/client/preview/index.ts              | 2 +-
 app/ember/src/client/preview/index.ts                | 2 +-
 app/html/src/client/preview/index.ts                 | 2 +-
 app/preact/src/client/preview/index.ts               | 2 +-
 app/react/src/client/preview/index.tsx               | 2 +-
 app/server/src/client/preview/index.ts               | 2 +-
 app/svelte/src/client/preview/index.ts               | 2 +-
 app/vue/src/client/preview/index.ts                  | 2 +-
 app/vue3/src/client/preview/index.ts                 | 2 +-
 app/web-components/src/client/preview/index.ts       | 2 +-
 docs/snippets/common/storybook-client-preview.ts.mdx | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/angular/src/client/preview/index.ts b/app/angular/src/client/preview/index.ts
index e37a283bd466..e2d014eeecec 100644
--- 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
index b2642044a9f8..b85ad89f9751 100644
--- 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
index 7838f55b09ff..decfcb1ee96e 100644
--- 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
index b15e21d72ee2..922e284a6e9c 100644
--- 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
index 4f47993c6719..9847e6da2046 100644
--- 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
index 4bedb816a6c2..9395dfb98109 100644
--- 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
index 59d9b39f39be..3c9f195dd5ee 100644
--- 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
index 7002a27b58b9..0d894499697c 100644
--- 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
index f37473e1329e..912dc4bf7919 100644
--- 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
index aeb08b3bc3da..ef8fe1cc37e4 100644
--- 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
index 436d862dc8ac..765d8d1ab341 100644
--- 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';
 

From 2d5b3a31e03f22bd6dcd3d662f0fa8044bdb802a Mon Sep 17 00:00:00 2001
From: Ian VanSchooten <ian.vanschooten@gmail.com>
Date: Mon, 4 Apr 2022 10:35:10 -0400
Subject: [PATCH 2/2] Add comment about reason for file

---
 lib/core/client.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/core/client.js b/lib/core/client.js
index 53f27fe5fbf5..35c555488761 100644
--- 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');