fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 15:54:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for multiple source files per pack

Browse source
This commit is contained in:
Claire 2022-02-11 23:52:42 +01:00
parent 9f763b5b79
commit f3b9a2b590
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/theming_concern.rb
View file

@ -20,7 +20,7 @@ module ThemingConcern
end end
def valid_pack_data?(data, pack_name) def valid_pack_data?(data, pack_name)
data['pack'].is_a?(Hash) && [String, Hash].any? { |c| data['pack'][pack_name].is_a?(c) } data['pack'].is_a?(Hash) && data['pack'][pack_name].present?
end end
def nil_pack(data) def nil_pack(data)

12
config/webpack/shared.js
View file

@ -16,10 +16,16 @@ function reducePacks (data, into = {}) {
const pack = data.pack[entry]; const pack = data.pack[entry];
if (!pack) continue; if (!pack) continue;
const packFile = typeof pack === 'string' ? pack : pack.filename; let packFiles = [];
if (typeof pack === 'string')
packFiles = [pack];
else if (Array.isArray(pack))
packFiles = pack;
else
packFiles = [pack.filename];
if (packFile) { if (packFiles) {
into[data.name ? `flavours/${data.name}/${entry}` : `core/${entry}`] = resolve(data.pack_directory, packFile); into[data.name ? `flavours/${data.name}/${entry}` : `core/${entry}`] = packFiles.map(packFile => resolve(data.pack_directory, packFile));
} }
} }