wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

move fileModifiedMap to context (fixes #4400) (#4470)

Browse source
This commit is contained in:
Brad Cornes 2021-05-26 14:07:24 +01:00 • committed by Adam Wathan
parent 6bf6738683
commit 55653ba004
1 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/jit/lib/setupContextUtils.js
View file

@ -301,9 +301,7 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
}
}
let fileModifiedMap = new Map()
function trackModified(files) {
function trackModified(files, context) {
let changed = false
for (let file of files) {
@ -313,11 +311,11 @@ function trackModified(files) {
let pathname = parsed.href.replace(parsed.hash, '').replace(parsed.search, '')
let newModified = fs.statSync(decodeURIComponent(pathname)).mtimeMs
if (!fileModifiedMap.has(file) || newModified > fileModifiedMap.get(file)) {
if (!context.fileModifiedMap.has(file) || newModified > context.fileModifiedMap.get(file)) {
changed = true
}
fileModifiedMap.set(file, newModified)
context.fileModifiedMap.set(file, newModified)
}
return changed
@ -507,24 +505,26 @@ export function getContext(
registerDependency(file)
}
let contextDependenciesChanged = trackModified([...contextDependencies])
env.DEBUG && console.log('Source path:', sourcePath)
if (!contextDependenciesChanged) {
// If this file already has a context in the cache and we don't need to
// reset the context, return the cached context.
if (isConfigFile && contextMap.has(sourcePath)) {
return [contextMap.get(sourcePath), false]
}
let existingContext
// If the config used already exists in the cache, return that.
if (configContextMap.has(tailwindConfigHash)) {
let context = configContextMap.get(tailwindConfigHash)
contextSourcesMap.get(context).add(sourcePath)
contextMap.set(sourcePath, context)
if (isConfigFile && contextMap.has(sourcePath)) {
existingContext = contextMap.get(sourcePath)
} else if (configContextMap.has(tailwindConfigHash)) {
let context = configContextMap.get(tailwindConfigHash)
contextSourcesMap.get(context).add(sourcePath)
contextMap.set(sourcePath, context)
return [context, false]
existingContext = context
}
// If there's already a context in the cache and we don't need to
// reset the context, return the cached context.
if (existingContext) {
let contextDependenciesChanged = trackModified([...contextDependencies], existingContext)
if (!contextDependenciesChanged) {
return [existingContext, false]
}
}
@ -565,7 +565,8 @@ export function getContext(
)
)
),
fileModifiedMap: new Map(),
// Carry over the existing modified map if we have one.
fileModifiedMap: new Map(existingContext ? existingContext.fileModifiedMap : undefined),
// ---
ruleCache: new Set(), // Hit
classCache: new Map(), // Hit
@ -581,6 +582,11 @@ export function getContext(
stylesheetCache: null, // Hit
}
if (!existingContext) {
// If we didn't have an existing modified map then populate it now.
trackModified([...contextDependencies], context)
}
// ---
// Update all context tracking state