Browse Source

Add support for multiple source files per pack

closed-social-glitch-2
Claire 2 years ago
parent
commit
f3b9a2b590
2 changed files with 11 additions and 5 deletions
  1. +1
    -1
      app/controllers/concerns/theming_concern.rb
  2. +10
    -4
      config/webpack/shared.js

+ 1
- 1
app/controllers/concerns/theming_concern.rb View File

@ -20,7 +20,7 @@ module ThemingConcern
end
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
def nil_pack(data)

+ 10
- 4
config/webpack/shared.js View File

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

Loading…
Cancel
Save