From 1884f2250b9d8458e395f153744f74b6117f0bb9 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:12:33 +0100
Subject: [PATCH 01/12] feat: format JSON script tags  (#424)

Also silences a (harmless) error log in the tests
closes #421
closes #419
---
 CHANGELOG.md                               | 4 ++++
 src/embed.ts                               | 7 ++++---
 src/print/node-helpers.ts                  | 6 ++++++
 test/printer/samples/no-tag-snippings.html | 4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2750f541..f432b304 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # prettier-plugin-svelte changelog
 
+## 3.2.0 (Unreleased)
+
+-   (feat) format JSON script tags
+
 ## 3.1.2
 
 -   (fix) handle `>` tags in attributes
diff --git a/src/embed.ts b/src/embed.ts
index 4c433b5e..a647bac3 100644
--- a/src/embed.ts
+++ b/src/embed.ts
@@ -11,6 +11,7 @@ import {
     getLeadingComment,
     isIgnoreDirective,
     isInsideQuotedAttribute,
+    isJSON,
     isLess,
     isNodeSupportedLanguage,
     isPugTemplate,
@@ -177,7 +178,7 @@ export function embed(path: FastPath, _options: Options) {
 
     const embedType = (
         tag: 'script' | 'style' | 'template',
-        parser: 'typescript' | 'babel-ts' | 'css' | 'scss' | 'less' | 'pug',
+        parser: 'typescript' | 'babel-ts' | 'css' | 'scss' | 'less' | 'pug' | 'json',
         isTopLevel: boolean,
     ) => {
         return async (
@@ -203,7 +204,7 @@ export function embed(path: FastPath, _options: Options) {
             // the user could have set the default language. babel-ts will format things a little
             // bit different though, especially preserving parentheses around dot notation which
             // fixes https://github.com/sveltejs/prettier-plugin-svelte/issues/218
-            isTypeScript(node) ? 'typescript' : 'babel-ts',
+            isTypeScript(node) ? 'typescript' : isJSON(node) ? 'json' : 'babel-ts',
             isTopLevel,
         );
     const embedStyle = (isTopLevel: boolean) =>
@@ -260,7 +261,7 @@ function getSnippedContent(node: Node) {
 
 async function formatBodyContent(
     content: string,
-    parser: 'typescript' | 'babel-ts' | 'css' | 'scss' | 'less' | 'pug',
+    parser: 'typescript' | 'babel-ts' | 'css' | 'scss' | 'less' | 'pug' | 'json',
     textToDoc: (text: string, options: object) => Promise<Doc>,
     options: ParserOptions & { pugTabWidth?: number },
 ) {
diff --git a/src/print/node-helpers.ts b/src/print/node-helpers.ts
index 7ee1b632..842b713e 100644
--- a/src/print/node-helpers.ts
+++ b/src/print/node-helpers.ts
@@ -268,6 +268,12 @@ export function isTypeScript(node: Node) {
     return ['typescript', 'ts'].includes(lang);
 }
 
+export function isJSON(node: Node) {
+    const lang = getLangAttribute(node) || '';
+    // https://github.com/prettier/prettier/pull/6293
+    return lang.endsWith('json') || lang.endsWith('importmap');
+}
+
 export function isLess(node: Node) {
     const lang = getLangAttribute(node) || '';
     return ['less'].includes(lang);
diff --git a/test/printer/samples/no-tag-snippings.html b/test/printer/samples/no-tag-snippings.html
index d60d00a1..9222c2fa 100644
--- a/test/printer/samples/no-tag-snippings.html
+++ b/test/printer/samples/no-tag-snippings.html
@@ -1,8 +1,8 @@
 <svelte:head>
     <script type="application/ld+json">
         {
-          "@context": "https://schema.org",
-          "@type": "etc..."
+            "@context": "https://schema.org",
+            "@type": "etc..."
         }
     </script>
     {@html `<style>${getCssText()}</style>`}

From cc856a0e5dedd56b7edb0aa1be18adaf385a247a Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:50:53 +0100
Subject: [PATCH 02/12] fix: don't duplicate comments of nested script/style
 tags (#425)

fixes #400
---
 CHANGELOG.md                                           |  1 +
 src/embed.ts                                           |  3 ++-
 src/print/index.ts                                     |  1 -
 .../samples/script-style-inside-element-comment.html   | 10 ++++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 test/printer/samples/script-style-inside-element-comment.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f432b304..ef0f13dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 3.2.0 (Unreleased)
 
 -   (feat) format JSON script tags
+-   (fix) don't duplicate comments of nested script/style tags
 
 ## 3.1.2
 
diff --git a/src/embed.ts b/src/embed.ts
index a647bac3..e3aab56b 100644
--- a/src/embed.ts
+++ b/src/embed.ts
@@ -366,7 +366,8 @@ async function embedTag(
         // the new position.
         return [...comments, result, hardline];
     } else {
-        return comments.length ? [...comments, result] : result;
+        // Only comments at the top level get the special "move comment" treatment.
+        return isTopLevel && comments.length ? [...comments, result] : result;
     }
 }
 
diff --git a/src/print/index.ts b/src/print/index.ts
index 394acc58..f525b396 100644
--- a/src/print/index.ts
+++ b/src/print/index.ts
@@ -46,7 +46,6 @@ import {
 import {
     ASTNode,
     AttributeNode,
-    CommentInfo,
     CommentNode,
     IfBlockNode,
     Node,
diff --git a/test/printer/samples/script-style-inside-element-comment.html b/test/printer/samples/script-style-inside-element-comment.html
new file mode 100644
index 00000000..2fd3e3c2
--- /dev/null
+++ b/test/printer/samples/script-style-inside-element-comment.html
@@ -0,0 +1,10 @@
+<div>
+    <!-- hello -->
+    <style></style>
+</div>
+<svelte:head>
+    <!-- world -->
+    <script>
+        let x;
+    </script>
+</svelte:head>

From 99c885e5d695bd59f26f156e66fd3f333f181e31 Mon Sep 17 00:00:00 2001
From: Curran Kelleher <68416+curran@users.noreply.github.com>
Date: Mon, 5 Feb 2024 03:43:35 -0500
Subject: [PATCH 03/12] chore: remove Buffer usage for browser environments
 (#423)

Closes #418
---
 src/base64-string.ts      | 20 ++++++++++++++++++++
 src/embed.ts              |  3 ++-
 src/lib/snipTagContent.ts |  6 ++++--
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 src/base64-string.ts

diff --git a/src/base64-string.ts b/src/base64-string.ts
new file mode 100644
index 00000000..887084f1
--- /dev/null
+++ b/src/base64-string.ts
@@ -0,0 +1,20 @@
+// Base64 string encoding and decoding module.
+// Uses Buffer for Node.js and btoa/atob for browser environments.
+// We use TextEncoder/TextDecoder for browser environments because
+// they can handle non-ASCII characters, unlike btoa/atob.
+
+export const stringToBase64 =
+    typeof Buffer !== 'undefined'
+        ? (str: string) => Buffer.from(str).toString('base64')
+        : (str: string) =>
+              btoa(
+                  new TextEncoder()
+                      .encode(str)
+                      .reduce((acc, byte) => acc + String.fromCharCode(byte), ''),
+              );
+
+export const base64ToString =
+    typeof Buffer !== 'undefined'
+        ? (str: string) => Buffer.from(str, 'base64').toString()
+        : (str: string) =>
+              new TextDecoder().decode(Uint8Array.from(atob(str), (c) => c.charCodeAt(0)));
diff --git a/src/embed.ts b/src/embed.ts
index e3aab56b..c04a953b 100644
--- a/src/embed.ts
+++ b/src/embed.ts
@@ -21,6 +21,7 @@ import {
 } from './print/node-helpers';
 import { CommentNode, ElementNode, Node, ScriptNode, StyleNode } from './print/nodes';
 import { extractAttributes } from './lib/extractAttributes';
+import { base64ToString } from './base64-string';
 
 const {
     builders: { group, hardline, softline, indent, dedent, literalline },
@@ -253,7 +254,7 @@ function getSnippedContent(node: Node) {
     const encodedContent = getAttributeTextValue(snippedTagContentAttribute, node);
 
     if (encodedContent) {
-        return Buffer.from(encodedContent, 'base64').toString('utf-8');
+        return base64ToString(encodedContent);
     } else {
         return '';
     }
diff --git a/src/lib/snipTagContent.ts b/src/lib/snipTagContent.ts
index 89337266..cb02d8d3 100644
--- a/src/lib/snipTagContent.ts
+++ b/src/lib/snipTagContent.ts
@@ -1,3 +1,5 @@
+import { base64ToString, stringToBase64 } from '../base64-string';
+
 export const snippedTagContentAttribute = '✂prettier:content✂';
 
 const scriptRegex =
@@ -42,7 +44,7 @@ export function snipScriptAndStyleTagContent(source: string): string {
             if (match.startsWith('<!--') || withinOtherSpan(index)) {
                 return match;
             }
-            const encodedContent = Buffer.from(content).toString('base64');
+            const encodedContent = stringToBase64(content);
             const newContent = `<${tagName}${attributes} ${snippedTagContentAttribute}="${encodedContent}">${placeholder}</${tagName}>`;
 
             // Adjust the spans because the source now has a different content length
@@ -97,7 +99,7 @@ const regex = /(<\w+.*?)\s*✂prettier:content✂="(.*?)">.*?(?=<\/)/gi;
 
 export function unsnipContent(text: string): string {
     return text.replace(regex, (_, start, encodedContent) => {
-        const content = Buffer.from(encodedContent, 'base64').toString('utf8');
+        const content = base64ToString(encodedContent);
         return `${start}>${content}`;
     });
 }

From 288d91567ddb37095cb063490108b4594377a374 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Tue, 13 Feb 2024 09:17:26 +0100
Subject: [PATCH 04/12] fix: handle updated `Snippet` block AST shape

fixes #428
---
 CHANGELOG.md       | 1 +
 src/embed.ts       | 7 +++++--
 src/print/nodes.ts | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef0f13dd..988f36fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 -   (feat) format JSON script tags
 -   (fix) don't duplicate comments of nested script/style tags
+-   (fix) handle updated `Snippet` block AST shape
 
 ## 3.1.2
 
diff --git a/src/embed.ts b/src/embed.ts
index c04a953b..6af912c3 100644
--- a/src/embed.ts
+++ b/src/embed.ts
@@ -75,7 +75,7 @@ export function embed(path: FastPath, _options: Options) {
 
     // embed does depth first traversal with deepest node called first, therefore we need to
     // check the parent to see if we are inside an expression that should be embedded.
-    const parent = path.getParentNode();
+    const parent: Node = path.getParentNode();
     const printJsExpression = () =>
         (parent as any).expression
             ? printJS(parent, options.svelteStrictMode ?? false, false, false, 'expression')
@@ -99,9 +99,12 @@ export function embed(path: FastPath, _options: Options) {
                 parent.expression.end =
                     options.originalText.indexOf(
                         ')',
-                        parent.context?.end ?? parent.expression.end,
+                        parent.context?.end ?? // TODO: remove at some point, snippet API changed in .next-..
+                            parent.parameters?.[parent.parameters.length - 1]?.end ??
+                            parent.expression.end,
                     ) + 1;
                 parent.context = null;
+                parent.parameters = null;
                 printSvelteBlockJS('expression');
             }
             break;
diff --git a/src/print/nodes.ts b/src/print/nodes.ts
index b5e56b55..c8c13ce5 100644
--- a/src/print/nodes.ts
+++ b/src/print/nodes.ts
@@ -294,7 +294,8 @@ export interface CommentInfo {
 export interface SnippetBlock extends BaseNode {
     type: 'SnippetBlock';
     expression: IdentifierNode;
-    context: null | any;
+    context?: BaseNode | null; // TODO: remove at some point, snippet API changed in .next-..
+    parameters: BaseNode[] | null;
     children: Node[];
 }
 

From d89241e11249b662394d1b356fc461d370c7441a Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 13 Feb 2024 14:23:46 +0100
Subject: [PATCH 05/12] feat: semi-standalone browser build (#430)

Adds a semi-standalone browser build under prettier-plugin-svelte/browser.

part of #69 (full fix would mean import maps work, which they don't because you need svelte/compiler.cjs which has the wrong mime type on package CDNs - this isn't fixable within this package, rather needs a different file type upstream)
closes #239
closes #257
closes #417

---------

Co-authored-by: Curran <curran.kelleher@gmail.com>
---
 .gitignore        |  1 +
 CHANGELOG.md      |  1 +
 README.md         |  4 ++++
 package-lock.json | 33 +++++++++++++++++++++++++++++++++
 package.json      |  3 +++
 rollup.config.js  | 42 +++++++++++++++++++++++++++++++++---------
 src/index.ts      |  3 ++-
 7 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f34e423..08863dc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ node_modules
 .history
 plugin.js
 plugin.js.map
+browser.js
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 988f36fb..ee07ab29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 3.2.0 (Unreleased)
 
 -   (feat) format JSON script tags
+-   (feat) introduce separate entry point using `prettier/standalone`
 -   (fix) don't duplicate comments of nested script/style tags
 -   (fix) handle updated `Snippet` block AST shape
 
diff --git a/README.md b/README.md
index d4dbc82a..a799ac13 100644
--- a/README.md
+++ b/README.md
@@ -220,6 +220,10 @@ Since we are using configuration overrides to handle svelte files, you might als
 }
 ```
 
+## Usage in the browser
+
+Usage in the browser is semi-supported. You can import the plugin from `prettier-plugin-svelte/browser` to get a version that depends on `prettier/standalone` and therefore doesn't use any node APIs. What isn't supported in a good way yet is using this without a build step - you still need a bundler like Vite to build everything together as one self-contained package in advance.
+
 ## Migration
 
 ```diff
diff --git a/package-lock.json b/package-lock.json
index 94036620..21e9c367 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
             "version": "3.1.2",
             "license": "MIT",
             "devDependencies": {
+                "@rollup/plugin-alias": "^5.1.0",
                 "@rollup/plugin-commonjs": "14.0.0",
                 "@rollup/plugin-node-resolve": "11.0.1",
                 "@types/node": "^14.0.0",
@@ -234,6 +235,38 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/@rollup/plugin-alias": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz",
+            "integrity": "sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==",
+            "dev": true,
+            "dependencies": {
+                "slash": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-alias/node_modules/slash": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+            "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/@rollup/plugin-commonjs": {
             "version": "14.0.0",
             "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-14.0.0.tgz",
diff --git a/package.json b/package.json
index 4f147b77..dc0b8a10 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "files": [
         "plugin.js",
         "plugin.js.map",
+        "browser.js",
         "index.d.ts"
     ],
     "types": "./index.d.ts",
@@ -14,6 +15,7 @@
             "types": "./index.d.ts",
             "default": "./plugin.js"
         },
+        "./browser": "./browser.js",
         "./package.json": "./package.json"
     },
     "scripts": {
@@ -37,6 +39,7 @@
     },
     "homepage": "https://github.com/sveltejs/prettier-plugin-svelte#readme",
     "devDependencies": {
+        "@rollup/plugin-alias": "^5.1.0",
         "@rollup/plugin-commonjs": "14.0.0",
         "@rollup/plugin-node-resolve": "11.0.1",
         "@types/node": "^14.0.0",
diff --git a/rollup.config.js b/rollup.config.js
index edcd9ffa..fd12ae57 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,14 +1,38 @@
+import alias from '@rollup/plugin-alias';
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import typescript from 'rollup-plugin-typescript';
 
-export default {
-    input: 'src/index.ts',
-    plugins: [resolve(), commonjs(), typescript()],
-    external: ['prettier', 'svelte'],
-    output: {
-        file: 'plugin.js',
-        format: 'cjs',
-        sourcemap: true,
+export default [
+    // CommonJS build
+    {
+        input: 'src/index.ts',
+        plugins: [resolve(), commonjs(), typescript()],
+        external: ['prettier', 'svelte/compiler'],
+        output: {
+            file: 'plugin.js',
+            format: 'cjs',
+            sourcemap: true,
+        },
     },
-};
+    // Browser build
+    // Supported use case: importing the plugin from a bundler like Vite or Webpack
+    // Semi-supported use case: importing the plugin directly in the browser through using import maps.
+    //                          (semi-supported because it requires a svelte/compiler.cjs import map and the .cjs ending has the wrong mime type on CDNs)
+    {
+        input: 'src/index.ts',
+        plugins: [
+            alias({
+                entries: [{ find: 'prettier', replacement: 'prettier/standalone' }],
+            }),
+            resolve(),
+            commonjs(),
+            typescript(),
+        ],
+        external: ['prettier/standalone', 'prettier/plugins/babel', 'svelte/compiler'],
+        output: {
+            file: 'browser.js',
+            format: 'esm',
+        },
+    },
+];
diff --git a/src/index.ts b/src/index.ts
index 40d15d3d..15dfc2f2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,6 +4,7 @@ import { hasPragma, print } from './print';
 import { ASTNode } from './print/nodes';
 import { embed, getVisitorKeys } from './embed';
 import { snipScriptAndStyleTagContent } from './lib/snipTagContent';
+import { parse } from 'svelte/compiler';
 
 const babelParser = prettierPluginBabel.parsers.babel;
 
@@ -29,7 +30,7 @@ export const parsers: Record<string, Parser> = {
         hasPragma,
         parse: (text) => {
             try {
-                return <ASTNode>{ ...require(`svelte/compiler`).parse(text), __isRoot: true };
+                return <ASTNode>{ ...parse(text), __isRoot: true };
             } catch (err: any) {
                 if (err.start != null && err.end != null) {
                     // Prettier expects error objects to have loc.start and loc.end fields.

From c8317eb0a0fb00bc4c05d47d5918fe8506013eda Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Tue, 13 Feb 2024 14:32:29 +0100
Subject: [PATCH 06/12] chore: release 3.2.0

---
 CHANGELOG.md      | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee07ab29..8b88a422 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # prettier-plugin-svelte changelog
 
-## 3.2.0 (Unreleased)
+## 3.2.0
 
 -   (feat) format JSON script tags
 -   (feat) introduce separate entry point using `prettier/standalone`
diff --git a/package-lock.json b/package-lock.json
index 21e9c367..a66f1f3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "3.1.2",
+    "version": "3.2.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "prettier-plugin-svelte",
-            "version": "3.1.2",
+            "version": "3.2.0",
             "license": "MIT",
             "devDependencies": {
                 "@rollup/plugin-alias": "^5.1.0",
diff --git a/package.json b/package.json
index dc0b8a10..9908af5c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "3.1.2",
+    "version": "3.2.0",
     "description": "Svelte plugin for prettier",
     "main": "plugin.js",
     "files": [

From 96049c64bef1849eea44ae7c7c581aed65b7c7a1 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Wed, 14 Feb 2024 10:03:13 +0100
Subject: [PATCH 07/12] fix: handle updated `@render` tag AST shape

fixes #428
---
 CHANGELOG.md                           |  4 +++
 package-lock.json                      |  4 +--
 package.json                           |  2 +-
 src/embed.ts                           | 42 ++++++++++++++++++--------
 src/index.ts                           |  7 ++++-
 src/print/nodes.ts                     |  9 +++++-
 test/printer/samples/snippet.html.skip | 22 ++++++++++++++
 7 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b88a422..71583d8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # prettier-plugin-svelte changelog
 
+## 3.2.1
+
+-   (fix) handle updated `@render` tag AST shape
+
 ## 3.2.0
 
 -   (feat) format JSON script tags
diff --git a/package-lock.json b/package-lock.json
index a66f1f3b..69f07930 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "prettier-plugin-svelte",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "license": "MIT",
             "devDependencies": {
                 "@rollup/plugin-alias": "^5.1.0",
diff --git a/package.json b/package.json
index 9908af5c..8ba7e8ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "description": "Svelte plugin for prettier",
     "main": "plugin.js",
     "files": [
diff --git a/src/embed.ts b/src/embed.ts
index 6af912c3..9f55ac5d 100644
--- a/src/embed.ts
+++ b/src/embed.ts
@@ -19,7 +19,7 @@ import {
     isTypeScript,
     printRaw,
 } from './print/node-helpers';
-import { CommentNode, ElementNode, Node, ScriptNode, StyleNode } from './print/nodes';
+import { BaseNode, CommentNode, ElementNode, Node, ScriptNode, StyleNode } from './print/nodes';
 import { extractAttributes } from './lib/extractAttributes';
 import { base64ToString } from './base64-string';
 
@@ -105,7 +105,8 @@ export function embed(path: FastPath, _options: Options) {
                     ) + 1;
                 parent.context = null;
                 parent.parameters = null;
-                printSvelteBlockJS('expression');
+                node.isJS = true;
+                node.asFunction = true;
             }
             break;
         case 'Element':
@@ -129,7 +130,9 @@ export function embed(path: FastPath, _options: Options) {
                 parent.expression.end =
                     options.originalText.indexOf(
                         ')',
-                        parent.argument?.end ?? parent.expression.end,
+                        parent.argument?.end ?? // TODO: remove at some point, snippet API changed in .next-..
+                            parent.arguments?.[parent.arguments.length - 1]?.end ??
+                            parent.expression.end,
                     ) + 1;
                 parent.argument = null;
                 printJS(parent, false, false, false, 'expression');
@@ -157,14 +160,14 @@ export function embed(path: FastPath, _options: Options) {
                     // so we need to have another public parser and defer to that
                     parser: 'svelteExpressionParser',
                     singleQuote: node.forceSingleQuote ? true : options.singleQuote,
+                    _svelte_asFunction: node.asFunction,
                 };
 
+                // If we have snipped content, it was done wrongly and we need to unsnip it.
+                // This happens for example for {@html `<script>{foo}</script>`}
+                const text = getText(node, options, true);
                 let docs = await textToDoc(
-                    forceIntoExpression(
-                        // If we have snipped content, it was done wrongly and we need to unsnip it.
-                        // This happens for example for {@html `<script>{foo}</script>`}
-                        getText(node, options, true),
-                    ),
+                    node.asFunction ? forceIntoFunction(text) : forceIntoExpression(text),
                     embeddedOptions,
                 );
                 if (node.forceSingleLine) {
@@ -173,6 +176,14 @@ export function embed(path: FastPath, _options: Options) {
                 if (node.removeParentheses) {
                     docs = removeParentheses(docs);
                 }
+                if (node.asFunction) {
+                    if (Array.isArray(docs) && typeof docs[0] === 'string') {
+                        docs[0] = docs[0].replace('function ', '');
+                        docs.splice(-1, 1);
+                    } else {
+                        throw new Error('Prettier AST changed, asFunction logic needs to change');
+                    }
+                }
                 return docs;
             } catch (e) {
                 return getText(node, options, true);
@@ -240,6 +251,10 @@ function forceIntoExpression(statement: string) {
     return `(${statement}\n)`;
 }
 
+function forceIntoFunction(statement: string) {
+    return `function ${statement} {}`;
+}
+
 function preformattedBody(str: string): Doc {
     if (!str) {
         return '';
@@ -382,11 +397,12 @@ function printJS(
     removeParentheses: boolean,
     name: string,
 ) {
-    if (!node[name] || typeof node[name] !== 'object') {
+    const part = node[name] as BaseNode | undefined;
+    if (!part || typeof part !== 'object') {
         return;
     }
-    node[name].isJS = true;
-    node[name].forceSingleQuote = forceSingleQuote;
-    node[name].forceSingleLine = forceSingleLine;
-    node[name].removeParentheses = removeParentheses;
+    part.isJS = true;
+    part.forceSingleQuote = forceSingleQuote;
+    part.forceSingleLine = forceSingleLine;
+    part.removeParentheses = removeParentheses;
 }
diff --git a/src/index.ts b/src/index.ts
index 15dfc2f2..336a6f64 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -64,7 +64,12 @@ export const parsers: Record<string, Parser> = {
         parse: (text: string, options: any) => {
             const ast = babelParser.parse(text, options);
 
-            return { ...ast, program: ast.program.body[0].expression };
+            let program = ast.program.body[0];
+            if (!options._svelte_asFunction) {
+                program = program.expression;
+            }
+
+            return { ...ast, program };
         },
     },
 };
diff --git a/src/print/nodes.ts b/src/print/nodes.ts
index c8c13ce5..30b7094b 100644
--- a/src/print/nodes.ts
+++ b/src/print/nodes.ts
@@ -1,9 +1,15 @@
 export interface BaseNode {
     start: number;
     end: number;
+    /** Whether this node is JS (not HTML/Svelte stuff) */
     isJS?: boolean;
+    /** Whether or not to print this node as a function */
+    asFunction?: boolean;
+    /** Whether or not to force single quotes when printing as JS */
     forceSingleQuote?: boolean;
+    /** Whether or not to force a single line when printing as JS */
     forceSingleLine?: boolean;
+    /** Whether or not to remove outer `()` when printing as JS */
     removeParentheses?: boolean;
 }
 
@@ -302,7 +308,8 @@ export interface SnippetBlock extends BaseNode {
 export interface RenderTag extends BaseNode {
     type: 'RenderTag';
     expression: IdentifierNode;
-    argument: null | any;
+    argument?: BaseNode | null;
+    arguments: BaseNode[] | null;
 }
 
 export type Node =
diff --git a/test/printer/samples/snippet.html.skip b/test/printer/samples/snippet.html.skip
index f0f25473..4f950380 100644
--- a/test/printer/samples/snippet.html.skip
+++ b/test/printer/samples/snippet.html.skip
@@ -6,5 +6,27 @@
     <p>bar</p>
 {/snippet}
 
+{#snippet baz(a, b, c = 1)}
+    <p>baz</p>
+{/snippet}
+
+<div>
+    {#snippet loooongFunction(
+        a,
+        lot,
+        _of,
+        parameters,
+        that,
+        make,
+        the,
+        lines,
+        _break,
+    )}
+        <p>baz</p>
+    {/snippet}
+</div>
+
 {@render foo()}
 {@render bar(x)}
+{@render test((() => "a")())}
+{@render test(t())}

From 08d7a8ba9978b5392d0adb4127da2cb7ed8aee6d Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Wed, 28 Feb 2024 10:46:24 +0100
Subject: [PATCH 08/12] chore: cross-test dirs test.only support

---
 test/formatting/index.ts | 5 ++++-
 test/printer/index.ts    | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/formatting/index.ts b/test/formatting/index.ts
index f0936a8a..9bb5b896 100644
--- a/test/formatting/index.ts
+++ b/test/formatting/index.ts
@@ -4,8 +4,11 @@ import { format } from 'prettier';
 import * as SveltePlugin from '../../src';
 
 let dirs = readdirSync('test/formatting/samples');
+const printerFilesHaveOnly = readdirSync('test/printer/samples').some(
+    (f) => f.endsWith('.only.html') || f.endsWith('.only.md'),
+);
 const endsWithOnly = (f: string): boolean => f.endsWith('.only');
-const hasOnly = dirs.some(endsWithOnly);
+const hasOnly = printerFilesHaveOnly || dirs.some(endsWithOnly);
 dirs = !hasOnly ? dirs : dirs.filter(endsWithOnly);
 
 if (process.env.CI && hasOnly) {
diff --git a/test/printer/index.ts b/test/printer/index.ts
index dd558328..2d2dc2c2 100644
--- a/test/printer/index.ts
+++ b/test/printer/index.ts
@@ -1,13 +1,16 @@
 import test from 'ava';
 import { readdirSync, readFileSync, existsSync } from 'fs';
 import { format } from 'prettier';
-import * as SveltePlugin from '../../src'
+import * as SveltePlugin from '../../src';
 
 let files = readdirSync('test/printer/samples').filter(
     (name) => name.endsWith('.html') || name.endsWith('.md'),
 );
+const formattingDirsHaveOnly = readdirSync('test/formatting/samples').some((d) =>
+    d.endsWith('.only'),
+);
 const endsWithOnly = (f: string): boolean => f.endsWith('.only.html') || f.endsWith('.only.md');
-const hasOnly = files.some(endsWithOnly);
+const hasOnly = formattingDirsHaveOnly || files.some(endsWithOnly);
 files = !hasOnly ? files : files.filter(endsWithOnly);
 
 if (process.env.CI && hasOnly) {
@@ -23,7 +26,7 @@ for (const file of files) {
 
     test(`printer: ${file.slice(0, file.length - `.${ending}`.length)}`, async (t) => {
         const actualOutput = await format(input, {
-            parser: (ending === 'html' ? 'svelte' : 'markdown'),
+            parser: ending === 'html' ? 'svelte' : 'markdown',
             plugins: [SveltePlugin],
             tabWidth: 4,
             ...options,

From c968fef2c2de4092ccedc0f2f9ba7cb0f207669f Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Wed, 28 Feb 2024 11:00:19 +0100
Subject: [PATCH 09/12] fix: adjust render tag printing for Svelte 5 AST
 changes

---
 src/embed.ts                           | 21 ++++++++++++---------
 test/printer/samples/snippet.html.skip |  3 +++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/embed.ts b/src/embed.ts
index 9f55ac5d..03bdaa58 100644
--- a/src/embed.ts
+++ b/src/embed.ts
@@ -125,16 +125,19 @@ export function embed(path: FastPath, _options: Options) {
             printJS(parent, false, false, true, 'expression');
             break;
         case 'RenderTag':
-            // We merge the two parts into one expression, which future-proofs this for template TS support
             if (node === parent.expression) {
-                parent.expression.end =
-                    options.originalText.indexOf(
-                        ')',
-                        parent.argument?.end ?? // TODO: remove at some point, snippet API changed in .next-..
-                            parent.arguments?.[parent.arguments.length - 1]?.end ??
-                            parent.expression.end,
-                    ) + 1;
-                parent.argument = null;
+                // TODO: remove this if block at some point, snippet API changed in .next-..
+                if ('argument' in parent || 'arguments' in parent) {
+                    parent.expression.end =
+                        options.originalText.indexOf(
+                            ')',
+                            parent.argument?.end ??
+                                parent.arguments?.[parent.arguments.length - 1]?.end ??
+                                parent.expression.end,
+                        ) + 1;
+                    parent.argument = null;
+                    parent.arguments = null;
+                }
                 printJS(parent, false, false, false, 'expression');
             }
             break;
diff --git a/test/printer/samples/snippet.html.skip b/test/printer/samples/snippet.html.skip
index 4f950380..765cf608 100644
--- a/test/printer/samples/snippet.html.skip
+++ b/test/printer/samples/snippet.html.skip
@@ -27,6 +27,9 @@
 </div>
 
 {@render foo()}
+{@render foo?.()}
 {@render bar(x)}
+{@render bar.baz[buzz](x)}
+{@render (why ? not : like ?? thiss)(x)}
 {@render test((() => "a")())}
 {@render test(t())}

From 601ee41a20311882bb9c046dcac21c868911b624 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Wed, 28 Feb 2024 11:01:02 +0100
Subject: [PATCH 10/12] chore: release 3.2.2

---
 CHANGELOG.md      |  4 ++++
 package-lock.json | 37 +++++++++++++++++++------------------
 package.json      |  2 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71583d8c..63aeba45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # prettier-plugin-svelte changelog
 
+## 3.2.2
+
+-   (fix) handle updated `@render` tag AST shape
+
 ## 3.2.1
 
 -   (fix) handle updated `@render` tag AST shape
diff --git a/package-lock.json b/package-lock.json
index 69f07930..b7a87256 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "3.2.1",
+    "version": "3.2.2",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "prettier-plugin-svelte",
-            "version": "3.2.1",
+            "version": "3.2.2",
             "license": "MIT",
             "devDependencies": {
                 "@rollup/plugin-alias": "^5.1.0",
@@ -153,9 +153,9 @@
             }
         },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-            "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+            "version": "0.3.4",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz",
+            "integrity": "sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/set-array": "^1.0.1",
@@ -702,9 +702,9 @@
             }
         },
         "node_modules/axobject-query": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
-            "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz",
+            "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==",
             "dev": true,
             "dependencies": {
                 "dequal": "^2.0.3"
@@ -3449,17 +3449,18 @@
             }
         },
         "node_modules/svelte": {
-            "version": "4.2.7",
-            "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.7.tgz",
-            "integrity": "sha512-UExR1KS7raTdycsUrKLtStayu4hpdV3VZQgM0akX8XbXgLBlosdE/Sf3crOgyh9xIjqSYB3UEBuUlIQKRQX2hg==",
+            "version": "4.2.12",
+            "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.12.tgz",
+            "integrity": "sha512-d8+wsh5TfPwqVzbm4/HCXC783/KPHV60NvwitJnyTA5lWn1elhXMNWhXGCJ7PwPa8qFUnyJNIyuIRt2mT0WMug==",
             "dev": true,
             "dependencies": {
                 "@ampproject/remapping": "^2.2.1",
                 "@jridgewell/sourcemap-codec": "^1.4.15",
                 "@jridgewell/trace-mapping": "^0.3.18",
+                "@types/estree": "^1.0.1",
                 "acorn": "^8.9.0",
                 "aria-query": "^5.3.0",
-                "axobject-query": "^3.2.1",
+                "axobject-query": "^4.0.0",
                 "code-red": "^1.0.3",
                 "css-tree": "^2.3.1",
                 "estree-walker": "^3.0.3",
@@ -3473,9 +3474,9 @@
             }
         },
         "node_modules/svelte/node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.20",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-            "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+            "version": "0.3.23",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz",
+            "integrity": "sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
@@ -3507,9 +3508,9 @@
             }
         },
         "node_modules/svelte/node_modules/magic-string": {
-            "version": "0.30.5",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-            "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+            "version": "0.30.7",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz",
+            "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.4.15"
diff --git a/package.json b/package.json
index 8ba7e8ec..46ec0a87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "3.2.1",
+    "version": "3.2.2",
     "description": "Svelte plugin for prettier",
     "main": "plugin.js",
     "files": [

From 539169b61e058e8f0409cd02c354571d136cbc32 Mon Sep 17 00:00:00 2001
From: Jeremiasz Major <jrh.mjr@gmail.com>
Date: Fri, 12 Apr 2024 16:32:13 +0200
Subject: [PATCH 11/12] fix: do not force slots to be self-closed (#435)

Related to sveltejs/kit#12102
---
 src/print/index.ts                                  | 2 +-
 test/printer/samples/self-closing-tags-lenient.html | 2 ++
 test/printer/samples/self-closing-tags.html         | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 test/printer/samples/self-closing-tags-lenient.html

diff --git a/src/print/index.ts b/src/print/index.ts
index f525b396..44ad01f1 100644
--- a/src/print/index.ts
+++ b/src/print/index.ts
@@ -215,10 +215,10 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
                 ((((node.type === 'Element' && !options.svelteStrictMode) ||
                     node.type === 'Head' ||
                     node.type === 'InlineComponent' ||
+                    node.type === 'Slot' ||
                     node.type === 'SlotTemplate' ||
                     node.type === 'Title') &&
                     didSelfClose) ||
-                    node.type === 'Slot' ||
                     node.type === 'Window' ||
                     selfClosingTags.indexOf(node.name) !== -1 ||
                     isDoctypeTag);
diff --git a/test/printer/samples/self-closing-tags-lenient.html b/test/printer/samples/self-closing-tags-lenient.html
new file mode 100644
index 00000000..23ef5f14
--- /dev/null
+++ b/test/printer/samples/self-closing-tags-lenient.html
@@ -0,0 +1,2 @@
+<slot />
+<slot></slot>
diff --git a/test/printer/samples/self-closing-tags.html b/test/printer/samples/self-closing-tags.html
index 662774ba..c9c7c0f4 100644
--- a/test/printer/samples/self-closing-tags.html
+++ b/test/printer/samples/self-closing-tags.html
@@ -6,6 +6,10 @@
 
 <MyComponent />
 
+<!-- TODO: self-closing slot shouldn't be allowed in the next major version -->
+<slot />
+<slot></slot>
+
 <img />
 
 <input />

From b120c4de5faa6ca6fa0c6867d6048e1dd1b958ca Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Fri, 12 Apr 2024 16:34:18 +0200
Subject: [PATCH 12/12] chore: release 3.2.3

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63aeba45..ba77dbea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # prettier-plugin-svelte changelog
 
+## 3.2.3
+
+-   (fix) don't force-self-close `<slot>` tags
+
 ## 3.2.2
 
 -   (fix) handle updated `@render` tag AST shape
diff --git a/package-lock.json b/package-lock.json
index b7a87256..dec8fe93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "3.2.2",
+    "version": "3.2.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "prettier-plugin-svelte",
-            "version": "3.2.2",
+            "version": "3.2.3",
             "license": "MIT",
             "devDependencies": {
                 "@rollup/plugin-alias": "^5.1.0",
diff --git a/package.json b/package.json
index 46ec0a87..2cb29577 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "3.2.2",
+    "version": "3.2.3",
     "description": "Svelte plugin for prettier",
     "main": "plugin.js",
     "files": [