From acab856b965767b7ad832b438c26769213b09903 Mon Sep 17 00:00:00 2001 From: Lucas Azzola Date: Sat, 15 Jul 2017 20:16:41 +1000 Subject: [PATCH] Integrate 1.5.3 hotfix (#2489) --- CHANGELOG.md | 60 ++++++++++++++------------ package.json | 2 +- website/static/lib/index.js | 2 +- website/static/lib/prettier-version.js | 2 +- 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa8df4e72..3076e5b7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.5.3 + +[link](https://github.com/jlongster/prettier/compare/1.5.2...1.5.3) + +* Force trailingComma option to "none" when parser is JSON (#2335) + # 1.5.2 [link](https://github.com/jlongster/prettier/compare/1.5.1...1.5.2) @@ -63,52 +69,52 @@ Lots of small fixes, mainly for TypeScript. [link](https://github.com/jlongster/prettier/compare/1.2.2...1.3.0) -* add printer branches for some TypeScript nodes (#1331) +* add printer branches for some TypeScript nodes (#1331) * Skip trailing commas with FlowShorthandWithOneArg (#1364) * add TSLastTypeNode and TSIndexedAccessType (#1370) -* add TSConstructorType (#1367) -* fix do-while break (#1373) +* add TSConstructorType (#1367) +* fix do-while break (#1373) * Fix missing trailing commas on flow generics (#1381) -* Add example of using yarn test with arguments (#1383) +* Add example of using yarn test with arguments (#1383) * Have --debug-check also run ast verification (#1337) -* Fix empty line in block with EmptyStatement (#1375) +* Fix empty line in block with EmptyStatement (#1375) * parent decides how to print type annotations (#1391) * add TSTypeOperator (#1396) * fix TSTypeReference not printing typeArguments (#1392) -* add TSMappedType and TSTypeParameter (#1393) +* add TSMappedType and TSTypeParameter (#1393) * fix TSFunctionType failing on TypeParameters (#1394) -* add TSIntersectionType (#1395) +* add TSIntersectionType (#1395) * fix typeParameters printing TSFunctionType w/o breaking flow (#1397) -* Fix optional flow parenthesis (#1357) -* [experimental] Add linting step in test pipeline (#1172) +* Fix optional flow parenthesis (#1357) +* [experimental] Add linting step in test pipeline (#1172) * fix VariableDeclarator not printing type parameters (#1415) * add TSMethodSignature (#1416) * Add TSParameterProperty, TSAbstractClassDeclaration and TSAbstractMethodDefinition (#1410) * Inline nullable in flow generics (#1426) -* fixed method 'check' error 'format' of undefined (#1424) +* fixed method 'check' error 'format' of undefined (#1424) * feat(typescript): add delcare modifier support for vars, classes and functions (#1436) -* Allow flow declarations to break on StringLiteralTypeAnnotations (#1437) +* Allow flow declarations to break on StringLiteralTypeAnnotations (#1437) * Require '::a.b' to have a preceding ; in no-semi style (#1442) * Require '(a || b).c++' to have a preceding ; in no-semi style (#1443) -* Upgrade flow parser to 0.45 (#1447) -* Add supertype tests and add TSAbstractClassProperty (#1467) +* Upgrade flow parser to 0.45 (#1447) +* Add supertype tests and add TSAbstractClassProperty (#1467) * Break class expression returned by arrow call (#1464) * update typescript snapshots to account for #1464 (#1470) -* [WIP] add TSNamespaceExportDeclaration (#1459) -* update yarn.lock (#1471) -* [RFC] Do not indent calls with a single template literal argument (#873) -* Proper indentation for template literals (#1385) -* Add parenthesis for unusual nested ternaries (#1386) -* Preserve inline comment as last argument (#1390) +* [WIP] add TSNamespaceExportDeclaration (#1459) +* update yarn.lock (#1471) +* [RFC] Do not indent calls with a single template literal argument (#873) +* Proper indentation for template literals (#1385) +* Add parenthesis for unusual nested ternaries (#1386) +* Preserve inline comment as last argument (#1390) * Only add parenthesis on ternaries inside of arrow functions if doesn't break (#1450) -* Fix windows line ending on template literals (#1439) -* Add space around `=` for flow generics default arguments (#1476) -* Don't break for unparenthesised single argument flow function (#1452) -* Don't break on empty arrays and objects (#1440) -* Do not break on [0] (#1441) -* Reorder flow object props (#1451) -* Break inline object first in function arguments (#1453) -* Break inline object first in function arguments (#1453) (#1173) +* Fix windows line ending on template literals (#1439) +* Add space around `=` for flow generics default arguments (#1476) +* Don't break for unparenthesised single argument flow function (#1452) +* Don't break on empty arrays and objects (#1440) +* Do not break on [0] (#1441) +* Reorder flow object props (#1451) +* Break inline object first in function arguments (#1453) +* Break inline object first in function arguments (#1453) (#1173) * Inline template literals as arrow body (#1485) # 1.2.2 diff --git a/package.json b/package.json index c075f1d9e..5c40838e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "prettier", - "version": "1.5.2", + "version": "1.5.3", "description": "Prettier is an opinionated code formatter", "bin": { "prettier": "./bin/prettier.js" diff --git a/website/static/lib/index.js b/website/static/lib/index.js index 27f37e1f2..5c3a77115 100644 --- a/website/static/lib/index.js +++ b/website/static/lib/index.js @@ -1284,7 +1284,7 @@ var comments$1 = { }; var name = "prettier"; -var version$1 = "1.5.2"; +var version$1 = "1.5.3"; var description = "Prettier is an opinionated JavaScript formatter"; var bin = { "prettier": "./bin/prettier.js" }; var repository = "prettier/prettier"; diff --git a/website/static/lib/prettier-version.js b/website/static/lib/prettier-version.js index 0d8a8a2f1..86c7b5260 100644 --- a/website/static/lib/prettier-version.js +++ b/website/static/lib/prettier-version.js @@ -1 +1 @@ -prettierVersion = "1.5.2"; \ No newline at end of file +prettierVersion = "1.5.3";