perf: module graph url shortcuts

packages/vite/src/node/server/moduleGraph.ts

@@ -61,6 +61,8 @@ export class ModuleGraph {
   fileToModulesMap = new Map<string, Set<ModuleNode>>()
   safeModulesPath = new Set<string>()
 
+  #rawUrlToModuleMap = new Map<string, ModuleNode>()
+
   constructor(
     private resolveId: (
       url: string,
@@ -72,6 +74,13 @@ export class ModuleGraph {
     rawUrl: string,
     ssr?: boolean,
   ): Promise<ModuleNode | undefined> {
+    // Quick path, if we already have a module for this rawUrl (even without extension)
+    const cleanedUrl = removeImportQuery(removeTimestampQuery(rawUrl))
+    const mod = this.#rawUrlToModuleMap.get(cleanedUrl)
+    if (mod) {
+      return mod
+    }
+
     const [url] = await this.resolveUrl(rawUrl, ssr)
     return this.urlToModuleMap.get(url)
   }
@@ -189,14 +198,25 @@ export class ModuleGraph {
     ssr?: boolean,
     setIsSelfAccepting = true,
   ): Promise<ModuleNode> {
+    // Quick path, if we already have a module for this rawUrl (even without extension)
+    const cleanedUrl = removeImportQuery(removeTimestampQuery(rawUrl))
+    let mod = this.#rawUrlToModuleMap.get(cleanedUrl)
+    if (mod) {
+      return mod
+    }
+
     const [url, resolvedId, meta] = await this.resolveUrl(rawUrl, ssr)
-    let mod = this.idToModuleMap.get(resolvedId)
+    mod = this.idToModuleMap.get(resolvedId)
     if (!mod) {
       mod = new ModuleNode(url, setIsSelfAccepting)
       if (meta) mod.meta = meta
+
       this.urlToModuleMap.set(url, mod)
+      this.#rawUrlToModuleMap.set(cleanedUrl, mod)
+
       mod.id = resolvedId
       this.idToModuleMap.set(resolvedId, mod)
+
       const file = (mod.file = cleanUrl(resolvedId))
       let fileMappedModules = this.fileToModulesMap.get(file)
       if (!fileMappedModules) {
@@ -207,9 +227,17 @@ export class ModuleGraph {
     }
     // multiple urls can map to the same module and id, make sure we register
     // the url to the existing module in that case
-    else if (!this.urlToModuleMap.has(url)) {
-      this.urlToModuleMap.set(url, mod)
+    else {
+      if (!this.urlToModuleMap.has(url)) {
+        this.urlToModuleMap.set(url, mod)
+      }
+      // Also register the clean url to the module, so that we can short-circuit
+      // resolving the same url twice
+      if (!this.#rawUrlToModuleMap.has(cleanedUrl)) {
+        this.#rawUrlToModuleMap.set(cleanedUrl, mod)
+      }
     }
+
     return mod
   }