From e14a1cf55db544a166378794dcc3d54063104484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E6=A0=91=40=E9=98=BF=E9=87=8C?=
 <dickeylth@users.noreply.github.com>
Date: Thu, 10 Feb 2022 17:38:41 +0800
Subject: [PATCH 1/2] feat:enable-optimizeDeps.esbuildOptions.loader

enable respect `optimizeDeps.esbuildOptions.loader` option so that the map of js types to loader could be customized, relevant issue: https://github.com/vitejs/vite/discussions/3448
---
 packages/vite/src/node/optimizer/index.ts | 8 ++++++--
 packages/vite/src/node/optimizer/scan.ts  | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index 37294aea459c15..f8b28bd9882f43 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -412,11 +412,15 @@ export async function runOptimizeDeps(
       try {
         exportsData = parse(entryContent) as ExportsData
       } catch {
+        const loader =
+          (esbuildOptions.loader &&
+            esbuildOptions.loader[path.extname(filePath)]) ||
+          'jsx'
         debug(
-          `Unable to parse dependency: ${id}. Trying again with a JSX transform.`
+          `Unable to parse dependency: ${id}. Trying again with a ${loader} transform.`
         )
         const transformed = await transformWithEsbuild(entryContent, filePath, {
-          loader: 'jsx'
+          loader
         })
         // Ensure that optimization won't fail by defaulting '.js' to the JSX parser.
         // This is useful for packages such as Gatsby.
diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index e940617386eb35..cf566fe5ad6420 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -476,8 +476,9 @@ function esbuildScanPlugin(
             contents
           }))
         }
+        const { loader } = config.optimizeDeps?.esbuildOptions ?? {}
         return {
-          loader: ext as Loader,
+          loader: ((loader && loader[`.${ext}`]) || ext) as Loader,
           contents
         }
       })

From 043262f222bcb25e7a85528db826bbd07f3efc90 Mon Sep 17 00:00:00 2001
From: bluwy <bjornlu.dev@gmail.com>
Date: Mon, 18 Apr 2022 10:41:19 +0800
Subject: [PATCH 2/2] refactor: update loader var

---
 packages/vite/src/node/optimizer/index.ts |  5 +----
 packages/vite/src/node/optimizer/scan.ts  | 12 ++++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index f8b28bd9882f43..01646d68dcd417 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -412,10 +412,7 @@ export async function runOptimizeDeps(
       try {
         exportsData = parse(entryContent) as ExportsData
       } catch {
-        const loader =
-          (esbuildOptions.loader &&
-            esbuildOptions.loader[path.extname(filePath)]) ||
-          'jsx'
+        const loader = esbuildOptions.loader?.[path.extname(filePath)] || 'jsx'
         debug(
           `Unable to parse dependency: ${id}. Trying again with a ${loader} transform.`
         )
diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index cf566fe5ad6420..ef59a35b1d22d3 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -463,22 +463,26 @@ function esbuildScanPlugin(
           contents = config.esbuild.jsxInject + `\n` + contents
         }
 
+        const loader =
+          config.optimizeDeps?.esbuildOptions?.loader?.[`.${ext}`] ||
+          (ext as Loader)
+
         if (contents.includes('import.meta.glob')) {
           return transformGlob(
             contents,
             id,
             config.root,
-            ext as Loader,
+            loader,
             resolve,
             config.logger
           ).then((contents) => ({
-            loader: ext as Loader,
+            loader,
             contents
           }))
         }
-        const { loader } = config.optimizeDeps?.esbuildOptions ?? {}
+
         return {
-          loader: ((loader && loader[`.${ext}`]) || ext) as Loader,
+          loader,
           contents
         }
       })