Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix prettier 2.3 formatting across the codebase #17242

Merged
merged 1 commit into from Jan 14, 2022
Merged

Fix prettier 2.3 formatting across the codebase #17242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions addons/a11y/src/components/A11YPanel.tsx
View file
Open in desktop
Expand Up @@ -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(
() => [
{
Expand Down
40 changes: 20 additions & 20 deletions addons/actions/src/preset/addArgsHelpers.test.ts
View file
Open in desktop
Expand Up @@ -7,53 +7,53 @@ 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),
});
});

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({});
});
});
Expand All @@ -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),
Expand All @@ -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({});
});
});
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/src/frameworks/react/lib/inspection/acornParser.ts
View file
Open in desktop
Expand Up @@ -207,7 +207,7 @@ function parseExpression(expression: any): ParsingResult<InspectionInferedType>
}

export function parse(value: string): ParsingResult<InspectionInferedType> {
const ast = (acornParser.parse(`(${value})`) as unknown) as estree.Program;
const ast = acornParser.parse(`(${value})`) as unknown as estree.Program;

let parsingResult: ParsingResult<InspectionUnknown> = {
inferredType: { type: InspectionType.UNKNOWN },
Expand Down
18 changes: 6 additions & 12 deletions addons/docs/src/frameworks/react/propTypes/handleProp.test.tsx
View file
Open in desktop
Expand Up @@ -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}',
},
});

Expand Down Expand Up @@ -144,8 +143,7 @@ describe('enhancePropTypesProp', () => {
const component = createTestComponent({
type: {
name: 'custom',
raw:
'function InlinedFunctionalComponent() {\n return <div>Inlined FunctionalComponent!</div>;\n}',
raw: 'function InlinedFunctionalComponent() {\n return <div>Inlined FunctionalComponent!</div>;\n}',
},
});

Expand All @@ -164,8 +162,7 @@ describe('enhancePropTypesProp', () => {
const component = createTestComponent({
type: {
name: 'custom',
raw:
'<div>Hello world from Montreal, Quebec, Canada!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</div>',
raw: '<div>Hello world from Montreal, Quebec, Canada!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</div>',
},
});

Expand Down Expand Up @@ -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")',
},
});

Expand Down Expand Up @@ -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}',
},
},
});
Expand Down Expand Up @@ -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}',
},
},
});
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/src/frameworks/react/react-argtypes.stories.tsx
View file
Open in desktop
Expand Up @@ -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<any>);
const rows = inferControls({ argTypes, parameters } as unknown as StoryContext<any>);
return { rows };
};

Expand Down
4 changes: 2 additions & 2 deletions addons/docs/src/frameworks/react/react-properties.test.ts
View file
Open in desktop
Expand Up @@ -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<AnyFramework>);
} as unknown as StoryContext<AnyFramework>);
expect(rows).toMatchSpecificSnapshot(path.join(testDir, 'argTypes.snapshot'));
});
}
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/src/frameworks/web-components/prepareForInline.ts
View file
Open in desktop
Expand Up @@ -17,5 +17,5 @@ export const prepareForInline = (storyFn: PartialStoryFn<WebComponentsFramework>
}
}

return (React.createElement(Story) as unknown) as React.CElement<{}, React.Component>;
return React.createElement(Story) as unknown as React.CElement<{}, React.Component>;
};
3 changes: 1 addition & 2 deletions addons/docs/src/lib/docgen/flow/createPropDef.test.ts
View file
Open in desktop
Expand Up @@ -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: [
{
Expand Down
2 changes: 1 addition & 1 deletion addons/links/src/preview.test.ts
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ jest.mock('global', () => ({
window: global,
}));

const mockAddons = (addons as unknown) as jest.Mocked<typeof addons>;
const mockAddons = addons as unknown as jest.Mocked<typeof addons>;

describe('preview', () => {
const channel = { emit: jest.fn() };
Expand Down
24 changes: 12 additions & 12 deletions addons/links/src/preview.ts
View file
Open in desktop
Expand Up @@ -37,19 +37,19 @@ export const hrefTo = (title: ComponentTitle, name: StoryName): Promise<string>
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;
Expand Down
2 changes: 1 addition & 1 deletion addons/links/src/react/components/link.test.tsx
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ const mockChannel = () => {
once: jest.fn(),
};
};
const mockAddons = (addons as unknown) as jest.Mocked<typeof addons>;
const mockAddons = addons as unknown as jest.Mocked<typeof addons>;

describe('LinkTo', () => {
describe('render', () => {
Expand Down
4 changes: 1 addition & 3 deletions addons/storyshots/storyshots-core/src/frameworks/Loader.ts
View file
Open in desktop
Expand Up @@ -19,9 +19,7 @@ export interface ClientApi<TFramework extends AnyFramework>
}

export interface Loader {
load: (
options: StoryshotsOptions
) => {
load: (options: StoryshotsOptions) => {
framework: SupportedFramework;
renderTree: RenderTree;
renderShallowTree: any;
Expand Down
19 changes: 8 additions & 11 deletions addons/storyshots/storyshots-core/src/frameworks/configure.ts
View file
Open in desktop
Expand Up @@ -96,9 +96,12 @@ function configure<TFramework extends AnyFramework>(
return;
}

const { preview, features = {}, stories = [], requireContexts = [] } = getConfigPathParts(
configPath
);
const {
preview,
features = {},
stories = [],
requireContexts = [],
} = getConfigPathParts(configPath);

global.FEATURES = features;
global.STORIES = stories.map((specifier) => ({
Expand All @@ -108,14 +111,8 @@ function configure<TFramework extends AnyFramework>(

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<TFramework>) =>
Expand Down
9 changes: 7 additions & 2 deletions addons/storyshots/storyshots-puppeteer/src/axeTest.ts
View file
Open in desktop
Expand Up @@ -9,8 +9,13 @@ export const axeTest = (customConfig: Partial<AxeConfig> = {}) => {
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);
Expand Down
5 changes: 2 additions & 3 deletions app/angular/src/client/preview/angular/components/app.component.ts
View file
Open in desktop
Expand Up @@ -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);
Expand Down