Merge branch 'v3.9.x'

# Conflicts:
#	package.json
#	scripts/build/transform/index.js
#	tests/format/js/import-expression/format.test.js
#	tests/format/markdown/liquid/__snapshots__/format.test.js.snap
#	tests/format/markdown/list/__snapshots__/format.test.js.snap
#	website/versioned_docs/version-stable/browser.md
#	yarn.lock

.github/ISSUE_TEMPLATE/formatting.md

@@ -26,7 +26,7 @@ Don't fill the form below manually! Let a program create a report for you:
 
 -->
 
-**Prettier 3.9.6**
+**Prettier 3.9.7**
 [Playground link](https://prettier.io/playground/#.....)
 
 ```sh

.github/ISSUE_TEMPLATE/integration.md

@@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE:
 
 **Environments:**
 
-- Prettier Version: 3.9.6
+- Prettier Version: 3.9.7
 - Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
 - Runtime: <!-- Node.js v14, Chrome v83, etc. -->
 - Operating System: <!-- Windows, Linux, macOS, etc. -->

CHANGELOG.md

@@ -1,3 +1,197 @@
+# 3.9.7
+
+[diff](https://github.com/prettier/prettier/compare/3.9.6...3.9.7)
+
+#### Markdown: Prevent indentation drift in list-item code blocks ([#19647](https://github.com/prettier/prettier/pull/19647), [#19990](https://github.com/prettier/prettier/pull/19990) by [@Austin1serb](https://github.com/Austin1serb), [@giaBaoJS](https://github.com/giaBaoJS))
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+- [x] short first line.
+
+      second paragraph at six spaces that wraps
+      onto another line here.
+
+<!-- Prettier 3.9.6 -->
+- [x] short first line.
+
+      second paragraph at six spaces that wraps
+          onto another line here.
+
+<!-- Prettier 3.9.7 -->
+- [x] short first line.
+
+      second paragraph at six spaces that wraps
+      onto another line here.
+```
+
+#### JavaScript: Fix embedded template literal idempotency ([#19725](https://github.com/prettier/prettier/pull/19725) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+const foo = html`
+            <div>${getText({
+            value,
+            })}</div>
+`;
+
+// Prettier 3.9.6 (first format)
+const foo = html`
+  <div>
+    ${getText({
+              value,
+            })}
+  </div>
+`;
+
+// Prettier 3.9.6 (second format)
+const foo = html`
+  <div>
+    ${getText({
+      value,
+    })}
+  </div>
+`;
+
+// Prettier 3.9.7
+const foo = html`
+  <div>
+    ${getText({
+      value,
+    })}
+  </div>
+`;
+```
+
+#### Markdown: Preserve Liquid blocks after Markdown tables ([#19730](https://github.com/prettier/prettier/pull/19730) by [@wanxiankai](https://github.com/wanxiankai), [@seiyab](https://github.com/seiyab))
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+| Argument | Type |
+| -------- | ---- |
+{% set default_params = {
+    "model": ["str"],
+} %}
+
+<!-- Prettier 3.9.6 -->
+| Argument                  | Type |
+| ------------------------- | ---- |
+| {% set default_params = { |
+
+    "model": ["str"],
+
+} %}
+
+<!-- Prettier 3.9.7 -->
+| Argument | Type |
+| -------- | ---- |
+{% set default_params = {
+    "model": ["str"],
+} %}
+```
+
+#### Markdown: Preserve single tildes in Markdown ([#19739](https://github.com/prettier/prettier/pull/19739) by [@lazerg](https://github.com/lazerg))
+
+Since 3.9.0, single-tilde spans like `H~2~O` were rewritten to double tildes, turning subscript syntax into strike-through. Only double tildes are treated that way now, matching GitHub.
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+H~2~O
+
+<!-- Prettier 3.9.6 -->
+H~~2~~O
+
+<!-- Prettier 3.9.7 -->
+H~2~O
+```
+
+#### Markdown: Fix Markdown blockquote containing `>` characters ([#19802](https://github.com/prettier/prettier/pull/19802) by [@seiyab](https://github.com/seiyab))
+
+<!-- prettier-ignore -->
+```md
+<!-- Input -->
+> **test**\>
+
+<!-- Prettier 3.9.6 -->
+> **test**>\>
+
+<!-- Prettier 3.9.7 -->
+> **test**\>
+```
+
+#### Markdown: Strip blockquote markers from a setext heading's continuation lines ([#19878](https://github.com/prettier/prettier/pull/19878) by [@Kjubikstronk](https://github.com/Kjubikstronk))
+
+A setext heading spanning multiple lines inside a blockquote kept the `>` marker of its continuation lines as literal text.
+
+<!-- prettier-ignore -->
+```md
+<!-- Input -->
+> Multi
+> Line
+> ===
+
+<!-- Prettier 3.9.6 -->
+> Multi > Line
+> ===
+
+<!-- Prettier 3.9.7 -->
+> Multi
+> Line
+> ===
+```
+
+#### Markdown: Fix HTML block indentation drift in markdown list items ([#19987](https://github.com/prettier/prettier/pull/19987) by [@lazerg](https://github.com/lazerg))
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+1. Enable images:
+
+    <p align="center">
+      <img alt="example">
+    </p>
+
+<!-- Prettier 3.9.6 (--tab-width=4) -->
+1. Enable images:
+
+     <p align="center">
+       <img alt="example">
+     </p>
+
+<!-- Prettier 3.9.7 (--tab-width=4) -->
+1. Enable images:
+
+    <p align="center">
+      <img alt="example">
+    </p>
+```
+
+#### Angular: Support `@boundary` error boundaries ([#20014](https://github.com/prettier/prettier/pull/20014) by [@Yahiro025](https://github.com/Yahiro025))
+
+<!-- prettier-ignore -->
+```html
+<!-- Input -->
+@boundary {
+<complex-chart [data]="data"/>
+}
+@error (let err) {
+<p>{{err.message}}</p>
+}
+
+<!-- Prettier 3.9.6 -->
+SyntaxError: Unexpected character "EOF" (Do you have an unescaped "{" in your template? Use "{{ '{' }}") to escape it.) (6:1)
+
+<!-- Prettier 3.9.7 -->
+@boundary {
+  <complex-chart [data]="data" />
+} @error (let err) {
+  <p>{{ err.message }}</p>
+}
+```
+
 # 3.9.6
 
 [diff](https://github.com/prettier/prettier/compare/3.9.5...3.9.6)

package.json

@@ -182,7 +182,7 @@
     "node-style-text": "2.1.2",
     "npm-run-all2": "9.0.3",
     "open-editor": "6.0.0",
-    "prettier": "3.9.6",
+    "prettier": "3.9.7",
     "pretty-bytes": "7.1.3",
     "pretty-ms": "9.3.1",
     "puppeteer": "25.11.0",

packages/plugin-hermes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-hermes",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Prettier Hermes plugin.",
   "type": "module",
   "exports": {

packages/plugin-oxc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-oxc",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Prettier Oxc plugin.",
   "type": "module",
   "exports": {

packages/plugin-yuku/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-yuku",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Prettier yuku plugin.",
   "type": "module",
   "exports": {

tests/format/js/import-expression/__snapshots__/format.test.js.snap

@@ -93,6 +93,16 @@ exports[`import-phase.js format[typescript] 1`] = `
 Cause: 'source' is not a valid meta-property for keyword 'import'."
 `;
 
+exports[`import-phase.js format[typescript] 1`] = `
+"'source' is not a valid meta-property for keyword 'import'. (1:1)
+> 1 | import.source(\`data:text/javascript,
+    | ^^^^^^^^^^^^^
+  2 |     console.log("RUN");
+  3 | \`)
+  4 |
+Cause: 'source' is not a valid meta-property for keyword 'import'."
+`;
+
 exports[`template-literal.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]

website/versioned_docs/version-stable/browser.md

@@ -21,7 +21,7 @@ Required options:
 
 - **[`parser`](options.md#parser) (or [`filepath`](options.md#file-path))**: One of these options has to be specified for Prettier to know which parser to use.
 
-- **`plugins`**: Unlike the `format` function from the [Node.js-based API](api.md#prettierformatsource-options), this function doesn’t load plugins automatically. The `plugins` option is required because all the parsers included in the Prettier package come as plugins (for reasons of file size). These plugins are files in [https://unpkg.com/browse/prettier@3.9.6/plugins](https://unpkg.com/browse/prettier@3.9.6/plugins). Note that `estree` plugin should be loaded when printing JavaScript, TypeScript, Flow, or JSON.
+- **`plugins`**: Unlike the `format` function from the [Node.js-based API](api.md#prettierformatsource-options), this function doesn’t load plugins automatically. The `plugins` option is required because all the parsers included in the Prettier package come as plugins (for reasons of file size). These plugins are files in [https://unpkg.com/browse/prettier@3.9.7/plugins](https://unpkg.com/browse/prettier@3.9.7/plugins). Note that `estree` plugin should be loaded when printing JavaScript, TypeScript, Flow, or JSON.
 
   You need to load the ones that you’re going to use and pass them to `prettier.format` using the `plugins` option.
 
@@ -32,8 +32,8 @@ See below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@3.9.6/standalone.js"></script>
+<script src="https://unpkg.com/prettier@3.9.7/standalone.js"></script>
-<script src="https://unpkg.com/prettier@3.9.6/plugins/graphql.js"></script>
+<script src="https://unpkg.com/prettier@3.9.7/plugins/graphql.js"></script>
 <script>
   (async () => {
     const formatted = await prettier.format("type Query { hello: String }", {
@@ -50,8 +50,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 
 ```html
 <script type="module">
-  import * as prettier from "https://unpkg.com/prettier@3.9.6/standalone.mjs";
+  import * as prettier from "https://unpkg.com/prettier@3.9.7/standalone.mjs";
-  import * as prettierPluginGraphql from "https://unpkg.com/prettier@3.9.6/plugins/graphql.mjs";
+  import * as prettierPluginGraphql from "https://unpkg.com/prettier@3.9.7/plugins/graphql.mjs";
 
   const formatted = await prettier.format("type Query { hello: String }", {
     parser: "graphql",
@@ -64,8 +64,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 
 ```js
 define([
-  "https://unpkg.com/prettier@3.9.6/standalone.js",
+  "https://unpkg.com/prettier@3.9.7/standalone.js",
-  "https://unpkg.com/prettier@3.9.6/plugins/graphql.js",
+  "https://unpkg.com/prettier@3.9.7/plugins/graphql.js",
 ], async (prettier, ...plugins) => {
   const formatted = await prettier.format("type Query { hello: String }", {
     parser: "graphql",
@@ -96,8 +96,8 @@ This syntax doesn’t necessarily work in the browser, but it can be used when b
 <TabItem value="module" label="Module worker">
 
 ```js
-import * as prettier from "https://unpkg.com/prettier@3.9.6/standalone.mjs";
+import * as prettier from "https://unpkg.com/prettier@3.9.7/standalone.mjs";
-import * as prettierPluginGraphql from "https://unpkg.com/prettier@3.9.6/plugins/graphql.mjs";
+import * as prettierPluginGraphql from "https://unpkg.com/prettier@3.9.7/plugins/graphql.mjs";
 
 const formatted = await prettier.format("type Query { hello: String }", {
   parser: "graphql",
@@ -110,8 +110,8 @@ const formatted = await prettier.format("type Query { hello: String }", {
 
 ```js
 importScripts(
-  "https://unpkg.com/prettier@3.9.6/standalone.js",
+  "https://unpkg.com/prettier@3.9.7/standalone.js",
-  "https://unpkg.com/prettier@3.9.6/plugins/graphql.js",
+  "https://unpkg.com/prettier@3.9.7/plugins/graphql.js",
 );
 
 (async () => {
@@ -131,9 +131,9 @@ If you want to format [embedded code](options.md#embedded-language-formatting),
 
 ```html
 <script type="module">
-  import * as prettier from "https://unpkg.com/prettier@3.9.6/standalone.mjs";
+  import * as prettier from "https://unpkg.com/prettier@3.9.7/standalone.mjs";
-  import * as prettierPluginBabel from "https://unpkg.com/prettier@3.9.6/plugins/babel.mjs";
+  import * as prettierPluginBabel from "https://unpkg.com/prettier@3.9.7/plugins/babel.mjs";
-  import * as prettierPluginEstree from "https://unpkg.com/prettier@3.9.6/plugins/estree.mjs";
+  import * as prettierPluginEstree from "https://unpkg.com/prettier@3.9.7/plugins/estree.mjs";
 
   console.log(
     await prettier.format("const html=/* HTML */ `<DIV> </DIV>`", {
@@ -149,10 +149,10 @@ The HTML code embedded in JavaScript stays unformatted because the `html` parser
 
 ```html
 <script type="module">
-  import * as prettier from "https://unpkg.com/prettier@3.9.6/standalone.mjs";
+  import * as prettier from "https://unpkg.com/prettier@3.9.7/standalone.mjs";
-  import * as prettierPluginBabel from "https://unpkg.com/prettier@3.9.6/plugins/babel.mjs";
+  import * as prettierPluginBabel from "https://unpkg.com/prettier@3.9.7/plugins/babel.mjs";
-  import * as prettierPluginEstree from "https://unpkg.com/prettier@3.9.6/plugins/estree.mjs";
+  import * as prettierPluginEstree from "https://unpkg.com/prettier@3.9.7/plugins/estree.mjs";
-  import * as prettierPluginHtml from "https://unpkg.com/prettier@3.9.6/plugins/html.mjs";
+  import * as prettierPluginHtml from "https://unpkg.com/prettier@3.9.7/plugins/html.mjs";
 
   console.log(
     await prettier.format("const html=/* HTML */ `<DIV> </DIV>`", {

website/versioned_docs/version-stable/install.md

@@ -12,35 +12,35 @@ First, install Prettier locally:
 <TabItem value="npm">
 
 ```bash
-npm install --save-dev --save-exact prettier@3.9.6
+npm install --save-dev --save-exact prettier@3.9.7
 ```
 
 </TabItem>
 <TabItem value="yarn">
 
 ```bash
-yarn add --dev --exact prettier@3.9.6
+yarn add --dev --exact prettier@3.9.7
 ```
 
 </TabItem>
 <TabItem value="pnpm">
 
 ```bash
-pnpm add --save-dev --save-exact prettier@3.9.6
+pnpm add --save-dev --save-exact prettier@3.9.7
 ```
 
 </TabItem>
 <TabItem value="bun">
 
 ```bash
-bun add --dev --exact prettier@3.9.6
+bun add --dev --exact prettier@3.9.7
 ```
 
 </TabItem>
 <TabItem value="deno">
 
 ```bash
-deno install --dev --save-exact prettier@3.9.6
+deno install --dev --save-exact prettier@3.9.7
 ```
 
 </TabItem>

website/versioned_docs/version-stable/sharing-configurations.md

@@ -46,7 +46,7 @@ Example `package.json`:
     "prettier": ">=3.0.0"
   },
   "devDependencies": {
-    "prettier": "3.9.6"
+    "prettier": "3.9.7"
   }
 }
 ```
@@ -193,7 +193,7 @@ export default config;
     "prettier": ">=3.0.0"
   },
   "devDependencies": {
-    "prettier": "3.9.6"
+    "prettier": "3.9.7"
   }
 }
 ```

yarn.lock

@@ -8267,12 +8267,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:3.9.6":
+"prettier@npm:3.9.7":
-  version: 3.9.6
+  version: 3.9.7
-  resolution: "prettier@npm:3.9.6"
+  resolution: "prettier@npm:3.9.7"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10/1dd1a1e0e40ec3b91cda9d294c4a95022aef61880ca3f441aad99b1252279f58a766c4cece81132c01550dcff1fd445efbd8812ea4a2374313e7fc6c8136f11f
+  checksum: 10/f719bab860078a9d2472de9901529ffd1e3190963aeb246dee40de8d2fc60d66ec850c3bfc182475d63b9fd339bba8daa1ad500db8771ab4f5823a8da3f4546a
   languageName: node
   linkType: hard
 
@@ -8400,7 +8400,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.9.6"
+    prettier: "npm:3.9.7"
     pretty-bytes: "npm:7.1.3"
     pretty-ms: "npm:9.3.1"
     puppeteer: "npm:25.11.0"