prettier 2.0.1 → 2.0.2

package/bin-prettier.js

@@ -13,8 +13,44 @@ var stream$5 = _interopDefault(require('stream'));
 var events = _interopDefault(require('events'));
 var readline = _interopDefault(require('readline'));
 
+var semverCompare = function cmp(a, b) {
+  var pa = a.split('.');
+  var pb = b.split('.');
+
+  for (var i = 0; i < 3; i++) {
+    var na = Number(pa[i]);
+    var nb = Number(pb[i]);
+    if (na > nb) return 1;
+    if (nb > na) return -1;
+    if (!isNaN(na) && isNaN(nb)) return 1;
+    if (isNaN(na) && !isNaN(nb)) return -1;
+  }
+
+  return 0;
+};
+
+var pleaseUpgradeNode = function pleaseUpgradeNode(pkg, opts) {
+  var opts = opts || {};
+  var requiredVersion = pkg.engines.node.replace('>=', '');
+  var currentVersion = process.version.replace('v', '');
+
+  if (semverCompare(currentVersion, requiredVersion) === -1) {
+    if (opts.message) {
+      console.error(opts.message(requiredVersion));
+    } else {
+      console.error(pkg.name + ' requires at least version ' + requiredVersion + ' of Node, please upgrade');
+    }
+
+    if (opts.hasOwnProperty('exitCode')) {
+      process.exit(opts.exitCode);
+    } else {
+      process.exit(1);
+    }
+  }
+};
+
 var name = "prettier";
-var version = "2.0.1";
+var version = "2.0.2";
 var description = "Prettier is an opinionated code formatter";
 var bin = "./bin/prettier.js";
 var repository = "prettier/prettier";
@@ -28,7 +64,7 @@ var engines = {
 var dependencies = {
 	"@angular/compiler": "9.0.5",
 	"@babel/code-frame": "7.8.0",
-	"@babel/parser": "7.9.2",
+	"@babel/parser": "7.9.3",
 	"@glimmer/syntax": "0.48.0",
 	"@iarna/toml": "2.2.3",
 	"@typescript-eslint/typescript-estree": "2.24.0",
@@ -61,12 +97,13 @@ var dependencies = {
 	"json-stable-stringify": "1.0.1",
 	leven: "3.1.0",
 	"lines-and-columns": "1.1.6",
-	"linguist-languages": "7.8.0",
+	"linguist-languages": "7.9.0",
 	lodash: "4.17.15",
 	mem: "6.0.1",
 	minimatch: "3.0.4",
 	minimist: "1.2.5",
 	"n-readlines": "1.0.0",
+	"please-upgrade-node": "3.2.0",
 	"postcss-less": "3.1.4",
 	"postcss-media-query-parser": "0.2.3",
 	"postcss-scss": "2.0.0",
@@ -85,21 +122,21 @@ var dependencies = {
 	"yaml-unist-parser": "1.1.1"
 };
 var devDependencies = {
-	"@babel/core": "7.8.7",
-	"@babel/preset-env": "7.8.7",
+	"@babel/core": "7.9.0",
+	"@babel/preset-env": "7.9.0",
 	"@rollup/plugin-alias": "3.0.1",
 	"@rollup/plugin-commonjs": "11.0.2",
 	"@rollup/plugin-json": "4.0.2",
 	"@rollup/plugin-node-resolve": "7.1.1",
 	"@rollup/plugin-replace": "2.3.1",
-	"babel-loader": "8.0.6",
+	"babel-loader": "8.1.0",
 	benchmark: "2.1.4",
 	"builtin-modules": "3.1.0",
 	codecov: "3.6.5",
 	"cross-env": "7.0.2",
 	cspell: "4.0.55",
 	eslint: "6.8.0",
-	"eslint-config-prettier": "6.10.0",
+	"eslint-config-prettier": "6.10.1",
 	"eslint-formatter-friendly": "7.0.0",
 	"eslint-plugin-import": "2.20.1",
 	"eslint-plugin-prettier": "3.1.2",
@@ -107,11 +144,10 @@ var devDependencies = {
 	"eslint-plugin-unicorn": "17.2.0",
 	execa: "4.0.0",
 	jest: "25.1.0",
-	"jest-junit": "10.0.0",
 	"jest-snapshot-serializer-ansi": "1.0.0",
 	"jest-snapshot-serializer-raw": "1.1.0",
 	"jest-watch-typeahead": "0.4.2",
-	prettier: "2.0.0",
+	prettier: "2.0.1",
 	rimraf: "3.0.2",
 	rollup: "2.1.0",
 	"rollup-plugin-babel": "4.4.0",
@@ -139,7 +175,7 @@ var scripts = {
 	"lint:changelog": "node ./scripts/lint-changelog.js",
 	"lint:prettier": "prettier \"**/*.{md,json,yml,html,css}\" --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 {bin,scripts,src}/**/*.js {docs,website/blog,changelog_unreleased}/**/*.md",
+	"lint:spellcheck": "cspell {bin,scripts,src,website}/**/*.js {docs,website/blog,changelog_unreleased}/**/*.md",
 	"lint:deps": "node ./scripts/check-deps.js",
 	build: "node --max-old-space-size=3072 ./scripts/build/build.js",
 	"build-docs": "node ./scripts/build-docs.js"
@@ -161,21 +197,21 @@ var _package = {
 };
 
 var _package$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name,
-  version: version,
-  description: description,
-  bin: bin,
-  repository: repository,
-  homepage: homepage,
-  author: author,
-  license: license,
-  main: main,
-  engines: engines,
-  dependencies: dependencies,
-  devDependencies: devDependencies,
-  scripts: scripts,
-  'default': _package
+    __proto__: null,
+    name: name,
+    version: version,
+    description: description,
+    bin: bin,
+    repository: repository,
+    homepage: homepage,
+    author: author,
+    license: license,
+    main: main,
+    engines: engines,
+    dependencies: dependencies,
+    devDependencies: devDependencies,
+    scripts: scripts,
+    'default': _package
 });
 
 function Diff() {}
@@ -1704,27 +1740,27 @@ function escapeHTML(s) {
 }
 
 var index_es6 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  Diff: Diff,
-  diffChars: diffChars,
-  diffWords: diffWords,
-  diffWordsWithSpace: diffWordsWithSpace,
-  diffLines: diffLines,
-  diffTrimmedLines: diffTrimmedLines,
-  diffSentences: diffSentences,
-  diffCss: diffCss,
-  diffJson: diffJson,
-  diffArrays: diffArrays,
-  structuredPatch: structuredPatch,
-  createTwoFilesPatch: createTwoFilesPatch,
-  createPatch: createPatch,
-  applyPatch: applyPatch,
-  applyPatches: applyPatches,
-  parsePatch: parsePatch,
-  merge: merge,
-  convertChangesToDMP: convertChangesToDMP,
-  convertChangesToXML: convertChangesToXML,
-  canonicalize: canonicalize
+    __proto__: null,
+    Diff: Diff,
+    diffChars: diffChars,
+    diffWords: diffWords,
+    diffWordsWithSpace: diffWordsWithSpace,
+    diffLines: diffLines,
+    diffTrimmedLines: diffTrimmedLines,
+    diffSentences: diffSentences,
+    diffCss: diffCss,
+    diffJson: diffJson,
+    diffArrays: diffArrays,
+    structuredPatch: structuredPatch,
+    createTwoFilesPatch: createTwoFilesPatch,
+    createPatch: createPatch,
+    applyPatch: applyPatch,
+    applyPatches: applyPatches,
+    parsePatch: parsePatch,
+    merge: merge,
+    convertChangesToDMP: convertChangesToDMP,
+    convertChangesToXML: convertChangesToXML,
+    canonicalize: canonicalize
 });
 
 /**
@@ -2811,14 +2847,14 @@ var coreOptions = {
   options
 };
 
-var require$$0 = getCjsExportFromNamespace(_package$1);
+var require$$1 = getCjsExportFromNamespace(_package$1);
 
 const semver$1 = {
   compare: compare_1,
   lt: lt_1,
   gte: gte_1
 };
-const currentVersion = require$$0.version;
+const currentVersion = require$$1.version;
 const coreOptions$1 = coreOptions.options;
 /**
  * Strings in `plugins` and `pluginSearchDirs` are handled by a wrapped version
@@ -3265,27 +3301,27 @@ function __importDefault(mod) {
 }
 
 var tslib_es6 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  __extends: __extends,
-  get __assign () { return __assign; },
-  __rest: __rest,
-  __decorate: __decorate,
-  __param: __param,
-  __metadata: __metadata,
-  __awaiter: __awaiter,
-  __generator: __generator,
-  __exportStar: __exportStar,
-  __values: __values,
-  __read: __read,
-  __spread: __spread,
-  __spreadArrays: __spreadArrays,
-  __await: __await,
-  __asyncGenerator: __asyncGenerator,
-  __asyncDelegator: __asyncDelegator,
-  __asyncValues: __asyncValues,
-  __makeTemplateObject: __makeTemplateObject,
-  __importStar: __importStar,
-  __importDefault: __importDefault
+    __proto__: null,
+    __extends: __extends,
+    get __assign () { return __assign; },
+    __rest: __rest,
+    __decorate: __decorate,
+    __param: __param,
+    __metadata: __metadata,
+    __awaiter: __awaiter,
+    __generator: __generator,
+    __exportStar: __exportStar,
+    __values: __values,
+    __read: __read,
+    __spread: __spread,
+    __spreadArrays: __spreadArrays,
+    __await: __await,
+    __asyncGenerator: __asyncGenerator,
+    __asyncDelegator: __asyncDelegator,
+    __asyncValues: __asyncValues,
+    __makeTemplateObject: __makeTemplateObject,
+    __importStar: __importStar,
+    __importDefault: __importDefault
 });
 
 var api = createCommonjsModule(function (module, exports) {
@@ -11504,6 +11540,7 @@ function getInterpreter(filepath) {
   try {
     fd = fs$2.openSync(filepath, "r");
   } catch (err) {
+    // istanbul ignore next
     return "";
   }
 
@@ -11540,13 +11577,20 @@ function getInterpreter(filepath) {
 }
 
 function inferParser(filepath, plugins) {
-  const filename = path$1.basename(filepath).toLowerCase(); // If the file has no extension, we can try to infer the language from the
+  const filename = path$1.basename(filepath).toLowerCase();
+  const languages = getSupportInfo$1({
+    plugins
+  }).languages.filter(language => language.since !== null); // If the file has no extension, we can try to infer the language from the
   // interpreter in the shebang line, if any; but since this requires FS access,
   // do it last.
 
-  const language = getSupportInfo$1({
-    plugins
-  }).languages.find(language => language.since !== null && (language.extensions && language.extensions.some(extension => filename.endsWith(extension)) || language.filenames && language.filenames.find(name => name.toLowerCase() === filename) || !filename.includes(".") && language.interpreters && language.interpreters.includes(getInterpreter(filepath))));
+  let language = languages.find(language => language.extensions && language.extensions.some(extension => filename.endsWith(extension)) || language.filenames && language.filenames.find(name => name.toLowerCase() === filename));
+
+  if (!language && !filename.includes(".")) {
+    const interpreter = getInterpreter(filepath);
+    language = languages.find(language => language.interpreters && language.interpreters.includes(interpreter));
+  }
+
   return language && language.parsers[0];
 }
 
@@ -12640,7 +12684,11 @@ function hasIgnoreComment(path) {
 }
 
 function hasNodeIgnoreComment(node) {
-  return node && node.comments && node.comments.length > 0 && node.comments.some(comment => comment.value.trim() === "prettier-ignore");
+  return node && (node.comments && node.comments.length > 0 && node.comments.some(comment => isNodeIgnoreComment(comment) && !comment.unignore) || node.prettierIgnore);
+}
+
+function isNodeIgnoreComment(comment) {
+  return comment.value.trim() === "prettier-ignore";
 }
 
 function addCommentHelper(node, comment) {
@@ -12740,6 +12788,7 @@ var util$1 = {
   printNumber,
   hasIgnoreComment,
   hasNodeIgnoreComment,
+  isNodeIgnoreComment,
   makeString,
   addLeadingComment,
   addDanglingComment,
@@ -14715,7 +14764,7 @@ var rangeUtil = {
   findNodeAtOffset
 };
 
-var require$$0$1 = getCjsExportFromNamespace(index_es6);
+var require$$0 = getCjsExportFromNamespace(index_es6);
 
 const normalizeOptions$1 = options$1.normalize;
 const {
@@ -14747,7 +14796,7 @@ function ensureAllCommentsPrinted(astComments) {
   }
 
   for (let i = 0; i < astComments.length; ++i) {
-    if (astComments[i].value.trim() === "prettier-ignore") {
+    if (util$1.isNodeIgnoreComment(astComments[i])) {
       // If there's a prettier-ignore, we're not printing that sub-tree so we
       // don't know if the comments was printed or not.
       return;
@@ -14848,7 +14897,7 @@ function coreFormat(text, opts, addAlignmentSize) {
     const oldCursorNodeCharArray = oldCursorNodeText.split("");
     oldCursorNodeCharArray.splice(cursorOffsetRelativeToOldCursorNode, 0, CURSOR);
     const newCursorNodeCharArray = newCursorNodeText.split("");
-    const cursorNodeDiff = require$$0$1.diffArrays(oldCursorNodeCharArray, newCursorNodeCharArray);
+    const cursorNodeDiff = require$$0.diffArrays(oldCursorNodeCharArray, newCursorNodeCharArray);
     let cursorOffset = newCursorNodeStart;
 
     for (const entry of cursorNodeDiff) {
@@ -20754,22 +20803,22 @@ var _package$2 = {
 };
 
 var _package$3 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$1,
-  version: version$1,
-  description: description$1,
-  keywords: keywords,
-  main: main$1,
-  contributors: contributors,
-  directories: directories,
-  scripts: scripts$1,
-  repository: repository$1,
-  bugs: bugs,
-  author: author$1,
-  license: license$1,
-  dependencies: dependencies$1,
-  devDependencies: devDependencies$1,
-  'default': _package$2
+    __proto__: null,
+    name: name$1,
+    version: version$1,
+    description: description$1,
+    keywords: keywords,
+    main: main$1,
+    contributors: contributors,
+    directories: directories,
+    scripts: scripts$1,
+    repository: repository$1,
+    bugs: bugs,
+    author: author$1,
+    license: license$1,
+    dependencies: dependencies$1,
+    devDependencies: devDependencies$1,
+    'default': _package$2
 });
 
 var require$$4 = getCjsExportFromNamespace(_package$3);
@@ -35342,8 +35391,22 @@ function handleCallExpressionComments(precedingNode, enclosingNode, comment) {
 
 function handleUnionTypeComments(precedingNode, enclosingNode, followingNode, comment) {
   if (enclosingNode && (enclosingNode.type === "UnionTypeAnnotation" || enclosingNode.type === "TSUnionType")) {
-    addTrailingComment$3(precedingNode, comment);
-    return true;
+    if (util$1.isNodeIgnoreComment(comment)) {
+      followingNode.prettierIgnore = true;
+      comment.unignore = true;
+    }
+
+    if (precedingNode) {
+      addTrailingComment$3(precedingNode, comment);
+      return true;
+    }
+
+    return false;
+  }
+
+  if (followingNode && (followingNode.type === "UnionTypeAnnotation" || followingNode.type === "TSUnionType") && util$1.isNodeIgnoreComment(comment)) {
+    followingNode.types[0].prettierIgnore = true;
+    comment.unignore = true;
   }
 
   return false;
@@ -35549,7 +35612,31 @@ function embed(path, print, textToDoc, options) {
           const rawQuasis = node.quasis.map(q => q.value.raw);
           let placeholderID = 0;
           const text = rawQuasis.reduce((prevVal, currVal, idx) => {
-            return idx === 0 ? currVal : prevVal + "@prettier-placeholder-" + placeholderID++ + "-id" + currVal;
+            if (idx === 0) {
+              return currVal;
+            }
+
+            let specialSuffix = ""; // colons and whitespaces
+
+            const trailingColons = currVal.match(/^(\s*)(:+)(\s*)/);
+
+            if (trailingColons) {
+              const whitespaceBeforeColons = !!trailingColons[1];
+              const numberOfColons = trailingColons[2].length;
+              const whitespaceAfterColons = !!trailingColons[3];
+
+              if (whitespaceAfterColons) ; else {
+                if (whitespaceBeforeColons) {
+                  specialSuffix += "-whitespace";
+                }
+
+                specialSuffix += "-colon".repeat(numberOfColons);
+                currVal = "\uffff" + currVal.slice(trailingColons[0].length);
+              }
+            }
+
+            const placeholder = `@prettier-placeholder${specialSuffix}-${placeholderID++}-id`;
+            return prevVal + placeholder + currVal;
           }, "");
           const doc = textToDoc(text, {
             parser: "css"
@@ -35751,12 +35838,19 @@ function replacePlaceholders(quasisDoc, expressionDocs) {
     if (atPlaceholderIndex > -1) {
       const placeholder = parts[atPlaceholderIndex];
       const rest = parts.slice(atPlaceholderIndex + 1);
-      const placeholderMatch = placeholder.match(/@prettier-placeholder-(.+)-id([\s\S]*)/);
-      const placeholderID = placeholderMatch[1]; // When the expression has a suffix appended, like:
+      const placeholderMatch = placeholder.match(/@prettier-placeholder((?:-whitespace|-colon)*)-(.+)-id([\s\S]*)/);
+      const specialSuffix = placeholderMatch[1]; // colons and whitespaces
+
+      const placeholderID = placeholderMatch[2]; // When the expression has a suffix appended, like:
       // animation: linear ${time}s ease-out;
 
-      const suffix = placeholderMatch[2];
+      let suffix = placeholderMatch[3];
       const expression = expressions[placeholderID];
+
+      if (specialSuffix) {
+        suffix = specialSuffix.replace(/-whitespace/g, " ").replace(/-colon/g, ":") + suffix.replace(/^\uffff/g, "");
+      }
+
       replaceCounter++;
       parts = parts.slice(0, atPlaceholderIndex).concat(["${", expression, "}" + suffix]).concat(rest);
     }
@@ -40145,8 +40239,13 @@ function printPathNoParens(path, options, print, args) {
 
     case "TSIndexSignature":
       {
-        const parent = path.getParentNode();
-        const parametersGroup = group$2(concat$6([indent$3(concat$6([softline$2, join$4(concat$6([", ", softline$2]), path.map(print, "parameters"))])), ifBreak$1(shouldPrintComma(options) ? "," : ""), softline$2]));
+        const parent = path.getParentNode(); // The typescript parser accepts multiple parameters here. If you're
+        // using them, it makes sense to have a trailing comma. But if you
+        // aren't, this is more like a computed property name than an array.
+        // So we leave off the trailing comma when there's just one parameter.
+
+        const trailingComma = n.parameters.length > 1 ? ifBreak$1(shouldPrintComma(options) ? "," : "") : "";
+        const parametersGroup = group$2(concat$6([indent$3(concat$6([softline$2, join$4(concat$6([", ", softline$2]), path.map(print, "parameters"))])), trailingComma, softline$2]));
         return concat$6([n.export ? "export " : "", n.accessibility ? concat$6([n.accessibility, " "]) : "", n.static ? "static " : "", n.readonly ? "readonly " : "", "[", n.parameters ? parametersGroup : "", n.typeAnnotation ? "]: " : "]", n.typeAnnotation ? path.call(print, "typeAnnotation") : "", parent.type === "ClassBody" ? semi : ""]);
       }
 
@@ -41942,7 +42041,7 @@ function willPrintOwnComments(path
 ) {
   const node = path.getValue();
   const parent = path.getParentNode();
-  return (node && (isJSXNode$1(node) || hasFlowShorthandAnnotationComment$2(node) || parent && (parent.type === "CallExpression" || parent.type === "OptionalCallExpression") && (hasFlowAnnotationComment$1(node.leadingComments) || hasFlowAnnotationComment$1(node.trailingComments))) || parent && (parent.type === "JSXSpreadAttribute" || parent.type === "JSXSpreadChild" || parent.type === "UnionTypeAnnotation" || parent.type === "TSUnionType" || (parent.type === "ClassDeclaration" || parent.type === "ClassExpression") && parent.superClass === node)) && !hasIgnoreComment$2(path);
+  return (node && (isJSXNode$1(node) || hasFlowShorthandAnnotationComment$2(node) || parent && (parent.type === "CallExpression" || parent.type === "OptionalCallExpression") && (hasFlowAnnotationComment$1(node.leadingComments) || hasFlowAnnotationComment$1(node.trailingComments))) || parent && (parent.type === "JSXSpreadAttribute" || parent.type === "JSXSpreadChild" || parent.type === "UnionTypeAnnotation" || parent.type === "TSUnionType" || (parent.type === "ClassDeclaration" || parent.type === "ClassExpression") && parent.superClass === node)) && (!hasIgnoreComment$2(path) || parent.type === "UnionTypeAnnotation" || parent.type === "TSUnionType");
 }
 
 function canAttachComment(node) {
@@ -42310,20 +42409,20 @@ var JavaScript = {
 };
 
 var JavaScript$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$2,
-  type: type,
-  tmScope: tmScope,
-  aceMode: aceMode,
-  codemirrorMode: codemirrorMode,
-  codemirrorMimeType: codemirrorMimeType,
-  color: color,
-  aliases: aliases,
-  extensions: extensions,
-  filenames: filenames,
-  interpreters: interpreters,
-  languageId: languageId,
-  'default': JavaScript
+    __proto__: null,
+    name: name$2,
+    type: type,
+    tmScope: tmScope,
+    aceMode: aceMode,
+    codemirrorMode: codemirrorMode,
+    codemirrorMimeType: codemirrorMimeType,
+    color: color,
+    aliases: aliases,
+    extensions: extensions,
+    filenames: filenames,
+    interpreters: interpreters,
+    languageId: languageId,
+    'default': JavaScript
 });
 
 var name$3 = "JSX";
@@ -42350,17 +42449,17 @@ var JSX = {
 };
 
 var JSX$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$3,
-  type: type$1,
-  group: group$3,
-  extensions: extensions$1,
-  tmScope: tmScope$1,
-  aceMode: aceMode$1,
-  codemirrorMode: codemirrorMode$1,
-  codemirrorMimeType: codemirrorMimeType$1,
-  languageId: languageId$1,
-  'default': JSX
+    __proto__: null,
+    name: name$3,
+    type: type$1,
+    group: group$3,
+    extensions: extensions$1,
+    tmScope: tmScope$1,
+    aceMode: aceMode$1,
+    codemirrorMode: codemirrorMode$1,
+    codemirrorMimeType: codemirrorMimeType$1,
+    languageId: languageId$1,
+    'default': JSX
 });
 
 var name$4 = "TypeScript";
@@ -42396,19 +42495,19 @@ var TypeScript = {
 };
 
 var TypeScript$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$4,
-  type: type$2,
-  color: color$1,
-  aliases: aliases$1,
-  interpreters: interpreters$1,
-  extensions: extensions$2,
-  tmScope: tmScope$2,
-  aceMode: aceMode$2,
-  codemirrorMode: codemirrorMode$2,
-  codemirrorMimeType: codemirrorMimeType$2,
-  languageId: languageId$2,
-  'default': TypeScript
+    __proto__: null,
+    name: name$4,
+    type: type$2,
+    color: color$1,
+    aliases: aliases$1,
+    interpreters: interpreters$1,
+    extensions: extensions$2,
+    tmScope: tmScope$2,
+    aceMode: aceMode$2,
+    codemirrorMode: codemirrorMode$2,
+    codemirrorMimeType: codemirrorMimeType$2,
+    languageId: languageId$2,
+    'default': TypeScript
 });
 
 var name$5 = "TSX";
@@ -42435,17 +42534,17 @@ var TSX = {
 };
 
 var TSX$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$5,
-  type: type$3,
-  group: group$4,
-  extensions: extensions$3,
-  tmScope: tmScope$3,
-  aceMode: aceMode$3,
-  codemirrorMode: codemirrorMode$3,
-  codemirrorMimeType: codemirrorMimeType$3,
-  languageId: languageId$3,
-  'default': TSX
+    __proto__: null,
+    name: name$5,
+    type: type$3,
+    group: group$4,
+    extensions: extensions$3,
+    tmScope: tmScope$3,
+    aceMode: aceMode$3,
+    codemirrorMode: codemirrorMode$3,
+    codemirrorMimeType: codemirrorMimeType$3,
+    languageId: languageId$3,
+    'default': TSX
 });
 
 var name$6 = "JSON";
@@ -42497,18 +42596,18 @@ var _JSON = {
 };
 
 var _JSON$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$6,
-  type: type$4,
-  tmScope: tmScope$4,
-  aceMode: aceMode$4,
-  codemirrorMode: codemirrorMode$4,
-  codemirrorMimeType: codemirrorMimeType$4,
-  searchable: searchable,
-  extensions: extensions$4,
-  filenames: filenames$1,
-  languageId: languageId$4,
-  'default': _JSON
+    __proto__: null,
+    name: name$6,
+    type: type$4,
+    tmScope: tmScope$4,
+    aceMode: aceMode$4,
+    codemirrorMode: codemirrorMode$4,
+    codemirrorMimeType: codemirrorMimeType$4,
+    searchable: searchable,
+    extensions: extensions$4,
+    filenames: filenames$1,
+    languageId: languageId$4,
+    'default': _JSON
 });
 
 var name$7 = "JSON with Comments";
@@ -42522,6 +42621,7 @@ var aliases$2 = [
 	"jsonc"
 ];
 var extensions$5 = [
+	".jsonc",
 	".sublime-build",
 	".sublime-commands",
 	".sublime-completions",
@@ -42562,19 +42662,19 @@ var JSON_with_Comments = {
 };
 
 var JSON_with_Comments$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$7,
-  type: type$5,
-  group: group$5,
-  tmScope: tmScope$5,
-  aceMode: aceMode$5,
-  codemirrorMode: codemirrorMode$5,
-  codemirrorMimeType: codemirrorMimeType$5,
-  aliases: aliases$2,
-  extensions: extensions$5,
-  filenames: filenames$2,
-  languageId: languageId$5,
-  'default': JSON_with_Comments
+    __proto__: null,
+    name: name$7,
+    type: type$5,
+    group: group$5,
+    tmScope: tmScope$5,
+    aceMode: aceMode$5,
+    codemirrorMode: codemirrorMode$5,
+    codemirrorMimeType: codemirrorMimeType$5,
+    aliases: aliases$2,
+    extensions: extensions$5,
+    filenames: filenames$2,
+    languageId: languageId$5,
+    'default': JSON_with_Comments
 });
 
 var name$8 = "JSON5";
@@ -42599,21 +42699,21 @@ var JSON5 = {
 };
 
 var JSON5$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$8,
-  type: type$6,
-  extensions: extensions$6,
-  tmScope: tmScope$6,
-  aceMode: aceMode$6,
-  codemirrorMode: codemirrorMode$6,
-  codemirrorMimeType: codemirrorMimeType$6,
-  languageId: languageId$6,
-  'default': JSON5
+    __proto__: null,
+    name: name$8,
+    type: type$6,
+    extensions: extensions$6,
+    tmScope: tmScope$6,
+    aceMode: aceMode$6,
+    codemirrorMode: codemirrorMode$6,
+    codemirrorMimeType: codemirrorMimeType$6,
+    languageId: languageId$6,
+    'default': JSON5
 });
 
-var require$$0$2 = getCjsExportFromNamespace(JavaScript$1);
+var require$$0$1 = getCjsExportFromNamespace(JavaScript$1);
 
-var require$$1 = getCjsExportFromNamespace(JSX$1);
+var require$$1$1 = getCjsExportFromNamespace(JSX$1);
 
 var require$$2 = getCjsExportFromNamespace(TypeScript$1);
 
@@ -42625,12 +42725,12 @@ var require$$5 = getCjsExportFromNamespace(JSON_with_Comments$1);
 
 var require$$6 = getCjsExportFromNamespace(JSON5$1);
 
-const languages = [createLanguage(require$$0$2, data => ({
+const languages = [createLanguage(require$$0$1, data => ({
   since: "0.0.0",
   parsers: ["babel", "flow"],
   vscodeLanguageIds: ["javascript", "mongo"],
   interpreters: data.interpreters.concat(["nodejs"])
-})), createLanguage(require$$0$2, () => ({
+})), createLanguage(require$$0$1, () => ({
   name: "Flow",
   since: "0.0.0",
   parsers: ["babel", "flow"],
@@ -42638,7 +42738,7 @@ const languages = [createLanguage(require$$0$2, data => ({
   aliases: [],
   filenames: [],
   extensions: [".js.flow"]
-})), createLanguage(require$$1, () => ({
+})), createLanguage(require$$1$1, () => ({
   since: "0.0.0",
   parsers: ["babel", "flow"],
   vscodeLanguageIds: ["javascriptreact"]
@@ -44104,17 +44204,17 @@ var CSS = {
 };
 
 var CSS$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$9,
-  type: type$7,
-  tmScope: tmScope$7,
-  aceMode: aceMode$7,
-  codemirrorMode: codemirrorMode$7,
-  codemirrorMimeType: codemirrorMimeType$7,
-  color: color$2,
-  extensions: extensions$7,
-  languageId: languageId$7,
-  'default': CSS
+    __proto__: null,
+    name: name$9,
+    type: type$7,
+    tmScope: tmScope$7,
+    aceMode: aceMode$7,
+    codemirrorMode: codemirrorMode$7,
+    codemirrorMimeType: codemirrorMimeType$7,
+    color: color$2,
+    extensions: extensions$7,
+    languageId: languageId$7,
+    'default': CSS
 });
 
 var name$a = "PostCSS";
@@ -44138,15 +44238,15 @@ var PostCSS = {
 };
 
 var PostCSS$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$a,
-  type: type$8,
-  tmScope: tmScope$8,
-  group: group$7,
-  extensions: extensions$8,
-  aceMode: aceMode$8,
-  languageId: languageId$8,
-  'default': PostCSS
+    __proto__: null,
+    name: name$a,
+    type: type$8,
+    tmScope: tmScope$8,
+    group: group$7,
+    extensions: extensions$8,
+    aceMode: aceMode$8,
+    languageId: languageId$8,
+    'default': PostCSS
 });
 
 var name$b = "Less";
@@ -44173,17 +44273,17 @@ var Less = {
 };
 
 var Less$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$b,
-  type: type$9,
-  group: group$8,
-  extensions: extensions$9,
-  tmScope: tmScope$9,
-  aceMode: aceMode$9,
-  codemirrorMode: codemirrorMode$8,
-  codemirrorMimeType: codemirrorMimeType$8,
-  languageId: languageId$9,
-  'default': Less
+    __proto__: null,
+    name: name$b,
+    type: type$9,
+    group: group$8,
+    extensions: extensions$9,
+    tmScope: tmScope$9,
+    aceMode: aceMode$9,
+    codemirrorMode: codemirrorMode$8,
+    codemirrorMimeType: codemirrorMimeType$8,
+    languageId: languageId$9,
+    'default': Less
 });
 
 var name$c = "SCSS";
@@ -44210,32 +44310,32 @@ var SCSS = {
 };
 
 var SCSS$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$c,
-  type: type$a,
-  tmScope: tmScope$a,
-  group: group$9,
-  aceMode: aceMode$a,
-  codemirrorMode: codemirrorMode$9,
-  codemirrorMimeType: codemirrorMimeType$9,
-  extensions: extensions$a,
-  languageId: languageId$a,
-  'default': SCSS
+    __proto__: null,
+    name: name$c,
+    type: type$a,
+    tmScope: tmScope$a,
+    group: group$9,
+    aceMode: aceMode$a,
+    codemirrorMode: codemirrorMode$9,
+    codemirrorMimeType: codemirrorMimeType$9,
+    extensions: extensions$a,
+    languageId: languageId$a,
+    'default': SCSS
 });
 
-var require$$0$3 = getCjsExportFromNamespace(CSS$1);
+var require$$0$2 = getCjsExportFromNamespace(CSS$1);
 
-var require$$1$1 = getCjsExportFromNamespace(PostCSS$1);
+var require$$1$2 = getCjsExportFromNamespace(PostCSS$1);
 
 var require$$2$1 = getCjsExportFromNamespace(Less$1);
 
 var require$$3$1 = getCjsExportFromNamespace(SCSS$1);
 
-const languages$1 = [createLanguage(require$$0$3, () => ({
+const languages$1 = [createLanguage(require$$0$2, () => ({
   since: "1.4.0",
   parsers: ["css"],
   vscodeLanguageIds: ["css"]
-})), createLanguage(require$$1$1, () => ({
+})), createLanguage(require$$1$2, () => ({
   since: "1.4.0",
   parsers: ["css"],
   vscodeLanguageIds: ["postcss"]
@@ -44806,21 +44906,21 @@ var Handlebars = {
 };
 
 var Handlebars$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$d,
-  type: type$b,
-  group: group$b,
-  aliases: aliases$3,
-  extensions: extensions$b,
-  tmScope: tmScope$b,
-  aceMode: aceMode$b,
-  languageId: languageId$b,
-  'default': Handlebars
+    __proto__: null,
+    name: name$d,
+    type: type$b,
+    group: group$b,
+    aliases: aliases$3,
+    extensions: extensions$b,
+    tmScope: tmScope$b,
+    aceMode: aceMode$b,
+    languageId: languageId$b,
+    'default': Handlebars
 });
 
-var require$$0$4 = getCjsExportFromNamespace(Handlebars$1);
+var require$$0$3 = getCjsExportFromNamespace(Handlebars$1);
 
-const languages$2 = [createLanguage(require$$0$4, () => ({
+const languages$2 = [createLanguage(require$$0$3, () => ({
   since: null,
   // unreleased
   parsers: ["glimmer"],
@@ -45183,19 +45283,19 @@ var GraphQL = {
 };
 
 var GraphQL$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$e,
-  type: type$c,
-  extensions: extensions$c,
-  tmScope: tmScope$c,
-  aceMode: aceMode$c,
-  languageId: languageId$c,
-  'default': GraphQL
+    __proto__: null,
+    name: name$e,
+    type: type$c,
+    extensions: extensions$c,
+    tmScope: tmScope$c,
+    aceMode: aceMode$c,
+    languageId: languageId$c,
+    'default': GraphQL
 });
 
-var require$$0$5 = getCjsExportFromNamespace(GraphQL$1);
+var require$$0$4 = getCjsExportFromNamespace(GraphQL$1);
 
-const languages$3 = [createLanguage(require$$0$5, () => ({
+const languages$3 = [createLanguage(require$$0$4, () => ({
   since: "1.5.0",
   parsers: ["graphql"],
   vscodeLanguageIds: ["graphql"]
@@ -46085,19 +46185,6 @@ function getAncestorNode$2(path, typeOrTypes) {
 }
 
 function printLine(path, value, options) {
-  const greatGrandParentNode = path.getParentNode(2);
-
-  if (greatGrandParentNode && greatGrandParentNode.type === "listItem") {
-    const parentNode = path.getParentNode();
-    const grandParentNode = path.getParentNode(1);
-    const index = grandParentNode.children.indexOf(parentNode);
-    const prevGrandParentNode = grandParentNode.children[index - 1];
-
-    if (prevGrandParentNode && prevGrandParentNode.type === "break") {
-      return "";
-    }
-  }
-
   if (options.proseWrap === "preserve" && value === "\n") {
     return hardline$b;
   }
@@ -46515,30 +46602,30 @@ var Markdown = {
 };
 
 var Markdown$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$f,
-  type: type$d,
-  aliases: aliases$4,
-  aceMode: aceMode$d,
-  codemirrorMode: codemirrorMode$a,
-  codemirrorMimeType: codemirrorMimeType$a,
-  wrap: wrap,
-  extensions: extensions$d,
-  filenames: filenames$3,
-  tmScope: tmScope$d,
-  languageId: languageId$d,
-  'default': Markdown
+    __proto__: null,
+    name: name$f,
+    type: type$d,
+    aliases: aliases$4,
+    aceMode: aceMode$d,
+    codemirrorMode: codemirrorMode$a,
+    codemirrorMimeType: codemirrorMimeType$a,
+    wrap: wrap,
+    extensions: extensions$d,
+    filenames: filenames$3,
+    tmScope: tmScope$d,
+    languageId: languageId$d,
+    'default': Markdown
 });
 
-var require$$0$6 = getCjsExportFromNamespace(Markdown$1);
+var require$$0$5 = getCjsExportFromNamespace(Markdown$1);
 
-const languages$4 = [createLanguage(require$$0$6, data => ({
+const languages$4 = [createLanguage(require$$0$5, data => ({
   since: "1.8.0",
   parsers: ["markdown"],
   vscodeLanguageIds: ["markdown"],
   filenames: data.filenames.concat(["README"]),
   extensions: data.extensions.filter(extension => extension !== ".mdx")
-})), createLanguage(require$$0$6, () => ({
+})), createLanguage(require$$0$5, () => ({
   name: "MDX",
   since: "1.15.0",
   parsers: ["mdx"],
@@ -46819,8 +46906,8 @@ var index = [
 ];
 
 var htmlTagNames = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  'default': index
+    __proto__: null,
+    'default': index
 });
 
 var a = [
@@ -47504,87 +47591,87 @@ var index$1 = {
 };
 
 var htmlElementAttributes = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  a: a,
-  abbr: abbr,
-  applet: applet,
-  area: area,
-  audio: audio,
-  base: base,
-  basefont: basefont,
-  bdo: bdo,
-  blockquote: blockquote,
-  body: body,
-  br: br,
-  button: button,
-  canvas: canvas,
-  caption: caption,
-  col: col,
-  colgroup: colgroup,
-  data: data,
-  del: del$1,
-  details: details,
-  dfn: dfn,
-  dialog: dialog,
-  dir: dir,
-  div: div,
-  dl: dl,
-  embed: embed$3,
-  fieldset: fieldset,
-  font: font,
-  form: form,
-  frame: frame,
-  frameset: frameset,
-  h1: h1,
-  h2: h2,
-  h3: h3,
-  h4: h4,
-  h5: h5,
-  h6: h6,
-  head: head,
-  hr: hr,
-  html: html,
-  iframe: iframe,
-  img: img,
-  input: input,
-  ins: ins,
-  isindex: isindex,
-  label: label,
-  legend: legend,
-  li: li,
-  link: link$3,
-  map: map$1,
-  menu: menu,
-  meta: meta,
-  meter: meter,
-  object: object,
-  ol: ol,
-  optgroup: optgroup,
-  option: option,
-  output: output,
-  p: p,
-  param: param,
-  pre: pre,
-  progress: progress,
-  q: q,
-  script: script,
-  select: select,
-  slot: slot,
-  source: source$1,
-  style: style,
-  table: table,
-  tbody: tbody,
-  td: td,
-  textarea: textarea,
-  tfoot: tfoot,
-  th: th,
-  thead: thead,
-  time: time,
-  tr: tr,
-  track: track,
-  ul: ul,
-  video: video,
-  'default': index$1
+    __proto__: null,
+    a: a,
+    abbr: abbr,
+    applet: applet,
+    area: area,
+    audio: audio,
+    base: base,
+    basefont: basefont,
+    bdo: bdo,
+    blockquote: blockquote,
+    body: body,
+    br: br,
+    button: button,
+    canvas: canvas,
+    caption: caption,
+    col: col,
+    colgroup: colgroup,
+    data: data,
+    del: del$1,
+    details: details,
+    dfn: dfn,
+    dialog: dialog,
+    dir: dir,
+    div: div,
+    dl: dl,
+    embed: embed$3,
+    fieldset: fieldset,
+    font: font,
+    form: form,
+    frame: frame,
+    frameset: frameset,
+    h1: h1,
+    h2: h2,
+    h3: h3,
+    h4: h4,
+    h5: h5,
+    h6: h6,
+    head: head,
+    hr: hr,
+    html: html,
+    iframe: iframe,
+    img: img,
+    input: input,
+    ins: ins,
+    isindex: isindex,
+    label: label,
+    legend: legend,
+    li: li,
+    link: link$3,
+    map: map$1,
+    menu: menu,
+    meta: meta,
+    meter: meter,
+    object: object,
+    ol: ol,
+    optgroup: optgroup,
+    option: option,
+    output: output,
+    p: p,
+    param: param,
+    pre: pre,
+    progress: progress,
+    q: q,
+    script: script,
+    select: select,
+    slot: slot,
+    source: source$1,
+    style: style,
+    table: table,
+    tbody: tbody,
+    td: td,
+    textarea: textarea,
+    tfoot: tfoot,
+    th: th,
+    thead: thead,
+    time: time,
+    tr: tr,
+    track: track,
+    ul: ul,
+    video: video,
+    'default': index$1
 });
 
 var htmlTagNames$1 = getCjsExportFromNamespace(htmlTagNames);
@@ -49536,18 +49623,18 @@ var HTML = {
 };
 
 var HTML$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$g,
-  type: type$e,
-  tmScope: tmScope$e,
-  aceMode: aceMode$e,
-  codemirrorMode: codemirrorMode$b,
-  codemirrorMimeType: codemirrorMimeType$b,
-  color: color$3,
-  aliases: aliases$5,
-  extensions: extensions$e,
-  languageId: languageId$e,
-  'default': HTML
+    __proto__: null,
+    name: name$g,
+    type: type$e,
+    tmScope: tmScope$e,
+    aceMode: aceMode$e,
+    codemirrorMode: codemirrorMode$b,
+    codemirrorMimeType: codemirrorMimeType$b,
+    color: color$3,
+    aliases: aliases$5,
+    extensions: extensions$e,
+    languageId: languageId$e,
+    'default': HTML
 });
 
 var name$h = "Vue";
@@ -49570,42 +49657,42 @@ var Vue = {
 };
 
 var Vue$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$h,
-  type: type$f,
-  color: color$4,
-  extensions: extensions$f,
-  tmScope: tmScope$f,
-  aceMode: aceMode$f,
-  languageId: languageId$f,
-  'default': Vue
+    __proto__: null,
+    name: name$h,
+    type: type$f,
+    color: color$4,
+    extensions: extensions$f,
+    tmScope: tmScope$f,
+    aceMode: aceMode$f,
+    languageId: languageId$f,
+    'default': Vue
 });
 
-var require$$0$7 = getCjsExportFromNamespace(HTML$1);
+var require$$0$6 = getCjsExportFromNamespace(HTML$1);
 
-var require$$1$2 = getCjsExportFromNamespace(Vue$1);
+var require$$1$3 = getCjsExportFromNamespace(Vue$1);
 
-const languages$5 = [createLanguage(require$$0$7, () => ({
+const languages$5 = [createLanguage(require$$0$6, () => ({
   name: "Angular",
   since: "1.15.0",
   parsers: ["angular"],
   vscodeLanguageIds: ["html"],
   extensions: [".component.html"],
   filenames: []
-})), createLanguage(require$$0$7, data => ({
+})), createLanguage(require$$0$6, data => ({
   since: "1.15.0",
   parsers: ["html"],
   vscodeLanguageIds: ["html"],
   extensions: data.extensions.concat([".mjml" // MJML is considered XML in Linguist but it should be formatted as HTML
   ])
-})), createLanguage(require$$0$7, () => ({
+})), createLanguage(require$$0$6, () => ({
   name: "Lightning Web Components",
   since: "1.17.0",
   parsers: ["lwc"],
   vscodeLanguageIds: ["html"],
   extensions: [],
   filenames: []
-})), createLanguage(require$$1$2, () => ({
+})), createLanguage(require$$1$3, () => ({
   since: "1.10.0",
   parsers: ["vue"],
   vscodeLanguageIds: ["vue"]
@@ -50332,7 +50419,8 @@ var filenames$4 = [
 	".clang-format",
 	".clang-tidy",
 	".gemrc",
-	"glide.lock"
+	"glide.lock",
+	"yarn.lock"
 ];
 var aceMode$g = "yaml";
 var codemirrorMode$c = "yaml";
@@ -50352,26 +50440,28 @@ var YAML = {
 };
 
 var YAML$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  name: name$i,
-  type: type$g,
-  tmScope: tmScope$g,
-  aliases: aliases$6,
-  extensions: extensions$g,
-  filenames: filenames$4,
-  aceMode: aceMode$g,
-  codemirrorMode: codemirrorMode$c,
-  codemirrorMimeType: codemirrorMimeType$c,
-  languageId: languageId$g,
-  'default': YAML
+    __proto__: null,
+    name: name$i,
+    type: type$g,
+    tmScope: tmScope$g,
+    aliases: aliases$6,
+    extensions: extensions$g,
+    filenames: filenames$4,
+    aceMode: aceMode$g,
+    codemirrorMode: codemirrorMode$c,
+    codemirrorMimeType: codemirrorMimeType$c,
+    languageId: languageId$g,
+    'default': YAML
 });
 
-var require$$0$8 = getCjsExportFromNamespace(YAML$1);
+var require$$0$7 = getCjsExportFromNamespace(YAML$1);
 
-const languages$6 = [createLanguage(require$$0$8, () => ({
+const languages$6 = [createLanguage(require$$0$7, data => ({
   since: "1.14.0",
   parsers: ["yaml"],
-  vscodeLanguageIds: ["yaml"]
+  vscodeLanguageIds: ["yaml"],
+  // yarn.lock is not YAML: https://github.com/yarnpkg/yarn/issues/5629
+  filenames: data.filenames.filter(filename => filename !== "yarn.lock")
 }))];
 var languageYaml = {
   languages: languages$6,
@@ -50632,7 +50722,7 @@ var loadPlugins = {
 
 const {
   version: version$2
-} = require$$0;
+} = require$$1;
 const {
   getSupportInfo: getSupportInfo$2
 } = support;
@@ -52495,7 +52585,7 @@ function cliifyOptions(object, apiDetailedOptionMap) {
 }
 
 function diff(a, b) {
-  return require$$0$1.createTwoFilesPatch("", "", a, b, "", "", {
+  return require$$0.createTwoFilesPatch("", "", a, b, "", "", {
     context: 2
   });
 }
@@ -53262,6 +53352,8 @@ var util$2 = {
   normalizeDetailedOptionMap
 };
 
+pleaseUpgradeNode(require$$1);
+
 function run(args) {
   const context = util$2.createContext(args);