Skip to content

Commit dbf37d0

Browse files
committed
Merge remote-tracking branch 'origin/master' into add-fixer
2 parents d58aba9 + 4464576 commit dbf37d0

3 files changed

Lines changed: 548 additions & 427 deletions

File tree

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
"license": "Apache-2.0",
2929
"private": false,
3030
"peerDependencies": {
31-
"ember-template-lint": "^2.5.2",
31+
"ember-template-lint": "^2.10.0",
3232
"prettier": "^1.18.2"
3333
},
3434
"devDependencies": {
35-
"ember-template-lint": "^2.5.2",
36-
"eslint": "^6.0.1",
35+
"ember-template-lint": "^2.10.0",
36+
"eslint": "^7.1.0",
3737
"eslint-config-prettier": "^6.0.0",
3838
"eslint-plugin-node": "^11.0.0",
3939
"eslint-plugin-prettier": "^3.1.0",
4040
"lerna-changelog": "^1.0.0",
41-
"markdownlint-cli": "^0.22.0",
42-
"mocha": "^7.0.1",
41+
"markdownlint-cli": "^0.23.1",
42+
"mocha": "^8.1.0",
4343
"npm-run-all": "^4.1.5",
4444
"prettier": "^1.19.0"
4545
},

test/unit/rules/lint-prettier-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const plugin = require("../../../ember-template-lint-plugin-prettier");
44
generateRuleTests({
55
name: "prettier",
66

7-
groupMethodBefore: beforeEach,
7+
groupMethodBefore: before,
88
groupingMethod: describe,
99
testMethod: it,
1010
plugins: [plugin],

0 commit comments

Comments
 (0)