fix merge conflicts

.github/workflows/benchmark.yml

@@ -49,7 +49,7 @@ jobs:
         run: cargo codspeed build --features codspeed -p xtask_bench
 
       - name: Run the benchmarks
-        uses: CodSpeedHQ/action@a58b84c0b61569a9cbb7cfb378cc849d65cf1ce5 # v2.4.3
+        uses: CodSpeedHQ/action@ce4674c9a7e4628edd2df5a3c8e4fbacc451a21c # v2.4.4
         timeout-minutes: 30
         with:
           run: cargo codspeed run

.github/workflows/publish_container_ci.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/pull_request.yml

@@ -125,7 +125,7 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 

.github/workflows/pull_request_js.yml

@@ -34,7 +34,7 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
       - name: Run Biome Format
         run: |
           pnpm i

.github/workflows/release_cli.yml

@@ -230,7 +230,7 @@ jobs:
         run: |
           bash scripts/print-changelog.sh ${{ needs.build.outputs.version }} >| ${{ github.workspace }}/RELEASE_NOTES
       - name: Create GitHub release and tag
-        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0 # v2.0.6
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/release_js_api.yml

@@ -75,7 +75,7 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
 
       - name: Set release infos
         if: needs.check.outputs.prerelease == 'true'
@@ -151,7 +151,7 @@ jobs:
         run: |
           bash scripts/print-changelog.sh ${{ needs.build.outputs.version }} >| ${{ github.workspace }}/RELEASE_NOTES
       - name: Create GitHub release and tag
-        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0 # v2.0.6
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

CHANGELOG.md

@@ -22,7 +22,20 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 #### New features
 
-- Add `--graphql-linter-enabled` option, to control whether the linter should enabled or not for GraphQL files. Contributed by @ematipico
+- Add `--graphql-linter-enabled` option, to control whether the linter should be enabled or not for GraphQL files. Contributed by @ematipico
+- The option `--max-diagnostics` now accept a `none` value, which lifts the limit of diagnostics shown. Contributed by @ematipico
+
+#### Enhancements
+
+- When a `--reporter` is provided, and it's different from the default one, the value provided by via `--max-diagnostics` is ignored and **the limit is lifted**. Contributed by @ematipico
+
+- `biome init` now generates a new config file with more options set.
+  This change intends to improve discoverability of the options and to set the more commonly used options to their default values.
+  Contributed by Conaclos
+
+#### Bug fixes
+
+- `biome lint --write` now takes `--only` and `--skip` into account ([#3470](https://github.com/biomejs/biome/issues/3470)). Contributed by Conaclos
 
 ### Configuration
 
@@ -40,6 +53,72 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 ### Formatter
 
+#### Enhancements
+
+- Add parentheses for nullcoalescing in ternaries.
+
+  This change aligns on [Prettier 3.3.3](https://github.com/prettier/prettier/blob/main/CHANGELOG.md#333).
+  This adds clarity to operator precedence.
+
+  ```diff
+  - foo ? bar ?? foo : baz;
+  + foo ? (bar ?? foo) : baz;
+  ```
+
+  Contributed by @Conaclos
+
+#### Bug fixes
+
+- Keep the parentheses around `infer` declarations in type unions and type intersections ([#3419](https://github.com/biomejs/biome/issues/3419)). Contributed by @Conaclos
+
+- Keep parentheses around a `yield` expression inside a type assertion.
+
+  Previously, Biome removed parentheses around some expressions that require them inside a type assertion.
+  For example, in the following code, Biome now preserves the parentheses.
+
+  ```ts
+  function* f() {
+    return <T>(yield 0);
+  }
+  ```
+
+  Contributed by @Conaclos
+
+- Remove parentheses around expressions that don't need them inside a decorator.
+
+  Biome now matches Prettier in the following cases:
+
+  ```diff
+    class {
+  -   @(decorator)
+  +   @decorator
+      method() {}
+    },
+    class {
+  -   @(decorator())
+  +   @decorator()
+      method() {}
+    },
+    class {
+      @(decorator?.())
+      method() {}
+    },
+  ```
+
+  Contributed by @Conaclos
+
+- Keep parentheses around objects preceded with a `@satisfies` comment.
+
+  In the following example, parentheses are no longer removed.
+
+  ```ts
+  export const PROPS = /** @satisfies {Record<string, string>} */ ({
+    prop: 0,
+  });
+  ```
+
+  Contributed by @Conaclos
+
 ### JavaScript APIs
 
 ### Linter
@@ -48,7 +127,7 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 - Add support for GraphQL linting. Contributed by @ematipico
 - Add [nursery/noDynamicNamespaceImportAccess](https://biomejs.dev/linter/no-dynamic-namespace-import-access/). Contributed by @minht11
-- [noUndeclaredVariables](https://biomejs.dev/linter/rules/no-undeclared-variables/) n longer report a direct reference to an enum member ([#2974](https://github.com/biomejs/biome/issues/2974)).
+- [noUndeclaredVariables](https://biomejs.dev/linter/rules/no-undeclared-variables/) no longer reports a direct reference to an enum member ([#2974](https://github.com/biomejs/biome/issues/2974)).
 
   In the following code, the `A` reference is no longer reported as an undeclared variable.
 
@@ -63,6 +142,7 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 - Add [nursery/noIrregularWhitespace](https://biomejs.dev/linter/rules/no-irregular-whitespace). Contributed by @michellocana
 - Implement `noIrreguluarWhitespace` for CSS. Contributed by @DerTimonius
+- Add [nursery/useTrimStartEnd](https://biomejs.dev/linter/rules/use-trim-start-end/). Contributed by @chansuke
 
 #### Enhancements
 
@@ -93,12 +173,48 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
   Contributed by @Conaclos
 
+- [useFilenamingConvention](https://biomejs.dev/linter/rules/use-filenaming-convention) now supports Next.js/Nuxt/Astro dynamic routes ([#3465](https://github.com/biomejs/biome/issues/3465)).
+
+  [Next.js](https://nextjs.org/docs/pages/building-your-application/routing/dynamic-routes#catch-all-segments), [SolidStart](https://docs.solidjs.com/solid-start/building-your-application/routing#renaming-index), [Nuxt](https://nuxt.com/docs/guide/directory-structure/server#catch-all-route), and [Astro](https://docs.astro.build/en/guides/routing/#rest-parameters) support dynamic routes such as `[...slug].js` and `[[...slug]].js`.
+
+  Biome now recognizes this syntax. `slug` must contain only alphanumeric characters.
+
+  Contributed by @Conaclos
+
+- [useExportType](https://biomejs.dev/linter/rules/use-export-type/) no longer report empty `export` ([#3535](https://github.com/biomejs/biome/issues/3535)).
+
+  An empty `export {}` allows you to force TypeScript to consider a file with no imports and exports as an EcmaScript module.
+  While `export type {}` is valid, it is more common to use `export {}`.
+  Users may find it confusing that the linter asks them to convert it to `export type {}`.
+  Also, a bundler should be able to remove `export {}` as well as `export type {}`.
+  So it is not so useful to report `export {}`.
+
+  Contributed by @Conaclos
+
 #### Bug fixes
 
 - Don't request alt text for elements hidden from assistive technologies ([#3316](https://github.com/biomejs/biome/issues/3316)). Contributed by @robintown
 - Fix [[#3149](https://github.com/biomejs/biome/issues/3149)] crashes that occurred when applying the `noUselessFragments` unsafe fixes in certain scenarios. Contributed by @unvalley
 - `noExcessiveNestedTestSuites`: Fix another edge case where the rule would alert on heavily nested zod schemas. Contributed by @dyc3
 
+- `noExtraNonNullAssertion` no longer reports a single non-null assertion enclosed in parentheses ([#3352](https://github.com/biomejs/biome/issues/3352)). Contributed by @Conaclos
+
+- `useAdjacentOverloadSignatures` no longer reports a `#private` class member and a public class member that share the same name ([#3309](https://github.com/biomejs/biome/issues/3309)).
+
+  The following code is no longer reported:
+
+  ```js
+  class C {
+    #f() {}
+    g() {}
+    f() {}
+  }
+  ```
+
+  Contributed by @Conaclos
+
+- [useNamingConvention](https://biomejs.dev/linter/rules/use-naming-convention/) now accepts applying custom convention on abstract classes. Contributed by @Conaclos
+
 ### Parser
 
 #### Bug fixes
@@ -112,7 +228,7 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
   }
 }
 ```
-- Fix [#3410](https://github.com/biomejs/biome/issues/3410) by correctly parsing break statements containing keywords. 
+- Fix [#3410](https://github.com/biomejs/biome/issues/3410) by correctly parsing break statements containing keywords.
   ```js
   out: while (true) {
     break out;

CONTRIBUTING.md

@@ -4,32 +4,36 @@ We can use help in a bunch of areas and any help is greatly appreciated!
 
 ## Table of Contents
 
-* [Asking questions, making proposals](#asking-questions-making-proposals)
-* [Reporting bugs](#reporting-bugs)
-* [Getting Started](#getting-started)
-* [Install the required tools](#install-the-required-tools)
-* [Testing](#testing)
-  + [Debugging](#debugging)
-* [Checks](#checks)
-* [Crates development](#crates-development)
-  + [Analyzers and lint rules](#analyzers-and-lint-rules)
-  + [Parser](#parser)
-  + [Formatter](#formatter)
-* [Crate dependencies](#crate-dependencies)
-* [Node.js development](#nodejs-development)
-  + [Translations](#translations)
-* [Commit messages](#commit-messages)
-* [Creating pull requests](#creating-pull-requests)
-  + [Changelog](#changelog)
-    - [Writing a changelog line](#writing-a-changelog-line)
-  + [Documentation](#documentation)
-  + [Versioning](#versioning)
-* [Releasing](#releasing)
-* [Resources](#resources)
-* [Current Members](#current-members)
-  + [Lead team](#lead-team)
-  + [Core Contributors team](#core-contributors-team)
-  + [Maintainers team](#maintainers-team)
+- [🚀 Contributing](#-contributing)
+  - [Table of Contents](#table-of-contents)
+  - [Asking questions, making proposals](#asking-questions-making-proposals)
+  - [Reporting bugs](#reporting-bugs)
+  - [Getting Started](#getting-started)
+  - [Install the required tools](#install-the-required-tools)
+  - [Testing](#testing)
+    - [Debugging](#debugging)
+  - [Checks](#checks)
+  - [Crates development](#crates-development)
+    - [Create new crates](#create-new-crates)
+    - [Analyzers and lint rules](#analyzers-and-lint-rules)
+    - [Parser](#parser)
+    - [Formatter](#formatter)
+  - [Crate dependencies](#crate-dependencies)
+  - [Node.js development](#nodejs-development)
+    - [Translations](#translations)
+  - [Commit messages](#commit-messages)
+  - [Creating pull requests](#creating-pull-requests)
+    - [Changelog](#changelog)
+      - [Writing a changelog line](#writing-a-changelog-line)
+    - [Documentation](#documentation)
+    - [Versioning](#versioning)
+  - [Releasing](#releasing)
+  - [Resources](#resources)
+  - [Current Members](#current-members)
+    - [Lead team](#lead-team)
+    - [Core Contributors team](#core-contributors-team)
+    - [Maintainers team](#maintainers-team)
+    - [Past Maintainers](#past-maintainers)
 
 ## Asking questions, making proposals
 
@@ -425,6 +429,7 @@ Members are listed in alphabetical order. Members are free to use the full name,
 
 ### Maintainers team
 
+- [Carson McManus @dyc3](https://github.com/dyc3)
 - [Dani Guardiola @DaniGuardiola](https://github.com/DaniGuardiola)
 - [Justinas Delinda @minht11](https://github.com/minht11)
 - [Madeline Gurriarán @SuperchupuDev](https://github.com/SuperchupuDev)