From 7a664ca3e845c840fa299fa1ee1ee0e787593038 Mon Sep 17 00:00:00 2001 From: Paul Melnikow Date: Wed, 8 Aug 2018 17:57:14 -0400 Subject: [PATCH] Run prettier (#1866) Merging this separately so the commit with the tooling change is readable. This is a follow-on to #1167 which turned prettier on. --- frontend/components/badge-examples.js | 139 +-- frontend/components/dynamic-badge-maker.js | 68 +- frontend/components/examples-page.js | 82 +- frontend/components/footer.js | 56 +- frontend/components/header.js | 14 +- frontend/components/markup-modal.js | 108 ++- frontend/components/meta.js | 13 +- frontend/components/search-results.js | 48 +- frontend/components/static-badge-maker.js | 44 +- frontend/components/suggestion-and-search.js | 102 +- frontend/components/usage.js | 143 ++- frontend/constants.js | 11 +- frontend/lib/badge-url.js | 41 +- frontend/lib/badge-url.spec.js | 83 +- frontend/lib/generate-image-markup.js | 59 +- frontend/lib/prepare-examples.js | 51 +- frontend/lib/prepare-examples.spec.js | 18 +- frontend/lib/resolve-url.js | 14 +- frontend/lib/resolve-url.spec.js | 14 +- lib/all-badge-examples.js | 36 +- lib/all-badge-examples.spec.js | 23 +- lib/analytics.js | 128 +-- lib/badge-cli.js | 101 +- lib/badge-cli.spec.js | 66 +- lib/badge-data.js | 125 +-- lib/badge-data.spec.js | 112 ++- lib/color-formatters.js | 74 +- lib/color-formatters.spec.js | 140 +-- lib/defaults.js | 6 +- lib/deprecated-services.js | 22 +- lib/deprecation-helpers.js | 32 +- lib/deprecation-helpers.spec.js | 60 +- lib/error-helper.js | 60 +- lib/error-helper.spec.js | 128 +-- lib/export-badge-examples-cli.js | 6 +- lib/export-supported-features-cli.js | 10 +- lib/github-auth.js | 324 ++++--- lib/github-auth/is-valid-token.js | 6 +- lib/github-helpers.js | 38 +- lib/github-helpers.spec.js | 20 +- lib/github-provider.js | 144 ++- lib/in-process-server-test-helpers.js | 38 +- lib/licenses.js | 69 +- lib/licenses.spec.js | 20 +- lib/load-logos.js | 36 +- lib/load-simple-icons.js | 26 +- lib/log.js | 61 +- lib/log.spec.js | 103 +- lib/logo-helper.js | 14 +- lib/logo-helper.spec.js | 36 +- lib/lru-cache.js | 122 +-- lib/lru-cache.spec.js | 196 ++-- lib/luarocks-version.js | 44 +- lib/luarocks-version.spec.js | 39 +- lib/make-badge-test-helpers.js | 23 +- lib/make-badge.js | 217 +++-- lib/make-badge.spec.js | 241 +++-- lib/nexus-version.js | 10 +- lib/nodeify-sync.js | 12 +- lib/nodeify-sync.spec.js | 44 +- lib/nuget-provider.js | 500 +++++----- lib/path-helpers.js | 32 +- lib/php-version.js | 195 ++-- lib/php-version.spec.js | 110 ++- lib/pypi-helpers.js | 52 +- lib/pypi-helpers.spec.js | 134 +-- lib/register-chai-plugins.spec.js | 8 +- lib/regular-update.js | 71 +- lib/request-handler.js | 273 +++--- lib/request-handler.spec.js | 321 ++++--- lib/result-sender.js | 45 +- lib/server-config.js | 34 +- lib/server-secrets.js | 20 +- lib/service-test-runner/cli.js | 68 +- lib/service-test-runner/infer-pull-request.js | 58 +- .../infer-pull-request.spec.js | 31 +- .../pull-request-services-cli.js | 46 +- lib/service-test-runner/runner.js | 46 +- lib/service-test-runner/services-for-title.js | 22 +- .../services-for-title.spec.js | 24 +- lib/suggest.js | 147 +-- lib/svg-badge-parser.js | 28 +- lib/svg-badge-parser.spec.js | 24 +- lib/svg-to-img.js | 42 +- lib/svg-to-img.spec.js | 50 +- lib/sys/monitor.js | 86 +- lib/sys/rate-limit.js | 54 +- lib/sys/secret-is-valid.js | 18 +- lib/teamcity-badge-helpers.js | 57 +- lib/test-config.js | 6 +- lib/text-formatters.js | 101 +- lib/text-formatters.spec.js | 128 +-- lib/text-measurer.js | 81 +- lib/text-measurer.spec.js | 218 +++-- lib/token-pool.js | 173 ++-- lib/token-pool.spec.js | 180 ++-- lib/token-provider.js | 61 +- lib/token-provider.spec.js | 26 +- lib/unhandled-rejection.spec.js | 6 +- lib/version.js | 126 +-- lib/version.spec.js | 139 ++- lib/vscode-badge-helpers.js | 44 +- pages/index.js | 17 +- services/amo/amo.tester.js | 60 +- services/ansible/ansible.tester.js | 37 +- services/apm/apm.service.js | 101 +- services/apm/apm.tester.js | 66 +- services/appveyor/appveyor.service.js | 34 +- services/appveyor/appveyor.tester.js | 37 +- services/aur/aur.tester.js | 118 +-- services/base-json.spec.js | 42 +- services/base.js | 182 ++-- services/base.spec.js | 255 ++--- services/bitbucket/bitbucket.tester.js | 189 ++-- services/bithound/bithound.tester.js | 20 +- services/bitrise/bitrise.tester.js | 56 +- services/bountysource/bountysource.tester.js | 51 +- services/bower/bower.tester.js | 78 +- services/bugzilla/bugzilla.tester.js | 28 +- services/buildkite/buildkite.tester.js | 55 +- services/bundlephobia/bundlephobia.tester.js | 10 +- services/cauditor/cauditor.tester.js | 10 +- services/cdnjs/cdnjs.service.js | 45 +- services/cdnjs/cdnjs.tester.js | 36 +- services/chocolatey/chocolatey.tester.js | 176 ++-- .../chrome-web-store.tester.js | 57 +- services/circleci/circleci.tester.js | 89 +- services/clojars/clojars.service.js | 39 +- services/clojars/clojars.tester.js | 34 +- services/cocoapods/cocoapods.tester.js | 207 ++-- services/codeclimate/codeclimate.tester.js | 139 +-- services/codecov/codecov.tester.js | 32 +- services/codeship/codeship.tester.js | 61 +- services/codetally/codetally.tester.js | 35 +- services/conda/conda.tester.js | 112 ++- .../continuousphp/continuousphp.tester.js | 36 +- services/coveralls/coveralls.tester.js | 161 ++-- services/cran/cran.tester.js | 50 +- services/crates/crates.tester.js | 12 +- services/david/david.tester.js | 86 +- services/dependabot/dependabot.tester.js | 58 +- services/depfu/depfu.tester.js | 32 +- services/discord/discord.tester.js | 48 +- services/discourse/discourse.tester.js | 132 +-- services/dockbit/dockbit.tester.js | 58 +- services/docker/docker.tester.js | 303 +++--- services/dotnetstatus/dotnetstatus.tester.js | 12 +- services/dub/dub.tester.js | 152 +-- .../eclipse-marketplace.tester.js | 72 +- services/elm-package/elm-package.tester.js | 16 +- services/errors.js | 68 +- services/gem/gem.service.js | 257 +++-- services/gem/gem.tester.js | 134 +-- services/gemnasium/gemnasium.tester.js | 19 +- services/github/auth/admin.js | 18 +- .../github/github-api-provider.integration.js | 38 +- services/github/github-api-provider.js | 22 +- services/github/github-api-provider.spec.js | 84 +- services/github/github.tester.js | 907 +++++++++++------- services/gratipay/gratipay.tester.js | 10 +- services/hackage/hackage.tester.js | 50 +- services/hexpm/hexpm.tester.js | 43 +- services/hhvm/hhvm.tester.js | 59 +- services/homebrew/homebrew.tester.js | 47 +- services/index.js | 24 +- services/itunes/itunes.tester.js | 41 +- services/jenkins/jenkins.tester.js | 133 ++- services/jetbrains/jetbrains.tester.js | 205 ++-- services/jitpack/jitpack.tester.js | 20 +- services/json/json.tester.js | 175 +++- services/lgtm/lgtm.tester.js | 206 ++-- services/liberapay/liberapay.tester.js | 75 +- services/librariesio/librariesio.tester.js | 50 +- services/libscore/libscore.tester.js | 46 +- services/luarocks/luarocks.tester.js | 26 +- services/magnumci/magnumci.tester.js | 12 +- services/maintenance/maintenance.tester.js | 18 +- .../maven-central/maven-central.tester.js | 44 +- .../maven-metadata/maven-metadata.tester.js | 29 +- services/microbadger/microbadger.tester.js | 107 ++- services/myget/myget.tester.js | 246 ++--- services/nexus/nexus.tester.js | 93 +- services/node/node-version-color.js | 34 +- services/node/node.service.js | 30 +- services/node/node.tester.js | 38 +- services/npm/npm-base.js | 54 +- services/npm/npm-downloads.service.js | 34 +- services/npm/npm-license.service.js | 30 +- services/npm/npm-type-definitions.service.js | 30 +- services/npm/npm-type-definitions.spec.js | 14 +- services/npm/npm-version.service.js | 36 +- services/npm/npm.tester.js | 208 ++-- services/nsp/nsp.tester.js | 21 +- services/nuget-fixtures.js | 69 +- services/nuget/nuget.tester.js | 248 ++--- services/packagist/packagist.tester.js | 91 +- services/php-eye/php-eye.tester.js | 35 +- .../powershellgallery.tester.js | 179 ++-- services/pypi/pypi.tester.js | 153 +-- services/readthedocs/readthedocs.tester.js | 44 +- services/redmine/redmine.tester.js | 91 +- services/requires/requires.tester.js | 50 +- services/resharper/resharper.tester.js | 176 ++-- services/response-fixtures.js | 14 +- services/scrutinizer/scrutinizer.tester.js | 101 +- services/service-tester.js | 52 +- services/shippable/shippable.tester.js | 59 +- services/snap-ci/snap-ci.tester.js | 10 +- services/sonarqube/sonarqube.tester.js | 82 +- services/sourceforge/sourceforge.tester.js | 61 +- services/suggest/suggest.tester.js | 71 +- services/test-validators.js | 92 +- services/time/time.service.js | 18 +- services/travis/travis.tester.js | 108 ++- services/twitter/twitter.tester.js | 48 +- services/uptimerobot/uptimerobot.tester.js | 133 +-- .../vaadin-directory.tester.js | 137 +-- .../vscode-marketplace.tester.js | 99 +- services/waffle/waffle.tester.js | 95 +- services/website/website.tester.js | 46 +- services/wordpress/wordpress.tester.js | 86 +- services/xml/xml.tester.js | 207 ++-- services/yaml/yaml.tester.js | 124 ++- 223 files changed, 10277 insertions(+), 8078 deletions(-) diff --git a/frontend/components/badge-examples.js b/frontend/components/badge-examples.js index e8c9f78a47489..3b7cca205d084 100644 --- a/frontend/components/badge-examples.js +++ b/frontend/components/badge-examples.js @@ -1,8 +1,8 @@ -import React from 'react'; -import { Link } from "react-router-dom"; -import PropTypes from 'prop-types'; -import classNames from 'classnames'; -import resolveBadgeUrl from '../lib/badge-url'; +import React from 'react' +import { Link } from 'react-router-dom' +import PropTypes from 'prop-types' +import classNames from 'classnames' +import resolveBadgeUrl from '../lib/badge-url' const Badge = ({ title, @@ -14,39 +14,49 @@ const Badge = ({ shouldDisplay = () => true, onClick, }) => { - const handleClick = onClick ? - () => onClick({ title, previewUri, exampleUri, documentation }) - : undefined; + const handleClick = onClick + ? () => onClick({ title, previewUri, exampleUri, documentation }) + : undefined - const previewImage = previewUri - ? ( - ) : '\u00a0'; // non-breaking space + src={resolveBadgeUrl(previewUri, baseUri, { longCache })} + alt="" + /> + ) : ( + '\u00a0' + ) // non-breaking space const resolvedExampleUri = resolveBadgeUrl( exampleUri || previewUri, baseUri, - { longCache: false }); + { longCache: false } + ) if (shouldDisplay()) { return ( - - { title }: + + {title}: - { previewImage } + {previewImage} - - { resolvedExampleUri } + + {resolvedExampleUri} - ); + ) } - return null; -}; + return null +} Badge.propTypes = { title: PropTypes.string.isRequired, previewUri: PropTypes.string, @@ -56,75 +66,74 @@ Badge.propTypes = { longCache: PropTypes.bool.isRequired, shouldDisplay: PropTypes.func, onClick: PropTypes.func.isRequired, -}; +} const Category = ({ category, examples, baseUri, longCache, onClick }) => { - if (examples.filter(example => example.shouldDisplay()).length === 0){ - return null; + if (examples.filter(example => example.shouldDisplay()).length === 0) { + return null } return (
-

{ category.name }

+

{category.name}

- { - examples.map(badgeData => ( - - )) - } + {examples.map(badgeData => ( + + ))}
- ); -}; + ) +} Category.propTypes = { category: PropTypes.shape({ id: PropTypes.string.isRequired, name: PropTypes.string.isRequired, }).isRequired, - examples: PropTypes.arrayOf(PropTypes.shape({ - title: PropTypes.string.isRequired, - previewUri: PropTypes.string, - exampleUri: PropTypes.string, - documentation: PropTypes.string, - })).isRequired, + examples: PropTypes.arrayOf( + PropTypes.shape({ + title: PropTypes.string.isRequired, + previewUri: PropTypes.string, + exampleUri: PropTypes.string, + documentation: PropTypes.string, + }) + ).isRequired, baseUri: PropTypes.string, longCache: PropTypes.bool.isRequired, onClick: PropTypes.func.isRequired, -}; +} const BadgeExamples = ({ categories, baseUri, longCache, onClick }) => (
- { - categories.map((categoryData, i) => ( - - )) - } + {categories.map((categoryData, i) => ( + + ))}
-); +) BadgeExamples.propTypes = { - categories: PropTypes.arrayOf(PropTypes.shape({ - category: Category.propTypes.category, - examples: Category.propTypes.examples, - })), + categories: PropTypes.arrayOf( + PropTypes.shape({ + category: Category.propTypes.category, + examples: Category.propTypes.examples, + }) + ), baseUri: PropTypes.string, longCache: PropTypes.bool.isRequired, onClick: PropTypes.func.isRequired, -}; +} -export { - Badge, - BadgeExamples, -}; +export { Badge, BadgeExamples } diff --git a/frontend/components/dynamic-badge-maker.js b/frontend/components/dynamic-badge-maker.js index e6ac8a6bee8cc..a8eb0f1957ac3 100644 --- a/frontend/components/dynamic-badge-maker.js +++ b/frontend/components/dynamic-badge-maker.js @@ -1,11 +1,11 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import { dynamicBadgeUrl } from '../lib/badge-url'; +import React from 'react' +import PropTypes from 'prop-types' +import { dynamicBadgeUrl } from '../lib/badge-url' export default class DynamicBadgeMaker extends React.Component { static propTypes = { baseUri: PropTypes.string, - }; + } state = { datatype: '', @@ -15,22 +15,26 @@ export default class DynamicBadgeMaker extends React.Component { color: '', prefix: '', suffix: '', - }; + } - makeBadgeUri () { - const { datatype, label, url, query, color, prefix, suffix } = this.state; - const { baseUri: baseUrl = document.location.href } = this.props; - return dynamicBadgeUrl(baseUrl, datatype, label, url, query, { color, prefix, suffix }); + makeBadgeUri() { + const { datatype, label, url, query, color, prefix, suffix } = this.state + const { baseUri: baseUrl = document.location.href } = this.props + return dynamicBadgeUrl(baseUrl, datatype, label, url, query, { + color, + prefix, + suffix, + }) } handleSubmit(e) { - e.preventDefault(); - document.location = this.makeBadgeUri(); + e.preventDefault() + document.location = this.makeBadgeUri() } get isValid() { - const { datatype, label, url, query } = this.state; - return datatype && label && url && query; + const { datatype, label, url, query } = this.state + return datatype && label && url && query } render() { @@ -39,44 +43,60 @@ export default class DynamicBadgeMaker extends React.Component { {} + {' '} + {} this.setState({ label: event.target.value })} - placeholder="label" /> {} + placeholder="label" + />{' '} + {} this.setState({ url: event.target.value })} - placeholder="url" /> {} + placeholder="url" + />{' '} + {} this.setState({ query: event.target.value })} - placeholder="query" /> {} + placeholder="query" + />{' '} + {} this.setState({ color: event.target.value })} - placeholder="color" /> {} + placeholder="color" + />{' '} + {} this.setState({ prefix: event.target.value })} - placeholder="prefix" /> {} + placeholder="prefix" + />{' '} + {} this.setState({ suffix: event.target.value })} - placeholder="suffix" /> {} - + placeholder="suffix" + />{' '} + {} + - ); + ) } } diff --git a/frontend/components/examples-page.js b/frontend/components/examples-page.js index 6a41794db2030..f60b512e612f8 100644 --- a/frontend/components/examples-page.js +++ b/frontend/components/examples-page.js @@ -1,27 +1,26 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import Meta from './meta'; -import Header from './header'; -import SuggestionAndSearch from './suggestion-and-search'; -import SearchResults from './search-results'; -import MarkupModal from './markup-modal'; -import Usage from './usage'; -import Footer from './footer'; -import { baseUri, longCache } from '../constants'; +import React from 'react' +import PropTypes from 'prop-types' +import Meta from './meta' +import Header from './header' +import SuggestionAndSearch from './suggestion-and-search' +import SearchResults from './search-results' +import MarkupModal from './markup-modal' +import Usage from './usage' +import Footer from './footer' +import { baseUri, longCache } from '../constants' export default class ExamplesPage extends React.Component { - constructor(props) { - super(props); + super(props) this.state = { category: props.match.params.id, query: null, example: null, searchReady: true, - }; - this.searchTimeout = 0; - this.renderSearchResults = this.renderSearchResults.bind(this); - this.searchQueryChanged = this.searchQueryChanged.bind(this); + } + this.searchTimeout = 0 + this.renderSearchResults = this.renderSearchResults.bind(this) + this.searchQueryChanged = this.searchQueryChanged.bind(this) } static propTypes = { @@ -29,7 +28,7 @@ export default class ExamplesPage extends React.Component { } searchQueryChanged(query) { - this.setState({searchReady: false}); + this.setState({ searchReady: false }) /* Add a small delay before showing search results so that we wait until the user has stipped typing @@ -40,29 +39,32 @@ export default class ExamplesPage extends React.Component { b) stops the page from 'flashing' as the user types, like this: https://user-images.githubusercontent.com/7288322/42600206-9b278470-85b5-11e8-9f63-eb4a0c31cb4a.gif */ - window.clearTimeout(this.searchTimeout); + window.clearTimeout(this.searchTimeout) this.searchTimeout = window.setTimeout(() => { this.setState({ searchReady: true, - query: query - }); - }, 500); + query: query, + }) + }, 500) } renderSearchResults() { if (this.state.searchReady) { - if ((this.state.query != null) && (this.state.query.length === 1)) { - return (
Search term must have 2 or more characters
); + if (this.state.query != null && this.state.query.length === 1) { + return
Search term must have 2 or more characters
} else { return ( { this.setState({ example }); }} /> - ); + clickHandler={example => { + this.setState({ example }) + }} + /> + ) } } else { - return (
searching...
); + return
searching...
} } @@ -73,32 +75,34 @@ export default class ExamplesPage extends React.Component {
{ this.setState({ example: null }); }} - baseUri={baseUri} /> + onRequestClose={() => { + this.setState({ example: null }) + }} + baseUri={baseUri} + />
{ this.setState({ example }); }} + onBadgeClick={example => { + this.setState({ example }) + }} baseUri={baseUri} - longCache={longCache} /> - + longCache={longCache} + /> + donate
- { this.renderSearchResults() } - + {this.renderSearchResults()} +