Skip to content

Commit 94717b8

Browse files
author
Robert Jackson
committed
Add prettier setup to eslint config.
1 parent 6fe91cb commit 94717b8

File tree

4 files changed

+44
-7
lines changed

4 files changed

+44
-7
lines changed

.eslintrc.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@ module.exports = {
33
plugins: ['node'],
44
extends: [
55
'eslint:recommended',
6-
'plugin:node/recommended'
6+
'plugin:node/recommended',
7+
'plugin:prettier/recommended',
78
],
89
parserOptions: {
910
sourceType: 'script',
10-
ecmaVersion: 2017
11+
ecmaVersion: 2017,
1112
},
1213
env: {
1314
browser: false,
14-
node: true
15+
node: true,
1516
},
1617
overrides: [
1718
// test files
1819
{
1920
files: ['tests/**/*.js'],
2021
env: {
21-
qunit: true
22-
}
23-
}
24-
]
22+
qunit: true,
23+
},
24+
},
25+
],
2526
};

.prettierrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"singleQuote": true
3+
}

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
"ember-cli": "~3.20.0",
3838
"ember-cli-dependency-checker": "^3.2.0",
3939
"eslint": "^7.7.0",
40+
"eslint-config-prettier": "^6.11.0",
4041
"eslint-plugin-node": "^11.1.0",
42+
"eslint-plugin-prettier": "^3.1.4",
4143
"execa": "^4.0.3",
4244
"prettier": "^2.1.1",
4345
"qunit": "^2.11.1",

yarn.lock

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2587,6 +2587,13 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
25872587
version "1.0.5"
25882588
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
25892589

2590+
eslint-config-prettier@^6.11.0:
2591+
version "6.11.0"
2592+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
2593+
integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==
2594+
dependencies:
2595+
get-stdin "^6.0.0"
2596+
25902597
eslint-plugin-es@^3.0.0:
25912598
version "3.0.0"
25922599
resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz#98cb1bc8ab0aa807977855e11ad9d1c9422d014b"
@@ -2607,6 +2614,13 @@ eslint-plugin-node@^11.1.0:
26072614
resolve "^1.10.1"
26082615
semver "^6.1.0"
26092616

2617+
eslint-plugin-prettier@^3.1.4:
2618+
version "3.1.4"
2619+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
2620+
integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==
2621+
dependencies:
2622+
prettier-linter-helpers "^1.0.0"
2623+
26102624
eslint-scope@^5.1.0:
26112625
version "5.1.0"
26122626
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
@@ -2902,6 +2916,11 @@ fast-deep-equal@^2.0.1:
29022916
version "2.0.1"
29032917
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
29042918

2919+
fast-diff@^1.1.2:
2920+
version "1.2.0"
2921+
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
2922+
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
2923+
29052924
fast-glob@^3.0.3:
29062925
version "3.0.4"
29072926
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.0.4.tgz#d484a41005cb6faeb399b951fd1bd70ddaebb602"
@@ -3365,6 +3384,11 @@ get-stdin@^4.0.1:
33653384
version "4.0.1"
33663385
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
33673386

3387+
get-stdin@^6.0.0:
3388+
version "6.0.0"
3389+
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
3390+
integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
3391+
33683392
[email protected], get-stream@^3.0.0:
33693393
version "3.0.0"
33703394
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -5892,6 +5916,13 @@ prepend-http@^2.0.0:
58925916
version "2.0.0"
58935917
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
58945918

5919+
prettier-linter-helpers@^1.0.0:
5920+
version "1.0.0"
5921+
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
5922+
integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
5923+
dependencies:
5924+
fast-diff "^1.1.2"
5925+
58955926
prettier@^2.1.1:
58965927
version "2.1.1"
58975928
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"

0 commit comments

Comments
 (0)