From bf5f7831d14f48546c24548ebfc14d434ae842bc Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 24 Nov 2022 13:00:11 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Valentin Palkovic --- .../storyshots-core/src/frameworks/angular/loader.ts | 4 ++-- .../storyshots/storyshots-core/src/frameworks/html/loader.ts | 4 ++-- .../storyshots-core/src/frameworks/preact/loader.ts | 4 ++-- .../storyshots/storyshots-core/src/frameworks/rax/loader.ts | 2 +- .../storyshots/storyshots-core/src/frameworks/react/loader.ts | 4 ++-- .../storyshots/storyshots-core/src/frameworks/riot/loader.ts | 4 ++-- .../storyshots-core/src/frameworks/svelte/loader.ts | 4 ++-- .../storyshots/storyshots-core/src/frameworks/vue/loader.ts | 4 ++-- .../storyshots/storyshots-core/src/frameworks/vue3/loader.ts | 4 ++-- .../storyshots-core/src/frameworks/web-components/loader.ts | 4 ++-- code/frameworks/nextjs/package.json | 1 - .../src/modules/preview-web/docs-context/DocsContextProps.ts | 4 +--- .../modules/preview-web/docs-context/DocsRenderFunction.ts | 4 +--- code/lib/preview-api/src/modules/store/decorators.test.ts | 2 +- 14 files changed, 22 insertions(+), 27 deletions(-) diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/angular/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/angular/loader.ts index 9f08d57fc9c..17601530775 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/angular/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/angular/loader.ts @@ -36,10 +36,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/html/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/html/loader.ts index f4efc668319..d2d14657fc4 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/html/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/html/loader.ts @@ -13,10 +13,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/preact/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/preact/loader.ts index 09212270d3b..91b98c44ee9 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/preact/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/preact/loader.ts @@ -19,10 +19,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/rax/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/rax/loader.ts index 8cd3f8cc66d..b28dbdac9a5 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/rax/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/rax/loader.ts @@ -14,7 +14,7 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { ...coreClientAPI, diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/react/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/react/loader.ts index eff037eed6f..132a6925c4a 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/react/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/react/loader.ts @@ -11,10 +11,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/riot/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/riot/loader.ts index 8b2dc347381..2565fa5bea4 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/riot/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/riot/loader.ts @@ -19,10 +19,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/svelte/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/svelte/loader.ts index 6e97c5db541..484075f9fc9 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/svelte/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/svelte/loader.ts @@ -16,10 +16,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts index 7e16d3644ca..9ae516e4597 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts @@ -19,10 +19,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/vue3/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/vue3/loader.ts index 93f9390aa50..399396af521 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/vue3/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/vue3/loader.ts @@ -14,10 +14,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/web-components/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/web-components/loader.ts index de920d91a95..5ddaddb4556 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/web-components/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/web-components/loader.ts @@ -13,10 +13,10 @@ function load(options: StoryshotsOptions) { let mockStartedAPI: any; jest.mock('@storybook/preview-api', () => { - const coreClientAPI = jest.requireActual('@storybook/preview-api'); + const previewAPI = jest.requireActual('@storybook/preview-api'); return { - ...coreClientAPI, + ...previewAPI, start: (...args: any[]) => { mockStartedAPI = coreClientAPI.start(...args); return mockStartedAPI; diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index 77aed8fdf04..2d989efb6db 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -59,7 +59,6 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@babel/preset-typescript": "^7.18.6", "@storybook/addons": "7.0.0-alpha.52", "@storybook/builder-webpack5": "7.0.0-alpha.52", "@storybook/core-common": "7.0.0-alpha.52", diff --git a/code/lib/preview-api/src/modules/preview-web/docs-context/DocsContextProps.ts b/code/lib/preview-api/src/modules/preview-web/docs-context/DocsContextProps.ts index 52c9b1498e0..c73df45e223 100644 --- a/code/lib/preview-api/src/modules/preview-web/docs-context/DocsContextProps.ts +++ b/code/lib/preview-api/src/modules/preview-web/docs-context/DocsContextProps.ts @@ -1,3 +1 @@ -import type { DocsContextProps } from '@storybook/types'; - -export { DocsContextProps }; +export type { DocsContextProps } from '@storybook/types'; diff --git a/code/lib/preview-api/src/modules/preview-web/docs-context/DocsRenderFunction.ts b/code/lib/preview-api/src/modules/preview-web/docs-context/DocsRenderFunction.ts index 819b7e8607e..d7533154a2c 100644 --- a/code/lib/preview-api/src/modules/preview-web/docs-context/DocsRenderFunction.ts +++ b/code/lib/preview-api/src/modules/preview-web/docs-context/DocsRenderFunction.ts @@ -1,3 +1 @@ -import type { DocsRenderFunction } from '@storybook/types'; - -export type { DocsRenderFunction }; +export type { DocsRenderFunction } from '@storybook/types'; diff --git a/code/lib/preview-api/src/modules/store/decorators.test.ts b/code/lib/preview-api/src/modules/store/decorators.test.ts index 44ae403e398..d8e6b3fb247 100644 --- a/code/lib/preview-api/src/modules/store/decorators.test.ts +++ b/code/lib/preview-api/src/modules/store/decorators.test.ts @@ -92,7 +92,7 @@ describe('client-api.decorators', () => { // the same story twice at the same time. it('does not interleave contexts if two decorated stories are call simultaneously', async () => { const contexts: StoryContext[] = []; - let resolve: any; + let resolve: (value: unknown) => void; const fence = new Promise((r) => { resolve = r; });