From d04618b28b4faf0e512878d073a93a779d735f96 Mon Sep 17 00:00:00 2001 From: Brandon Dail Date: Wed, 12 Jul 2017 11:19:24 -0500 Subject: [PATCH] Run all fixtures through Prettier (#10157) * Include fixtures in prettier default pattern * Run all fixtures through Prettier --- fixtures/art/VectorWidget.js | 69 +++-- fixtures/art/app.js | 2 +- fixtures/art/webpack.config.js | 12 +- fixtures/dom/public/react-loader.js | 3 +- fixtures/dom/src/components/App.js | 4 +- fixtures/dom/src/components/Fixture.js | 4 +- fixtures/dom/src/components/FixtureSet.js | 9 +- fixtures/dom/src/components/Header.js | 84 +++--- fixtures/dom/src/components/TestCase.js | 96 +++---- .../src/components/fixtures/buttons/index.js | 8 +- fixtures/dom/src/components/fixtures/index.js | 2 +- .../InputPlaceholderFixture.js | 30 +- .../input-change-events/RadioClickFixture.js | 28 +- .../RangeKeyboardFixture.js | 44 ++- .../fixtures/input-change-events/index.js | 15 +- .../number-inputs/NumberInputDecimal.js | 8 +- .../number-inputs/NumberInputExtraZeroes.js | 12 +- .../fixtures/number-inputs/NumberTestCase.js | 22 +- .../fixtures/number-inputs/index.js | 69 ++--- .../password-inputs/PasswordTestCase.js | 18 +- .../fixtures/password-inputs/index.js | 2 +- .../components/fixtures/range-inputs/index.js | 14 +- .../src/components/fixtures/selects/index.js | 8 +- .../fixtures/text-inputs/InputTestCase.js | 20 +- .../components/fixtures/text-inputs/index.js | 16 +- .../components/fixtures/textareas/index.js | 8 +- fixtures/dom/src/components/propTypes.js | 6 +- fixtures/dom/src/index.js | 5 +- fixtures/dom/src/tags.js | 24 +- fixtures/fiber-debugger/src/App.js | 137 +++++---- fixtures/fiber-debugger/src/Editor.js | 28 +- fixtures/fiber-debugger/src/Fibers.js | 272 ++++++++++-------- fixtures/fiber-debugger/src/describeFibers.js | 4 +- fixtures/fiber-debugger/src/index.js | 5 +- fixtures/packaging/browserify/dev/input.js | 2 +- fixtures/packaging/browserify/prod/input.js | 2 +- .../packaging/brunch/dev/app/initialize.js | 2 +- fixtures/packaging/brunch/dev/input.js | 2 +- .../packaging/brunch/prod/app/initialize.js | 2 +- fixtures/packaging/brunch/prod/input.js | 2 +- fixtures/packaging/build-all.js | 2 +- fixtures/packaging/rjs/dev/input.js | 2 +- fixtures/packaging/rjs/prod/input.js | 2 +- .../packaging/systemjs-builder/dev/input.js | 2 +- .../packaging/systemjs-builder/prod/input.js | 2 +- .../packaging/webpack-alias/dev/config.js | 2 +- fixtures/packaging/webpack-alias/dev/input.js | 2 +- .../packaging/webpack-alias/prod/config.js | 2 +- .../packaging/webpack-alias/prod/input.js | 2 +- fixtures/packaging/webpack/dev/input.js | 2 +- fixtures/packaging/webpack/prod/config.js | 14 +- fixtures/packaging/webpack/prod/input.js | 2 +- fixtures/ssr/server/index.js | 15 +- fixtures/ssr/server/render.js | 2 +- fixtures/ssr/src/components/App.js | 2 +- fixtures/ssr/src/components/Chrome.js | 10 +- fixtures/ssr/src/components/Page.js | 12 +- fixtures/ssr/src/index.js | 2 +- scripts/prettier/index.js | 2 +- 59 files changed, 626 insertions(+), 555 deletions(-) diff --git a/fixtures/art/VectorWidget.js b/fixtures/art/VectorWidget.js index da5cde9e4b..9c20ed3de2 100644 --- a/fixtures/art/VectorWidget.js +++ b/fixtures/art/VectorWidget.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. */ -"use strict"; +'use strict'; var React = require('react'); var ReactART = require('react-art'); @@ -72,10 +72,7 @@ class VectorWidget extends React.Component { */ render() { return ( - + {this.renderGraphic(this.state.degrees)} ); @@ -84,12 +81,9 @@ class VectorWidget extends React.Component { /** * Better SVG support for React coming soon. */ - renderGraphic = (rotation) => { - + renderGraphic = rotation => { return ( - + @@ -102,8 +96,18 @@ class VectorWidget extends React.Component { - - + + @@ -113,18 +117,33 @@ class VectorWidget extends React.Component { }; } -var BORDER_PATH = "M3.00191459,4 C1.34400294,4 0,5.34785514 0,7.00550479 L0,220.994495 C0,222.65439 1.34239483,224 3.00191459,224 L276.998085,224 C278.655997,224 280,222.652145 280,220.994495 L280,7.00550479 C280,5.34561033 278.657605,4 276.998085,4 L3.00191459,4 Z M3.00191459,4"; -var BG_PATH = "M3.00191459,1 C1.34400294,1 0,2.34785514 0,4.00550479 L0,217.994495 C0,219.65439 1.34239483,221 3.00191459,221 L276.998085,221 C278.655997,221 280,219.652145 280,217.994495 L280,4.00550479 C280,2.34561033 278.657605,1 276.998085,1 L3.00191459,1 Z M3.00191459,1"; -var BAR_PATH = "M3.00191459,0 C1.34400294,0 0,1.34559019 0,3.00878799 L0,21 C0,21 0,21 0,21 L280,21 C280,21 280,21 280,21 L280,3.00878799 C280,1.34708027 278.657605,0 276.998085,0 L3.00191459,0 Z M3.00191459,0"; -var RED_DOT_PATH = "M12.5,17 C16.0898511,17 19,14.0898511 19,10.5 C19,6.91014895 16.0898511,4 12.5,4 C8.91014895,4 6,6.91014895 6,10.5 C6,14.0898511 8.91014895,17 12.5,17 Z M12.5,17"; -var YELLOW_DOT_PATH = "M31.5,17 C35.0898511,17 38,14.0898511 38,10.5 C38,6.91014895 35.0898511,4 31.5,4 C27.9101489,4 25,6.91014895 25,10.5 C25,14.0898511 27.9101489,17 31.5,17 Z M31.5,17"; -var GREEN_DOT_PATH = "M50.5,17 C54.0898511,17 57,14.0898511 57,10.5 C57,6.91014895 54.0898511,4 50.5,4 C46.9101489,4 44,6.91014895 44,10.5 C44,14.0898511 46.9101489,17 50.5,17 Z M50.5,17"; -var CENTER_DOT_PATH = "M84,105 C92.8365564,105 100,97.8365564 100,89 C100,80.1634436 92.8365564,73 84,73 C75.1634436,73 68,80.1634436 68,89 C68,97.8365564 75.1634436,105 84,105 Z M84,105"; -var RING_ONE_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121"; -var RING_TWO_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121"; -var RING_THREE_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121"; -var RING_TWO_ROTATE = new Transform().translate(84.000000, 89.000000).rotate(-240.000000).translate(-84.000000, -89.000000); -var RING_THREE_ROTATE = new Transform().translate(84.000000, 89.000000).rotate(-300.000000).translate(-84.000000, -89.000000); +var BORDER_PATH = + 'M3.00191459,4 C1.34400294,4 0,5.34785514 0,7.00550479 L0,220.994495 C0,222.65439 1.34239483,224 3.00191459,224 L276.998085,224 C278.655997,224 280,222.652145 280,220.994495 L280,7.00550479 C280,5.34561033 278.657605,4 276.998085,4 L3.00191459,4 Z M3.00191459,4'; +var BG_PATH = + 'M3.00191459,1 C1.34400294,1 0,2.34785514 0,4.00550479 L0,217.994495 C0,219.65439 1.34239483,221 3.00191459,221 L276.998085,221 C278.655997,221 280,219.652145 280,217.994495 L280,4.00550479 C280,2.34561033 278.657605,1 276.998085,1 L3.00191459,1 Z M3.00191459,1'; +var BAR_PATH = + 'M3.00191459,0 C1.34400294,0 0,1.34559019 0,3.00878799 L0,21 C0,21 0,21 0,21 L280,21 C280,21 280,21 280,21 L280,3.00878799 C280,1.34708027 278.657605,0 276.998085,0 L3.00191459,0 Z M3.00191459,0'; +var RED_DOT_PATH = + 'M12.5,17 C16.0898511,17 19,14.0898511 19,10.5 C19,6.91014895 16.0898511,4 12.5,4 C8.91014895,4 6,6.91014895 6,10.5 C6,14.0898511 8.91014895,17 12.5,17 Z M12.5,17'; +var YELLOW_DOT_PATH = + 'M31.5,17 C35.0898511,17 38,14.0898511 38,10.5 C38,6.91014895 35.0898511,4 31.5,4 C27.9101489,4 25,6.91014895 25,10.5 C25,14.0898511 27.9101489,17 31.5,17 Z M31.5,17'; +var GREEN_DOT_PATH = + 'M50.5,17 C54.0898511,17 57,14.0898511 57,10.5 C57,6.91014895 54.0898511,4 50.5,4 C46.9101489,4 44,6.91014895 44,10.5 C44,14.0898511 46.9101489,17 50.5,17 Z M50.5,17'; +var CENTER_DOT_PATH = + 'M84,105 C92.8365564,105 100,97.8365564 100,89 C100,80.1634436 92.8365564,73 84,73 C75.1634436,73 68,80.1634436 68,89 C68,97.8365564 75.1634436,105 84,105 Z M84,105'; +var RING_ONE_PATH = + 'M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121'; +var RING_TWO_PATH = + 'M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121'; +var RING_THREE_PATH = + 'M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121'; +var RING_TWO_ROTATE = new Transform() + .translate(84.000000, 89.000000) + .rotate(-240.000000) + .translate(-84.000000, -89.000000); +var RING_THREE_ROTATE = new Transform() + .translate(84.000000, 89.000000) + .rotate(-300.000000) + .translate(-84.000000, -89.000000); module.exports = VectorWidget; - diff --git a/fixtures/art/app.js b/fixtures/art/app.js index 5c981fabd0..d3c5d469b3 100644 --- a/fixtures/art/app.js +++ b/fixtures/art/app.js @@ -1,4 +1,4 @@ -"use strict"; +'use strict'; var React = require('react'); var ReactDOM = require('react-dom'); diff --git a/fixtures/art/webpack.config.js b/fixtures/art/webpack.config.js index 3582a5bc11..3705805488 100644 --- a/fixtures/art/webpack.config.js +++ b/fixtures/art/webpack.config.js @@ -16,19 +16,19 @@ module.exports = { require.resolve('babel-preset-react'), ], }, - } - ] + }, + ], }, plugins: [ new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('development'), }, - }) + }), ], resolve: { alias: { - react: require.resolve('react') - } - } + react: require.resolve('react'), + }, + }, }; diff --git a/fixtures/dom/public/react-loader.js b/fixtures/dom/public/react-loader.js index af8fe8874e..945905e388 100644 --- a/fixtures/dom/public/react-loader.js +++ b/fixtures/dom/public/react-loader.js @@ -29,7 +29,8 @@ var version = query.version || 'local'; if (version !== 'local') { REACT_PATH = 'https://unpkg.com/react@' + version + '/dist/react.min.js'; - DOM_PATH = 'https://unpkg.com/react-dom@' + version + '/dist/react-dom.min.js'; + DOM_PATH = + 'https://unpkg.com/react-dom@' + version + '/dist/react-dom.min.js'; } document.write(''); diff --git a/fixtures/dom/src/components/App.js b/fixtures/dom/src/components/App.js index a22b1d918c..a0c076115a 100644 --- a/fixtures/dom/src/components/App.js +++ b/fixtures/dom/src/components/App.js @@ -4,11 +4,11 @@ import Fixtures from './fixtures'; import '../style.css'; -function App () { +function App() { return (
-
+
diff --git a/fixtures/dom/src/components/Fixture.js b/fixtures/dom/src/components/Fixture.js index 6074fa7d44..378f07c36c 100644 --- a/fixtures/dom/src/components/Fixture.js +++ b/fixtures/dom/src/components/Fixture.js @@ -7,7 +7,7 @@ const propTypes = { class Fixture extends React.Component { render() { - const { children } = this.props; + const {children} = this.props; return (
@@ -19,4 +19,4 @@ class Fixture extends React.Component { Fixture.propTypes = propTypes; -export default Fixture +export default Fixture; diff --git a/fixtures/dom/src/components/FixtureSet.js b/fixtures/dom/src/components/FixtureSet.js index ff98b2884c..00949b22c6 100644 --- a/fixtures/dom/src/components/FixtureSet.js +++ b/fixtures/dom/src/components/FixtureSet.js @@ -7,16 +7,13 @@ const propTypes = { }; class FixtureSet extends React.Component { - render() { - const { title, description, children } = this.props; + const {title, description, children} = this.props; return (

{title}

- {description && ( -

{description}

- )} + {description &&

{description}

} {children}
@@ -26,4 +23,4 @@ class FixtureSet extends React.Component { FixtureSet.propTypes = propTypes; -export default FixtureSet +export default FixtureSet; diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js index 6d1b32599f..9a4a0a932d 100644 --- a/fixtures/dom/src/components/Header.js +++ b/fixtures/dom/src/components/Header.js @@ -1,4 +1,4 @@ -import { parse, stringify } from 'query-string'; +import {parse, stringify} from 'query-string'; import getVersionTags from '../tags'; const React = window.React; @@ -8,15 +8,14 @@ class Header extends React.Component { const query = parse(window.location.search); const version = query.version || 'local'; const versions = [version]; - this.state = { version, versions }; + this.state = {version, versions}; } componentWillMount() { - getVersionTags() - .then(tags => { - let versions = tags.map(tag => tag.name.slice(1)); - versions = [`local`, ...versions]; - this.setState({ versions }); - }) + getVersionTags().then(tags => { + let versions = tags.map(tag => tag.name.slice(1)); + versions = [`local`, ...versions]; + this.setState({versions}); + }); } handleVersionChange(event) { const query = parse(window.location.search); @@ -31,41 +30,50 @@ class Header extends React.Component { } render() { return ( -
-
- - - React Sandbox (v{React.version}) - +
+
+ + + React Sandbox (v{React.version}) + -
- - + + + +
-
-
+
); } } diff --git a/fixtures/dom/src/components/TestCase.js b/fixtures/dom/src/components/TestCase.js index 053eac9467..84fa28c954 100644 --- a/fixtures/dom/src/components/TestCase.js +++ b/fixtures/dom/src/components/TestCase.js @@ -2,14 +2,14 @@ import cn from 'classnames'; import semver from 'semver'; import React from 'react'; import PropTypes from 'prop-types'; -import { parse } from 'query-string'; -import { semverString } from './propTypes'; +import {parse} from 'query-string'; +import {semverString} from './propTypes'; const propTypes = { children: PropTypes.node.isRequired, title: PropTypes.node.isRequired, resolvedIn: semverString, - resolvedBy: PropTypes.string + resolvedBy: PropTypes.string, }; class TestCase extends React.Component { @@ -21,10 +21,10 @@ class TestCase extends React.Component { }; } - handleChange = (e) => { + handleChange = e => { this.setState({ - complete: e.target.checked - }) + complete: e.target.checked, + }); }; render() { @@ -37,24 +37,16 @@ class TestCase extends React.Component { children, } = this.props; - let { complete } = this.state; + let {complete} = this.state; - const { version } = parse(window.location.search); - const isTestRelevant = ( - !version || - !resolvedIn || - semver.gte(version, resolvedIn) - ); + const {version} = parse(window.location.search); + const isTestRelevant = + !version || !resolvedIn || semver.gte(version, resolvedIn); complete = !isTestRelevant || complete; return ( -
+