Skip to content

Commit edbd262

Browse files
authoredMar 26, 2023
perf: cache depsCacheDirPrefix value for isOptimizedDepFile (#12601)
1 parent 19d1980 commit edbd262

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed
 

‎packages/vite/src/node/optimizer/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -930,15 +930,15 @@ export function getDepsCacheDir(config: ResolvedConfig, ssr: boolean): string {
930930
return getDepsCacheDirPrefix(config) + getDepsCacheSuffix(config, ssr)
931931
}
932932

933-
export function getDepsCacheDirPrefix(config: ResolvedConfig): string {
933+
function getDepsCacheDirPrefix(config: ResolvedConfig): string {
934934
return normalizePath(path.resolve(config.cacheDir, 'deps'))
935935
}
936936

937-
export function isOptimizedDepFile(
938-
id: string,
937+
export function createIsOptimizedDepFile(
939938
config: ResolvedConfig,
940-
): boolean {
941-
return id.startsWith(getDepsCacheDirPrefix(config))
939+
): (id: string) => boolean {
940+
const depsCacheDirPrefix = getDepsCacheDirPrefix(config)
941+
return (id) => id.startsWith(depsCacheDirPrefix)
942942
}
943943

944944
export function createIsOptimizedDepUrl(

‎packages/vite/src/node/optimizer/optimizer.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import type { ResolvedConfig, ViteDevServer } from '..'
66
import {
77
addManuallyIncludedOptimizeDeps,
88
addOptimizedDepInfo,
9+
createIsOptimizedDepFile,
910
createIsOptimizedDepUrl,
1011
debuggerViteDeps as debug,
1112
depsFromOptimizedDepInfo,
@@ -14,7 +15,6 @@ import {
1415
extractExportsData,
1516
getOptimizedDepPath,
1617
initDepsOptimizerMetadata,
17-
isOptimizedDepFile,
1818
loadCachedDepOptimizationMetadata,
1919
newDepOptimizationProcessing,
2020
optimizeServerSsrDeps,
@@ -112,7 +112,7 @@ async function createDepsOptimizer(
112112
metadata,
113113
registerMissingImport,
114114
run: () => debouncedProcessing(0),
115-
isOptimizedDepFile: (id: string) => isOptimizedDepFile(id, config),
115+
isOptimizedDepFile: createIsOptimizedDepFile(config),
116116
isOptimizedDepUrl: createIsOptimizedDepUrl(config),
117117
getOptimizedDepId: (depInfo: OptimizedDepInfo) =>
118118
isBuild ? depInfo.file : `${depInfo.file}?v=${depInfo.browserHash}`,
@@ -754,7 +754,7 @@ async function createDevSsrDepsOptimizer(
754754

755755
const depsOptimizer = {
756756
metadata,
757-
isOptimizedDepFile: (id: string) => isOptimizedDepFile(id, config),
757+
isOptimizedDepFile: createIsOptimizedDepFile(config),
758758
isOptimizedDepUrl: createIsOptimizedDepUrl(config),
759759
getOptimizedDepId: (depInfo: OptimizedDepInfo) =>
760760
`${depInfo.file}?v=${depInfo.browserHash}`,

‎packages/vite/src/node/plugins/importAnalysis.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ import {
5454
shouldExternalizeForSSR,
5555
} from '../ssr/ssrExternal'
5656
import { transformRequest } from '../server/transformRequest'
57-
import {
58-
getDepsCacheDirPrefix,
59-
getDepsOptimizer,
60-
optimizedDepNeedsInterop,
61-
} from '../optimizer'
57+
import { getDepsOptimizer, optimizedDepNeedsInterop } from '../optimizer'
6258
import { checkPublicFile } from './asset'
6359
import {
6460
ERR_OUTDATED_OPTIMIZED_DEP,
@@ -348,7 +344,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
348344
// in root: infer short absolute path from root
349345
url = resolved.id.slice(root.length)
350346
} else if (
351-
resolved.id.startsWith(getDepsCacheDirPrefix(config)) ||
347+
depsOptimizer?.isOptimizedDepFile(resolved.id) ||
352348
fs.existsSync(cleanUrl(resolved.id))
353349
) {
354350
// an optimized deps may not yet exists in the filesystem, or

0 commit comments

Comments
 (0)
Please sign in to comment.