Skip to content

Commit

Permalink
Fix Prettier config to extend to .jsx files
Browse files Browse the repository at this point in the history
  • Loading branch information
mszabo-wikia committed Feb 26, 2023
1 parent 8fc6c3d commit 15f692a
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"fmt": "yarn prettier",
"lint": "npm-run-all -ln --parallel prettier-lint tsc-lint eslint check-license",
"prepare": "lerna run --stream --sort prepublishOnly",
"prettier": "prettier --write '{.,scripts}/*.{js,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,json,md,ts,tsx}' 'packages/*/*.{css,js,json,md,ts,tsx}'",
"prettier-lint": "prettier --list-different '{.,scripts}/*.{js,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,json,md,ts,tsx}' 'packages/*/*.{css,js,json,md,ts,tsx}'",
"prettier": "prettier --write '{.,scripts}/*.{js,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx}'",
"prettier-lint": "prettier --list-different '{.,scripts}/*.{js,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx}'",
"test": "lerna run test",
"tsc-lint": "tsc --build",
"tsc-lint-debug": "tsc --listFiles",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,38 +49,38 @@ function ScatterPlotImpl(props) {
}, []);

return (
<div className="TraceResultsScatterPlot" ref={containerRef}>
{containerWidth && (
<XYPlot
margin={{
left: 50,
}}
width={containerWidth}
colorType="literal"
height={200}
>
<XAxis
title="Time"
tickTotal={4}
tickFormat={t => moment(t / ONE_MILLISECOND).format('hh:mm:ss a')}
/>
<YAxis title="Duration" tickTotal={3} tickFormat={t => formatDuration(t)} />
<MarkSeries
sizeRange={[3, 10]}
opacity={0.5}
onValueClick={onValueClick}
onValueMouseOver={onValueOver}
onValueMouseOut={onValueOut}
data={data}
/>
{overValue && (
<Hint value={overValue}>
<h4 className="scatter-plot-hint">{overValue.name || FALLBACK_TRACE_NAME}</h4>
</Hint>
)}
</XYPlot>
)}
</div>
<div className="TraceResultsScatterPlot" ref={containerRef}>
{containerWidth && (
<XYPlot
margin={{
left: 50,
}}
width={containerWidth}
colorType="literal"
height={200}
>
<XAxis
title="Time"
tickTotal={4}
tickFormat={t => moment(t / ONE_MILLISECOND).format('hh:mm:ss a')}
/>
<YAxis title="Duration" tickTotal={3} tickFormat={t => formatDuration(t)} />
<MarkSeries
sizeRange={[3, 10]}
opacity={0.5}
onValueClick={onValueClick}
onValueMouseOver={onValueOver}
onValueMouseOut={onValueOut}
data={data}
/>
{overValue && (
<Hint value={overValue}>
<h4 className="scatter-plot-hint">{overValue.name || FALLBACK_TRACE_NAME}</h4>
</Hint>
)}
</XYPlot>
)}
</div>
);
}

Expand Down Expand Up @@ -108,11 +108,11 @@ ScatterPlotImpl.defaultProps = {
};

const ScatterPlot = compose(
withState('overValue', 'setOverValue', null),
withProps(({ setOverValue }) => ({
onValueOver: value => setOverValue(value),
onValueOut: () => setOverValue(null),
}))
withState('overValue', 'setOverValue', null),
withProps(({ setOverValue }) => ({
onValueOver: value => setOverValue(value),
onValueOut: () => setOverValue(null),
}))
)(ScatterPlotImpl);

export { ScatterPlotImpl };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class SearchTracePageImpl extends Component {
</TabPane>
<TabPane tab="JSON File" key="fileLoader">
<FileLoader
loadJsonTraces={(fileList) => {
loadJsonTraces={fileList => {
loadJsonTraces(fileList);
}}
/>
Expand Down

0 comments on commit 15f692a

Please sign in to comment.