allow global config created locally

vikejs · Feb 27, 2025 · 669ebbe · 669ebbe
1 parent 42ffb40
commit 669ebbe
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/vike/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.ts b/vike/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.ts
@@ -263,7 +263,7 @@ async function resolveConfigDefinitions(
 ) {
   const plusFilesAllOrdered = Object.values(plusFilesAll)
     .flat()
-    .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderGlobal(plusFile1, plusFile2, plusFilesAll, null))
+    .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderGlobal(plusFile1, plusFile2, null))
   const configDefinitionsGlobal = getConfigDefinitions(
     // We use `plusFilesAll` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
     plusFilesAllOrdered,
@@ -541,7 +541,7 @@ function sortConfigValueSources(configValueSources: ConfigValueSources, location
         if (!source1.plusFile || !source2.plusFile) return 0
         const isGlobal = !locationIdPage
         if (isGlobal) {
-          return sortAfterInheritanceOrderGlobal(source1.plusFile, source2.plusFile, null, configName)
+          return sortAfterInheritanceOrderGlobal(source1.plusFile, source2.plusFile, configName)
         } else {
           return sortAfterInheritanceOrderPage(source1.plusFile, source2.plusFile, locationIdPage, configName)
         }
@@ -571,16 +571,8 @@ function sortAfterInheritanceOrderPage(
 function sortAfterInheritanceOrderGlobal(
   plusFile1: PlusFile,
   plusFile2: PlusFile,
-  plusFilesAll: PlusFilesByLocationId | null,
   configName: string | null
 ): SortReturn {
-  if (plusFilesAll) {
-    const ret = makeFirst((plusFile: PlusFile) => isGlobalLocation(plusFile.locationId, plusFilesAll))(
-      plusFile1,
-      plusFile2
-    )
-    if (ret !== 0) return ret
-  }
   {
     const ret = lowerFirst((plusFile: PlusFile) => plusFile.locationId.split('/').length)(plusFile1, plusFile2)
     if (ret !== 0) return ret