Skip to content

Commit b7fd2dc

Browse files
sosukesuzukisosukesuzuki
authored
Merge branch 'main' into bugfix/markdown_unexpected_newline
2 parents 6eb23db + 5ba6bf6 commit b7fd2dc

1,135 files changed

Lines changed: 44046 additions & 26581 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
66

77
# Prettier bump after release
8+
# 3.5.0
9+
cac3858a34b8be0487befab7d55170f5ed14d452
810
# 3.3.3
911
060ef1b2ae29348eec056619af5752f20369b010
1012
# 3.2.3

‎.github/ISSUE_TEMPLATE/formatting.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BEFORE SUBMITTING AN ISSUE:
1616
2. We get a lot of requests for adding options, but Prettier is
1717
built on the principle of being opinionated about code formatting.
1818
This means we add options only in the case of strict technical necessity.
19-
Find out more: https://prettier.io/docs/en/option-philosophy.html
19+
Find out more: https://prettier.io/docs/option-philosophy
2020
2121
Don't fill the form below manually! Let a program create a report for you:
2222
@@ -26,7 +26,7 @@ Don't fill the form below manually! Let a program create a report for you:
2626
2727
-->
2828

29-
**Prettier 3.3.3**
29+
**Prettier 3.5.3**
3030
[Playground link](https://prettier.io/playground/#.....)
3131

3232
```sh

‎.github/ISSUE_TEMPLATE/integration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE:
2020

2121
**Environments:**
2222

23-
- Prettier Version: 3.3.3
23+
- Prettier Version: 3.5.3
2424
- Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
2525
- Runtime: <!-- Node.js v14, Chrome v83, etc. -->
2626
- Operating System: <!-- Windows, Linux, macOS, etc. -->

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Description
22

3-
<!-- Please provide a brief summary of your changes: -->
3+
<!-- Please provide a brief summary of your changes -->
44

55
## Checklist
66

@@ -11,7 +11,3 @@
1111
- [ ] (If changing the API or CLI) I’ve documented the changes I’ve made (in the `docs/` directory).
1212
- [ ] (If the change is user-facing) I’ve added my changes to `changelog_unreleased/*/XXXX.md` file following `changelog_unreleased/TEMPLATE.md`.
1313
- [ ] I’ve read the [contributing guidelines](https://github.com/prettier/prettier/blob/main/CONTRIBUTING.md).
14-
15-
<!-- Please DO NOT remove the playground link -->
16-
17-
**✨[Try the playground for this PR](https://prettier.io/playground-redirect)✨**

‎.github/codeql/codeql-config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
name: "CodeQL config"
22
paths-ignore:
33
- tests/format
4+
- tests/integration/cli

‎.github/renovate.json5‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,53 @@
99
prConcurrentLimit: 0,
1010
packageRules: [
1111
{
12-
matchDepNames: ["react", "react-dom"],
1312
groupName: "react",
13+
matchPackageNames: ["react", "react-dom"],
1414
},
1515
{
16-
matchPackagePrefixes: ["@babel/"],
1716
groupName: "babel",
17+
matchPackageNames: ["@babel/*"],
1818
},
1919
{
20-
matchPackagePrefixes: ["@typescript-eslint/"],
2120
groupName: "typescript-eslint",
21+
matchPackageNames: ["@typescript-eslint/*"],
2222
},
2323
{
24-
matchPackagePrefixes: ["@glimmer/"],
2524
groupName: "glimmer",
25+
matchPackageNames: ["@glimmer/*"],
2626
},
2727
{
28-
matchDepNames: ["flow-parser", "hermes-parser"],
2928
groupName: "flow-parser",
29+
matchPackageNames: ["flow-parser", "hermes-parser"],
3030
},
3131
{
32-
matchDepNames: [
32+
groupName: "ESLint related dependencies",
33+
matchPackageNames: [
3334
"eslint",
34-
"@eslint/compat",
35-
"@eslint/eslintrc",
36-
"@eslint/js",
37-
"@stylistic/eslint-plugin-js",
35+
"@eslint/*",
36+
"@eslint-react/eslint-plugin",
37+
"@stylistic/eslint-plugin",
3838
"eslint-config-prettier",
3939
"eslint-plugin-compat",
4040
"eslint-plugin-jest",
4141
"eslint-plugin-n",
42-
"eslint-plugin-react",
4342
"eslint-plugin-regexp",
4443
"eslint-plugin-simple-import-sort",
4544
"eslint-plugin-unicorn",
4645
"globals",
4746
],
48-
groupName: "ESLint related dependencies",
4947
},
5048
{
51-
matchDepNames: ["@angular/compiler", "angular-estree-parser"],
5249
groupName: "Angular Estree",
50+
matchPackageNames: ["@angular/compiler", "angular-estree-parser"],
51+
},
52+
{
53+
groupName: "Regex related dependencies",
54+
matchPackageNames: ["regexp-util", "unicode-regex", "cjk-regex"],
55+
},
56+
{
57+
groupName: "Config search related dependencies",
58+
matchPackageNames: ["url-or-path", "search-closest"],
5359
},
5460
{
5561
branchPrefix: "renovate/website/",
@@ -66,8 +72,22 @@
6672
labels: ["dependency:tools"],
6773
},
6874
{
69-
matchManagers: ["github-actions"],
7075
groupName: "GitHub Actions",
76+
matchManagers: ["github-actions"],
77+
},
78+
// Forbid [email protected]
79+
// https://github.com/prettier/prettier/pull/13171#issuecomment-1258427561
80+
{
81+
matchPackageNames: ["codemirror"],
82+
allowedVersions: "!/^6\\.65\\.7$/",
83+
},
84+
{
85+
matchPackageNames: ["react", "react-dom"],
86+
allowedVersions: "^18.0.0",
87+
},
88+
{
89+
groupName: "docusaurus",
90+
matchPackageNames: ["@docusaurus/*"],
7191
},
7292
],
7393
ignoreDeps: [

‎.github/workflows/autofix.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: autofix.ci # needed to securely identify the workflow
2+
3+
on:
4+
pull_request:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: true
9+
10+
jobs:
11+
fix:
12+
name: Run automated fix
13+
uses: prettier/shared-workflows/.github/workflows/automated-fix.yml@main
14+
permissions: {}
15+
with:
16+
repository: prettier/prettier

‎.github/workflows/check-sizes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
cache: "yarn"
2626

2727
- name: Check Sizes
28-
uses: preactjs/compressed-size-action@2.7.0
28+
uses: preactjs/compressed-size-action@2.8.0
2929
with:
3030
repo-token: "${{ secrets.GITHUB_TOKEN }}"
3131
pattern: "./dist/**/*"

‎.github/workflows/dev-package-test.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ jobs:
3333
- "20"
3434
NPM_CLIENT:
3535
- "yarn"
36-
# Disabled temporarily #13151
37-
# - "npm"
36+
- "npm"
3837
- "pnpm"
3938
env:
4039
INSTALL_PACKAGE: true
41-
NPM_CLIENT: ${{ matrix.NPM_CLIENT }}
40+
PRETTIER_INSTALL_NPM_CLIENT: ${{ matrix.NPM_CLIENT }}
4241
name: Test with ${{ matrix.NPM_CLIENT }}
4342
runs-on: ${{ matrix.os }}
4443
steps:

‎.github/workflows/dev-test.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ jobs:
2727
- "windows-latest"
2828
node:
2929
# Latest even version
30-
- "22"
30+
- "24"
3131
# Minimal version for development
3232
- "20"
3333
include:
3434
- os: "ubuntu-latest"
3535
# Pick a version that is fast (normally highest LTS version)
36-
node: "22"
36+
node: "24"
3737
ENABLE_CODE_COVERAGE: true
3838
FULL_TEST: true
3939
CHECK_TEST_PARSERS: true
4040
# Versions not tested on linux, normally only even versions
4141
# If latest version is an odd number, it can be listed below too
42-
# - os: "ubuntu-latest"
43-
# node: "20"
42+
- os: "ubuntu-latest"
43+
node: "22"
4444
env:
4545
ENABLE_CODE_COVERAGE: ${{ matrix.ENABLE_CODE_COVERAGE }}
4646
FULL_TEST: ${{ matrix.FULL_TEST }}
@@ -69,9 +69,10 @@ jobs:
6969
run: yarn c8 yarn test
7070

7171
- name: Upload Coverage
72-
uses: codecov/codecov-action@v4
72+
uses: codecov/codecov-action@v5
7373
if: ${{ matrix.ENABLE_CODE_COVERAGE }}
7474
with:
7575
fail_ci_if_error: true
76+
disable_search: true
7677
files: coverage/lcov.info
7778
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)