Browse Source
fix: resolve conflicts between eslint and prettier and bump prettier-plugin-packagejson version to 2.4.6(#3328)
pull/3330/head
xingyu
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
9 additions and
8 deletions
-
.eslintignore
-
package.json
-
pnpm-lock.yaml
|
|
|
@ -13,3 +13,4 @@ dist |
|
|
|
.local |
|
|
|
/bin |
|
|
|
Dockerfile |
|
|
|
package.json |
|
|
|
|
|
|
|
@ -137,7 +137,7 @@ |
|
|
|
"husky": "^8.0.3", |
|
|
|
"lint-staged": "13.2.3", |
|
|
|
"prettier": "^2.8.8", |
|
|
|
"prettier-plugin-packagejson": "^2.4.4", |
|
|
|
"prettier-plugin-packagejson": "^2.4.6", |
|
|
|
"rimraf": "^5.0.1", |
|
|
|
"turbo": "^1.10.7", |
|
|
|
"typescript": "^5.2.2", |
|
|
|
|
|
|
|
@ -214,8 +214,8 @@ importers: |
|
|
|
specifier: ^2.8.8 |
|
|
|
version: 2.8.8 |
|
|
|
prettier-plugin-packagejson: |
|
|
|
specifier: ^2.4.4 |
|
|
|
version: 2.4.4(prettier@2.8.8) |
|
|
|
specifier: ^2.4.6 |
|
|
|
version: 2.4.6(prettier@2.8.8) |
|
|
|
rimraf: |
|
|
|
specifier: ^5.0.1 |
|
|
|
version: 5.0.1 |
|
|
|
@ -9522,8 +9522,8 @@ packages: |
|
|
|
fast-diff: 1.3.0 |
|
|
|
dev: true |
|
|
|
|
|
|
|
/prettier-plugin-packagejson@2.4.4(prettier@2.8.8): |
|
|
|
resolution: {integrity: sha512-Xk74PATiZDW+kELIh8e8EY0JpwHo9xbSGc4YfIfxmITWAF8yqHa7A+yAQLLMRoQEkKNi+xaMnR8BX2F9zrsczg==} |
|
|
|
/prettier-plugin-packagejson@2.4.6(prettier@2.8.8): |
|
|
|
resolution: {integrity: sha512-5JGfzkJRL0DLNyhwmiAV9mV0hZLHDwddFCs2lc9CNxOChpoWUQVe8K4qTMktmevmDlMpok2uT10nvHUyU59sNw==} |
|
|
|
peerDependencies: |
|
|
|
prettier: '>= 1.16.0' |
|
|
|
peerDependenciesMeta: |
|
|
|
@ -9531,7 +9531,7 @@ packages: |
|
|
|
optional: true |
|
|
|
dependencies: |
|
|
|
prettier: 2.8.8 |
|
|
|
sort-package-json: 2.5.0 |
|
|
|
sort-package-json: 2.6.0 |
|
|
|
synckit: 0.8.5 |
|
|
|
dev: true |
|
|
|
|
|
|
|
@ -10339,8 +10339,8 @@ packages: |
|
|
|
resolution: {integrity: sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==} |
|
|
|
dev: true |
|
|
|
|
|
|
|
/sort-package-json@2.5.0: |
|
|
|
resolution: {integrity: sha512-KIsqEi/ameVyhhatpzwialQVSMP1mFzRLJgTBKJDz0duQmhnBDjf8MFyFoIoVnW69SqjH3/bziCSlgiuz2KbHg==} |
|
|
|
/sort-package-json@2.6.0: |
|
|
|
resolution: {integrity: sha512-XSQ+lY9bAYA8ZsoChcEoPlgcSMaheziEp1beox1JVxy1SV4F2jSq9+h2rJ+3mC/Dhu9Ius1DLnInD5AWcsDXZw==} |
|
|
|
hasBin: true |
|
|
|
dependencies: |
|
|
|
detect-indent: 7.0.1 |
|
|
|
|
