Skip to content
This repository has been archived by the owner on May 19, 2020. It is now read-only.

Commit

Permalink
Update eslint so that prettier config can be used
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathaningram committed Dec 19, 2017
1 parent 505d7f6 commit 4702ef3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Ignore all skins except the `cg` skin.
# This is required if other skins are symlinked into the skins directory but
# should not be linted.
static_src/skins/*
!static_src/skins/cg

static_src/tests.bundle.js
test/**/*.js
static_src/test/server/fixtures/
Expand Down
5 changes: 2 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "airbnb",
"extends": ["airbnb", "prettier"],
"parserOptions": {
"ecmaVersion": 6,
"ecmaFeatures": {
Expand All @@ -14,7 +14,6 @@
"rules": {
"comma-dangle": [2, "never"],
"react/no-deprecated": 0,
"react/prefer-stateless-function": 0,
"space-before-function-paren": [1, "never"]
"react/prefer-stateless-function": 0
}
}
3 changes: 0 additions & 3 deletions .prettierrc.json

This file was deleted.

0 comments on commit 4702ef3

Please sign in to comment.