Skip to content

Commit 2dd0b49

Browse files
authored
fix: allow cache overlap in parallel builds (#8592)
1 parent 739175b commit 2dd0b49

File tree

7 files changed

+10
-14
lines changed

7 files changed

+10
-14
lines changed

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,11 @@ export function getOptimizedDepPath(
615615
function getDepsCacheSuffix(config: ResolvedConfig): string {
616616
let suffix = ''
617617
if (config.command === 'build') {
618-
suffix += '_build'
618+
// Differentiate build caches depending on outDir to allow parallel builds
619+
const { outDir } = config.build
620+
const buildId =
621+
outDir.length > 8 || outDir.includes('/') ? getHash(outDir) : outDir
622+
suffix += `_build-${buildId}`
619623
if (config.build.ssr) {
620624
suffix += '_ssr'
621625
}

playground/assets/vite.config-relative-base.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ module.exports = {
2222
},
2323
testConfig: {
2424
baseRoute: '/relative-base/'
25-
},
26-
cacheDir: 'node_modules/.vite/relative-base'
25+
}
2726
}

playground/assets/vite.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ module.exports = {
1717
assetsInlineLimit: 8192, // 8kb
1818
manifest: true,
1919
watch: {}
20-
},
21-
cacheDir: 'node_modules/.vite/foo'
20+
}
2221
}

playground/worker/vite.config-es.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,5 @@ module.exports = vite.defineConfig({
3838
}
3939
}
4040
}
41-
],
42-
cacheDir: 'node_modules/.vite/es'
41+
]
4342
})

playground/worker/vite.config-relative-base.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,5 @@ module.exports = vite.defineConfig({
4040
}
4141
}
4242
}
43-
],
44-
cacheDir: 'node_modules/.vite/relative-base'
43+
]
4544
})

playground/worker/vite.config-sourcemap.js

-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ module.exports = vite.defineConfig((sourcemap) => {
2121
}
2222
}
2323
},
24-
cacheDir: `node_modules/.vite/iife-${
25-
typeof sourcemap === 'boolean' ? 'sourcemap' : 'sourcemap-' + sourcemap
26-
}`,
2724
build: {
2825
outDir: `dist/iife-${
2926
typeof sourcemap === 'boolean' ? 'sourcemap' : 'sourcemap-' + sourcemap

playground/worker/vite.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@ module.exports = vite.defineConfig({
2323
entryFileNames: 'assets/[name].js'
2424
}
2525
}
26-
},
27-
cacheDir: 'node_modules/.vite/iife'
26+
}
2827
})

0 commit comments

Comments
 (0)