Skip to content

Commit 44ccfd1

Browse files
committed
minor refactor
1 parent 146a3ac commit 44ccfd1

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

vike/shared/page-configs/getUserFriendlyConfigs.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type { FileType } from '../getPageFiles/fileTypes.js'
1515
import type { PageFile } from '../getPageFiles/getPageFileObject.js'
1616
import type {
1717
ConfigValues,
18+
DefinedAtData,
1819
PageConfigBuildTime,
1920
PageConfigGlobalRuntime,
2021
PageConfigRuntime,
@@ -310,12 +311,10 @@ function getUserFriendlyConfigs_V1Design(pageConfig: { configValues: ConfigValue
310311
sources[configName]!.push(src)
311312
}
312313

313-
const addLegacy = (
314-
configName: string,
315-
value: unknown,
316-
configDefinedAt: ConfigDefinedAtOptional,
317-
configValueFilePathToShowToUser: string | null
318-
) => {
314+
const addLegacy = (configName: string, value: unknown, definedAtData: DefinedAtData) => {
315+
const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(definedAtData)
316+
const configDefinedAt = getConfigDefinedAtOptional('Config', configName, definedAtData)
317+
319318
configEntries[configName] = configEntries[configName] ?? []
320319
// Currently each configName has only one entry. Adding an entry for each overriden config value isn't implemented yet. (This is an isomorphic file and it isn't clear whether this can/should be implemented on the client-side. We should load a minimum amount of code on the client-side.)
321320
assert(configEntries[configName]!.length === 0)
@@ -340,8 +339,6 @@ function getUserFriendlyConfigs_V1Design(pageConfig: { configValues: ConfigValue
340339

341340
Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
342341
const { value } = configValue
343-
const configValueFilePathToShowToUser = getConfigValueFilePathToShowToUser(configValue.definedAtData)
344-
const configDefinedAt = getConfigDefinedAtOptional('Config', configName, configValue.definedAtData)
345342

346343
config[configName] = config[configName] ?? value
347344

@@ -379,7 +376,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig: { configValues: ConfigValue
379376
from.configsComputed[configName] = src
380377
}
381378

382-
addLegacy(configName, value, configDefinedAt, configValueFilePathToShowToUser)
379+
addLegacy(configName, value, configValue.definedAtData)
383380
})
384381

385382
return {

0 commit comments

Comments
 (0)