From 89f6b7ee4f8edb2bffbbe44ffcbe4fd32624a065 Mon Sep 17 00:00:00 2001
From: Patrick Pircher <patricklx@users.noreply.github.com>
Date: Tue, 12 Nov 2024 15:11:01 +0100
Subject: [PATCH 1/2] ensure its a embroider or file namespace

---
 packages/vite/src/esbuild-request.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/esbuild-request.ts b/packages/vite/src/esbuild-request.ts
index 37a8cb614..ba4b7fc76 100644
--- a/packages/vite/src/esbuild-request.ts
+++ b/packages/vite/src/esbuild-request.ts
@@ -105,7 +105,10 @@ export class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolv
         // and non-strict handlebars (which resolves
         // components/helpers/modifiers against the app's global pool).
         let pkg = this.packageCache.ownerOfFile(result.path);
-        if (pkg?.root === this.packageCache.appRoot) {
+        if (
+          pkg?.root === this.packageCache.appRoot &&
+          (result.namespace === 'file' || result.namespace.startsWith('embroider-'))
+        ) {
           let externalizedName = request.specifier;
           if (!packageName(externalizedName)) {
             // the request was a relative path. This won't remain valid once

From 9d9fb55d442fba08465bb45038eb5fc720bd0f21 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Tue, 10 Dec 2024 11:35:13 -0500
Subject: [PATCH 2/2] Update esbuild-request.ts

---
 packages/vite/src/esbuild-request.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/vite/src/esbuild-request.ts b/packages/vite/src/esbuild-request.ts
index 6ec8a0fc0..9aca75759 100644
--- a/packages/vite/src/esbuild-request.ts
+++ b/packages/vite/src/esbuild-request.ts
@@ -112,6 +112,10 @@ export class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolv
         let pkg = this.packageCache.ownerOfFile(result.path);
         if (
           pkg?.root === this.packageCache.appRoot &&
+          // vite provides node built-in polyfills under a custom namespace and we dont 
+          // want to interrupt that. We'd prefer they get bundled in the dep optimizer normally,
+          // rather than getting deferred to the app build (which also works, but means they didn't
+          // get pre-optimized).
           (result.namespace === 'file' || result.namespace.startsWith('embroider-'))
         ) {
           let externalizedName = request.specifier;