Skip to content

Commit 6600932

Browse files
author
aMarCruz
committed
v0.10.0
1 parent 956830e commit 6600932

File tree

6 files changed

+33
-35
lines changed

6 files changed

+33
-35
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog of eslint-plugin-prettierx
22

3+
## \[0.10.0] - 2019-11-21
4+
5+
### Changed
6+
7+
- Version of this package follows the [prettierx](https://github.com/brodybits/prettierx) version.
8+
- Updated dependencies, including Prettierx based on Prettier 1.9.1
9+
- ESLint minimum is v6.2.2
10+
311
## \[0.5.0] - 2019-10-30
412

513
### Changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Format your code with ESLint using [Prettierx](https://github.com/brodybits/pret
77
- Based on ESLint or external configuration.
88
- Presets\* for default options.
99

10-
For use with ESLint v6.0.1 as minimum, for ESLint v5.x use eslint-config-prettierx 0.4.x
10+
For use with ESLint v6.2.2 as minimum, for ESLint v5.x use eslint-config-prettierx 0.4.x
1111

1212
Minimum NodeJS version supported: NodeJS 8 - deprecated; NodeJS 10 is recommended as described in [brodybits/prettierx#6](https://github.com/brodybits/prettierx/issues/6)
1313

@@ -378,7 +378,7 @@ and add this config to your package.json
378378
}
379379
},
380380
"lint-staged": {
381-
"*.{js,jsx,ts,tsx}": ["eslint --fix", "git add"],
381+
"*.{js,mjs,jsx,ts,tsx}": ["eslint --fix", "git add"],
382382
"*.{md,json,css}": ["prettierx --write", "git add"]
383383
}
384384
}

package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-plugin-prettierx",
3-
"version": "0.5.0",
3+
"version": "0.10.0",
44
"description": "Format your code with ESLint using Prettierx, with presets for Prettier and StandardJS",
55
"keywords": [
66
"eslint",
@@ -35,23 +35,22 @@
3535
"test": "eslint -f unix --ext .js,.ts,.tsx bin lib prettier && cd .. && echo Test passed."
3636
},
3737
"dependencies": {
38-
"eslint-config-prettier": "^6.5.0",
38+
"eslint-config-prettier": "~6.7.0",
3939
"prettier-linter-helpers": "^1.0.0",
40-
"prettierx": "^0.8.0"
40+
"prettierx": "~0.10.0"
4141
},
4242
"devDependencies": {
4343
"@types/eslint": "^6.1.3",
44-
"@types/node": "^12.12.3",
45-
"@types/prettier": "^1.18.3",
46-
"@typescript-eslint/eslint-plugin": "^2.6.0",
47-
"@typescript-eslint/parser": "^2.6.0",
48-
"eslint": "6.0.1",
49-
"eslint-config-standardize": "^0.4.2",
50-
"prettier": "file:./prettier",
51-
"typescript": "^3.6.4"
44+
"@types/node": "^12.12.11",
45+
"@types/prettier": "^1.18.4",
46+
"@typescript-eslint/eslint-plugin": "~2.8.0",
47+
"@typescript-eslint/parser": "~2.8.0",
48+
"eslint": "6.2.2",
49+
"eslint-config-standardize": "~0.5.0",
50+
"typescript": "~3.7.2"
5251
},
5352
"peerDependencies": {
54-
"eslint": ">=6.0.1 <7.0.0"
53+
"eslint": ">=6.2.2"
5554
},
5655
"license": "MIT"
5756
}

prettier/LICENSE

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1-
MIT License
1+
Copyright © Christopher J. Brody, James Long, and other contributors
22

3-
Copyright (c) 2019 Alberto Martínez
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
116

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

prettier/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/* eslint-disable */
22
// @ts-nocheck
3-
module.exports = require('prettierx')
3+
const version = require('./package.json').version
4+
module.exports = Object.assign(require('prettierx'), { version })

prettier/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
{
22
"name": "prettier",
3-
"version": "1.18.0",
3+
"version": "1.19.1",
44
"description": "Prettier(x) is an opinionated code formatter",
55
"main": "./index.js",
66
"author": "James Long",
77
"bin": {
88
"prettier": "../prettierx/bin-prettierx.js"
99
},
10+
"engines": {
11+
"node": ">=8"
12+
},
1013
"peerDependencies": {
11-
"prettierx": "^0.8.0"
14+
"prettierx": "~0.10.0"
1215
},
16+
"homepage": "https://github.com/brodybits/prettierx",
1317
"license": "MIT"
1418
}

0 commit comments

Comments
 (0)