Skip to content

Commit 1d11f16

Browse files
committed
minor refactor
1 parent 99d4026 commit 1d11f16

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

packages/vike/src/node/vite/plugins/pluginReplaceConstantsEnvVars.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { escapeRegex } from '../../../utils/escapeRegex.js'
88
import { isNotNullish } from '../../../utils/isNullish.js'
99
import { assert, assertUsage, assertWarning } from '../../../utils/assert.js'
1010
import { isArray } from '../../../utils/isArray.js'
11-
import { lowerFirst } from '../../../utils/sorter.js'
11+
import { makeLast } from '../../../utils/sorter.js'
1212
import { assertPosixPath } from '../../../utils/path.js'
1313
import { getFilePathToShowToUserModule } from '../shared/getFilePath.js'
1414
import { normalizeId } from '../shared/normalizeId.js'
@@ -53,6 +53,11 @@ function pluginReplaceConstantsEnvVars(): Plugin[] {
5353
return [
5454
{
5555
name: 'vike:pluginReplaceConstantsEnvVars',
56+
// Correct oder:
57+
// 1. @vitejs/plugin-vue
58+
// 2. vike:pluginExtractAssets and vike:pluginExtractExportNames [needs to be applied after @vitejs/plugin-vue]
59+
// 3. vike:pluginReplaceConstantsEnvVars [needs to be applied after vike:pluginExtractAssets and vike:pluginExtractExportNames]
60+
// 4. vite:define (Vite built-in plugin) [needs to be applied after vike:pluginReplaceConstantsEnvVars]
5661
enforce: 'post',
5762
configResolved: {
5863
handler(config_) {
@@ -64,9 +69,8 @@ function pluginReplaceConstantsEnvVars(): Plugin[] {
6469

6570
envPrefix = getEnvPrefix(config)
6671

67-
// Vite's built-in plugin vite:define needs to apply after this plugin.
68-
// - This plugin vike:pluginReplaceConstantsEnvVars needs to apply after vike:pluginExtractAssets and vike:pluginExtractExportNames which need to apply after @vitejs/plugin-vue
69-
;(config.plugins as Plugin[]).sort(lowerFirst<Plugin>((plugin) => (plugin.name === 'vite:define' ? 1 : 0)))
72+
// See comment `Correct order` above
73+
;(config.plugins as Plugin[]).sort(makeLast<Plugin>((plugin) => plugin.name === 'vite:define'))
7074
},
7175
},
7276
transform: {

0 commit comments

Comments
 (0)