Skip to content

Commit

Permalink
[prettierx] Merge tag '1.19.0' of https://github.com/prettier/prettier
Browse files Browse the repository at this point in the history
…into dev

Release 1.19.0

NOTE that "[prettierx merge from prettier@1.19.0] (...)" comments
are added to help track when and where code from different places
in prettierx and upstream Prettier have come together.
These comments may be replaced by some more informative
comments over time in the future.
  • Loading branch information
Christopher J. Brody committed Nov 20, 2019
2 parents 6b67cfa + e788e8d commit 556cc65
Show file tree
Hide file tree
Showing 580 changed files with 22,513 additions and 11,177 deletions.
4 changes: 4 additions & 0 deletions .azure-pipelines/jobs/dev-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ steps:
- template: ../steps/install-dependencies.yml
- script: yarn check-deps
displayName: "Check dependencies"
- script: yarn check-types
displayName: "Check JSDoc types"
- script: yarn lint
displayName: "Lint code"
- script: yarn lint-docs
displayName: "Lint docs"
- script: yarn spellcheck
displayName: "Spellcheck"
23 changes: 12 additions & 11 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,33 @@ env:
es6: true
node: true
extends:
- eslint:recommended
- plugin:react/recommended
- plugin:prettier/recommended
- eslint:recommended
- plugin:react/recommended
- plugin:prettier/recommended
plugins:
- import
- import
rules:
curly: error
import/no-extraneous-dependencies:
- error
- devDependencies: ["tests*/**", "scripts/**"]
- error
- devDependencies: ["tests*/**", "scripts/**"]
no-control-regex: off
no-else-return: error
no-inner-declarations: error
no-unneeded-ternary: error
no-useless-return: error
no-var: error
one-var:
- error
- never
- error
- never
prefer-arrow-callback: error
prefer-const: error
react/display-name: off
react/no-deprecated: off
react/prop-types: off
strict: error
symbol-description: error
yoda:
- error
- never
- exceptRange: true
- error
- never
- exceptRange: true
1 change: 0 additions & 1 deletion .ignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
website/static/lib
dist

1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
dist/
cspell.json
14 changes: 10 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ $ git log --pretty=format:"- %s" rev1..rev2 | sed 's/#\([0-9]*\)/\[prettier\/pre

## prettierx 0.10.0-dev

### prettier 1.19.0

[diff](https://github.com/prettier/prettier/compare/1.18.2...1.19.0)

🔗 [Release Notes](https://prettier.io/blog/2019/11/09/1.19.0.html)

## prettierx 0.9.0

- no bundled TypeScript & no prod build
Expand All @@ -18,7 +24,7 @@ $ git log --pretty=format:"- %s" rev1..rev2 | sed 's/#\([0-9]*\)/\[prettier\/pre

### prettier 1.18.2

[diff](https://github.com/prettier/prettier/compare/1.18.2...1.18.1)
[diff](https://github.com/prettier/prettier/compare/1.18.1...1.18.2)

- TypeScript: only add trailing commas in tuples for `--trailing-comma=all` ([#6199] by [@duailibe])

Expand All @@ -29,7 +35,7 @@ $ git log --pretty=format:"- %s" rev1..rev2 | sed 's/#\([0-9]*\)/\[prettier\/pre

### prettier 1.18.1

[diff](https://github.com/prettier/prettier/compare/1.18.1...1.18.0)
[diff](https://github.com/prettier/prettier/compare/1.18.0...1.18.1)

- TypeScript: Add trailing comma in tsx, only for arrow function ([#6190] by [@sosukesuzuki])

Expand All @@ -45,15 +51,15 @@ $ git log --pretty=format:"- %s" rev1..rev2 | sed 's/#\([0-9]*\)/\[prettier\/pre
return "one";
}

// Output (Prettier stable)
// Output (Prettier 1.18.0)
interface Interface1<T,> {
one: "one";
}
function function1<T,>() {
return "one";
}

// Output (Prettier master)
// Output (Prettier 1.18.1)
interface Interface1<T> {
one: "one";
}
Expand Down
Loading

0 comments on commit 556cc65

Please sign in to comment.