From 561227c63a6935e812ad59b532562f6c38d7563a Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Fri, 31 Mar 2023 15:40:12 +0800
Subject: [PATCH] refactor: clean up preTransformRequest (#12672)

---
 packages/vite/src/node/plugins/importAnalysis.ts      | 11 +++++------
 .../vite/src/node/server/middlewares/indexHtml.ts     |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index d6d72308d42b44..0c41d7791ecf0e 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -53,7 +53,6 @@ import {
   cjsShouldExternalizeForSSR,
   shouldExternalizeForSSR,
 } from '../ssr/ssrExternal'
-import { transformRequest } from '../server/transformRequest'
 import { getDepsOptimizer, optimizedDepNeedsInterop } from '../optimizer'
 import { checkPublicFile } from './asset'
 import {
@@ -276,7 +275,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       let s: MagicString | undefined
       const str = () => s || (s = new MagicString(source))
       const importedUrls = new Set<string>()
-      const staticImportedUrls = new Set<{ url: string; id: string }>()
+      const staticImportedUrls = new Set<string>()
       const acceptedUrls = new Set<{
         url: string
         start: number
@@ -617,7 +616,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
 
           if (!isDynamicImport && isLocalImport) {
             // for pre-transforming
-            staticImportedUrls.add({ url: hmrUrl, id: resolvedId })
+            staticImportedUrls.add(hmrUrl)
           }
         } else if (!importer.startsWith(clientDir)) {
           if (!isInNodeModules(importer)) {
@@ -764,9 +763,9 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       // These requests will also be registered in transformRequest to be awaited
       // by the deps optimizer
       if (config.server.preTransformRequests && staticImportedUrls.size) {
-        staticImportedUrls.forEach(({ url }) => {
+        for (let url of staticImportedUrls) {
           url = removeImportQuery(url)
-          transformRequest(url, server, { ssr }).catch((e) => {
+          server.transformRequest(url, { ssr }).catch((e) => {
             if (e?.code === ERR_OUTDATED_OPTIMIZED_DEP) {
               // This are expected errors
               return
@@ -774,7 +773,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
             // Unexpected error, log the issue but avoid an unhandled exception
             config.logger.error(e.message)
           })
-        })
+        }
       }
 
       if (s) {
diff --git a/packages/vite/src/node/server/middlewares/indexHtml.ts b/packages/vite/src/node/server/middlewares/indexHtml.ts
index 64db1ba6838287..4ab0038333c2e6 100644
--- a/packages/vite/src/node/server/middlewares/indexHtml.ts
+++ b/packages/vite/src/node/server/middlewares/indexHtml.ts
@@ -326,6 +326,6 @@ function preTransformRequest(server: ViteDevServer, url: string, base: string) {
   // transform all url as non-ssr as html includes client-side assets only
   server.transformRequest(url).catch((e) => {
     // Unexpected error, log the issue but avoid an unhandled exception
-    server.config.logger.error(e)
+    server.config.logger.error(e.message)
   })
 }