From f3f2b2fb517c7890f66a8265a65e05fc70123b4f Mon Sep 17 00:00:00 2001 From: Romuald Brillout Date: Sat, 20 Apr 2024 21:16:20 +0200 Subject: [PATCH] fix: fix meta env change upon `.server.js`/`.client.js`/`.shared.js` (#1588) --- .../vue-full/pages/star-wars/@id/{+data.ts => +data.shared.ts} | 0 .../plugin/plugins/importUserCode/v1-design/getVikeConfig.ts | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename examples/vue-full/pages/star-wars/@id/{+data.ts => +data.shared.ts} (100%) diff --git a/examples/vue-full/pages/star-wars/@id/+data.ts b/examples/vue-full/pages/star-wars/@id/+data.shared.ts similarity index 100% rename from examples/vue-full/pages/star-wars/@id/+data.ts rename to examples/vue-full/pages/star-wars/@id/+data.shared.ts diff --git a/vike/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.ts b/vike/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.ts index c8297f7399..94ccd85d19 100644 --- a/vike/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.ts +++ b/vike/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.ts @@ -392,7 +392,6 @@ async function loadVikeConfig(userRootDir: string, outDirRoot: string, isDev: bo configName, interfaceFile.filePath.filePathToShowToUser ) - configDef.env = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName) if (!isConfigEnv(configDef, configName)) return const isAlreadyLoaded = interfacefileIsAlreaydLoaded(interfaceFile) if (isAlreadyLoaded) return @@ -719,7 +718,7 @@ async function getConfigValueSource( ): Promise { const conf = interfaceFile.fileExportsByConfigName[configName] assert(conf) - const configEnv = configDef.env + const configEnv = deriveConfigEnvFromFileName(configDef.env, interfaceFile.filePath.fileName) const { locationId } = interfaceFile const definedAtFilePath_: DefinedAtFilePath = {