From 0d2089c6876bcc04a46c3f7947ce4effc91dd9fd Mon Sep 17 00:00:00 2001
From: Rom <git@brillout.com>
Date: Mon, 25 Apr 2022 12:47:18 +0200
Subject: [PATCH] fix: set `isSelfAccepting` to `false` for any asset not
 processed by importAnalysis (#7898)

---
 packages/vite/src/node/plugins/importAnalysis.ts | 5 +++--
 packages/vite/src/node/server/moduleGraph.ts     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index 31e9cd76faa8a0..d8bf59225fd49a 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -59,7 +59,8 @@ const debug = createDebugger('vite:import-analysis')
 const clientDir = normalizePath(CLIENT_DIR)
 
 const skipRE = /\.(map|json)$/
-const canSkip = (id: string) => skipRE.test(id) || isDirectCSSRequest(id)
+export const canSkipImportAnalysis = (id: string) =>
+  skipRE.test(id) || isDirectCSSRequest(id)
 
 const optimizedDepChunkRE = /\/chunk-[A-Z0-9]{8}\.js/
 const optimizedDepDynamicRE = /-[A-Z0-9]{8}\.js/
@@ -131,7 +132,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       const ssr = options?.ssr === true
       const prettyImporter = prettifyUrl(importer, root)
 
-      if (canSkip(importer)) {
+      if (canSkipImportAnalysis(importer)) {
         isDebug && debug(colors.dim(`[skipped] ${prettyImporter}`))
         return null
       }
diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts
index a6c5bfa0ab121f..9c9f0d84bb738f 100644
--- a/packages/vite/src/node/server/moduleGraph.ts
+++ b/packages/vite/src/node/server/moduleGraph.ts
@@ -11,6 +11,7 @@ import {
 } from '../utils'
 import { FS_PREFIX } from '../constants'
 import type { TransformResult } from './transformRequest'
+import { canSkipImportAnalysis } from '../plugins/importAnalysis'
 
 export class ModuleNode {
   /**
@@ -39,9 +40,9 @@ export class ModuleNode {
     this.url = url
     this.type = isDirectCSSRequest(url) ? 'css' : 'js'
     // #7870
-    // The `isSelfAccepting` value is set by importAnalysis, but HTML
+    // The `isSelfAccepting` value is set by importAnalysis, but some
     // assets don't go through importAnalysis.
-    if (isHTMLRequest(url)) {
+    if (isHTMLRequest(url) || canSkipImportAnalysis(url)) {
       this.isSelfAccepting = false
     }
   }