Skip to content

Commit e17ff04

Browse files
committed
upgrade prettier
1 parent 360d1d9 commit e17ff04

File tree

3 files changed

+35
-26
lines changed

3 files changed

+35
-26
lines changed

package-lock.json

Lines changed: 26 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/frame/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"prosemirror-state": "^1.4.3",
2323
"prosemirror-keymap": "^1.2.2",
2424
"penpal": "^6.1.0",
25-
"prettier": "2.4.1",
25+
"prettier": "^3.0.2",
2626
"react": "^18.2.0",
2727
"react-dom": "^18.2.0",
2828
"react-icons": "^4.6.0",
@@ -43,7 +43,7 @@
4343
"@vitest/coverage-v8": "^0.33.0",
4444
"@vitejs/plugin-react": "^4.0.0",
4545
"@types/markdown-it": "^10.0.3",
46-
"@types/prettier": "^2.6.4",
46+
"@types/prettier": "^3.0.0",
4747
"chai": "^4.3.7"
4848
},
4949
"type": "module",

packages/frame/src/runtime/editor/prettier/index.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ export function setupPrettier(monacoInstance: typeof monaco) {
99
async provideDocumentFormattingEdits(model, options, token) {
1010
try {
1111
const prettier = await import("prettier/standalone");
12-
const parserTypescript = await import("prettier/parser-typescript");
13-
const newText = prettier.format(model.getValue(), {
12+
const parserTypescript = await import("prettier/plugins/typescript");
13+
const esTree = await import("prettier/plugins/estree");
14+
15+
const newText = await prettier.format(model.getValue(), {
1416
parser: "typescript",
15-
plugins: [parserTypescript],
17+
plugins: [parserTypescript, esTree.default],
1618
tabWidth: 2,
1719
printWidth: 80,
1820
jsxBracketSameLine: true,
@@ -34,9 +36,9 @@ export function setupPrettier(monacoInstance: typeof monaco) {
3436
monacoInstance.languages.registerDocumentFormattingEditProvider("css", {
3537
async provideDocumentFormattingEdits(model, options, token) {
3638
const prettier = await import("prettier/standalone");
37-
const parserCSS = await import("prettier/parser-postcss");
39+
const parserCSS = await import("prettier/plugins/postcss");
3840
try {
39-
const newText = prettier.format(model.getValue(), {
41+
const newText = await prettier.format(model.getValue(), {
4042
parser: "css",
4143
plugins: [parserCSS],
4244
tabWidth: 2,

0 commit comments

Comments
 (0)