Skip to content

Commit 15a7c71

Browse files
committed
Installed Prettier based on what we would see in a new Ember 3.24 app
1 parent 36e61e9 commit 15a7c71

File tree

5 files changed

+61
-1
lines changed

5 files changed

+61
-1
lines changed

.eslintrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ module.exports = {
1515
],
1616
extends: [
1717
'eslint:recommended',
18-
'plugin:ember/recommended'
18+
'plugin:ember/recommended',
19+
'plugin:prettier/recommended'
1920
],
2021
env: {
2122
browser: true
@@ -45,6 +46,7 @@ module.exports = {
4546
{
4647
files: [
4748
'.eslintrc.js',
49+
'.prettierrc.js',
4850
'.template-lintrc.js',
4951
'ember-cli-build.js',
5052
'testem.js',

.prettierignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.prettierrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,17 @@
6565
"ember-tether": "^2.0.0",
6666
"ember-truth-helpers": "^3.0.0",
6767
"eslint": "^7.11.0",
68+
"eslint-config-prettier": "^7.1.0",
6869
"eslint-plugin-ember": "^10.1.1",
6970
"eslint-plugin-node": "^11.1.0",
71+
"eslint-plugin-prettier": "^3.3.1",
7072
"highcharts": "^7.1.2",
7173
"leaflet": "^1.5.1",
7274
"loader.js": "^4.7.0",
7375
"luxon": "^1.21.3",
7476
"npm-run-all": "^4.1.5",
7577
"prember": "^1.0.3",
78+
"prettier": "^2.2.1",
7679
"qunit": "^2.13.0",
7780
"qunit-dom": "^1.5.0",
7881
"stylelint": "^13.7.2",

yarn.lock

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6592,6 +6592,11 @@ escodegen@^1.14.1:
65926592
optionalDependencies:
65936593
source-map "~0.6.1"
65946594

6595+
eslint-config-prettier@^7.1.0:
6596+
version "7.1.0"
6597+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz#5402eb559aa94b894effd6bddfa0b1ca051c858f"
6598+
integrity sha512-9sm5/PxaFG7qNJvJzTROMM1Bk1ozXVTKI0buKOyb0Bsr1hrwi0H/TzxF/COtf1uxikIK8SwhX7K6zg78jAzbeA==
6599+
65956600
eslint-plugin-ember@^10.1.1:
65966601
version "10.1.1"
65976602
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.1.1.tgz#27c2dbff2e4236434823b793721a5a9ef0c52e95"
@@ -6624,6 +6629,13 @@ eslint-plugin-node@^11.1.0:
66246629
resolve "^1.10.1"
66256630
semver "^6.1.0"
66266631

6632+
eslint-plugin-prettier@^3.3.1:
6633+
version "3.3.1"
6634+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
6635+
integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==
6636+
dependencies:
6637+
prettier-linter-helpers "^1.0.0"
6638+
66276639
eslint-scope@^4.0.3:
66286640
version "4.0.3"
66296641
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@@ -6992,6 +7004,11 @@ fast-deep-equal@^3.1.1:
69927004
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
69937005
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
69947006

7007+
fast-diff@^1.1.2:
7008+
version "1.2.0"
7009+
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
7010+
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
7011+
69957012
fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.4:
69967013
version "3.2.4"
69977014
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
@@ -11259,6 +11276,18 @@ prepend-http@^2.0.0:
1125911276
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
1126011277
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
1126111278

11279+
prettier-linter-helpers@^1.0.0:
11280+
version "1.0.0"
11281+
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
11282+
integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
11283+
dependencies:
11284+
fast-diff "^1.1.2"
11285+
11286+
prettier@^2.2.1:
11287+
version "2.2.1"
11288+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
11289+
integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
11290+
1126211291
pretty-ms@^3.1.0:
1126311292
version "3.2.0"
1126411293
resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.2.0.tgz#87a8feaf27fc18414d75441467d411d6e6098a25"

0 commit comments

Comments
 (0)