diff --git a/package.json b/package.json index 77800d470..664f1fd24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "prettier", - "version": "3.7.0", + "version": "3.8.0-dev", "description": "Prettier is an opinionated code formatter", "bin": "./bin/prettier.cjs", "repository": "prettier/prettier", @@ -165,7 +165,7 @@ "node-style-text": "2.1.2", "npm-run-all2": "8.0.4", "open-editor": "6.0.0", - "prettier": "3.6.2", + "prettier": "3.7.0", "pretty-bytes": "7.1.0", "pretty-ms": "9.3.0", "rollup-plugin-license": "3.6.0", diff --git a/src/config/prettier-config/loaders.js b/src/config/prettier-config/loaders.js index 2965be801..de8482998 100644 --- a/src/config/prettier-config/loaders.js +++ b/src/config/prettier-config/loaders.js @@ -57,9 +57,8 @@ async function loadYaml(file) { const content = await readFile(file); if (!parseYaml) { - ({ __parsePrettierYamlConfig: parseYaml } = await import( - "../../plugins/yaml.js" - )); + ({ __parsePrettierYamlConfig: parseYaml } = + await import("../../plugins/yaml.js")); } try { diff --git a/src/index.d.ts b/src/index.d.ts index 6f8b6a9fe..a1b53ab58 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -766,14 +766,14 @@ export interface BooleanSupportOption extends BaseSupportOption<"boolean"> { oppositeDescription?: string | undefined; } -export interface BooleanArraySupportOption - extends BaseSupportOption<"boolean"> { +export interface BooleanArraySupportOption extends BaseSupportOption<"boolean"> { default?: Array<{ value: boolean[] }> | undefined; array: true; } -export interface ChoiceSupportOption - extends BaseSupportOption<"choice"> { +export interface ChoiceSupportOption< + Value = any, +> extends BaseSupportOption<"choice"> { default?: Value | Array<{ value: Value }> | undefined; description: string; choices: Array<{ diff --git a/src/language-css/print/parenthesized-value-group.js b/src/language-css/print/parenthesized-value-group.js index 80db230b1..a520c21d8 100644 --- a/src/language-css/print/parenthesized-value-group.js +++ b/src/language-css/print/parenthesized-value-group.js @@ -30,10 +30,10 @@ import { shouldPrintTrailingComma } from "./misc.js"; function hasComma({ node, parent }, options) { return Boolean( node.source && - options.originalText - .slice(locStart(node), locStart(parent.close)) - .trimEnd() - .endsWith(","), + options.originalText + .slice(locStart(node), locStart(parent.close)) + .trimEnd() + .endsWith(","), ); } diff --git a/src/language-css/utils/is-scss-variable.js b/src/language-css/utils/is-scss-variable.js index f4eee2250..6859151f6 100644 --- a/src/language-css/utils/is-scss-variable.js +++ b/src/language-css/utils/is-scss-variable.js @@ -1,8 +1,8 @@ function isSCSSVariable(node, options) { return Boolean( options.parser === "scss" && - node?.type === "word" && - node.value.startsWith("$"), + node?.type === "word" && + node.value.startsWith("$"), ); } diff --git a/src/language-js/comments/printer-methods.js b/src/language-js/comments/printer-methods.js index 825e3000e..952e39cc5 100644 --- a/src/language-js/comments/printer-methods.js +++ b/src/language-js/comments/printer-methods.js @@ -73,12 +73,12 @@ class Foo { const isClassMethodCantAttachComment = (node, [parent]) => Boolean( node.type === "FunctionExpression" && - parent.type === "MethodDefinition" && - parent.value === node && - getFunctionParameters(node).length === 0 && - !node.returnType && - !isNonEmptyArray(node.typeParameters) && - node.body, + parent.type === "MethodDefinition" && + parent.value === node && + getFunctionParameters(node).length === 0 && + !node.returnType && + !isNonEmptyArray(node.typeParameters) && + node.body, ); // `foo as const` diff --git a/src/language-js/utils/index.js b/src/language-js/utils/index.js index c10ef46aa..a57eada69 100644 --- a/src/language-js/utils/index.js +++ b/src/language-js/utils/index.js @@ -149,8 +149,8 @@ function isSignedNumericLiteral(node) { function isStringLiteral(node) { return Boolean( node && - (node.type === "StringLiteral" || - (node.type === "Literal" && typeof node.value === "string")), + (node.type === "StringLiteral" || + (node.type === "Literal" && typeof node.value === "string")), ); } diff --git a/yarn.lock b/yarn.lock index 8175dd395..35da643d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7483,12 +7483,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.6.2": - version: 3.6.2 - resolution: "prettier@npm:3.6.2" +"prettier@npm:3.7.0": + version: 3.7.0 + resolution: "prettier@npm:3.7.0" bin: prettier: bin/prettier.cjs - checksum: 10/1213691706bcef1371d16ef72773c8111106c3533b660b1cc8ec158bd109cdf1462804125f87f981f23c4a3dba053b6efafda30ab0114cc5b4a725606bb9ff26 + checksum: 10/ac581ded785c672187a0b25bfb4f621870496835377ebffaaa9cfa41f58ffe9b0c81ecc6382b425c2d83a18f4fbad235777b7c0bdfe8e972f1964e1e99638b4a languageName: node linkType: hard @@ -7599,7 +7599,7 @@ __metadata: postcss-scss: "npm:4.0.9" postcss-selector-parser: "npm:2.2.3" postcss-values-parser: "npm:2.0.1" - prettier: "npm:3.6.2" + prettier: "npm:3.7.0" pretty-bytes: "npm:7.1.0" pretty-ms: "npm:9.3.0" regexp-util: "npm:2.0.3"