Skip to content

Commit af13baf

Browse files
committed
fix(prettier): use prettier v3
BREAKING CHANGE: prettier v3
1 parent 8b65dec commit af13baf

File tree

4 files changed

+23
-44
lines changed

4 files changed

+23
-44
lines changed

packages/infra/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"eslint": "^8.39.0",
2727
"eslint-plugin-disable": "^2.0.3",
2828
"jest": "^29.7.0",
29-
"prettier": "^2.8.8",
29+
"prettier": "^3.3.3",
3030
"typedoc": "^0.26.8",
3131
"typescript": "^5.6.3"
3232
},

packages/prettier-config-qiwi/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
"@trivago/prettier-plugin-sort-imports": "^4.3.0"
3333
},
3434
"peerDependencies": {
35-
"prettier": "^2.0.0",
35+
"prettier": "^3.0.0",
3636
"typescript": "^5.0.0"
3737
},
3838
"devDependencies": {
3939
"@qiwi/lint-config-infra": "2.1.1",
4040
"@swissquote/crafty-preset-jest": "^1.27.0",
4141
"jest": "^29.7.0",
42-
"prettier": "^2.8.8",
42+
"prettier": "^3.3.3",
4343
"stdstream-snapshot": "^1.2.9",
4444
"ts-jest": "^29.2.5",
4545
"typescript": "^5.6.3"
Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,23 @@
1-
import { execSync } from 'node:child_process'
2-
import {
3-
copyFileSync,
4-
existsSync,
5-
mkdirSync,
6-
readFileSync,
7-
rmdirSync,
8-
} from 'node:fs'
9-
import { resolve } from 'node:path'
10-
1+
import * as cp from 'node:child_process'
2+
import * as fs from 'node:fs'
3+
import * as path from 'node:path'
114
import * as prettierConfig from '../../main/js'
125

13-
describe('', () => {
14-
const tmpDir = resolve(__dirname, '../../../../../tmp')
15-
16-
beforeAll(() => {
17-
if (existsSync(tmpDir)) {
18-
rmdirSync(tmpDir, { recursive: true })
19-
}
20-
mkdirSync(tmpDir)
21-
})
6+
const root = path.resolve(__dirname, '../../../../../')
7+
const pkgRoot = path.resolve(root, 'packages/prettier-config-qiwi')
8+
const bin = path.resolve(root, 'node_modules/.bin/prettier')
229

10+
describe('prettier', () => {
2311
it('prettierConfig', () => {
2412
expect(prettierConfig).toBeDefined()
2513
})
2614

2715
it('formats as expected', async () => {
28-
const configPath = resolve(__dirname, '../../main/js/index.js')
29-
30-
const prettier = resolve(
31-
__dirname,
32-
'../../../../../node_modules/.bin/prettier',
33-
)
34-
const input = resolve(__dirname, '../fixtures/input.ts')
35-
const output = resolve(__dirname, '../fixtures/output.ts')
36-
const temp = resolve(tmpDir, 'index.ts')
37-
38-
copyFileSync(input, temp)
39-
40-
execSync(`${prettier} --config ${configPath} --write ${temp}`)
16+
const configPath = path.resolve(pkgRoot, 'src/main/js/index.js')
17+
const input = path.resolve(pkgRoot, 'src/test/fixtures/input.ts')
18+
const output = path.resolve(pkgRoot, 'src/test/fixtures/output.ts')
4119

42-
expect(readFileSync(temp, 'utf-8')).toBe(readFileSync(output, 'utf-8'))
20+
const result = cp.execSync(`${bin} ${input} --config ${configPath}`).toString()
21+
expect(result).toBe(fs.readFileSync(output, 'utf-8'))
4322
})
4423
})

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,7 +2040,7 @@ __metadata:
20402040
eslint: "npm:^8.39.0"
20412041
eslint-plugin-disable: "npm:^2.0.3"
20422042
jest: "npm:^29.7.0"
2043-
prettier: "npm:^2.8.8"
2043+
prettier: "npm:^3.3.3"
20442044
typedoc: "npm:^0.26.8"
20452045
typescript: "npm:^5.6.3"
20462046
bin:
@@ -6999,22 +6999,22 @@ __metadata:
69996999
"@swissquote/crafty-preset-jest": "npm:^1.27.0"
70007000
"@trivago/prettier-plugin-sort-imports": "npm:^4.3.0"
70017001
jest: "npm:^29.7.0"
7002-
prettier: "npm:^2.8.8"
7002+
prettier: "npm:^3.3.3"
70037003
stdstream-snapshot: "npm:^1.2.9"
70047004
ts-jest: "npm:^29.2.5"
70057005
typescript: "npm:^5.6.3"
70067006
peerDependencies:
7007-
prettier: ^2.0.0
7007+
prettier: ^3.0.0
70087008
typescript: ^5.0.0
70097009
languageName: unknown
70107010
linkType: soft
70117011

7012-
"prettier@npm:^2.8.8":
7013-
version: 2.8.8
7014-
resolution: "prettier@npm:2.8.8"
7012+
"prettier@npm:^3.3.3":
7013+
version: 3.3.3
7014+
resolution: "prettier@npm:3.3.3"
70157015
bin:
7016-
prettier: bin-prettier.js
7017-
checksum: 10/00cdb6ab0281f98306cd1847425c24cbaaa48a5ff03633945ab4c701901b8e96ad558eb0777364ffc312f437af9b5a07d0f45346266e8245beaf6247b9c62b24
7016+
prettier: bin/prettier.cjs
7017+
checksum: 10/5beac1f30b5b40162532b8e2f7c3a4eb650910a2695e9c8512a62ffdc09dae93190c29db9107fa7f26d1b6c71aad3628ecb9b5de1ecb0911191099be109434d7
70187018
languageName: node
70197019
linkType: hard
70207020

0 commit comments

Comments
 (0)