From 70cc8f72f31d85714c9026028d8db3e5b53ff2bd Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Thu, 17 Jun 2021 23:17:03 -0400 Subject: [PATCH] chore(*): upgrade prettier --- .../examples/counter/components/Counter.js | 9 +- extension/src/app/api/index.js | 8 +- .../browser/extension/inject/pageScript.js | 43 +++---- .../browser/extension/options/syncOptions.js | 3 +- extension/test/app/inject/enhancer.spec.js | 11 +- extension/test/chrome/extension.spec.js | 3 +- package.json | 2 +- .../src/charts/tree/tree.ts | 19 ++- packages/devui/src/Button/styles/common.ts | 27 ++-- packages/devui/src/Button/styles/default.ts | 28 ++-- packages/devui/src/Editor/Editor.tsx | 2 +- packages/devui/src/Editor/WithTabs.tsx | 4 +- packages/devui/src/Form/Form.tsx | 10 +- packages/devui/src/Slider/styles/default.ts | 27 ++-- packages/devui/src/Tabs/Tabs.stories.tsx | 6 +- packages/devui/src/Tabs/TabsHeader.tsx | 5 +- packages/devui/src/Tabs/styles/default.ts | 18 +-- packages/devui/src/Toolbar/styles/Toolbar.ts | 8 +- packages/devui/tests/Select.test.tsx | 4 +- packages/react-base16-styling/src/index.ts | 2 +- packages/react-dock/demo/index.html | 2 +- packages/react-dock/src/Dock.tsx | 14 +- .../src/createStylingFromTheme.ts | 7 +- packages/react-json-tree/src/types.ts | 40 +++--- .../src/components/TopButtons.tsx | 8 +- .../src/components/buttons/PrintButton.tsx | 2 +- .../src/constants/socketActionTypes.ts | 2 +- .../monitors/InspectorWrapper/ChartTab.tsx | 8 +- .../monitors/InspectorWrapper/index.tsx | 2 +- .../redux-devtools-app/src/middlewares/api.ts | 4 +- .../src/middlewares/exportState.ts | 75 +++++------ .../src/reducers/instances.ts | 4 +- .../src/reducers/reports.ts | 5 +- .../src/store/configureStore.ts | 20 +-- .../src/utils/stringifyJSON.ts | 2 +- .../src/ChartMonitor.tsx | 2 +- packages/redux-devtools-cli/src/index.ts | 4 +- .../test/integration.spec.ts | 64 ++++----- .../src/DockMonitor.tsx | 2 +- .../src/reducers.ts | 2 +- .../demo/src/js/index.tsx | 10 +- .../src/TestGenerator.tsx | 6 +- .../src/index.tsx | 20 ++- .../src/openFile.ts | 65 +++++----- .../containers/StackFrame.tsx | 6 +- .../react-error-overlay/utils/getSourceMap.ts | 6 +- .../utils/getStackFrames.ts | 16 ++- .../utils/parseCompileError.ts | 5 +- .../src/react-error-overlay/utils/parser.ts | 3 +- .../src/react-error-overlay/utils/unmapper.ts | 8 +- .../demo/src/index.html | 2 +- .../demo/src/js/index.tsx | 10 +- .../src/ActionListRow.tsx | 12 +- .../src/ActionPreview.tsx | 2 +- .../src/ActionPreviewHeader.tsx | 95 +++++++------- .../src/DevtoolsInspector.tsx | 20 +-- .../src/tabs/ActionTab.tsx | 7 +- .../src/tabs/DiffTab.tsx | 46 ++++--- .../src/tabs/StateTab.tsx | 7 +- .../src/instrument.ts | 121 +++++++++--------- .../test/instrument.spec.ts | 77 ++++------- .../src/LogMonitor.tsx | 2 +- .../src/LogMonitorEntry.tsx | 11 +- .../test/immutable.spec.ts | 8 +- .../src/SliderMonitor.tsx | 4 +- .../redux-devtools-utils/src/importState.ts | 42 +++--- packages/redux-devtools-utils/src/index.ts | 26 ++-- .../redux-devtools/src/createDevTools.tsx | 14 +- packages/redux-devtools/src/persistState.ts | 79 ++++++------ yarn.lock | 13 +- 70 files changed, 594 insertions(+), 657 deletions(-) diff --git a/extension/examples/counter/components/Counter.js b/extension/examples/counter/components/Counter.js index 08a0fcdb..306ad814 100644 --- a/extension/examples/counter/components/Counter.js +++ b/extension/examples/counter/components/Counter.js @@ -3,13 +3,8 @@ import PropTypes from 'prop-types'; class Counter extends Component { render() { - const { - increment, - autoIncrement, - incrementAsync, - decrement, - counter, - } = this.props; + const { increment, autoIncrement, incrementAsync, decrement, counter } = + this.props; return (

Clicked: {counter} times {' '} diff --git a/extension/src/app/api/index.js b/extension/src/app/api/index.js index 3c6ff30d..5c3e94ce 100644 --- a/extension/src/app/api/index.js +++ b/extension/src/app/api/index.js @@ -149,12 +149,8 @@ export function toContentScript(message, serializeState, serializeAction) { message.action = stringify(message.action, serializeAction); message.payload = stringify(message.payload, serializeState); } else if (message.type === 'STATE' || message.type === 'PARTIAL_STATE') { - const { - actionsById, - computedStates, - committedState, - ...rest - } = message.payload; + const { actionsById, computedStates, committedState, ...rest } = + message.payload; message.payload = rest; message.actionsById = stringify(actionsById, serializeAction); message.computedStates = stringify(computedStates, serializeState); diff --git a/extension/src/browser/extension/inject/pageScript.js b/extension/src/browser/extension/inject/pageScript.js index 7f3df58f..52046ae6 100644 --- a/extension/src/browser/extension/inject/pageScript.js +++ b/extension/src/browser/extension/inject/pageScript.js @@ -448,33 +448,32 @@ window.devToolsExtension.disconnect = (...args) => { return disconnect.apply(null, args); }; -const preEnhancer = (instanceId) => (next) => ( - reducer, - preloadedState, - enhancer -) => { - const store = next(reducer, preloadedState, enhancer); +const preEnhancer = + (instanceId) => (next) => (reducer, preloadedState, enhancer) => { + const store = next(reducer, preloadedState, enhancer); - if (stores[instanceId]) { - stores[instanceId].initialDispatch = store.dispatch; - } + if (stores[instanceId]) { + stores[instanceId].initialDispatch = store.dispatch; + } - return { - ...store, - dispatch: (...args) => - !window.__REDUX_DEVTOOLS_EXTENSION_LOCKED__ && store.dispatch(...args), + return { + ...store, + dispatch: (...args) => + !window.__REDUX_DEVTOOLS_EXTENSION_LOCKED__ && store.dispatch(...args), + }; }; -}; -const extensionCompose = (config) => (...funcs) => { - return (...args) => { - const instanceId = generateId(config.instanceId); - return [preEnhancer(instanceId), ...funcs].reduceRight( - (composed, f) => f(composed), - __REDUX_DEVTOOLS_EXTENSION__({ ...config, instanceId })(...args) - ); +const extensionCompose = + (config) => + (...funcs) => { + return (...args) => { + const instanceId = generateId(config.instanceId); + return [preEnhancer(instanceId), ...funcs].reduceRight( + (composed, f) => f(composed), + __REDUX_DEVTOOLS_EXTENSION__({ ...config, instanceId })(...args) + ); + }; }; -}; window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ = (...funcs) => { if (funcs.length === 0) { diff --git a/extension/src/browser/extension/options/syncOptions.js b/extension/src/browser/extension/options/syncOptions.js index ac483fe4..04827b5c 100644 --- a/extension/src/browser/extension/options/syncOptions.js +++ b/extension/src/browser/extension/options/syncOptions.js @@ -43,8 +43,7 @@ const get = (callback) => { blacklist: '', shouldCatchErrors: false, inject: true, - urls: - '^https?://localhost|0\\.0\\.0\\.0:\\d+\n^https?://.+\\.github\\.io', + urls: '^https?://localhost|0\\.0\\.0\\.0:\\d+\n^https?://.+\\.github\\.io', showContextMenus: true, }, function (items) { diff --git a/extension/test/app/inject/enhancer.spec.js b/extension/test/app/inject/enhancer.spec.js index 2ca8824b..14e6cc18 100644 --- a/extension/test/app/inject/enhancer.spec.js +++ b/extension/test/app/inject/enhancer.spec.js @@ -155,9 +155,9 @@ describe('Redux enhancer', () => { state: JSON.stringify({ monitorState: {}, actionsById: { - '0': { type: 'PERFORM_ACTION', action: { type: '@@INIT' } }, - '1': { type: 'PERFORM_ACTION', action: { type: 'INCREMENT' } }, - '2': { type: 'PERFORM_ACTION', action: { type: 'INCREMENT' } }, + 0: { type: 'PERFORM_ACTION', action: { type: '@@INIT' } }, + 1: { type: 'PERFORM_ACTION', action: { type: 'INCREMENT' } }, + 2: { type: 'PERFORM_ACTION', action: { type: 'INCREMENT' } }, }, nextActionId: 3, stagedActionIds: [0, 1, 2], @@ -193,9 +193,8 @@ describe('Redux enhancer', () => { it('should create the store using old Redux api', async () => { const message = await listenMessage(() => { - window.store = window.__REDUX_DEVTOOLS_EXTENSION__()(createStore)( - counter - ); + window.store = + window.__REDUX_DEVTOOLS_EXTENSION__()(createStore)(counter); expect(typeof window.store).toBe('object'); }); expect(message.type).toBe('INIT_INSTANCE'); diff --git a/extension/test/chrome/extension.spec.js b/extension/test/chrome/extension.spec.js index 0f1845f1..c880c151 100644 --- a/extension/test/chrome/extension.spec.js +++ b/extension/test/chrome/extension.spec.js @@ -6,7 +6,8 @@ import { switchMonitorTests, delay } from '../utils/e2e'; const port = 9515; const path = resolve('build/extension'); const extensionId = 'lmhkpmbekcpmknklioeibfkpmmfibljd'; -const actionsPattern = /^@@INIT(.|\n)+@@reduxReactRouter\/routerDidChange(.|\n)+@@reduxReactRouter\/initRoutes(.|\n)+$/; +const actionsPattern = + /^@@INIT(.|\n)+@@reduxReactRouter\/routerDidChange(.|\n)+@@reduxReactRouter\/initRoutes(.|\n)+$/; describe('Chrome extension', function () { beforeAll(async () => { diff --git a/package.json b/package.json index 44d1a66f..21f4fff6 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "html-webpack-plugin": "^4.3.0", "jest": "^26.2.2", "lerna": "^3.22.1", - "prettier": "^2.0.5", + "prettier": "^2.3.1", "raw-loader": "^4.0.1", "rimraf": "^3.0.2", "style-loader": "^1.2.1", diff --git a/packages/d3-state-visualizer/src/charts/tree/tree.ts b/packages/d3-state-visualizer/src/charts/tree/tree.ts index 47ae5176..84d5876b 100644 --- a/packages/d3-state-visualizer/src/charts/tree/tree.ts +++ b/packages/d3-state-visualizer/src/charts/tree/tree.ts @@ -214,13 +214,13 @@ export default function ( preserveAspectRatio: 'xMinYMin slice', }; - if (!((style as unknown) as { [key: string]: Primitive }).width) { + if (!(style as unknown as { [key: string]: Primitive }).width) { attr.width = fullWidth; } if ( - !((style as unknown) as { [key: string]: Primitive }).width || - !((style as unknown) as { [key: string]: Primitive }).height + !(style as unknown as { [key: string]: Primitive }).width || + !(style as unknown as { [key: string]: Primitive }).height ) { attr.viewBox = `0 0 ${fullWidth} ${fullHeight}`; } @@ -230,7 +230,7 @@ export default function ( const vis = root .append('svg') .attr(attr) - .style(({ cursor: '-webkit-grab', ...style } as unknown) as { + .style({ cursor: '-webkit-grab', ...style } as unknown as { [key: string]: Primitive; }) .call( @@ -303,10 +303,10 @@ export default function ( : (nextState as NodeWithId); if (isEmpty(data) || !data.name) { - data = ({ + data = { name: 'error', message: 'Please provide a state map or a tree structure', - } as unknown) as NodeWithId; + } as unknown as NodeWithId; } let nodeIndex = 0; @@ -366,10 +366,7 @@ export default function ( const node = vis .selectAll('g.node') .property('__oldData__', (d: NodeWithId) => d) - .data( - nodes, - (d) => d.id || (d.id = (++nodeIndex as unknown) as string) - ); + .data(nodes, (d) => d.id || (d.id = ++nodeIndex as unknown as string)); const nodeEnter = node .enter() .append('g') @@ -550,7 +547,7 @@ export default function ( .transition() .duration(transitionDuration) .attr({ - d: (diagonal as unknown) as Primitive, + d: diagonal as unknown as Primitive, }); // transition exiting nodes to the parent's new position diff --git a/packages/devui/src/Button/styles/common.ts b/packages/devui/src/Button/styles/common.ts index a58a4c3b..68333c63 100644 --- a/packages/devui/src/Button/styles/common.ts +++ b/packages/devui/src/Button/styles/common.ts @@ -192,7 +192,7 @@ export const tooltipStyle = ({ ${commonStyle({ theme, mark, size })} &:before { - content: "${tooltipTitle}"; + content: '${tooltipTitle}'; white-space: pre; color: ${theme.base06}; line-height: 16px; @@ -200,9 +200,8 @@ export const tooltipStyle = ({ border-radius: 3px; background: ${theme.base01}; border: 1px solid ${theme.base02}; - box-shadow: 1px 1px 2px -1px ${theme.base02}, 1px 1px 2px 0px ${ - theme.base02 -}; + box-shadow: 1px 1px 2px -1px ${theme.base02}, + 1px 1px 2px 0px ${theme.base02}; } &:after, @@ -223,18 +222,15 @@ export const tooltipStyle = ({ &:before { ${before(tooltipPosition)} ${getDirection(tooltipPosition)}: 3px; - ${ - theme.type === 'material' - ? css` - animation: ${fadeIn} 500ms; - ` - : '' - } + ${theme.type === 'material' + ? css` + animation: ${fadeIn} 500ms; + ` + : ''} } - ${ - theme.type !== 'material' && - ` + ${theme.type !== 'material' && + ` &:after { content: ""; border-style: solid; @@ -243,8 +239,7 @@ export const tooltipStyle = ({ ${after(tooltipPosition, theme.base02)} ${getDirection(tooltipPosition)}: 7px; } - ` - } + `} &:hover:after, &:hover:before { diff --git a/packages/devui/src/Button/styles/default.ts b/packages/devui/src/Button/styles/default.ts index c098bcb3..8439f356 100644 --- a/packages/devui/src/Button/styles/default.ts +++ b/packages/devui/src/Button/styles/default.ts @@ -21,38 +21,32 @@ export const style = ({ margin: auto 0; border: 1px solid ${theme.base02}; border-radius: 4px; - ${ - primary - ? ` + ${primary + ? ` background-color: ${theme.base05}; color: ${theme.base00}; ` - : ` + : ` background-color: ${theme.base01}; color: ${theme.base05}; - ` - } - ${ - disabled - ? ` + `} + ${disabled + ? ` cursor: not-allowed; opacity: 0.6; ` - : ` + : ` cursor: pointer; - ` - } + `} - ${ - !disabled && - ` + ${!disabled && + ` &:hover, &:focus { background-color: ${primary ? theme.base07 : theme.base02}; box-shadow: 1px 1px 2px ${theme.base03}; } - ` - } + `} &:focus { border: 1px solid ${theme.base0D}; } diff --git a/packages/devui/src/Editor/Editor.tsx b/packages/devui/src/Editor/Editor.tsx index c78ca961..eadc1b2e 100644 --- a/packages/devui/src/Editor/Editor.tsx +++ b/packages/devui/src/Editor/Editor.tsx @@ -7,7 +7,7 @@ import { defaultStyle, themedStyle } from './styles'; import { Theme } from '../themes/default'; const EditorContainer = styled.div( - ('' as unknown) as TemplateStringsArray, + '' as unknown as TemplateStringsArray, ({ theme }: { theme: Theme }) => theme.scheme === 'default' && theme.light ? defaultStyle diff --git a/packages/devui/src/Editor/WithTabs.tsx b/packages/devui/src/Editor/WithTabs.tsx index 60383488..830405a2 100644 --- a/packages/devui/src/Editor/WithTabs.tsx +++ b/packages/devui/src/Editor/WithTabs.tsx @@ -33,12 +33,12 @@ export default class WithTabs extends Component { tabs={[ { name: 'Function 1', - component: (Editor as unknown) as ComponentType, + component: Editor as unknown as ComponentType, selector: () => ({ value: value1, lineNumbers }), }, { name: 'Function 2', - component: (Editor as unknown) as ComponentType, + component: Editor as unknown as ComponentType, selector: () => ({ value: value2, lineNumbers }), }, ]} diff --git a/packages/devui/src/Form/Form.tsx b/packages/devui/src/Form/Form.tsx index e9cf4f41..41715ec5 100644 --- a/packages/devui/src/Form/Form.tsx +++ b/packages/devui/src/Form/Form.tsx @@ -22,14 +22,8 @@ export interface Props extends FormProps { */ export default class Form extends (PureComponent || Component)> { render() { - const { - widgets, - children, - submitText, - primaryButton, - noSubmit, - ...rest - } = this.props; + const { widgets, children, submitText, primaryButton, noSubmit, ...rest } = + this.props; return ( )} diff --git a/packages/devui/src/Slider/styles/default.ts b/packages/devui/src/Slider/styles/default.ts index b086d8d8..d1ab14cd 100644 --- a/packages/devui/src/Slider/styles/default.ts +++ b/packages/devui/src/Slider/styles/default.ts @@ -36,7 +36,9 @@ export const style = ({ width: 100%; color: ${theme.base06}; - > span { color: ${theme.base04}; } + > span { + color: ${theme.base04}; + } } input { @@ -54,9 +56,8 @@ export const style = ({ border-radius: 0.8em/1.1em; font-size: 1em; cursor: pointer; - background: linear-gradient(${theme.base02}, ${ - theme.base00 -}) padding-box, 50% 50% border-box; + background: linear-gradient(${theme.base02}, ${theme.base00}) padding-box, + 50% 50% border-box; background-size: 100% 100%; } @@ -74,10 +75,10 @@ export const style = ({ }` )} - ${prefixSelectors( - 'input', - ['webkit-slider-thumb', 'moz-range-thumb', 'ms-thumb'], - `{ + ${prefixSelectors( + 'input', + ['webkit-slider-thumb', 'moz-range-thumb', 'ms-thumb'], + `{ position: relative; appearance: none; cursor: ew-resize; @@ -90,15 +91,15 @@ export const style = ({ border-radius: 50%; cursor: pointer; }` - )} + )} ${prefixSelectors( - 'input:focus:not(:active)', - ['webkit-slider-thumb', 'moz-range-thumb', 'ms-thumb'], - `{ + 'input:focus:not(:active)', + ['webkit-slider-thumb', 'moz-range-thumb', 'ms-thumb'], + `{ box-shadow: 0 0 1px 2px ${theme.base0D}; }` - )} + )} input::-moz-focus-outer { border: 0; diff --git a/packages/devui/src/Tabs/Tabs.stories.tsx b/packages/devui/src/Tabs/Tabs.stories.tsx index 308016d9..7598992a 100644 --- a/packages/devui/src/Tabs/Tabs.stories.tsx +++ b/packages/devui/src/Tabs/Tabs.stories.tsx @@ -37,9 +37,9 @@ Default.argTypes = { onClick: { control: { disable: true } }, }; -export const WithContent = (Template as Story< - TabsProps<{ selected: string }> ->).bind({}); +export const WithContent = ( + Template as Story> +).bind({}); WithContent.args = { tabs, selected: 'Tab2', diff --git a/packages/devui/src/Tabs/TabsHeader.tsx b/packages/devui/src/Tabs/TabsHeader.tsx index e5d7e4a0..6ad33a90 100644 --- a/packages/devui/src/Tabs/TabsHeader.tsx +++ b/packages/devui/src/Tabs/TabsHeader.tsx @@ -82,9 +82,8 @@ export default class TabsHeader

extends Component, State> { (this.tabsRef!.children[tabButtons.length - 1] as HTMLButtonElement) .value === 'expandIcon' ) { - this.iconWidth = tabButtons[ - tabButtons.length - 1 - ].getBoundingClientRect().width; + this.iconWidth = + tabButtons[tabButtons.length - 1].getBoundingClientRect().width; shouldCollapse = true; } } else if (this.state.hiddenTabs.length === 0) { diff --git a/packages/devui/src/Tabs/styles/default.ts b/packages/devui/src/Tabs/styles/default.ts index e79ae5da..1d3da379 100644 --- a/packages/devui/src/Tabs/styles/default.ts +++ b/packages/devui/src/Tabs/styles/default.ts @@ -15,13 +15,11 @@ export const style = ({ background-color: ${theme.base01}; width: 100%; overflow: hidden; - ${ - !main && - ` + ${!main && + ` border-top: 1px solid ${theme.base01}; border-bottom: 1px solid ${theme.base02}; - ` - } + `} > div { display: flex; @@ -50,16 +48,14 @@ export const style = ({ } > [data-selected] { - ${ - main - ? `border-bottom: 2px solid ${theme.base0D};` - : ` + ${main + ? `border-bottom: 2px solid ${theme.base0D};` + : ` background-color: ${theme.base00}; border: 1px solid ${theme.base02}; border-bottom: 1px solid ${theme.base00}; box-shadow: 0 1px ${theme.base00}; - ` - } + `} color: ${theme.base07}; } } diff --git a/packages/devui/src/Toolbar/styles/Toolbar.ts b/packages/devui/src/Toolbar/styles/Toolbar.ts index a70b13ad..bee6a842 100644 --- a/packages/devui/src/Toolbar/styles/Toolbar.ts +++ b/packages/devui/src/Toolbar/styles/Toolbar.ts @@ -11,9 +11,11 @@ export interface Props { noBorder?: boolean; } -const Toolbar = (styled as ThemedStyledInterface< - Base16Theme & { fontFamily?: CSS.Property.FontFamily } ->).div` +const Toolbar = ( + styled as ThemedStyledInterface< + Base16Theme & { fontFamily?: CSS.Property.FontFamily } + > +).div` display: flex; flex-shrink: 0; box-sizing: border-box; diff --git a/packages/devui/tests/Select.test.tsx b/packages/devui/tests/Select.test.tsx index 1fe9a888..f76fc3db 100644 --- a/packages/devui/tests/Select.test.tsx +++ b/packages/devui/tests/Select.test.tsx @@ -44,7 +44,7 @@ describe('Select', function () { ); const input = wrapper.find('input'); - ((input.at(0).instance() as unknown) as HTMLInputElement).value = 'two'; + (input.at(0).instance() as unknown as HTMLInputElement).value = 'two'; input.first().simulate('change'); expect(mountToJson(wrapper)).toMatchSnapshot(); input.first().simulate('keyDown', { keyCode: 13 }); @@ -56,7 +56,7 @@ describe('Select', function () { const wrapper = mount(