diff --git a/package.json b/package.json
index 62581782d7..4f5748cc5d 100644
--- a/package.json
+++ b/package.json
@@ -42,5 +42,13 @@
"typescript-eslint": "^8.24.0",
"v8-natives": "^1.2.5",
"vitest": "^2.1.9"
+ },
+ "pnpm": {
+ "overrides": {
+ "esrap": "link:../../esrap"
+ }
+ },
+ "dependencies": {
+ "esrap": "link:../../../../esrap"
}
}
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index d2fbdb32f7..1b1276182b 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -164,14 +164,14 @@
"dependencies": {
"@ampproject/remapping": "^2.3.0",
"@jridgewell/sourcemap-codec": "^1.5.0",
+ "@sveltejs/acorn-typescript": "^1.0.5",
"@types/estree": "^1.0.5",
"acorn": "^8.12.1",
- "@sveltejs/acorn-typescript": "^1.0.5",
"aria-query": "^5.3.1",
"axobject-query": "^4.1.0",
"clsx": "^2.1.1",
"esm-env": "^1.2.1",
- "esrap": "^1.4.8",
+ "esrap": "https://pkg.pr.new/sveltejs/esrap@a275a5c",
"is-reference": "^3.0.3",
"locate-character": "^3.0.0",
"magic-string": "^0.30.11",
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
index ba3f4b155a..a87a356d58 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/client/index.svelte.js
@@ -22,6 +22,7 @@ export default function Bind_component_snippet($$anchor) {
get value() {
return $.get(value);
},
+
set value($$value) {
$.set(value, $$value, true);
}
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
index cadae2cf15..e2c0ee29a5 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
@@ -16,6 +16,7 @@ export default function Bind_component_snippet($$payload) {
get value() {
return value;
},
+
set value($$value) {
value = $$value;
$$settled = false;
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
index 28bb01fb18..d84b674f88 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js
@@ -6,6 +6,7 @@ var root = $.from_html(` 'test';
var fragment = root();
var div = $.first_child(fragment);
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
index 4ea5edb6a0..cf731d8187 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
@@ -3,6 +3,7 @@ import * as $ from 'svelte/internal/server';
export default function Main($$payload) {
// needs to be a snapshot test because jsdom does auto-correct the attribute casing
let x = 'test';
+
let y = () => 'test';
$$payload.out += ` `;
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
index 762a23754c..218951b836 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
@@ -14,6 +14,7 @@ export default function Function_prop_no_getter($$anchor) {
onmousedown: () => $.set(count, $.get(count) + 1),
onmouseup,
onmouseenter: () => $.set(count, plusOne($.get(count)), true),
+
children: ($$anchor, $$slotProps) => {
$.next();
@@ -22,6 +23,7 @@ export default function Function_prop_no_getter($$anchor) {
$.template_effect(() => $.set_text(text, `clicks: ${$.get(count) ?? ''}`));
$.append($$anchor, text);
},
+
$$slots: { default: true }
});
}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
index 88f6f55ee7..7d37abd97b 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
@@ -13,9 +13,11 @@ export default function Function_prop_no_getter($$payload) {
onmousedown: () => count += 1,
onmouseup,
onmouseenter: () => count = plusOne(count),
+
children: ($$payload) => {
$$payload.out += `clicks: ${$.escape(count)}`;
},
+
$$slots: { default: true }
});
}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/client/index.svelte.js
index 792d5421e1..d4034dc55d 100644
--- a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/client/index.svelte.js
@@ -6,6 +6,7 @@ var root = $.from_tree(
[
['h1', null, 'hello'],
' ',
+
[
'div',
{ class: 'potato' },
diff --git a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/client/index.svelte.js
index ebbe191dcb..884e919f14 100644
--- a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/client/index.svelte.js
@@ -4,5 +4,4 @@ import * as $ from 'svelte/internal/client';
import { random } from './module.svelte';
export default function Imports_in_modules($$anchor) {
-
}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/client/module.svelte.js b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/client/module.svelte.js
index 0d366e6258..feab7bf8da 100644
--- a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/client/module.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/client/module.svelte.js
@@ -1,5 +1,6 @@
/* module.svelte.js generated by Svelte VERSION */
import * as $ from 'svelte/internal/client';
+
import { random } from './export';
export { random };
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
index 4cd6bc59d7..75de235220 100644
--- a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
@@ -2,5 +2,4 @@ import * as $ from 'svelte/internal/server';
import { random } from './module.svelte';
export default function Imports_in_modules($$payload) {
-
}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/module.svelte.js b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/module.svelte.js
index 2e0af8af84..fbbf1b955e 100644
--- a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/module.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/module.svelte.js
@@ -1,5 +1,6 @@
/* module.svelte.js generated by Svelte VERSION */
import * as $ from 'svelte/internal/server';
+
import { random } from './export';
export { random };
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cfbc54df33..08373e6b9d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,9 +4,16 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+overrides:
+ esrap: link:../../esrap
+
importers:
.:
+ dependencies:
+ esrap:
+ specifier: link:../../esrap
+ version: link:../../esrap
devDependencies:
'@changesets/cli':
specifier: ^2.27.8
@@ -87,8 +94,8 @@ importers:
specifier: ^1.2.1
version: 1.2.1
esrap:
- specifier: ^1.4.8
- version: 1.4.8
+ specifier: link:../../../../esrap
+ version: link:../../../../esrap
is-reference:
specifier: ^3.0.3
version: 3.0.3
@@ -1261,9 +1268,6 @@ packages:
resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
engines: {node: '>=0.10'}
- esrap@1.4.8:
- resolution: {integrity: sha512-jlENbjZ7lqgJV9/OmgAtVqrFFMwsl70ctOgPIg5oTdQVGC13RSkMdtvAmu7ZTLax92c9ljnIG0xleEkdL69hwg==}
-
esrecurse@4.3.0:
resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
engines: {node: '>=4.0'}
@@ -3622,10 +3626,6 @@ snapshots:
dependencies:
estraverse: 5.3.0
- esrap@1.4.8:
- dependencies:
- '@jridgewell/sourcemap-codec': 1.5.0
-
esrecurse@4.3.0:
dependencies:
estraverse: 5.3.0