Skip to content

Commit

Permalink
Update prettier to 1.x, closes #6
Browse files Browse the repository at this point in the history
  • Loading branch information
sheerun committed Apr 18, 2017
1 parent d8a2559 commit 10f45ee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@
"find-up": "^2.1.0",
"get-stdin": "^5.0.1",
"glob": "^7.1.1",
"ignore": "^3.2.4",
"ignore": "^3.2.7",
"indent-string": "^3.1.0",
"lodash.memoize": "^4.1.2",
"loglevel-colored-level-prefix": "^1.0.0",
"meow": "3.7.0",
"messageformat": "^1.0.2",
"prettier-eslint": "^4.3.2",
"prettier-eslint": "^5.1.0",
"eslint": "*",
"rxjs": "^5.2.0"
"rxjs": "^5.3.0"
},
"devDependencies": {
"babel-cli": "^6.23.0",
"babel-cli": "^6.24.1",
"babel-jest": "^19.0.0",
"babel-preset-node-module": "^1.2.1",
"babel-register": "^6.23.0",
"babel-register": "^6.24.1",
"cross-run": "^1.0.1",
"husky": "^0.13.2",
"husky": "^0.13.3",
"jest": "^19.0.2",
"lint-staged": "^3.3.1",
"prettier": "^0.22.0",
"lint-staged": "^3.4.0",
"prettier": "^1.1.0",
"rimraf": "^2.6.1"
},
"scripts": {
Expand Down
6 changes: 1 addition & 5 deletions src/format-files.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,7 @@ test('logs errors to the console if something goes wrong', async () => {
const cliError = expect.stringContaining('eslint-config-error')
const errorOutput = expect.stringContaining('Some weird eslint config error')
expect(console.error).toHaveBeenCalledTimes(4)
expect(console.error).toHaveBeenCalledWith(
errorPrefix,
cliError,
errorOutput
)
expect(console.error).toHaveBeenCalledWith(errorPrefix, cliError, errorOutput)
})

test('forwards logLevel onto prettier-eslint', async () => {
Expand Down

0 comments on commit 10f45ee

Please sign in to comment.