From 4996b17f16c2dcc979cfb42f80accaad80483d58 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 27 Nov 2024 15:29:32 -0800
Subject: [PATCH 1/2] chore: upgrade esm-env for Vite 6 support

---
 .changeset/healthy-drinks-compete.md |  5 +++++
 packages/svelte/package.json         |  2 +-
 pnpm-lock.yaml                       | 13 +++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/healthy-drinks-compete.md

diff --git a/.changeset/healthy-drinks-compete.md b/.changeset/healthy-drinks-compete.md
new file mode 100644
index 000000000000..80edab017183
--- /dev/null
+++ b/.changeset/healthy-drinks-compete.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: upgrade esm-env for Vite 6 support
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 61f2ec2d546b..5bf1863bc4c5 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -142,7 +142,7 @@
     "acorn-typescript": "^1.4.13",
     "aria-query": "^5.3.1",
     "axobject-query": "^4.1.0",
-    "esm-env": "^1.0.0",
+    "esm-env": "^1.2.0",
     "esrap": "^1.2.2",
     "is-reference": "^3.0.3",
     "locate-character": "^3.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 261a82f30081..9ff34ea5594a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -81,8 +81,8 @@ importers:
         specifier: ^4.1.0
         version: 4.1.0
       esm-env:
-        specifier: ^1.0.0
-        version: 1.0.0
+        specifier: ^1.2.0
+        version: 1.2.0
       esrap:
         specifier: ^1.2.2
         version: 1.2.2
@@ -1445,6 +1445,9 @@ packages:
   esm-env@1.0.0:
     resolution: {integrity: sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==}
 
+  esm-env@1.2.0:
+    resolution: {integrity: sha512-OhSQuHL3mUcaQHjGe8UMG8GsJIJHYYz0flR0h9fiTPNMupLMkb7TvcRD0EeJXW5a8GHBgfz08b6FDLNK7kkPQA==}
+
   espree@10.1.0:
     resolution: {integrity: sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -3531,7 +3534,7 @@ snapshots:
       '@types/cookie': 0.6.0
       cookie: 0.6.0
       devalue: 5.1.1
-      esm-env: 1.0.0
+      esm-env: 1.2.0
       import-meta-resolve: 4.1.0
       kleur: 4.1.5
       magic-string: 0.30.11
@@ -3546,7 +3549,7 @@ snapshots:
   '@sveltejs/site-kit@6.0.0-next.64(@sveltejs/kit@2.8.3(@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.6(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@5.4.6(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)':
     dependencies:
       '@sveltejs/kit': 2.8.3(@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.6(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@5.4.6(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
-      esm-env: 1.0.0
+      esm-env: 1.2.0
       svelte: link:packages/svelte
       svelte-persisted-store: 0.9.2(svelte@packages+svelte)
 
@@ -4196,6 +4199,8 @@ snapshots:
 
   esm-env@1.0.0: {}
 
+  esm-env@1.2.0: {}
+
   espree@10.1.0:
     dependencies:
       acorn: 8.12.1

From 40666b15d7b5c6bbda7560337c3d2c7ef790af01 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Wed, 27 Nov 2024 19:10:30 -0500
Subject: [PATCH 2/2] dedupe

---
 pnpm-lock.yaml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9ff34ea5594a..2556f0c10022 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -224,7 +224,7 @@ importers:
         version: 6.0.1(@lezer/common@1.2.1)
       esm-env:
         specifier: ^1.0.0
-        version: 1.0.0
+        version: 1.2.0
       marked:
         specifier: ^7.0.2
         version: 7.0.5
@@ -1236,7 +1236,7 @@ packages:
     resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
 
   concat-map@0.0.1:
-    resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
   console-control-strings@1.1.0:
     resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
@@ -1442,9 +1442,6 @@ packages:
       jiti:
         optional: true
 
-  esm-env@1.0.0:
-    resolution: {integrity: sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==}
-
   esm-env@1.2.0:
     resolution: {integrity: sha512-OhSQuHL3mUcaQHjGe8UMG8GsJIJHYYz0flR0h9fiTPNMupLMkb7TvcRD0EeJXW5a8GHBgfz08b6FDLNK7kkPQA==}
 
@@ -4197,8 +4194,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  esm-env@1.0.0: {}
-
   esm-env@1.2.0: {}
 
   espree@10.1.0: