Revert "Run Prettier on All The Things"

picandocodigo · Feb 1, 2018 · c8e2c67 · c8e2c67
1 parent bf14e59
commit c8e2c67
Show file tree

Hide file tree

Showing 84 changed files with 1,231 additions and 1,808 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -71,7 +71,10 @@ rules:
   ###########
   prettier/prettier:
     - error
-    - parser: typescript
+    - singleQuote: true
+      trailingComma: es5
+      semi: false
+      parser: typescript
   no-restricted-syntax:
     - error
     # no-default-export

diff --git a/.prettierignore b/.prettierignore
@@ -1,15 +1,2 @@
-out/
-dist/
-node_modules/
-npm-debug.log
-yarn-error.log
-app/node_modules/
-.DS_Store
-.awcache
-.idea/
-.eslintcache
-
-app/static/common
-app/test/fixtures
-gemoji
 *.json
+*.md
diff --git a/.prettierrc.yml b/.prettierrc.yml
diff --git a/.travis.yml b/.travis.yml
@@ -57,7 +57,10 @@ install:
   - yarn install --force
 
 script:
-  - yarn lint && yarn build:prod && yarn test:setup && yarn test
+  - yarn lint
+  - yarn build:prod
+  - yarn test:setup
+  - yarn test
 
 after_failure:
   - yarn test:review
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -5,9 +5,9 @@
 In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of
-experience, nationality, personal appearance, race, religion, or sexual identity
-and orientation.
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
 
 ## Our Standards
 
@@ -23,7 +23,7 @@ include:
 Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
+advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
@@ -37,11 +37,11 @@ Project maintainers are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
 response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, or to ban temporarily or permanently any
-contributor for other behaviors that they deem inappropriate, threatening,
-offensive, or harmful.
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
 
 ## Scope
 
@@ -55,20 +55,20 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All complaints
-will be reviewed and investigated and will result in a response that is deemed
-necessary and appropriate to the circumstances. The project team is obligated to
-maintain confidentiality with regard to the reporter of an incident. Further
-details of specific enforcement policies may be posted separately.
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
 members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
 [version]: http://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/README.md b/README.md
@@ -16,19 +16,16 @@ uses [React](https://facebook.github.io/react/).
 
 Download the official installer for your operating system:
 
-* [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin)
-* [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32)
-* [Windows machine-wide install](https://central.github.com/deployments/desktop/desktop/latest/win32?format=msi)
+ - [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin)
+ - [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32)
+ - [Windows machine-wide install](https://central.github.com/deployments/desktop/desktop/latest/win32?format=msi)
 
-There are several community-supported package managers that can be used to
-install Github Desktop.
-
-* Windows users can install using [Chocolatey](https://chocolatey.org/) package
-  manager: `c:\> choco install github-desktop`
-* macOS users can install using [Homebrew](https://brew.sh/) package manager:
-  `$ brew cask install github`
-* Arch Linux users can install the latest version from the
-  [AUR](https://aur.archlinux.org/packages/github-desktop/).
+There are several community-supported package managers that can be used to install Github Desktop.
+ - Windows users can install using [Chocolatey](https://chocolatey.org/) package manager:
+      `c:\> choco install github-desktop`
+ - macOS users can install using [Homebrew](https://brew.sh/) package manager:
+      `$ brew cask install github`
+ - Arch Linux users can install the latest version from the [AUR](https://aur.archlinux.org/packages/github-desktop/).
 
 You can install this alongside your existing GitHub Desktop for Mac or GitHub
 Desktop for Windows application.
@@ -42,29 +39,26 @@ from disk onto the application to get started.
 Want to test out new features and get fixes before everyone else? Install the
 beta channel to get access to early builds of Desktop:
 
-* [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin?env=beta)
-* [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32?env=beta)
+ - [macOS](https://central.github.com/deployments/desktop/desktop/latest/darwin?env=beta)
+ - [Windows](https://central.github.com/deployments/desktop/desktop/latest/win32?env=beta)
 
 ## I have a problem with GitHub Desktop
 
-First, please search the
-[open issues](https://github.com/desktop/desktop/issues?q=is%3Aopen) and
-[closed issues](https://github.com/desktop/desktop/issues?q=is%3Aclosed) to see
-if your issue hasn't already been reported (it may also be fixed).
+First, please search the [open issues](https://github.com/desktop/desktop/issues?q=is%3Aopen)
+and [closed issues](https://github.com/desktop/desktop/issues?q=is%3Aclosed)
+to see if your issue hasn't already been reported (it may also be fixed).
 
-If you can't find an issue that matches what you're seeing, open a
-[new issue](https://github.com/desktop/desktop/issues/new) and fill out the
-template to provide us with enough information to investigate further.
+If you can't find an issue that matches what you're seeing, open a [new issue](https://github.com/desktop/desktop/issues/new)
+and fill out the template to provide us with enough information to investigate
+further.
 
 ## How can I contribute to GitHub Desktop?
 
 The [CONTRIBUTING.md](./CONTRIBUTING.md) document will help you get setup and
 familiar with the source. The [documentation](docs/) folder also contains more
 resources relevant to the project.
 
-If you're looking for something to work on, check out the
-[help wanted](https://github.com/desktop/desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22help%20wanted%22)
-label.
+If you're looking for something to work on, check out the [help wanted](https://github.com/desktop/desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22help%20wanted%22) label.
 
 ## More Resources
 
@@ -76,10 +70,10 @@ information about GitHub Desktop.
 **[MIT](LICENSE)**
 
 The MIT license grant is not for GitHub's trademarks, which include the logo
-designs. GitHub reserves all trademark and copyright rights in and to all GitHub
-trademarks. GitHub's logos include, for instance, the stylized Invertocat
-designs that include "logo" in the file title in the following folder:
-[logos](app/static/logos).
+designs. GitHub reserves all trademark and copyright rights in and to all
+GitHub trademarks. GitHub's logos include, for instance, the stylized
+Invertocat designs that include "logo" in the file title in the following
+folder: [logos](app/static/logos).
 
 GitHub® and its stylized versions and the Invertocat mark are GitHub's
 Trademarks or registered Trademarks. When using GitHub's logos, be sure to

diff --git a/app/src/crash/styles/crash.scss b/app/src/crash/styles/crash.scss
@@ -5,8 +5,7 @@
 @import '../../../styles/ui/button';
 @import '../../../styles/ui/scroll';
 
-#desktop-crash-container,
-#crash-app {
+#desktop-crash-container, #crash-app {
   height: 100%;
 }
 
@@ -36,6 +35,7 @@ pre.error {
 }
 
 header {
+
   margin-bottom: var(--spacing-double);
   display: flex;
   flex: none;

diff --git a/app/styles/_globals.scss b/app/styles/_globals.scss
@@ -29,8 +29,7 @@ html {
 
 // We never want the window to be scrollable, everything has to fit
 // or be placed into a scrollable container.
-html,
-body {
+html, body {
   height: 100%;
   width: 100%;
   margin: 0;
@@ -59,9 +58,7 @@ body {
 }
 
 :not(input):not(textarea) {
-  &,
-  &::after,
-  &::before {
+  &, &::after, &::before {
     -webkit-user-select: none;
     user-select: none;
     cursor: default;
@@ -84,14 +81,9 @@ img {
 // margin for easier control within type scales as it avoids margin collapsing.
 //
 // From: https://github.com/twbs/bootstrap/blob/a0f10e6dcb9aef2d8e36e57f3c8b1b06034a8877/scss/_reboot.scss
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
+h1, h2, h3, h4, h5, h6 {
   margin-top: 0;
-  margin-bottom: 0.5rem;
+  margin-bottom: .5rem;
 }
 
 // Regardless of platform behavior we never want buttons to be

diff --git a/app/styles/_mixins.scss b/app/styles/_mixins.scss
@@ -1,5 +1,5 @@
-@import 'mixins/platform';
-@import 'mixins/ellipsis';
-@import 'mixins/octicon-status';
-@import 'mixins/textboxish';
-@import 'mixins/checkboard-background';
+@import "mixins/platform";
+@import "mixins/ellipsis";
+@import "mixins/octicon-status";
+@import "mixins/textboxish";
+@import "mixins/checkboard-background";
diff --git a/app/styles/_ui.scss b/app/styles/_ui.scss
@@ -1,61 +1,61 @@
-@import 'ui/app';
-@import 'ui/app-menu';
-@import 'ui/scroll';
-@import 'ui/window/title-bar';
-@import 'ui/window/app-menu-bar';
-@import 'ui/window/focus';
-@import 'ui/window/zoom-info';
-@import 'ui/window/toast-notification';
-@import 'ui/file-list';
-@import 'ui/octicons';
-@import 'ui/list';
-@import 'ui/repository-list';
-@import 'ui/changes';
-@import 'ui/cloning-repository-view';
-@import 'ui/diff';
-@import 'ui/history';
-@import 'ui/repository';
-@import 'ui/resizable';
-@import 'ui/toolbar/toolbar';
-@import 'ui/toolbar/button';
-@import 'ui/toolbar/dropdown';
-@import 'ui/tab-bar';
-@import 'ui/panel';
-@import 'ui/popup';
-@import 'ui/progress';
-@import 'ui/branches';
-@import 'ui/emoji';
-@import 'ui/ui-view';
-@import 'ui/autocompletion';
-@import 'ui/welcome';
-@import 'ui/foldout';
-@import 'ui/preferences';
-@import 'ui/path-text';
-@import 'ui/configure-git-user';
-@import 'ui/form';
-@import 'ui/text-box';
-@import 'ui/button';
-@import 'ui/select';
-@import 'ui/row';
-@import 'ui/text-area';
-@import 'ui/checkbox';
-@import 'ui/errors';
-@import 'ui/dialog';
-@import 'ui/add-repository';
-@import 'ui/discard-changes';
-@import 'ui/filter-list';
-@import 'ui/missing-repository-view';
-@import 'ui/horizontal-rule';
-@import 'ui/about';
-@import 'ui/avatar';
-@import 'ui/call-to-action';
-@import 'ui/acknowledgements';
-@import 'ui/update-notification';
-@import 'ui/vertical-segmented-control';
-@import 'ui/blank-slate';
-@import 'ui/terms-and-conditions';
-@import 'ui/ref';
-@import 'ui/monospaced';
+@import "ui/app";
+@import "ui/app-menu";
+@import "ui/scroll";
+@import "ui/window/title-bar";
+@import "ui/window/app-menu-bar";
+@import "ui/window/focus";
+@import "ui/window/zoom-info";
+@import "ui/window/toast-notification";
+@import "ui/file-list";
+@import "ui/octicons";
+@import "ui/list";
+@import "ui/repository-list";
+@import "ui/changes";
+@import "ui/cloning-repository-view";
+@import "ui/diff";
+@import "ui/history";
+@import "ui/repository";
+@import "ui/resizable";
+@import "ui/toolbar/toolbar";
+@import "ui/toolbar/button";
+@import "ui/toolbar/dropdown";
+@import "ui/tab-bar";
+@import "ui/panel";
+@import "ui/popup";
+@import "ui/progress";
+@import "ui/branches";
+@import "ui/emoji";
+@import "ui/ui-view";
+@import "ui/autocompletion";
+@import "ui/welcome";
+@import "ui/foldout";
+@import "ui/preferences";
+@import "ui/path-text";
+@import "ui/configure-git-user";
+@import "ui/form";
+@import "ui/text-box";
+@import "ui/button";
+@import "ui/select";
+@import "ui/row";
+@import "ui/text-area";
+@import "ui/checkbox";
+@import "ui/errors";
+@import "ui/dialog";
+@import "ui/add-repository";
+@import "ui/discard-changes";
+@import "ui/filter-list";
+@import "ui/missing-repository-view";
+@import "ui/horizontal-rule";
+@import "ui/about";
+@import "ui/avatar";
+@import "ui/call-to-action";
+@import "ui/acknowledgements";
+@import "ui/update-notification";
+@import "ui/vertical-segmented-control";
+@import "ui/blank-slate";
+@import "ui/terms-and-conditions";
+@import "ui/ref";
+@import "ui/monospaced";
 @import 'ui/initialize-lfs';
 @import 'ui/ci-status';
 @import 'ui/pull-request-badge';

diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
@@ -36,11 +36,8 @@
   // Typography
   //
   // Font, line-height, and color for body text, headings, and more.
-  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
-    'Helvetica Neue', Arial, sans-serif;
-  --font-family-monospace: Menlo, Monaco, Consolas, 'Liberation Mono',
-    'Courier New', monospace;
+  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
+  --font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 
   /**
    * Font weight to use for semibold text