From 8888ebc0143f1d7d80682a718d283d5a427af33b Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 14 Jan 2022 23:26:56 +0800 Subject: [PATCH] Fix prettier 2.3 formatting across the codebase --- addons/a11y/src/components/A11YPanel.tsx | 7 +- .../actions/src/preset/addArgsHelpers.test.ts | 40 ++-- .../react/lib/inspection/acornParser.ts | 2 +- .../react/propTypes/handleProp.test.tsx | 18 +- .../react/react-argtypes.stories.tsx | 2 +- .../frameworks/react/react-properties.test.ts | 4 +- .../web-components/prepareForInline.ts | 2 +- .../src/lib/docgen/flow/createPropDef.test.ts | 3 +- addons/links/src/preview.test.ts | 2 +- addons/links/src/preview.ts | 24 +-- .../links/src/react/components/link.test.tsx | 2 +- .../storyshots-core/src/frameworks/Loader.ts | 4 +- .../src/frameworks/configure.ts | 19 +- .../storyshots-puppeteer/src/axeTest.ts | 9 +- .../angular/components/app.component.ts | 5 +- .../src/client/preview/decorateStory.ts | 21 +-- app/angular/src/client/preview/decorators.ts | 82 ++++---- .../server/angular-devkit-build-webpack.ts | 35 ++-- .../server/framework-preset-angular-cli.ts | 4 +- .../src/server/framework-preset-angular.ts | 2 +- app/ember/src/client/preview/index.ts | 10 +- app/preact/src/client/preview/render.tsx | 2 +- app/react/src/client/preview/types-6-3.ts | 20 +- app/react/src/client/preview/types-7-0.ts | 5 +- app/react/src/server/cra-config.test.ts | 8 +- app/server/src/client/preview/index.ts | 10 +- app/svelte/src/client/preview/decorators.ts | 39 ++-- app/svelte/src/client/preview/index.ts | 16 +- app/vue/src/client/preview/decorateStory.ts | 4 +- app/vue3/src/client/preview/decorateStory.ts | 4 +- lib/addons/src/hooks.ts | 59 +++--- lib/api/src/index.tsx | 16 +- lib/api/src/lib/stories.ts | 2 +- lib/api/src/modules/refs.ts | 2 +- lib/api/src/modules/release-notes.ts | 14 +- lib/api/src/modules/versions.ts | 14 +- lib/api/src/tests/events.test.ts | 2 +- lib/api/src/tests/globals.test.ts | 16 +- lib/api/src/tests/shortcuts.test.js | 33 ++-- lib/api/src/tests/versions.test.js | 78 ++++++-- lib/builder-webpack5/src/index.ts | 4 +- lib/cli/src/initiate.ts | 23 +-- .../JsPackageManagerFactory.test.ts | 2 +- lib/client-api/src/ClientApi.test.ts | 6 +- lib/client-logger/src/index.ts | 54 +++--- lib/components/scripts/writeCssScript.js | 54 +++--- lib/components/src/Loader/Loader.tsx | 83 ++++---- .../src/ScrollArea/GlobalScrollAreaStyles.tsx | 178 +++++++++--------- lib/components/src/controls/Color.tsx | 9 +- lib/components/src/controls/Object.tsx | 41 ++-- lib/components/src/icon/icons.tsx | 96 ++++------ .../src/typography/DocumentWrapper.tsx | 18 +- lib/core-common/src/config.test.ts | 6 +- lib/core-common/src/presets.ts | 46 ++--- .../__tests__/to-require-context.test.ts | 6 +- lib/core-common/src/utils/envs.ts | 7 +- .../src/utils/progress-reporting.ts | 7 +- .../src/utils/output-startup-information.ts | 11 +- .../src/utils/stories-json.test.ts | 8 +- lib/csf-tools/src/mdx/sb-mdx-plugin.ts | 7 +- lib/manager-webpack4/src/index.ts | 4 +- .../src/presets/manager-preset.ts | 10 +- lib/manager-webpack5/src/index.ts | 4 +- .../src/presets/manager-preset.ts | 10 +- lib/preview-web/src/PreviewWeb.tsx | 6 +- lib/preview-web/src/parseArgsParam.ts | 3 +- lib/preview-web/src/types.ts | 9 +- lib/router/src/utils.ts | 3 +- .../abstract-syntax-tree/generate-helpers.js | 8 +- .../abstract-syntax-tree/inject-decorator.js | 12 +- lib/store/src/decorators.ts | 16 +- lib/store/src/storySort.ts | 149 ++++++++------- lib/store/src/types.ts | 66 ++++--- lib/ui/src/components/layout/mobile.tsx | 12 +- .../components/preview/preview.mockdata.tsx | 6 +- lib/ui/src/components/preview/preview.tsx | 8 +- lib/ui/src/components/preview/toolbar.tsx | 16 +- lib/ui/src/components/sidebar/Refs.tsx | 7 +- lib/ui/src/components/sidebar/Search.tsx | 7 +- .../src/components/sidebar/mockdata.large.ts | 88 ++++----- scripts/build-package.js | 3 +- scripts/build-storybooks.js | 3 +- scripts/run-e2e.ts | 3 +- 83 files changed, 874 insertions(+), 886 deletions(-) diff --git a/addons/a11y/src/components/A11YPanel.tsx b/addons/a11y/src/components/A11YPanel.tsx index a00d6178440a..41173cb2afa9 100644 --- a/addons/a11y/src/components/A11YPanel.tsx +++ b/addons/a11y/src/components/A11YPanel.tsx @@ -94,9 +94,10 @@ export const A11YPanel: React.FC = () => { emit(EVENTS.MANUAL, storyId); }, [storyId]); - const manualActionItems = useMemo(() => [{ title: 'Run test', onClick: handleManual }], [ - handleManual, - ]); + const manualActionItems = useMemo( + () => [{ title: 'Run test', onClick: handleManual }], + [handleManual] + ); const readyActionItems = useMemo( () => [ { diff --git a/addons/actions/src/preset/addArgsHelpers.test.ts b/addons/actions/src/preset/addArgsHelpers.test.ts index dd388ef3d665..0cdd4bd8d768 100644 --- a/addons/actions/src/preset/addArgsHelpers.test.ts +++ b/addons/actions/src/preset/addArgsHelpers.test.ts @@ -7,11 +7,11 @@ describe('actions parameter enhancers', () => { const argTypes = { onClick: {}, onFocus: {}, somethingElse: {} }; it('should add actions that match a pattern', () => { - const args = inferActionsFromArgTypesRegex(({ + const args = inferActionsFromArgTypesRegex({ initialArgs: {}, argTypes, parameters, - } as unknown) as StoryContext); + } as unknown as StoryContext); expect(args).toEqual({ onClick: expect.any(Function), onFocus: expect.any(Function), @@ -19,41 +19,41 @@ describe('actions parameter enhancers', () => { }); it('should NOT override pre-existing args', () => { - const args = inferActionsFromArgTypesRegex(({ + const args = inferActionsFromArgTypesRegex({ initialArgs: { onClick: 'pre-existing value' }, argTypes, parameters, - } as unknown) as StoryContext); + } as unknown as StoryContext); expect(args).toEqual({ onFocus: expect.any(Function) }); }); it('should NOT override pre-existing args, if null', () => { - const args = inferActionsFromArgTypesRegex(({ + const args = inferActionsFromArgTypesRegex({ initialArgs: { onClick: null }, argTypes, parameters, - } as unknown) as StoryContext); + } as unknown as StoryContext); expect(args).toEqual({ onFocus: expect.any(Function) }); }); it('should override pre-existing args, if undefined', () => { - const args = inferActionsFromArgTypesRegex(({ + const args = inferActionsFromArgTypesRegex({ initialArgs: { onClick: undefined }, argTypes, parameters, - } as unknown) as StoryContext); + } as unknown as StoryContext); expect(args).toEqual({ onClick: expect.any(Function), onFocus: expect.any(Function) }); }); it('should do nothing if actions are disabled', () => { - const args = inferActionsFromArgTypesRegex(({ + const args = inferActionsFromArgTypesRegex({ initialArgs: {}, argTypes, parameters: { ...parameters, actions: { ...parameters.actions, disable: true }, }, - } as unknown) as StoryContext); + } as unknown as StoryContext); expect(args).toEqual({}); }); }); @@ -65,11 +65,11 @@ describe('actions parameter enhancers', () => { }; it('should add actions based on action.args', () => { expect( - addActionsFromArgTypes(({ + addActionsFromArgTypes({ initialArgs: {}, argTypes, parameters: {}, - } as unknown) as StoryContext) + } as unknown as StoryContext) ).toEqual({ onClick: expect.any(Function), onBlur: expect.any(Function), @@ -78,41 +78,41 @@ describe('actions parameter enhancers', () => { it('should NOT override pre-existing args', () => { expect( - addActionsFromArgTypes(({ + addActionsFromArgTypes({ argTypes: { onClick: { action: 'clicked!' } }, initialArgs: { onClick: 'pre-existing value' }, parameters: {}, - } as unknown) as StoryContext) + } as unknown as StoryContext) ).toEqual({}); }); it('should NOT override pre-existing args, if null', () => { expect( - addActionsFromArgTypes(({ + addActionsFromArgTypes({ argTypes: { onClick: { action: 'clicked!' } }, initialArgs: { onClick: null }, parameters: {}, - } as unknown) as StoryContext) + } as unknown as StoryContext) ).toEqual({}); }); it('should override pre-existing args, if undefined', () => { expect( - addActionsFromArgTypes(({ + addActionsFromArgTypes({ argTypes: { onClick: { action: 'clicked!' } }, initialArgs: { onClick: undefined }, parameters: {}, - } as unknown) as StoryContext) + } as unknown as StoryContext) ).toEqual({ onClick: expect.any(Function) }); }); it('should do nothing if actions are disabled', () => { expect( - addActionsFromArgTypes(({ + addActionsFromArgTypes({ initialArgs: {}, argTypes, parameters: { actions: { disable: true } }, - } as unknown) as StoryContext) + } as unknown as StoryContext) ).toEqual({}); }); }); diff --git a/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts b/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts index 28a5a7ad2267..0d82841057ed 100644 --- a/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts +++ b/addons/docs/src/frameworks/react/lib/inspection/acornParser.ts @@ -207,7 +207,7 @@ function parseExpression(expression: any): ParsingResult } export function parse(value: string): ParsingResult { - const ast = (acornParser.parse(`(${value})`) as unknown) as estree.Program; + const ast = acornParser.parse(`(${value})`) as unknown as estree.Program; let parsingResult: ParsingResult = { inferredType: { type: InspectionType.UNKNOWN }, diff --git a/addons/docs/src/frameworks/react/propTypes/handleProp.test.tsx b/addons/docs/src/frameworks/react/propTypes/handleProp.test.tsx index dcbcecb5e16d..4483a6a1f754 100644 --- a/addons/docs/src/frameworks/react/propTypes/handleProp.test.tsx +++ b/addons/docs/src/frameworks/react/propTypes/handleProp.test.tsx @@ -107,8 +107,7 @@ describe('enhancePropTypesProp', () => { const component = createTestComponent({ type: { name: 'custom', - raw: - '{\n text: PropTypes.string.isRequired,\n value1: PropTypes.string.isRequired,\n value2: PropTypes.string.isRequired,\n value3: PropTypes.string.isRequired,\n value4: PropTypes.string.isRequired,\n}', + raw: '{\n text: PropTypes.string.isRequired,\n value1: PropTypes.string.isRequired,\n value2: PropTypes.string.isRequired,\n value3: PropTypes.string.isRequired,\n value4: PropTypes.string.isRequired,\n}', }, }); @@ -144,8 +143,7 @@ describe('enhancePropTypesProp', () => { const component = createTestComponent({ type: { name: 'custom', - raw: - 'function InlinedFunctionalComponent() {\n return
Inlined FunctionalComponent!
;\n}', + raw: 'function InlinedFunctionalComponent() {\n return
Inlined FunctionalComponent!
;\n}', }, }); @@ -164,8 +162,7 @@ describe('enhancePropTypesProp', () => { const component = createTestComponent({ type: { name: 'custom', - raw: - '
Hello world from Montreal, Quebec, Canada!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
', + raw: '
Hello world from Montreal, Quebec, Canada!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
', }, }); @@ -203,8 +200,7 @@ describe('enhancePropTypesProp', () => { const component = createTestComponent({ type: { name: 'custom', - raw: - 'Symbol("A very very very very very very lonnnngggggggggggggggggggggggggggggggggggg symbol")', + raw: 'Symbol("A very very very very very very lonnnngggggggggggggggggggggggggggggggggggg symbol")', }, }); @@ -608,8 +604,7 @@ describe('enhancePropTypesProp', () => { name: 'objectOf', value: { name: 'custom', - raw: - '{\n foo: PropTypes.string,\n bar: PropTypes.string,\n another: PropTypes.string,\n anotherAnother: PropTypes.string,\n}', + raw: '{\n foo: PropTypes.string,\n bar: PropTypes.string,\n another: PropTypes.string,\n anotherAnother: PropTypes.string,\n}', }, }, }); @@ -815,8 +810,7 @@ describe('enhancePropTypesProp', () => { name: 'arrayOf', value: { name: 'custom', - raw: - '{\n text: PropTypes.string.isRequired,\n value: PropTypes.string.isRequired,\n another: PropTypes.string.isRequired,\n another2: PropTypes.string.isRequired,\n another3: PropTypes.string.isRequired,\n another4: PropTypes.string.isRequired,\n}', + raw: '{\n text: PropTypes.string.isRequired,\n value: PropTypes.string.isRequired,\n another: PropTypes.string.isRequired,\n another2: PropTypes.string.isRequired,\n another3: PropTypes.string.isRequired,\n another4: PropTypes.string.isRequired,\n}', }, }, }); diff --git a/addons/docs/src/frameworks/react/react-argtypes.stories.tsx b/addons/docs/src/frameworks/react/react-argtypes.stories.tsx index 0f6594721eb4..5f98016d96a3 100644 --- a/addons/docs/src/frameworks/react/react-argtypes.stories.tsx +++ b/addons/docs/src/frameworks/react/react-argtypes.stories.tsx @@ -11,7 +11,7 @@ import { Component } from '../../blocks'; const argsTableProps = (component: Component) => { const argTypes = extractArgTypes(component); const parameters = { __isArgsStory: true }; - const rows = inferControls(({ argTypes, parameters } as unknown) as StoryContext); + const rows = inferControls({ argTypes, parameters } as unknown as StoryContext); return { rows }; }; diff --git a/addons/docs/src/frameworks/react/react-properties.test.ts b/addons/docs/src/frameworks/react/react-properties.test.ts index 30bdc5aa69c1..bf6e9b4e967f 100644 --- a/addons/docs/src/frameworks/react/react-properties.test.ts +++ b/addons/docs/src/frameworks/react/react-properties.test.ts @@ -71,10 +71,10 @@ describe('react component properties', () => { // snapshot the output of `extractArgTypes` const argTypes = extractArgTypes(component); const parameters = { __isArgsStory: true }; - const rows = inferControls(({ + const rows = inferControls({ argTypes, parameters, - } as unknown) as StoryContext); + } as unknown as StoryContext); expect(rows).toMatchSpecificSnapshot(path.join(testDir, 'argTypes.snapshot')); }); } diff --git a/addons/docs/src/frameworks/web-components/prepareForInline.ts b/addons/docs/src/frameworks/web-components/prepareForInline.ts index dcdb86c3432b..75f7cc5a4304 100644 --- a/addons/docs/src/frameworks/web-components/prepareForInline.ts +++ b/addons/docs/src/frameworks/web-components/prepareForInline.ts @@ -17,5 +17,5 @@ export const prepareForInline = (storyFn: PartialStoryFn } } - return (React.createElement(Story) as unknown) as React.CElement<{}, React.Component>; + return React.createElement(Story) as unknown as React.CElement<{}, React.Component>; }; diff --git a/addons/docs/src/lib/docgen/flow/createPropDef.test.ts b/addons/docs/src/lib/docgen/flow/createPropDef.test.ts index 4b563e3f86db..be5dc82fa69b 100644 --- a/addons/docs/src/lib/docgen/flow/createPropDef.test.ts +++ b/addons/docs/src/lib/docgen/flow/createPropDef.test.ts @@ -97,8 +97,7 @@ describe('type', () => { flowType: { name: 'signature', type: 'object', - raw: - '{ (x: string): void, prop1: string, prop2: string, prop3: string, prop4: string, prop5: string, prop6: string, prop7: string, prop8: string }', + raw: '{ (x: string): void, prop1: string, prop2: string, prop3: string, prop4: string, prop5: string, prop6: string, prop7: string, prop8: string }', signature: { properties: [ { diff --git a/addons/links/src/preview.test.ts b/addons/links/src/preview.test.ts index e0013cf8545f..f5dd3af355f1 100644 --- a/addons/links/src/preview.test.ts +++ b/addons/links/src/preview.test.ts @@ -11,7 +11,7 @@ jest.mock('global', () => ({ window: global, })); -const mockAddons = (addons as unknown) as jest.Mocked; +const mockAddons = addons as unknown as jest.Mocked; describe('preview', () => { const channel = { emit: jest.fn() }; diff --git a/addons/links/src/preview.ts b/addons/links/src/preview.ts index aaf4b84e6ecc..0a49eff5a878 100644 --- a/addons/links/src/preview.ts +++ b/addons/links/src/preview.ts @@ -37,19 +37,19 @@ export const hrefTo = (title: ComponentTitle, name: StoryName): Promise const valueOrCall = (args: string[]) => (value: string | ((...args: string[]) => string)) => typeof value === 'function' ? value(...args) : value; -export const linkTo = (idOrTitle: string, nameInput?: string | ((...args: any[]) => string)) => ( - ...args: any[] -) => { - const resolver = valueOrCall(args); - const title = resolver(idOrTitle); - const name = resolver(nameInput); +export const linkTo = + (idOrTitle: string, nameInput?: string | ((...args: any[]) => string)) => + (...args: any[]) => { + const resolver = valueOrCall(args); + const title = resolver(idOrTitle); + const name = resolver(nameInput); - if (title?.match(/--/) && !name) { - navigate({ storyId: title }); - } else { - navigate({ kind: title, story: name }); - } -}; + if (title?.match(/--/) && !name) { + navigate({ storyId: title }); + } else { + navigate({ kind: title, story: name }); + } + }; const linksListener = (e: Event) => { const { target } = e; diff --git a/addons/links/src/react/components/link.test.tsx b/addons/links/src/react/components/link.test.tsx index ebef61478bdf..b2e75887549b 100644 --- a/addons/links/src/react/components/link.test.tsx +++ b/addons/links/src/react/components/link.test.tsx @@ -29,7 +29,7 @@ const mockChannel = () => { once: jest.fn(), }; }; -const mockAddons = (addons as unknown) as jest.Mocked; +const mockAddons = addons as unknown as jest.Mocked; describe('LinkTo', () => { describe('render', () => { diff --git a/addons/storyshots/storyshots-core/src/frameworks/Loader.ts b/addons/storyshots/storyshots-core/src/frameworks/Loader.ts index 0d15defea34f..43e0adbaf5b1 100644 --- a/addons/storyshots/storyshots-core/src/frameworks/Loader.ts +++ b/addons/storyshots/storyshots-core/src/frameworks/Loader.ts @@ -19,9 +19,7 @@ export interface ClientApi } export interface Loader { - load: ( - options: StoryshotsOptions - ) => { + load: (options: StoryshotsOptions) => { framework: SupportedFramework; renderTree: RenderTree; renderShallowTree: any; diff --git a/addons/storyshots/storyshots-core/src/frameworks/configure.ts b/addons/storyshots/storyshots-core/src/frameworks/configure.ts index 37dd0d570834..8561768010b5 100644 --- a/addons/storyshots/storyshots-core/src/frameworks/configure.ts +++ b/addons/storyshots/storyshots-core/src/frameworks/configure.ts @@ -96,9 +96,12 @@ function configure( return; } - const { preview, features = {}, stories = [], requireContexts = [] } = getConfigPathParts( - configPath - ); + const { + preview, + features = {}, + stories = [], + requireContexts = [], + } = getConfigPathParts(configPath); global.FEATURES = features; global.STORIES = stories.map((specifier) => ({ @@ -108,14 +111,8 @@ function configure( if (preview) { // This is essentially the same code as lib/core/src/server/preview/virtualModuleEntry.template - const { - parameters, - decorators, - globals, - globalTypes, - argsEnhancers, - argTypesEnhancers, - } = jest.requireActual(preview); + const { parameters, decorators, globals, globalTypes, argsEnhancers, argTypesEnhancers } = + jest.requireActual(preview); if (decorators) { decorators.forEach((decorator: DecoratorFunction) => diff --git a/addons/storyshots/storyshots-puppeteer/src/axeTest.ts b/addons/storyshots/storyshots-puppeteer/src/axeTest.ts index d9db81952450..21548a4a0e0a 100644 --- a/addons/storyshots/storyshots-puppeteer/src/axeTest.ts +++ b/addons/storyshots/storyshots-puppeteer/src/axeTest.ts @@ -9,8 +9,13 @@ export const axeTest = (customConfig: Partial = {}) => { return puppeteerTest({ ...extendedConfig, async testBody(page, testOptions) { - const { element = '#root', exclude, disabledRules, options, config } = - testOptions.context.parameters.a11y || {}; + const { + element = '#root', + exclude, + disabledRules, + options, + config, + } = testOptions.context.parameters.a11y || {}; await beforeAxeTest(page, options); const axe = new AxePuppeteer(page); axe.include(element); diff --git a/app/angular/src/client/preview/angular/components/app.component.ts b/app/angular/src/client/preview/angular/components/app.component.ts index 57bd79442abc..f4e6c0f60d66 100644 --- a/app/angular/src/client/preview/angular/components/app.component.ts +++ b/app/angular/src/client/preview/angular/components/app.component.ts @@ -48,9 +48,8 @@ export class AppComponent implements OnInit, OnDestroy { const componentRef = this.target.createComponent(compFactory); const { instance } = componentRef; // For some reason, manual change detection ref is only working when getting the ref from the injector (rather than componentRef.changeDetectorRef) - const childChangeDetectorRef: ChangeDetectorRef = componentRef.injector.get( - ChangeDetectorRef - ); + const childChangeDetectorRef: ChangeDetectorRef = + componentRef.injector.get(ChangeDetectorRef); this.subscription = this.data.subscribe((newData) => { this.setProps(instance, newData); diff --git a/app/angular/src/client/preview/decorateStory.ts b/app/angular/src/client/preview/decorateStory.ts index 85ee8da7bf37..1f0643933a0d 100644 --- a/app/angular/src/client/preview/decorateStory.ts +++ b/app/angular/src/client/preview/decorateStory.ts @@ -9,18 +9,17 @@ export default function decorateStory( decorators: DecoratorFunction[] ): LegacyStoryFn { const returnDecorators = [cleanArgsDecorator, ...decorators].reduce( - (previousStoryFn: LegacyStoryFn, decorator) => ( - context: StoryContext - ) => { - const decoratedStory = decorator((update) => { - return previousStoryFn({ - ...context, - ...sanitizeStoryContextUpdate(update), - }); - }, context); + (previousStoryFn: LegacyStoryFn, decorator) => + (context: StoryContext) => { + const decoratedStory = decorator((update) => { + return previousStoryFn({ + ...context, + ...sanitizeStoryContextUpdate(update), + }); + }, context); - return decoratedStory; - }, + return decoratedStory; + }, (context) => prepareMain(mainStoryFn(context), context) ); diff --git a/app/angular/src/client/preview/decorators.ts b/app/angular/src/client/preview/decorators.ts index 8b2b3824c5a7..c74dcff99461 100644 --- a/app/angular/src/client/preview/decorators.ts +++ b/app/angular/src/client/preview/decorators.ts @@ -8,49 +8,51 @@ import { AngularFramework } from './types-6-0'; // We use `any` here as the default type rather than `Args` because we need something that is // castable to any component-specific args type when the user is being careful. -export const moduleMetadata = ( - metadata: Partial -): DecoratorFunction => (storyFn) => { - const story = storyFn(); - const storyMetadata = story.moduleMetadata || {}; - metadata = metadata || {}; +export const moduleMetadata = + (metadata: Partial): DecoratorFunction => + (storyFn) => { + const story = storyFn(); + const storyMetadata = story.moduleMetadata || {}; + metadata = metadata || {}; - return { - ...story, - moduleMetadata: { - declarations: [...(metadata.declarations || []), ...(storyMetadata.declarations || [])], - entryComponents: [ - ...(metadata.entryComponents || []), - ...(storyMetadata.entryComponents || []), - ], - imports: [...(metadata.imports || []), ...(storyMetadata.imports || [])], - schemas: [...(metadata.schemas || []), ...(storyMetadata.schemas || [])], - providers: [...(metadata.providers || []), ...(storyMetadata.providers || [])], - }, + return { + ...story, + moduleMetadata: { + declarations: [...(metadata.declarations || []), ...(storyMetadata.declarations || [])], + entryComponents: [ + ...(metadata.entryComponents || []), + ...(storyMetadata.entryComponents || []), + ], + imports: [...(metadata.imports || []), ...(storyMetadata.imports || [])], + schemas: [...(metadata.schemas || []), ...(storyMetadata.schemas || [])], + providers: [...(metadata.providers || []), ...(storyMetadata.providers || [])], + }, + }; }; -}; -export const componentWrapperDecorator = ( - element: Type | ((story: string) => string), - props?: ICollection | ((storyContext: StoryContext) => ICollection) -): DecoratorFunction => (storyFn, storyContext) => { - const story = storyFn(); - const currentProps = typeof props === 'function' ? (props(storyContext) as ICollection) : props; +export const componentWrapperDecorator = + ( + element: Type | ((story: string) => string), + props?: ICollection | ((storyContext: StoryContext) => ICollection) + ): DecoratorFunction => + (storyFn, storyContext) => { + const story = storyFn(); + const currentProps = typeof props === 'function' ? (props(storyContext) as ICollection) : props; - const template = isComponent(element) - ? computesTemplateFromComponent(element, currentProps ?? {}, story.template) - : element(story.template); + const template = isComponent(element) + ? computesTemplateFromComponent(element, currentProps ?? {}, story.template) + : element(story.template); - return { - ...story, - template, - ...(currentProps || story.props - ? { - props: { - ...currentProps, - ...story.props, - }, - } - : {}), + return { + ...story, + template, + ...(currentProps || story.props + ? { + props: { + ...currentProps, + ...story.props, + }, + } + : {}), + }; }; -}; diff --git a/app/angular/src/server/angular-devkit-build-webpack.ts b/app/angular/src/server/angular-devkit-build-webpack.ts index 9d9ed78cbd0b..cace158b8e06 100644 --- a/app/angular/src/server/angular-devkit-build-webpack.ts +++ b/app/angular/src/server/angular-devkit-build-webpack.ts @@ -47,21 +47,24 @@ const importAngularCliWebpackConfigGenerator = (): { }; }; -const importAngularCliReadTsconfigUtil = (): typeof import('@angular-devkit/build-angular/src/utils/read-tsconfig') => { - // First we look for webpack config according to directory structure of Angular 11 - if (moduleIsAvailable('@angular-devkit/build-angular/src/utils/read-tsconfig')) { - // eslint-disable-next-line global-require - return require('@angular-devkit/build-angular/src/utils/read-tsconfig'); - } - // We fallback on directory structure of Angular 10 (and below) - if ( - moduleIsAvailable('@angular-devkit/build-angular/src/angular-cli-files/utilities/read-tsconfig') - ) { - // eslint-disable-next-line global-require - return require('@angular-devkit/build-angular/src/angular-cli-files/utilities/read-tsconfig'); - } - throw new Error('ReadTsconfig not found in "@angular-devkit/build-angular"'); -}; +const importAngularCliReadTsconfigUtil = + (): typeof import('@angular-devkit/build-angular/src/utils/read-tsconfig') => { + // First we look for webpack config according to directory structure of Angular 11 + if (moduleIsAvailable('@angular-devkit/build-angular/src/utils/read-tsconfig')) { + // eslint-disable-next-line global-require + return require('@angular-devkit/build-angular/src/utils/read-tsconfig'); + } + // We fallback on directory structure of Angular 10 (and below) + if ( + moduleIsAvailable( + '@angular-devkit/build-angular/src/angular-cli-files/utilities/read-tsconfig' + ) + ) { + // eslint-disable-next-line global-require + return require('@angular-devkit/build-angular/src/angular-cli-files/utilities/read-tsconfig'); + } + throw new Error('ReadTsconfig not found in "@angular-devkit/build-angular"'); + }; const buildWebpackConfigOptions = async ( dirToSearch: string, @@ -137,7 +140,7 @@ const buildWebpackConfigOptions = async ( return { root: getSystemPath(workspaceRootNormalized), // The dependency of `@angular-devkit/build-angular` to `@angular-devkit/core` is not exactly the same version as the one for storybook (node modules of node modules ^^) - logger: (createConsoleLogger() as unknown) as WebpackConfigOptions['logger'], + logger: createConsoleLogger() as unknown as WebpackConfigOptions['logger'], projectRoot: getSystemPath(projectRootNormalized), sourceRoot: sourceRootNormalized ? getSystemPath(sourceRootNormalized) : undefined, buildOptions, diff --git a/app/angular/src/server/framework-preset-angular-cli.ts b/app/angular/src/server/framework-preset-angular-cli.ts index 3ed039ccca0f..2d7d6da3eb1c 100644 --- a/app/angular/src/server/framework-preset-angular-cli.ts +++ b/app/angular/src/server/framework-preset-angular-cli.ts @@ -87,13 +87,13 @@ export async function webpackFinal(baseConfig: webpack.Configuration, options: P function getBuilderContext(options: PresetOptions): BuilderContext { return ( options.angularBuilderContext ?? - (({ + ({ target: { project: 'noop-project', builder: '', options: {} }, workspaceRoot: process.cwd(), getProjectMetadata: () => ({}), getTargetOptions: () => ({}), logger: new logging.Logger('Storybook'), - } as unknown) as BuilderContext) + } as unknown as BuilderContext) ); } diff --git a/app/angular/src/server/framework-preset-angular.ts b/app/angular/src/server/framework-preset-angular.ts index 8c15a333f235..1538f901c763 100644 --- a/app/angular/src/server/framework-preset-angular.ts +++ b/app/angular/src/server/framework-preset-angular.ts @@ -78,7 +78,7 @@ export async function webpack( /@angular(\\|\/)core(\\|\/)(fesm5|bundles)/, path.resolve(__dirname, '..') ), - (createForkTsCheckerInstance(tsLoaderOptions) as any) as Configuration['plugins'][0], + createForkTsCheckerInstance(tsLoaderOptions) as any as Configuration['plugins'][0], ], }; } diff --git a/app/ember/src/client/preview/index.ts b/app/ember/src/client/preview/index.ts index 78bc0f24d3bf..b2642044a9f8 100644 --- a/app/ember/src/client/preview/index.ts +++ b/app/ember/src/client/preview/index.ts @@ -5,14 +5,8 @@ import { renderToDOM } from './render'; const { configure: coreConfigure, clientApi, forceReRender } = start(renderToDOM); -export const { - setAddon, - addDecorator, - addParameters, - clearDecorators, - getStorybook, - raw, -} = clientApi; +export const { setAddon, addDecorator, addParameters, clearDecorators, getStorybook, raw } = + clientApi; const framework = 'ember'; export const storiesOf = (kind: string, m: any) => diff --git a/app/preact/src/client/preview/render.tsx b/app/preact/src/client/preview/render.tsx index 095e2ebea50f..d78cfe699c8b 100644 --- a/app/preact/src/client/preview/render.tsx +++ b/app/preact/src/client/preview/render.tsx @@ -11,7 +11,7 @@ function preactRender(story: StoryFnPreactReturnType, domElement: HTMLElement): // Preact 10 only: preact.render(story, domElement); } else { - renderedStory = (preact.render(story, domElement, renderedStory) as unknown) as Element; + renderedStory = preact.render(story, domElement, renderedStory) as unknown as Element; } } diff --git a/app/react/src/client/preview/types-6-3.ts b/app/react/src/client/preview/types-6-3.ts index cb1025b975b4..85c72920bee1 100644 --- a/app/react/src/client/preview/types-6-3.ts +++ b/app/react/src/client/preview/types-6-3.ts @@ -10,9 +10,8 @@ export * from './types-6-0'; * export default { ... } as ComponentMeta; * ``` */ -export type ComponentMeta< - T extends keyof JSX.IntrinsicElements | JSXElementConstructor -> = Meta>; +export type ComponentMeta> = + Meta>; /** * For the common case where a (CSFv2) story is a simple component that receives args as props: @@ -21,9 +20,8 @@ export type ComponentMeta< * const Template: ComponentStory = (args) =>