From c52e17c81a377e509725ea610ec9d55cb147efa4 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Sat, 22 Oct 2022 01:08:39 +0200
Subject: [PATCH] step 6

---
 code/lib/client-api/src/ClientApi.ts        | 12 ---------
 code/lib/client-api/src/StoryStoreFacade.ts | 12 ---------
 code/lib/client-api/src/index.ts            | 29 +++++----------------
 code/lib/client-api/src/queryparams.ts      |  3 +--
 code/lib/types/src/modules/client-api.ts    | 13 ++++-----
 5 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/code/lib/client-api/src/ClientApi.ts b/code/lib/client-api/src/ClientApi.ts
index 9ef7ff088d5..44fc74c68a0 100644
--- a/code/lib/client-api/src/ClientApi.ts
+++ b/code/lib/client-api/src/ClientApi.ts
@@ -18,7 +18,6 @@ import type {
   StoryFn,
   Globals,
   GlobalTypes,
-  LegacyStoryFn,
   Addon_ClientApiAddons,
   Addon_StoryApi,
   Store_NormalizedComponentAnnotations,
@@ -34,17 +33,6 @@ import {
 
 import { StoryStoreFacade } from './StoryStoreFacade';
 
-export interface GetStorybookStory<TFramework extends AnyFramework> {
-  name: string;
-  render: LegacyStoryFn<TFramework>;
-}
-
-export interface GetStorybookKind<TFramework extends AnyFramework> {
-  kind: string;
-  fileName: string;
-  stories: GetStorybookStory<TFramework>[];
-}
-
 // ClientApi (and StoreStore) are really singletons. However they are not created until the
 // relevant framework instanciates them via `start.js`. The good news is this happens right away.
 let singleton: ClientApi<AnyFramework>;
diff --git a/code/lib/client-api/src/StoryStoreFacade.ts b/code/lib/client-api/src/StoryStoreFacade.ts
index 6e012ce8a0e..6765fe932e2 100644
--- a/code/lib/client-api/src/StoryStoreFacade.ts
+++ b/code/lib/client-api/src/StoryStoreFacade.ts
@@ -10,7 +10,6 @@ import type {
   StoryId,
   AnyFramework,
   Parameters,
-  StoryFn,
   Addon_IndexEntry,
   Store_NormalizedProjectAnnotations,
   Store_NormalizedStoriesSpecifier,
@@ -23,17 +22,6 @@ import type {
 import { StoryStore, userOrAutoTitle, sortStoriesV6 } from '@storybook/store';
 import { logger } from '@storybook/client-logger';
 
-export interface GetStorybookStory<TFramework extends AnyFramework> {
-  name: string;
-  render: StoryFn<TFramework>;
-}
-
-export interface GetStorybookKind<TFramework extends AnyFramework> {
-  kind: string;
-  fileName: string;
-  stories: GetStorybookStory<TFramework>[];
-}
-
 export class StoryStoreFacade<TFramework extends AnyFramework> {
   projectAnnotations: Store_NormalizedProjectAnnotations<TFramework>;
 
diff --git a/code/lib/client-api/src/index.ts b/code/lib/client-api/src/index.ts
index d0a4035540c..976a34dec77 100644
--- a/code/lib/client-api/src/index.ts
+++ b/code/lib/client-api/src/index.ts
@@ -1,31 +1,14 @@
-import {
-  ClientApi,
+export {
+  addArgs,
+  addArgsEnhancer,
+  addArgTypes,
+  addArgTypesEnhancer,
   addDecorator,
   addLoader,
   addParameters,
-  addArgs,
-  addArgTypes,
-  addArgsEnhancer,
-  addArgTypesEnhancer,
   addStepRunner,
+  ClientApi,
   setGlobalRender,
 } from './ClientApi';
 
-export type { GetStorybookKind, GetStorybookStory } from './ClientApi';
-
 export * from './queryparams';
-
-export * from '@storybook/store';
-
-export {
-  addDecorator,
-  addLoader,
-  addParameters,
-  addArgsEnhancer,
-  addArgTypesEnhancer,
-  addArgs,
-  addArgTypes,
-  addStepRunner,
-  setGlobalRender,
-  ClientApi,
-};
diff --git a/code/lib/client-api/src/queryparams.ts b/code/lib/client-api/src/queryparams.ts
index e9d120f6263..be0c29f201f 100644
--- a/code/lib/client-api/src/queryparams.ts
+++ b/code/lib/client-api/src/queryparams.ts
@@ -1,9 +1,8 @@
 import global from 'global';
 import { parse } from 'qs';
 
-const { document } = global;
-
 export const getQueryParams = () => {
+  const { document } = global;
   // document.location is not defined in react-native
   if (document && document.location && document.location.search) {
     return parse(document.location.search, { ignoreQueryPrefix: true });
diff --git a/code/lib/types/src/modules/client-api.ts b/code/lib/types/src/modules/client-api.ts
index 544d6c0645f..908abab0265 100644
--- a/code/lib/types/src/modules/client-api.ts
+++ b/code/lib/types/src/modules/client-api.ts
@@ -12,6 +12,7 @@ import type {
   LoaderFunction,
   Parameters,
   ProjectAnnotations,
+  LegacyStoryFn,
   StoryContext,
   StoryFn,
   StoryId,
@@ -97,15 +98,15 @@ export interface ClientAPI_ClientApiAddons<StoryFnReturnType> {
   [key: string]: ClientAPI_ClientApiAddon<StoryFnReturnType>;
 }
 
-export interface ClientAPI_GetStorybookStory {
+export type ClientAPI_RenderContextWithoutStoryContext = Omit<Store_RenderContext, 'storyContext'>;
+
+export interface ClientAPI_GetStorybookStory<TFramework extends AnyFramework> {
   name: string;
-  render: StoryFn;
+  render: LegacyStoryFn<TFramework>;
 }
 
-export interface ClientAPI_GetStorybookKind {
+export interface ClientAPI_GetStorybookKind<TFramework extends AnyFramework> {
   kind: string;
   fileName: string;
-  stories: ClientAPI_GetStorybookStory[];
+  stories: ClientAPI_GetStorybookStory<TFramework>[];
 }
-
-export type ClientAPI_RenderContextWithoutStoryContext = Omit<Store_RenderContext, 'storyContext'>;