prettier 2.1.0 → 2.1.1

package/bin-prettier.js

@@ -58,7 +58,7 @@ var pleaseUpgradeNode = function pleaseUpgradeNode(pkg, opts) {
 };
 
 var name = "prettier";
-var version = "2.1.0";
+var version = "2.1.1";
 var description = "Prettier is an opinionated code formatter";
 var bin = "./bin/prettier.js";
 var repository = "prettier/prettier";
@@ -78,12 +78,12 @@ var files = [
 	"bin"
 ];
 var dependencies = {
-	"@angular/compiler": "10.0.11",
+	"@angular/compiler": "10.0.12",
 	"@babel/code-frame": "7.10.4",
 	"@babel/parser": "7.11.2",
 	"@glimmer/syntax": "0.59.0",
 	"@iarna/toml": "2.2.5",
-	"@typescript-eslint/typescript-estree": "3.9.1",
+	"@typescript-eslint/typescript-estree": "3.10.0",
 	"angular-estree-parser": "2.2.0",
 	"angular-html-parser": "1.7.1",
 	camelcase: "6.0.0",
@@ -153,7 +153,7 @@ var devDependencies = {
 	"@rollup/plugin-replace": "2.3.3",
 	"@types/estree": "0.0.45",
 	"@types/node": "14.6.0",
-	"@typescript-eslint/types": "3.9.1",
+	"@typescript-eslint/types": "3.10.0",
 	"babel-loader": "8.1.0",
 	benchmark: "2.1.4",
 	"builtin-modules": "3.1.0",
@@ -173,7 +173,7 @@ var devDependencies = {
 	"jest-snapshot-serializer-raw": "1.1.0",
 	"jest-watch-typeahead": "0.6.0",
 	"npm-run-all": "4.1.5",
-	prettier: "2.0.5",
+	prettier: "2.1.0",
 	rimraf: "3.0.2",
 	rollup: "2.26.5",
 	"rollup-plugin-node-globals": "1.4.0",
@@ -201,7 +201,7 @@ var scripts = {
 	"lint:typecheck": "tsc",
 	"lint:eslint": "cross-env EFF_NO_LINK_RULES=true eslint . --format friendly",
 	"lint:changelog": "node ./scripts/lint-changelog.js",
-	"lint:prettier": "prettier \"**/*.{md,json,yml,html,css,js,d.ts}\" \"!test*\" --check",
+	"lint:prettier": "prettier . \"!test*\" --check",
 	"lint:dist": "eslint --no-eslintrc --no-ignore --env=es6,browser --parser-options=ecmaVersion:2016 \"dist/!(bin-prettier|index|third-party).js\"",
 	"lint:spellcheck": "cspell \"**/*\" \".github/**/*\"",
 	"lint:deps": "node ./scripts/check-deps.js",

package/doc.js

@@ -1120,7 +1120,7 @@
   }, value));
 
   var name = "prettier";
-  var version$1 = "2.1.0";
+  var version$1 = "2.1.1";
   var description = "Prettier is an opinionated code formatter";
   var bin = "./bin/prettier.js";
   var repository = "prettier/prettier";
@@ -1140,12 +1140,12 @@
   	"bin"
   ];
   var dependencies = {
-  	"@angular/compiler": "10.0.11",
+  	"@angular/compiler": "10.0.12",
   	"@babel/code-frame": "7.10.4",
   	"@babel/parser": "7.11.2",
   	"@glimmer/syntax": "0.59.0",
   	"@iarna/toml": "2.2.5",
-  	"@typescript-eslint/typescript-estree": "3.9.1",
+  	"@typescript-eslint/typescript-estree": "3.10.0",
   	"angular-estree-parser": "2.2.0",
   	"angular-html-parser": "1.7.1",
   	camelcase: "6.0.0",
@@ -1215,7 +1215,7 @@
   	"@rollup/plugin-replace": "2.3.3",
   	"@types/estree": "0.0.45",
   	"@types/node": "14.6.0",
-  	"@typescript-eslint/types": "3.9.1",
+  	"@typescript-eslint/types": "3.10.0",
   	"babel-loader": "8.1.0",
   	benchmark: "2.1.4",
   	"builtin-modules": "3.1.0",
@@ -1235,7 +1235,7 @@
   	"jest-snapshot-serializer-raw": "1.1.0",
   	"jest-watch-typeahead": "0.6.0",
   	"npm-run-all": "4.1.5",
-  	prettier: "2.0.5",
+  	prettier: "2.1.0",
   	rimraf: "3.0.2",
   	rollup: "2.26.5",
   	"rollup-plugin-node-globals": "1.4.0",
@@ -1263,7 +1263,7 @@
   	"lint:typecheck": "tsc",
   	"lint:eslint": "cross-env EFF_NO_LINK_RULES=true eslint . --format friendly",
   	"lint:changelog": "node ./scripts/lint-changelog.js",
-  	"lint:prettier": "prettier \"**/*.{md,json,yml,html,css,js,d.ts}\" \"!test*\" --check",
+  	"lint:prettier": "prettier . \"!test*\" --check",
   	"lint:dist": "eslint --no-eslintrc --no-ignore --env=es6,browser --parser-options=ecmaVersion:2016 \"dist/!(bin-prettier|index|third-party).js\"",
   	"lint:spellcheck": "cspell \"**/*\" \".github/**/*\"",
   	"lint:deps": "node ./scripts/check-deps.js",

package/index.js

@@ -21,7 +21,7 @@ var stream__default = /*#__PURE__*/_interopDefaultLegacy(stream$6);
 var events__default = /*#__PURE__*/_interopDefaultLegacy(events$1);
 
 var name = "prettier";
-var version = "2.1.0";
+var version = "2.1.1";
 var description = "Prettier is an opinionated code formatter";
 var bin = "./bin/prettier.js";
 var repository = "prettier/prettier";
@@ -41,12 +41,12 @@ var files = [
 	"bin"
 ];
 var dependencies = {
-	"@angular/compiler": "10.0.11",
+	"@angular/compiler": "10.0.12",
 	"@babel/code-frame": "7.10.4",
 	"@babel/parser": "7.11.2",
 	"@glimmer/syntax": "0.59.0",
 	"@iarna/toml": "2.2.5",
-	"@typescript-eslint/typescript-estree": "3.9.1",
+	"@typescript-eslint/typescript-estree": "3.10.0",
 	"angular-estree-parser": "2.2.0",
 	"angular-html-parser": "1.7.1",
 	camelcase: "6.0.0",
@@ -116,7 +116,7 @@ var devDependencies = {
 	"@rollup/plugin-replace": "2.3.3",
 	"@types/estree": "0.0.45",
 	"@types/node": "14.6.0",
-	"@typescript-eslint/types": "3.9.1",
+	"@typescript-eslint/types": "3.10.0",
 	"babel-loader": "8.1.0",
 	benchmark: "2.1.4",
 	"builtin-modules": "3.1.0",
@@ -136,7 +136,7 @@ var devDependencies = {
 	"jest-snapshot-serializer-raw": "1.1.0",
 	"jest-watch-typeahead": "0.6.0",
 	"npm-run-all": "4.1.5",
-	prettier: "2.0.5",
+	prettier: "2.1.0",
 	rimraf: "3.0.2",
 	rollup: "2.26.5",
 	"rollup-plugin-node-globals": "1.4.0",
@@ -164,7 +164,7 @@ var scripts = {
 	"lint:typecheck": "tsc",
 	"lint:eslint": "cross-env EFF_NO_LINK_RULES=true eslint . --format friendly",
 	"lint:changelog": "node ./scripts/lint-changelog.js",
-	"lint:prettier": "prettier \"**/*.{md,json,yml,html,css,js,d.ts}\" \"!test*\" --check",
+	"lint:prettier": "prettier . \"!test*\" --check",
 	"lint:dist": "eslint --no-eslintrc --no-ignore --env=es6,browser --parser-options=ecmaVersion:2016 \"dist/!(bin-prettier|index|third-party).js\"",
 	"lint:spellcheck": "cspell \"**/*\" \".github/**/*\"",
 	"lint:deps": "node ./scripts/check-deps.js",
@@ -40665,8 +40665,14 @@ function needsParens(path, options) {
 
     // fallthrough
 
-    case "TSTypeOperator":
     case "TSInferType":
+      if (node.type === "TSInferType" && parent.type === "TSRestType") {
+        return false;
+      }
+
+    // fallthrough
+
+    case "TSTypeOperator":
       return parent.type === "TSArrayType" || parent.type === "TSOptionalType" || parent.type === "TSRestType" || parent.type === "TSIndexedAccessType" && node === parent.objectType || parent.type === "TSTypeOperator" || parent.type === "TSTypeAnnotation" && /^TSJSDoc/.test(path.getParentNode(1).type);
 
     case "ArrayTypeAnnotation":
@@ -51617,7 +51623,7 @@ function inferStyleParser(node) {
     lang
   } = node.attrMap;
 
-  if (lang === "postcss" || lang === "css") {
+  if (!lang || lang === "postcss" || lang === "css") {
     return "css";
   }
 
@@ -51640,11 +51646,11 @@ function inferScriptParser(node, options) {
   }
 
   if (node.name === "style") {
-    return inferStyleParser(node) || "css";
+    return inferStyleParser(node);
   }
 
   if (options && isVueNonHtmlBlock(node, options)) {
-    return _inferScriptParser(node) || inferStyleParser(node) || getParserName$2(node.attrMap.lang, options);
+    return _inferScriptParser(node) || !("src" in node.attrMap) && getParserName$2(node.attrMap.lang, options);
   }
 }
 
@@ -52807,19 +52813,27 @@ function embed$4(path, print, textToDoc, options) {
           return;
         }
 
-        if (isVueNonHtmlBlock$1(node, options)) {
+        if (!node.isSelfClosing && isVueNonHtmlBlock$1(node, options)) {
           const parser = inferScriptParser$1(node, options);
 
           if (!parser) {
             return;
           }
 
-          const doc = textToDoc(htmlTrimPreserveIndentation$1(getNodeContent(node, options)), {
-            parser
-          }, {
-            stripTrailingHardline: true
-          });
-          return concat$m([printOpeningTagPrefix(node, options), group$k(printOpeningTag(path, options, print)), hardline$f, doc, hardline$f, printClosingTag(node, options), printClosingTagSuffix(node, options)]);
+          const content = getNodeContent(node, options);
+          let isEmpty = /^\s*$/.test(content);
+          let doc = "";
+
+          if (!isEmpty) {
+            doc = textToDoc(htmlTrimPreserveIndentation$1(content), {
+              parser
+            }, {
+              stripTrailingHardline: true
+            });
+            isEmpty = doc === "";
+          }
+
+          return concat$m([printOpeningTagPrefix(node, options), group$k(printOpeningTag(path, options, print)), isEmpty ? "" : hardline$f, doc, isEmpty ? "" : hardline$f, printClosingTag(node, options), printClosingTagSuffix(node, options)]);
         }
 
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin-prettier.js",
   "repository": "prettier/prettier",