Skip to content

Commit f2e2a42

Browse files
committed
Merge branch 'dev-0.9'
2 parents 4b337b4 + a26f4f9 commit f2e2a42

19 files changed

+3773
-80
lines changed

.github/workflows/perform-test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@ on:
2121
jobs:
2222
run-tester:
2323
runs-on: ubuntu-latest
24+
strategy:
25+
matrix:
26+
prettier-version: [v3.0, v3.1, v3.2, v3.3, v3.4, v3.5, v3.6, v3.7]
2427
steps:
2528
- uses: actions/checkout@v3
29+
with:
30+
ref: testing-prettier-${{ matrix.prettier-version }}
2631
- uses: actions/setup-node@v3
2732
with:
2833
node-version: 18

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,7 @@ Starting with `0.6.0`, when there is a minor release on one side, I plan to refl
110110
## Compatibility with other Prettier plugins
111111

112112
All other plugins used with this plugin must be compatible with your version of Prettier.
113+
114+
## Stargazers over time
115+
116+
[![Stargazers over time](https://starchart.cc/ony3000/prettier-plugin-merge.svg?variant=adaptive)](https://starchart.cc/ony3000/prettier-plugin-merge)

global.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ declare global {
2626

2727
type SupportedParserNames =
2828
| 'babel'
29+
| 'babel-ts'
2930
| 'typescript'
3031
| 'angular'
3132
| 'html'
3233
| 'vue'
34+
| 'oxc'
35+
| 'oxc-ts'
3336
| 'astro'
3437
| 'svelte';
3538

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,19 @@
3535
},
3636
"devDependencies": {
3737
"@biomejs/biome": "2.0.0",
38+
"@oxc-parser/binding-linux-x64-gnu": "0.99.0",
39+
"@prettier/plugin-oxc": "0.1.3",
3840
"@trivago/prettier-plugin-sort-imports": "4.2.1",
3941
"@types/diff": "5.0.3",
4042
"@types/node": "20.17.46",
4143
"esbuild": "0.25.0",
42-
"prettier": "3.1.0",
44+
"prettier": "3.7.3",
4345
"prettier-plugin-astro": "0.11.0",
44-
"prettier-plugin-brace-style": "0.8.2",
45-
"prettier-plugin-classnames": "0.8.6",
46+
"prettier-plugin-brace-style": "0.9.0",
47+
"prettier-plugin-classnames": "0.9.0",
4648
"prettier-plugin-space-before-function-paren": "0.0.7",
4749
"prettier-plugin-svelte": "3.0.0",
48-
"prettier-plugin-tailwindcss": "0.5.2",
50+
"prettier-plugin-tailwindcss": "0.7.2",
4951
"rimraf": "5.0.1",
5052
"typescript": "5.8.3",
5153
"vite-tsconfig-paths": "4.2.3",

0 commit comments

Comments
 (0)