diff options
author | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
commit | c0341f06be5310a00b85a5d48fa80891d47c6710 (patch) | |
tree | 907ef7f787f8bd446a6d9be1448a8bcff74e5a08 /config/webpack/configuration.js | |
parent | 169688aa9f2a69ac3d36332c833e9cad43b5f7a5 (diff) | |
parent | 6f78c66fe01921a4e7e01aa6e2386a5fce7f3afd (diff) |
Merge remote-tracking branch 'glitch/main'
Not at all sure where the admin UI is going to display English language names now but OK.
Diffstat (limited to 'config/webpack/configuration.js')
-rw-r--r-- | config/webpack/configuration.js | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index f05c888d5..55ee06c0c 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -21,8 +21,7 @@ const core = function () { return data.pack ? data : {}; }(); -for (let i = 0; i < flavourFiles.length; i++) { - const flavourFile = flavourFiles[i]; +flavourFiles.forEach((flavourFile) => { const data = load(readFileSync(flavourFile), 'utf8'); data.name = basename(dirname(flavourFile)); data.skin = {}; @@ -35,27 +34,25 @@ for (let i = 0; i < flavourFiles.length; i++) { if (data.pack && typeof data.pack === 'object') { flavours[data.name] = data; } -} +}); -for (let i = 0; i < skinFiles.length; i++) { - const skinFile = skinFiles[i]; +skinFiles.forEach((skinFile) => { let skin = basename(skinFile); const name = basename(dirname(skinFile)); if (!flavours[name]) { - continue; + return; } const data = flavours[name].skin; if (lstatSync(skinFile).isDirectory()) { data[skin] = {}; const skinPacks = glob.sync(join(skinFile, '*.{css,scss}')); - for (let j = 0; j < skinPacks.length; j++) { - const pack = skinPacks[j]; + skinPacks.forEach((pack) => { data[skin][basename(pack, extname(pack))] = pack; - } + }); } else if ((skin = skin.match(/^(.*)\.s?css$/i))) { data[skin[1]] = { common: skinFile }; } -} +}); const output = { path: resolve('public', settings.public_output_path), |