[pull] main from prettier:main

.editorconfig

@@ -17,5 +17,5 @@ trim_trailing_whitespace = false
 [tests/{**/__snapshots__/*, tests/format/**/*}]
 trim_trailing_whitespace = false
 
-[tests/format/**/jsfmt.spec.js]
+[tests/format/**/format.test.js]
 trim_trailing_whitespace = true

.eslintignore

@@ -2,6 +2,8 @@
 # Do not use `tests/format/**/*`, since it will ignore directories
 # https://github.com/eslint/eslint/issues/17964#issuecomment-1879772142
 tests/format/**/*.*
+!tests/format/**/format.test.js
+# TODO: Remove this in 2025
 !tests/format/**/jsfmt.spec.js
 tests/integration/cli/
 test*.*

.git-blame-ignore-revs

@@ -106,3 +106,6 @@ b6225788966a4a6b49e652044337436642dcd627
 # Reverted changes to the printer (#13210 #13104)
 cdb149417068f3de364fd8db5e9baaf9d2ff4f8c
 8dae4abf41e1ccec3515e8acea159505bbd55f33
+
+# Format test file rename (#16259)
+16449ce9140cac682eab3fb11e15beed14960da6

.github/renovate.json5

@@ -9,7 +9,7 @@
   prConcurrentLimit: 0,
   packageRules: [
     {
-      matchPackageNames: ["react", "react-dom"],
+      matchDepNames: ["react", "react-dom"],
       groupName: "react",
     },
     {
@@ -25,7 +25,7 @@
       groupName: "glimmer",
     },
     {
-      matchPackageNames: [
+      matchDepNames: [
         "eslint",
         "@eslint/eslintrc",
         "@eslint/js",
@@ -42,7 +42,7 @@
       groupName: "ESLint related dependencies",
     },
     {
-      matchPackageNames: ["@angular/compiler", "angular-estree-parser"],
+      matchDepNames: ["@angular/compiler", "angular-estree-parser"],
       groupName: "Angular Estree",
     },
     {

.github/workflows/check-sizes.yml

@@ -25,7 +25,7 @@ jobs:
           cache: "yarn"
 
       - name: Check Sizes
-        uses: preactjs/compressed-size-action@2.5.0
+        uses: preactjs/compressed-size-action@2.6.0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           pattern: "./dist/**/*"

.github/workflows/dev-test.yml

@@ -27,13 +27,13 @@ jobs:
           - "windows-latest"
         node:
           # Latest even version
-          - "20"
+          - "22"
           # Minimal version for development
           - "18"
         include:
           - os: "ubuntu-latest"
             # Pick a version that is fast (normally highest LTS version)
-            node: "20"
+            node: "22"
             ENABLE_CODE_COVERAGE: true
             FULL_TEST: true
             CHECK_TEST_PARSERS: true
@@ -69,8 +69,9 @@ jobs:
         run: yarn c8 yarn test
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         if: ${{ matrix.ENABLE_CODE_COVERAGE }}
         with:
           fail_ci_if_error: true
           files: coverage/lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/mark-issue-duplicate.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !github.event.issue.pull_request && startsWith(github.event.comment.body, 'Duplicate of ') }}
     steps:
-      - uses: actions-cool/issues-helper@v3.5.2
+      - uses: actions-cool/issues-helper@v3.6.0
         with:
           actions: "mark-duplicate"
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prod-test.yml

@@ -56,20 +56,27 @@ jobs:
           - "windows-latest"
         node:
           # Latest even version
-          - "20"
+          - "22"
           # Minimal version for production
           - "14"
         include:
           - os: "ubuntu-latest"
             # Pick a version that is fast (normally highest LTS version)
-            node: "20"
+            node: "22"
             FULL_TEST: true
           # Versions not tested on linux, normally only even versions
           # If latest version is an odd number, it can be listed bellow too
           - os: "ubuntu-latest"
             node: "16"
           - os: "ubuntu-latest"
             node: "21"
+          # Tests on Intel Mac x Node.js 14
+          - os: "macos-13"
+            node: "14"
+        # setup-node does not support Node.js 14 x M1 Mac
+        exclude:
+          - os: "macos-latest"
+            node: "14"
     env:
       FULL_TEST: ${{ matrix.FULL_TEST }}
     name: ${{ matrix.FULL_TEST && '[Full Test] ' || '' }} Node.js ${{ matrix.node }} on ${{ startsWith(matrix.os, 'macos') && 'MacOS' || startsWith(matrix.os, 'windows') && 'Windows' || 'Linux' }}
@@ -91,10 +98,15 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: "yarn"
 
+      # `jest@30.0.0-alpha.2` is the last version that supports Node.js v14
+      - name: Install jest@30.0.0-alpha.2
+        if: ${{ matrix.node == '14' }}
+        run: node ./scripts/prepare-nodejs-14-test.js
+
       - name: Install Dependencies(yarn@3,mutable)
+        if: ${{ matrix.node == '14' || matrix.node == '16' }}
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
-        if: ${{ matrix.node == '14' || matrix.node == '16' }}
         run: yarn install
 
       - name: Install Dependencies

.prettierignore

@@ -1,7 +1,7 @@
 **/.yarn/*
 
 /tests/format/**/*.*
-!/tests/format/**/jsfmt.spec.js
+!/tests/format/**/format.test.js
 /tests/integration/cli/
 /tests/integration/plugins/**/*.*
 !/tests/integration/plugins/automatic/node_modules/@prettier/plugin-foo/index.js

.yarnrc.yml

@@ -9,4 +9,4 @@ nodeLinker: node-modules
 plugins:
   - .yarn/plugins/plugin-setup-editor.cjs
 
-yarnPath: .yarn/releases/yarn-4.1.0.cjs
+yarnPath: .yarn/releases/yarn-4.1.1.cjs

CHANGELOG.md

@@ -68,15 +68,15 @@ export class AppComponent {}
 
 #### Use `"json"` parser for `tsconfig.json` by default ([#16012](https://github.com/prettier/prettier/pull/16012) by [@sosukesuzuki](https://github.com/sosukesuzuki))
 
-In [v3.2.0](https://prettier.io/blog/2024/01/12/3.2.0#new-jsonc-parser-added-15831httpsgithubcomprettierprettierpull15831-by-fiskerhttpsgithubcomfisker), we introduced `"jsonc"` parser which adds trialing comma **by default**.
+In [v3.2.0](https://prettier.io/blog/2024/01/12/3.2.0#new-jsonc-parser-added-15831httpsgithubcomprettierprettierpull15831-by-fiskerhttpsgithubcomfisker), we introduced `"jsonc"` parser which adds trailing comma **by default**.
 
 When adding a new parser we also define how it will be used based on the [`linguist-languages`](https://www.npmjs.com/package/linguist-languages) data.
 
 `tsconfig.json` is a special file used by [TypeScript](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html#using-tsconfigjson-or-jsconfigjson), it uses `.json` file extension, but it actually uses the [JSON with Comments](https://code.visualstudio.com/docs/languages/json#_json-with-comments) syntax. However, we found that there are many third-party tools not recognize it correctly because of the confusing `.json` file extension.
 
 We decide to treat it as a JSON file for now to avoid the extra configuration step.
 
-To keep using the `"jsonc"` parser for your `tsconfig.json` files, add the following to your `.pretterrc` file
+To keep using the `"jsonc"` parser for your `tsconfig.json` files, add the following to your `.prettierrc` file
 
 ```json
 {

CONTRIBUTING.md

@@ -11,7 +11,7 @@ yarn test
 
 The tests use [Jest snapshots](https://facebook.github.io/jest/docs/en/snapshot-testing.html). You can make changes and run `jest -u` (or `yarn test -u`) to update the snapshots. Then run `git diff` to take a look at what changed. Always update the snapshots when opening a PR.
 
-Each test directory in `tests/format` has a `jsfmt.spec.js` file that controls how exactly the rest of the files in the directory are used for tests. This file must contain one or more calls to the `runFormatTest` global function. For example, in directories with JavaScript formatting tests, `jsfmt.spec.js` generally looks like this:
+Each test directory in `tests/format` has a `format.test.js` file that controls how exactly the rest of the files in the directory are used for tests. This file must contain one or more calls to the `runFormatTest` global function. For example, in directories with JavaScript formatting tests, `format.test.js` generally looks like this:
 
 ```js
 runFormatTest(import.meta, ["babel", "flow", "typescript"]);
@@ -87,7 +87,7 @@ If you're contributing a performance improvement, the following Prettier CLI opt
 - `--debug-repeat N` uses a naïve loop to repeat the formatting `N` times and measures the average run duration. It can be useful to highlight hot functions in the profiler. This can also set by environment variable `PRETTIER_PERF_REPEAT`.
 - `--debug-benchmark` uses [`benchmark`](https://npm.im/benchmark) module to produce statistically significant duration measurements.
 
-For convenience, the following commands for profiling are available via `package.json` `scripts`.
+For convenience, the following commands for profiling are available via [`package.json`](package.json) `scripts`.
 
 - `PRETTIER_PERF_REPEAT=1000 yarn perf <filename>` starts the naïve loop. See the CLI output for when the measurements finish, and stop profiling at that moment.
 - `PRETTIER_PERF_REPEAT=1000 yarn perf:inspect <filename>` starts the naïve loop with `node --inspect-brk` flag that pauses execution and waits for Chromium/Chrome/Node Inspector to attach. Open [`chrome://inspect`](chrome://inspect), select the process to inspect, and activate the CPU Profiler, this will unpause execution. See the CLI output for when the measurements finish, and stop the CPU Profiler at that moment to avoid collecting more data than needed.
@@ -101,7 +101,7 @@ In the above commands:
 
 In addition to the options above, you can use [`node --prof` and `node --prof-process`](https://nodejs.org/en/docs/guides/simple-profiling/), as well as `node --trace-opt --trace-deopt`, to get more advanced performance insights.
 
-The script `scripts/benchmark/compare.sh` can be used to compare performance of two or more commits/branches using [hyperfine](https://github.com/sharkdp/hyperfine). Usage (don't forget to install hyperfine):
+The script [`scripts/benchmark/compare.sh`](scripts/benchmark/compare.sh) can be used to compare performance of two or more commits/branches using [hyperfine](https://github.com/sharkdp/hyperfine). Usage (don't forget to install hyperfine):
 
 ```sh
 PRETTIER_PERF_FILENAME=my.js ./compare.sh main some-pr-branch

FUNDING.json

@@ -0,0 +1,7 @@
+{
+  "drips": {
+    "ethereum": {
+      "ownedBy": "0x3A39F5E9BFe0a90e394982492e166C5635893141"
+    }
+  }
+}

changelog_unreleased/flow/16191.md

@@ -0,0 +1,23 @@
+#### Component syntax printing support for Flow (#16191 by @SamChou19815)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+component MyComponent(a: string, b: number) renders SomeComponent {
+  return <OtherComponent />;
+}
+hook useMyHook(a: string) {
+  return useState(a);
+}
+
+// Prettier stable
+// does not parse
+
+// Prettier main
+component MyComponent(a: string, b: number) renders SomeComponent {
+  return <OtherComponent />;
+}
+hook useMyHook(a: string) {
+  return useState(a);
+}
+```

changelog_unreleased/javascript/16064.md

@@ -0,0 +1,21 @@
+#### Format embedded GQL in template literal statements (#16064 by @keithlayne)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+/* GraphQL */ `
+  query foo { id }
+`;
+
+// Prettier stable
+/* GraphQL */ `
+  query foo { id }
+`;
+
+// Prettier main
+/* GraphQL */ `
+  query foo {
+    id
+  }
+`;
+```

changelog_unreleased/javascript/16116.md

@@ -0,0 +1,19 @@
+#### Allow linebreaks in member expressions in template interpolations (#16116 by @bakkot)
+
+When there is already a linebreak in a template interpolation, allow it to stay there even if it is a member expression. Note that (as of [#15209](https://github.com/prettier/prettier/pull/15209)) Prettier will not insert a linebreak inside an interpolation when one is not already present.
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+`template with ${
+    very.very.very.very.very.very.very.very.very.very.very.long.chain
+}`;
+
+// Prettier stable
+`template with ${very.very.very.very.very.very.very.very.very.very.very.long.chain}`;
+
+// Prettier main
+`template with ${
+  very.very.very.very.very.very.very.very.very.very.very.long.chain
+}`;
+```

changelog_unreleased/markdown/15993.md

@@ -0,0 +1,51 @@
+#### Improve wrapping for code block in markdown and jsx in mdx (#15993 by @seiyab)
+
+<!-- prettier-ignore -->
+````md
+<!-- Input -->
+```css
+img {
+  filter: drop-shadow(2px 2px 0 hsl(300deg 100% 50%)) drop-shadow(
+      -2px -2px 0 hsl(210deg 100% 50%)
+)
+    drop-shadow(2px 2px 0 hsl(120deg 100% 50%)) drop-shadow(
+      -2px -2px 0 hsl(30deg 100% 50%)
+    );
+}
+```
+
+<!-- Prettier stable -->
+```css
+img {
+  filter: drop-shadow(2px 2px 0 hsl(300deg 100% 50%)) drop-shadow(
+      -2px -2px 0 hsl(210deg 100% 50%)
+    )
+    drop-shadow(2px 2px 0 hsl(120deg 100% 50%)) drop-shadow(
+      -2px -2px 0 hsl(30deg 100% 50%)
+    );
+}
+```
+
+<!-- Prettier main -->
+```css
+img {
+  filter: drop-shadow(2px 2px 0 hsl(300deg 100% 50%))
+    drop-shadow(-2px -2px 0 hsl(210deg 100% 50%))
+    drop-shadow(2px 2px 0 hsl(120deg 100% 50%))
+    drop-shadow(-2px -2px 0 hsl(30deg 100% 50%));
+}
+```
+````
+
+<!-- prettier-ignore -->
+```md
+<!-- Input -->
+<ExternalLink href="http://example.com">Prettier</ExternalLink> is an opinionated-code-formatter-that-support-many-languages-and-integrate-with-most-editors
+
+<!-- Prettier stable -->
+<ExternalLink href="http://example.com">Prettier</ExternalLink> is an opinionated-code-formatter-that-support-many-languages-and-integrate-with-most-editors
+
+<!-- Prettier main -->
+<ExternalLink href="http://example.com">Prettier</ExternalLink> is an
+opinionated-code-formatter-that-support-many-languages-and-integrate-with-most-editors
+```

changelog_unreleased/markdown/16158.md

@@ -0,0 +1,21 @@
+#### Improve wrapping for markdown / mdx (#16158 by @seiyab)
+
+```json
+{ "proseWrap": "always" }
+```
+
+<!-- prettier-ignore -->
+```md
+<!-- Input --> 
+\
+word very-very-very-very-very-very-very-very-very-very-long-word very-very-very-very-very-very-very-very-very-very-long-word
+
+<!-- Prettier stable -->
+\
+word very-very-very-very-very-very-very-very-very-very-long-word very-very-very-very-very-very-very-very-very-very-long-word
+
+<!-- Prettier main -->
+\
+word very-very-very-very-very-very-very-very-very-very-long-word
+very-very-very-very-very-very-very-very-very-very-long-word
+```

changelog_unreleased/typescript/16133.md

@@ -0,0 +1,22 @@
+#### Respect `--no-semi` for readonly class field (#16133 by @sxzz)
+
+<!-- prettier-ignore -->
+```tsx
+// Input
+class A {
+  field
+  readonly [expr] = true
+}
+
+// Prettier stable
+class A {
+  field;
+  readonly [expr] = true
+}
+
+// Prettier main
+class A {
+  field
+  readonly [expr] = true
+}
+```

changelog_unreleased/typescript/16194.md

@@ -0,0 +1,21 @@
+#### Add necessary parentheses to yield expressions (#16194 by @kirkwaiblinger)
+
+Add parentheses around yield expressions if parent is an angle-bracket type assertion.
+
+<!-- prettier-ignore -->
+```ts
+// Input
+function* g() {
+  const y = <T>(yield x);
+}
+
+// Prettier stable
+function* g() {
+  const y = <T>yield x;
+}
+
+// Prettier main
+function* g() {
+  const y = <T>(yield x);
+}
+```