Merge branch 'main' into transfer

.github/workflows/deploy test.yml

@@ -17,13 +17,13 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: nrwl/nx-set-shas@v4
-        id: last_successful_commit_push
+      - uses: younited/[email protected]
+        id: forkpoint
 
       - id: changed-files
         uses: tj-actions/changed-files@v45
         with:
-          base_sha: ${{ steps.last_successful_commit_push.outputs.base }}
+          base_sha: ${{ steps.forkpoint.outputs.fork_point_sha }}
           files: |
             components/**/*.lua
             standard/**/*.lua

components/infobox/commons/infobox_basic.lua

@@ -102,13 +102,19 @@ end
 ---@param widgets Widget[]
 ---@return string
 function BasicInfobox:build(widgets)
-	return Infobox{
+	local infobox = Infobox{
 		gameName = self.wiki,
 		forceDarkMode = Logic.readBool(self.args.darkmodeforced),
 		bottomContent = self.bottomContent,
 		warnings = self.warnings,
 		children = widgets,
-	}:tryMake(self.injector) or ''
+	}
+	if self.injector then
+		-- Customizable backwards compatibility
+		local CustomizableContext = Lua.import('Module:Widget/Contexts/Customizable')
+		return CustomizableContext.LegacyCustomizable{value = self.injector, children = {infobox}}:tryMake()
+	end
+	return infobox:tryMake()
 end
 
 return BasicInfobox

components/infobox/wikis/apexlegends/infobox_map_custom.lua

@@ -49,6 +49,11 @@ function CustomInjector:parse(id, widgets)
 
 		if String.isEmpty(args.ring) then return widgets end
 
+		local rows = {self.caller:_createRingTableHeader()}
+		Array.forEach(self.caller:getAllArgsForBase(args, 'ring'), function(ringData)
+			table.insert(rows, self.caller:_createRingTableRow(ringData))
+		end)
+
 		local ringTable = WidgetTable{
 			classes = {'fo-nttax-infobox' ,'wiki-bordercolor-light'}, --row alternating bg
 			css = {
@@ -58,14 +63,9 @@ function CustomInjector:parse(id, widgets)
 				['padding-bottom'] = '0px',
 				['border-top-style'] = 'none',
 			},
+			children = rows,
 		}
 
-		ringTable:addRow(self.caller:_createRingTableHeader())
-
-		Array.forEach(self.caller:getAllArgsForBase(args, 'ring'), function(ringData)
-			ringTable:addRow(self.caller:_createRingTableRow(ringData))
-		end)
-
 		Array.appendWith(widgets,
 			Title{children = 'Ring Information'},
 			ringTable
@@ -77,23 +77,23 @@ end
 
 ---@return WidgetTableRow
 function CustomMap:_createRingTableHeader()
-	local headerRow = TableRow{css = {['font-weight'] = 'bold'}} -- bg needed
-	return headerRow
-		:addCell(TableCell{children = {'Ring'}})
-		:addCell(TableCell{children = {'Wait (s)'}})
-		:addCell(TableCell{children = {'Close<br>Time (s)'}})
-		:addCell(TableCell{children = {'Damage<br>per tick'}})
-		:addCell(TableCell{children = {'End Diameter (m)'}})
+	return TableRow{css = {['font-weight'] = 'bold'}, children = {
+		TableCell{children = {'Ring'}},
+		TableCell{children = {'Wait (s)'}},
+		TableCell{children = {'Close Time (s)'}},
+		TableCell{children = {'Damage per tick'}},
+		TableCell{children = {'End Diameter (m)'}},
+	}} -- bg needed
 end
 
 ---@param ringData string
 ---@return WidgetTableRow
 function CustomMap:_createRingTableRow(ringData)
-	local row = TableRow{}
+	local cells = {}
 	for _, item in ipairs(mw.text.split(ringData, ',')) do
-		row:addCell(TableCell{children = {item}})
+		table.insert(cells, TableCell{children = {item}})
 	end
-	return row
+	return TableRow{children = cells}
 end
 
 ---@param args table

components/infobox/wikis/geoguessr/infobox_league_custom.lua

@@ -9,10 +9,10 @@
 local Class = require('Module:Class')
 local Lua = require('Module:Lua')
 
-local Injector = Lua.import('Module:Infobox/Widget/Injector')
+local Injector = Lua.import('Module:Widget/Injector')
 local League = Lua.import('Module:Infobox/League')
 
-local Widgets = require('Module:Infobox/Widget/All')
+local Widgets = require('Module:Widget/All')
 local Cell = Widgets.Cell
 
 ---@class GeoguessrLeagueInfobox: InfoboxLeague

components/infobox/wikis/geoguessr/infobox_person_player_custom.lua

@@ -13,11 +13,11 @@ local Page = require('Module:Page')
 local TeamHistoryAuto = require('Module:TeamHistoryAuto')
 local Variables = require('Module:Variables')
 
-local Injector = Lua.import('Module:Infobox/Widget/Injector')
+local Injector = Lua.import('Module:Widget/Injector')
 local MatchTicker = Lua.import('Module:MatchTicker/Custom')
 local Player = Lua.import('Module:Infobox/Person')
 
-local Widgets = require('Module:Infobox/Widget/All')
+local Widgets = require('Module:Widget/All')
 local Cell = Widgets.Cell
 
 local ROLES = {

components/match2/commons/match_group_legacy.lua

@@ -18,7 +18,6 @@ local Table = require('Module:Table')
 
 local MatchGroup = Lua.import('Module:MatchGroup')
 local MatchGroupUtil = Lua.import('Module:MatchGroup/Util')
-local MatchSubobjects = Lua.import('Module:Match/Subobjects')
 
 local globalVars = PageVariableNamespace()
 
@@ -248,7 +247,7 @@ function MatchGroupLegacy:handleMap(details, mapIndex)
 		map = self:_copyAndReplace(blueprint, details, true)
 	end
 
-	return MatchSubobjects.luaGetMap(map)
+	return map
 end
 
 ---@param isReset boolean

components/match2/commons/starcraft_starcraft2/match_group_input_starcraft.lua

@@ -142,6 +142,9 @@ function MatchFunctions.extractMaps(match, opponents)
 	local maps = {}
 	local subGroup = 0
 	for mapKey, mapInput, mapIndex in Table.iter.pairsByPrefix(match, 'map', {requireIndex = true}) do
+		if Logic.isEmpty(mapInput) then
+			break
+		end
 		local map
 		map, subGroup = MapFunctions.readMap(mapInput, subGroup, #opponents)