From 65d8d6dc0eae23c7c969664d0c2d127511cc0bd9 Mon Sep 17 00:00:00 2001
From: Kasper Fabricius Kristensen
 <45367945+kasperkristensen@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:00:18 +0100
Subject: [PATCH] fix(js-sdk,admin-bundler): Fix qs import (#11172)

---
 .changeset/nasty-parrots-push.md               | 6 ++++++
 packages/admin/admin-bundler/src/lib/config.ts | 1 +
 packages/core/js-sdk/src/client.ts             | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/nasty-parrots-push.md

diff --git a/.changeset/nasty-parrots-push.md b/.changeset/nasty-parrots-push.md
new file mode 100644
index 0000000000..280b2e40d1
--- /dev/null
+++ b/.changeset/nasty-parrots-push.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/admin-bundler": patch
+"@medusajs/js-sdk": patch
+---
+
+fix(js-sdk,admin-bundler): Import resolve from qs in a way that works in both ESM and CJS projects, and add @medusajs/js-sdk to optimized deps
diff --git a/packages/admin/admin-bundler/src/lib/config.ts b/packages/admin/admin-bundler/src/lib/config.ts
index 5ea667763a..90128f92c2 100644
--- a/packages/admin/admin-bundler/src/lib/config.ts
+++ b/packages/admin/admin-bundler/src/lib/config.ts
@@ -34,6 +34,7 @@ export async function getViteConfig(
         "react-router-dom",
         "@medusajs/ui",
         "@medusajs/dashboard",
+        "@medusajs/js-sdk",
         "@tanstack/react-query",
       ],
       exclude: [...VIRTUAL_MODULES],
diff --git a/packages/core/js-sdk/src/client.ts b/packages/core/js-sdk/src/client.ts
index 14994129a4..6b7d2c7b1c 100644
--- a/packages/core/js-sdk/src/client.ts
+++ b/packages/core/js-sdk/src/client.ts
@@ -1,5 +1,5 @@
 import { events } from "fetch-event-stream"
-import qs from "qs"
+import { stringify } from "qs"
 import {
   ClientFetch,
   Config,
@@ -242,7 +242,7 @@ export class Client {
           const params = Object.fromEntries(
             normalizedInput.searchParams.entries()
           )
-          const stringifiedQuery = qs.stringify({ ...params, ...init.query })
+          const stringifiedQuery = stringify({ ...params, ...init.query })
           normalizedInput.search = stringifiedQuery
         }
       }