Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: set isSelfAccepting to false for any asset not processed by importAnalysis #7898

Merged
merged 1 commit into from
Apr 25, 2022
Merged

fix: set isSelfAccepting to false for any asset not processed by importAnalysis #7898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/vite/src/node/plugins/importAnalysis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 3 additions & 2 deletions packages/vite/src/node/server/moduleGraph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down Expand Up @@ -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
}
}
Expand Down