From 361dc14f0693548067b318e671f7eafb6d16f39d Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Mar 2022 20:11:50 +0800
Subject: [PATCH 1/2] Update Vercel logo & link (#12456)

---
 website/data/users.yml                            |   7 +++----
 .../static/images/users/vercel-logotype-dark.svg  |   3 +++
 website/static/images/users/zeit-200x100.png      | Bin 687 -> 0 bytes
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 website/static/images/users/vercel-logotype-dark.svg
 delete mode 100644 website/static/images/users/zeit-200x100.png

diff --git a/website/data/users.yml b/website/data/users.yml
index 19856bc09..de6cbe3cd 100644
--- a/website/data/users.yml
+++ b/website/data/users.yml
@@ -43,10 +43,9 @@
   greyImage: /images/users/used_by_storybook.svg
   infoLink: https://storybook.js.org/
   pinned: true
-- caption: ZEIT
-  image: /images/users/zeit-200x100.png
-  greyImage: /images/users/used_by_zeit.svg
-  infoLink: https://zeit.co
+- caption: Vercel
+  image: /images/users/vercel-logotype-dark.svg
+  infoLink: https://vercel.com/
 - caption: Spotify
   image: /images/users/used_by_spotify.svg
   infoLink: https://spotify.github.io
diff --git a/website/static/images/users/vercel-logotype-dark.svg b/website/static/images/users/vercel-logotype-dark.svg
new file mode 100644
index 000000000..bb5a15a24
--- /dev/null
+++ b/website/static/images/users/vercel-logotype-dark.svg
@@ -0,0 +1,3 @@
+<svg width="4438" height="1000" viewBox="0 0 4438 1000" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2223.75 250C2051.25 250 1926.87 362.5 1926.87 531.25C1926.87 700 2066.72 812.5 2239.38 812.5C2343.59 812.5 2435.47 771.25 2492.34 701.719L2372.81 632.656C2341.25 667.188 2293.28 687.344 2239.38 687.344C2164.53 687.344 2100.94 648.281 2077.34 585.781H2515.16C2518.59 568.281 2520.63 550.156 2520.63 531.094C2520.63 362.5 2396.41 250 2223.75 250ZM2076.09 476.562C2095.62 414.219 2149.06 375 2223.75 375C2298.59 375 2352.03 414.219 2371.41 476.562H2076.09ZM2040.78 78.125L1607.81 828.125L1174.69 78.125H1337.03L1607.66 546.875L1878.28 78.125H2040.78ZM577.344 0L1154.69 1000H0L577.344 0ZM3148.75 531.25C3148.75 625 3210 687.5 3305 687.5C3369.38 687.5 3417.66 658.281 3442.5 610.625L3562.5 679.844C3512.81 762.656 3419.69 812.5 3305 812.5C3132.34 812.5 3008.13 700 3008.13 531.25C3008.13 362.5 3132.5 250 3305 250C3419.69 250 3512.66 299.844 3562.5 382.656L3442.5 451.875C3417.66 404.219 3369.38 375 3305 375C3210.16 375 3148.75 437.5 3148.75 531.25ZM4437.5 78.125V796.875H4296.88V78.125H4437.5ZM3906.25 250C3733.75 250 3609.38 362.5 3609.38 531.25C3609.38 700 3749.38 812.5 3921.88 812.5C4026.09 812.5 4117.97 771.25 4174.84 701.719L4055.31 632.656C4023.75 667.188 3975.78 687.344 3921.88 687.344C3847.03 687.344 3783.44 648.281 3759.84 585.781H4197.66C4201.09 568.281 4203.12 550.156 4203.12 531.094C4203.12 362.5 4078.91 250 3906.25 250ZM3758.59 476.562C3778.13 414.219 3831.41 375 3906.25 375C3981.09 375 4034.53 414.219 4053.91 476.562H3758.59ZM2961.25 265.625V417.031C2945.63 412.5 2929.06 409.375 2911.25 409.375C2820.47 409.375 2755 471.875 2755 565.625V796.875H2614.38V265.625H2755V409.375C2755 330 2847.34 265.625 2961.25 265.625Z" fill="black"/>
+</svg>
diff --git a/website/static/images/users/zeit-200x100.png b/website/static/images/users/zeit-200x100.png
deleted file mode 100644
index f19168e74e9e3fb3d86927306bf5fdae376ced2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmeAS@N?(olHy`uVBq!ia0vp^CxAGGg9S)t_HS=sU|=fqba4!+xb^myZH926%(0K^
zJEsdduM*p$p&=r4@lk*y3%jGsg{`qu_4MZI^68bC^7-8@-O75rX~zqNuI2?RJXD(%
zxLgl5Et+O#->z2G(!JBWSikZ8^B<F+C`_o9t1FMO-~?KR3YI*U5Pah4I=^I+#HYv8
zeEdTcI%;NI(4XmJ>@t!6w9!l--d+K>Z+@$9Y8^50mx<JV@$<fw&uc05NjYcPUKz|3
z>s0Ypt$m@95`4T<)tXzjbcT=ikx5gVf5`=PykxqV@;EO;cG>nKPW4*#EmxNcT$cH`
z<bC0FE1&FJz78*E{q&br3!d9?=}Gohcg6jos>{Bd`M%<CN|e&FEj=%@Tbz8-JG5lG
zC%!V+8!&Ohr1B7HL2koXwRKO{x~x0=B`}rA``S(kppE7oI-Y%TM|GaG^9e>5JxjWl
zXmnR`+metkJNuosRXAv9ezkkGp{cUJLyuGVm*oDwML)wfoih2zdoSpZmCWbd>Akn^
zxlLtnVbl4s!T-qFt%BOOSM=Vrvo0u&;M-!Lvj5XezoWmKl*8A}`SvSp)!I7AHfPzs
z`f9zSs~2m8&%1Nr+1pG#1I6Z`OV+Y|;qD1$x3VwKulm`>DcO=;_^N<u^F!9@udmFU
z;3#puI`mPD<)N_GcaJXTpD|(XF3G)o<~3&j-tMivwsgYWnU`{|Fmq}y*gVbiJ=gLz
zb1PSTzPL_CR(<)0;AwZZewz5SRBcK8<%_Qhs?WPszyJ3P#N8LSTI{#jhTAz?uDd0E
zic{XtKKFTdOz8K;cZw~vPG#>cjusVpx?1ALp1-^H9$&vw5jFCGybIgy&%J%QW4E;J
PN06MStDnm{r-UW|pvp53


From ae080df3e7c38e22ddb47699f71bd2bbca3d822e Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Mar 2022 20:13:28 +0800
Subject: [PATCH 2/2] Enable `unicorn/template-indent` rule (#12469)

---
 .eslintrc.js                                  |  1 +
 scripts/release/utils.js                      |  4 +-
 tests/config/install-prettier.js              | 11 ++--
 tests/config/utils/check-parsers.js           | 12 ++--
 tests/format/js/cursor/jsfmt.spec.js          | 22 ++++---
 .../__tests__/__snapshots__/format.js.snap    | 11 ++--
 tests/integration/__tests__/doc-trim.js       | 15 +++--
 tests/integration/__tests__/format.js         | 15 ++---
 .../__tests__/ignore-in-subdirectories.js     |  3 +-
 .../__tests__/line-suffix-boundary.js         | 13 ++--
 tests/integration/__tests__/load-toml.js      | 25 ++++----
 tests/integration/__tests__/stdin-filepath.js | 61 ++++++++++---------
 .../__tests__/with-parser-inference.js        | 33 +++++-----
 13 files changed, 122 insertions(+), 104 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 45ea57473..3cd5adc21 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -153,6 +153,7 @@ module.exports = {
     "unicorn/prefer-string-starts-ends-with": "error",
     "unicorn/prefer-switch": "error",
     "unicorn/prefer-type-error": "error",
+    "unicorn/template-indent": "error",
   },
   overrides: [
     {
diff --git a/scripts/release/utils.js b/scripts/release/utils.js
index 27910ab3a..3a47125db 100644
--- a/scripts/release/utils.js
+++ b/scripts/release/utils.js
@@ -103,9 +103,9 @@ function getBlogPostInfo(version) {
 
 function getChangelogContent({ version, previousVersion, body }) {
   return outdent`
-  [diff](https://github.com/prettier/prettier/compare/${previousVersion}...${version})
+    [diff](https://github.com/prettier/prettier/compare/${previousVersion}...${version})
 
-  ${body}
+    ${body}
   `;
 }
 
diff --git a/tests/config/install-prettier.js b/tests/config/install-prettier.js
index 2f62f50c9..eb6dbd45b 100644
--- a/tests/config/install-prettier.js
+++ b/tests/config/install-prettier.js
@@ -2,6 +2,7 @@
 
 const path = require("path");
 const fs = require("fs");
+const { outdent } = require("outdent");
 const { default: chalk } = require("../../vendors/chalk.js");
 const { default: tempy } = require("../../vendors/tempy.js");
 const { execaSync } = require("../../vendors/execa.js");
@@ -74,12 +75,12 @@ module.exports = (packageDir) => {
 
   console.log(
     chalk.green(
+      outdent`
+        Prettier installed
+          at ${chalk.inverse(installed)}
+          from ${chalk.inverse(packageDir)}
+          with ${chalk.inverse(client)}.
       `
-Prettier installed
-  at ${chalk.inverse(installed)}
-  from ${chalk.inverse(packageDir)}
-  with ${chalk.inverse(client)}.
-      `.trim()
     )
   );
 
diff --git a/tests/config/utils/check-parsers.js b/tests/config/utils/check-parsers.js
index 8234ebe10..a0d88f02a 100644
--- a/tests/config/utils/check-parsers.js
+++ b/tests/config/utils/check-parsers.js
@@ -163,13 +163,13 @@ const checkParser = ({ dirname, files }, parsers = []) => {
       suggestCategories.length === 0
         ? ""
         : outdent`
-            Suggest move your tests to:
-            ${suggestCategories
-              .map((category) => `- ${path.join(TESTS_ROOT, category)}`)
-              .join("\n")}
+          Suggest move your tests to:
+          ${suggestCategories
+            .map((category) => `- ${path.join(TESTS_ROOT, category)}`)
+            .join("\n")}
 
-            Or config to allow use this parser in "${__filename}".
-          `;
+          Or config to allow use this parser in "${__filename}".
+        `;
 
     throw new Error(
       `Parser "${parser}" should not used in "${dirname}".${
diff --git a/tests/format/js/cursor/jsfmt.spec.js b/tests/format/js/cursor/jsfmt.spec.js
index 841828427..499d7e225 100644
--- a/tests/format/js/cursor/jsfmt.spec.js
+++ b/tests/format/js/cursor/jsfmt.spec.js
@@ -1,6 +1,7 @@
 run_spec(__dirname, ["babel", "typescript", "flow"]);
 
 const prettier = require("prettier-local");
+const { outdent } = require("outdent");
 
 test("translates cursor correctly in basic case", () => {
   expect(
@@ -32,17 +33,22 @@ test("keeps cursor inside formatted node", () => {
 });
 
 test("doesn't insert second placeholder for nonexistent TypeAnnotation", () => {
-  const code = `
-foo('bar', cb => {
-  console.log('stuff')
-})`;
+  const code =
+    "\n" +
+    outdent`
+      foo('bar', cb => {
+        console.log('stuff')
+      })
+    `;
   expect(
     prettier.formatWithCursor(code, { parser: "babel", cursorOffset: 24 })
   ).toMatchObject({
-    formatted: `foo("bar", (cb) => {
-  console.log("stuff");
-});
-`,
+    formatted:
+      outdent`
+        foo("bar", (cb) => {
+          console.log("stuff");
+        });
+      ` + "\n",
     cursorOffset: 25,
   });
 });
diff --git a/tests/integration/__tests__/__snapshots__/format.js.snap b/tests/integration/__tests__/__snapshots__/format.js.snap
index b4365a670..40cafac78 100644
--- a/tests/integration/__tests__/__snapshots__/format.js.snap
+++ b/tests/integration/__tests__/__snapshots__/format.js.snap
@@ -12,12 +12,11 @@ exports[`html parser should handle CRLF correctly 1`] = `"\\"<!--\\\\r\\\\n  tes
 exports[`markdown parser should handle CRLF correctly 1`] = `"\\"\`\`\`\\\\r\\\\n\\\\r\\\\n\\\\r\\\\n\`\`\`\\\\r\\\\n\\""`;
 
 exports[`typescript parser should throw the first error when both JSX and non-JSX mode failed 1`] = `
-"Expression expected. (9:7)
-   7 | );
-   8 |
->  9 | label:
-     |       ^
-  10 |   "
+"Expression expected. (8:7)
+  6 | );
+  7 |
+> 8 | label:
+    |       ^"
 `;
 
 exports[`yaml parser should handle CRLF correctly 1`] = `"\\"a: 123\\\\r\\\\n\\""`;
diff --git a/tests/integration/__tests__/doc-trim.js b/tests/integration/__tests__/doc-trim.js
index 4f248f214..0a0b4678b 100644
--- a/tests/integration/__tests__/doc-trim.js
+++ b/tests/integration/__tests__/doc-trim.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const prettier = require("prettier-local");
+const { outdent } = require("outdent");
 const docPrinter = prettier.doc.printer;
 const docBuilders = prettier.doc.builders;
 
@@ -34,12 +35,14 @@ describe("trim", () => {
           "}",
         ])
       ),
-      `function()
-{
-#if DEBUG
-  alert(42);
-#endif
-}`,
+      outdent`
+        function()
+        {
+        #if DEBUG
+          alert(42);
+        #endif
+        }
+      `,
     ],
     [
       "ignores trimmed characters when fitting the line",
diff --git a/tests/integration/__tests__/format.js b/tests/integration/__tests__/format.js
index 50578fa4c..ea7c7f7a2 100644
--- a/tests/integration/__tests__/format.js
+++ b/tests/integration/__tests__/format.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const prettier = require("prettier-local");
+const { outdent } = require("outdent");
 const fooPlugin = require("../plugins/defaultOptions/plugin.js");
 
 test("yaml parser should handle CRLF correctly", () => {
@@ -14,15 +15,15 @@ test("yaml parser should handle CRLF correctly", () => {
 });
 
 test("typescript parser should throw the first error when both JSX and non-JSX mode failed", () => {
-  const input = `
-import React from "react";
+  const input = outdent`
+    import React from "react";
 
-const App = () => (
-  <div className="App">
-  </div>
-);
+    const App = () => (
+      <div className="App">
+      </div>
+    );
 
-label:
+    label:
   `;
   expect(() =>
     prettier.format(input, { parser: "typescript" })
diff --git a/tests/integration/__tests__/ignore-in-subdirectories.js b/tests/integration/__tests__/ignore-in-subdirectories.js
index e99e1015e..59c2b80b7 100644
--- a/tests/integration/__tests__/ignore-in-subdirectories.js
+++ b/tests/integration/__tests__/ignore-in-subdirectories.js
@@ -70,8 +70,7 @@ describe("formats files when executing in a subdirectory and using stdin", () =>
       input: "hello_world( );",
     }
   ).test({
-    stdout: `hello_world();
-`,
+    stdout: "hello_world();\n",
     status: 0,
   });
 });
diff --git a/tests/integration/__tests__/line-suffix-boundary.js b/tests/integration/__tests__/line-suffix-boundary.js
index e74dc58b6..449b88646 100644
--- a/tests/integration/__tests__/line-suffix-boundary.js
+++ b/tests/integration/__tests__/line-suffix-boundary.js
@@ -2,6 +2,7 @@
 
 /** @type {import('prettier')} */
 const prettier = require("prettier-local");
+const { outdent } = require("outdent");
 
 const { group, indent, line, lineSuffix, lineSuffixBoundary, softline } =
   prettier.doc.builders;
@@ -24,11 +25,13 @@ describe("lineSuffixBoundary", () => {
       "];",
     ]);
 
-    const expected = `let foo = [
-  item1,
-  item2, // comment
-  item3
-];`;
+    const expected = outdent`
+      let foo = [
+        item1,
+        item2, // comment
+        item3
+      ];
+    `;
 
     expect(printDoc(doc)).toBe(expected);
   });
diff --git a/tests/integration/__tests__/load-toml.js b/tests/integration/__tests__/load-toml.js
index fb92b1cf9..dd4bf2200 100644
--- a/tests/integration/__tests__/load-toml.js
+++ b/tests/integration/__tests__/load-toml.js
@@ -1,22 +1,23 @@
 "use strict";
 
+const { outdent } = require("outdent");
 const loadToml = require("../../../src/utils/load-toml.js");
 
 describe("TOML", () => {
   const exampleFilePath = "example.toml";
 
-  const exampleToml = `
-# This is a TOML document.
-title = "TOML Example"
-[owner]
-name = "Tom Preston-Werner"
-dob = 1979-05-27T07:32:00-08:00 # First class dates
-[database]
-server = "192.168.1.1"
-ports = [ 8001, 8001, 8002 ]
-connection_max = 5000
-enabled = true
-`;
+  const exampleToml = outdent`
+    # This is a TOML document.
+    title = "TOML Example"
+    [owner]
+    name = "Tom Preston-Werner"
+    dob = 1979-05-27T07:32:00-08:00 # First class dates
+    [database]
+    server = "192.168.1.1"
+    ports = [ 8001, 8001, 8002 ]
+    connection_max = 5000
+    enabled = true
+  `;
 
   const wrongToml = "///ERROR///";
 
diff --git a/tests/integration/__tests__/stdin-filepath.js b/tests/integration/__tests__/stdin-filepath.js
index 5be8c05d5..c0778c55b 100644
--- a/tests/integration/__tests__/stdin-filepath.js
+++ b/tests/integration/__tests__/stdin-filepath.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const { isCI } = require("ci-info");
+const { outdent } = require("outdent");
 const runPrettier = require("../run-prettier.js");
 
 describe("format correctly if stdin content compatible with stdin-filepath", () => {
@@ -38,11 +39,11 @@ describe("apply editorconfig for stdin-filepath with nonexistent file", () => {
     "cli",
     ["--stdin-filepath", "config/editorconfig/nonexistent.js"],
     {
-      input: `
-function f() {
-  console.log("should be indented with a tab");
-}
-`.trim(), // js
+      input: outdent`
+        function f() {
+          console.log("should be indented with a tab");
+        }
+      `, // js
     }
   ).test({
     status: 0,
@@ -54,11 +55,11 @@ describe("apply editorconfig for stdin-filepath with nonexistent directory", ()
     "cli",
     ["--stdin-filepath", "config/editorconfig/nonexistent/one/two/three.js"],
     {
-      input: `
-function f() {
-  console.log("should be indented with a tab");
-}
-`.trim(), // js
+      input: outdent`
+        function f() {
+          console.log("should be indented with a tab");
+        }
+      `, // js
     }
   ).test({
     status: 0,
@@ -70,11 +71,11 @@ describe("apply editorconfig for stdin-filepath with a deep path", () => {
     "cli",
     ["--stdin-filepath", "config/editorconfig/" + "a/".repeat(30) + "three.js"],
     {
-      input: `
-function f() {
-  console.log("should be indented with a tab");
-}
-`.trim(), // js
+      input: outdent`
+        function f() {
+          console.log("should be indented with a tab");
+        }
+      `, // js
     }
   ).test({
     status: 0,
@@ -83,11 +84,11 @@ function f() {
 
 if (isCI) {
   describe("apply editorconfig for stdin-filepath in root", () => {
-    const code = `
-function f() {
-  console.log("should be indented with a tab");
-}
-`.trim();
+    const code = outdent`
+      function f() {
+        console.log("should be indented with a tab");
+      }
+    `;
     runPrettier("cli", ["--stdin-filepath", "/foo.js"], {
       input: code, // js
     }).test({
@@ -104,11 +105,11 @@ describe("apply editorconfig for stdin-filepath with a deep path", () => {
     "cli",
     ["--stdin-filepath", "config/editorconfig/" + "a/".repeat(30) + "three.js"],
     {
-      input: `
-function f() {
-  console.log("should be indented with a tab");
-}
-`.trim(), // js
+      input: outdent`
+        function f() {
+          console.log("should be indented with a tab");
+        }
+      `, // js
     }
   ).test({
     status: 0,
@@ -123,11 +124,11 @@ describe("don’t apply editorconfig outside project for stdin-filepath with non
       "config/editorconfig/repo-root/nonexistent/one/two/three.js",
     ],
     {
-      input: `
-function f() {
-  console.log("should be indented with 2 spaces");
-}
-`.trim(), // js
+      input: outdent`
+        function f() {
+          console.log("should be indented with 2 spaces");
+        }
+      `, // js
     }
   ).test({
     status: 0,
diff --git a/tests/integration/__tests__/with-parser-inference.js b/tests/integration/__tests__/with-parser-inference.js
index 3e7bb779c..2e5d64527 100644
--- a/tests/integration/__tests__/with-parser-inference.js
+++ b/tests/integration/__tests__/with-parser-inference.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const prettier = require("prettier-local");
+const { outdent } = require("outdent");
 const runPrettier = require("../run-prettier.js");
 
 describe("infers postcss parser", () => {
@@ -49,22 +50,24 @@ describe("infers parser from filename", () => {
   test("json from .swcrc", () => {
     expect(
       prettier.format(
-        `
-    {
-      "jsc": {
-    // Requires v1.2.50 or upper and requires target to be es2016 or upper.
-        "keepClassNames": false
-      }
-    }
-    `,
+        /* indent */ `
+          {
+                      "jsc": {
+                    // Requires v1.2.50 or upper and requires target to be es2016 or upper.
+                        "keepClassNames": false
+                      }}
+        `,
         { filepath: "/path/to/.swcrc" }
       )
-    ).toBe(`{
-  "jsc": {
-    // Requires v1.2.50 or upper and requires target to be es2016 or upper.
-    "keepClassNames": false
-  }
-}
-`);
+    ).toBe(
+      outdent`
+        {
+          "jsc": {
+            // Requires v1.2.50 or upper and requires target to be es2016 or upper.
+            "keepClassNames": false
+          }
+        }
+      ` + "\n"
+    );
   });
 });