Skip to content

Commit 47b1270

Browse files
authored
fix: more robust plugin.sharedDuringBuild (#18351)
1 parent 5ea4b00 commit 47b1270

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

packages/vite/src/node/build.ts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,25 +1576,20 @@ export async function createBuilderWithResolvedConfig(
15761576
}
15771577
const patchPlugins = (resolvedPlugins: Plugin[]) => {
15781578
// Force opt-in shared plugins
1579-
const environmentPlugins = [...resolvedPlugins]
1580-
let validMixedPlugins = true
1581-
for (let i = 0; i < environmentPlugins.length; i++) {
1582-
const environmentPlugin = environmentPlugins[i]
1583-
const sharedPlugin = config.plugins[i]
1579+
let j = 0
1580+
for (let i = 0; i < resolvedPlugins.length; i++) {
1581+
const environmentPlugin = resolvedPlugins[i]
15841582
if (
15851583
config.builder.sharedPlugins ||
15861584
environmentPlugin.sharedDuringBuild
15871585
) {
1588-
if (environmentPlugin.name !== sharedPlugin.name) {
1589-
validMixedPlugins = false
1590-
break
1586+
for (let k = j; k < config.plugins.length; k++) {
1587+
if (environmentPlugin.name === config.plugins[k].name) {
1588+
resolvedPlugins[i] = config.plugins[k]
1589+
j = k + 1
1590+
break
1591+
}
15911592
}
1592-
environmentPlugins[i] = sharedPlugin
1593-
}
1594-
}
1595-
if (validMixedPlugins) {
1596-
for (let i = 0; i < environmentPlugins.length; i++) {
1597-
resolvedPlugins[i] = environmentPlugins[i]
15981593
}
15991594
}
16001595
}

0 commit comments

Comments
 (0)