Refactor compile-time glitch-soc theme handling

diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index f05c888d5c7526e696d960d33fe9a7ba61596a9b..55ee06c0cc1ca5b349b745e86f826bf3d28f8772 100644 (file)
--- 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),

diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index ce08ac2065fc814d58770365946b5b65fe397376..de347fa888b1ae241c46d1a12f527c63c745445b 100644 (file)
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -10,38 +10,33 @@ const rules = require('./rules');
 const localePacks = require('./generateLocalePacks');
 
 function reducePacks (data, into = {}) {
-  if (!data.pack) {
-    return into;
-  }
-  Object.keys(data.pack).reduce((map, entry) => {
+  if (!data.pack) return into;
+
+  for (const entry in data.pack) {
     const pack = data.pack[entry];
-    if (!pack) {
-      return map;
-    }
+    if (!pack) continue;
+
     const packFile = typeof pack === 'string' ? pack : pack.filename;
+
     if (packFile) {
-      map[data.name ? `flavours/${data.name}/${entry}` : `core/${entry}`] = resolve(data.pack_directory, packFile);
+      into[data.name ? `flavours/${data.name}/${entry}` : `core/${entry}`] = resolve(data.pack_directory, packFile);
+    }
+  }
+
+  if (!data.name) return into;
+
+  for (const skinName in data.skin) {
+    const skin = data.skin[skinName];
+    if (!skin) continue;
+
+    for (const entry in skin) {
+      const packFile = skin[entry];
+      if (!packFile) continue;
+
+      into[`skins/${data.name}/${skinName}/${entry}`] = resolve(packFile);
     }
-    return map;
-  }, into);
-  if (data.name) {
-    Object.keys(data.skin).reduce((map, entry) => {
-      const skin = data.skin[entry];
-      const skinName = entry;
-      if (!skin) {
-        return map;
-      }
-      Object.keys(skin).reduce((map, entry) => {
-        const packFile = skin[entry];
-        if (!packFile) {
-          return map;
-        }
-        map[`skins/${data.name}/${skinName}/${entry}`] = resolve(packFile);
-        return map;
-      }, into);
-      return map;
-    }, into);
   }
+
   return into;
 }
 
@@ -49,7 +44,7 @@ const entries = Object.assign(
   { locales: resolve('app', 'javascript', 'locales') },
   localePacks,
   reducePacks(core),
-  Object.keys(flavours).reduce((map, entry) => reducePacks(flavours[entry], map), {})
+  Object.values(flavours).reduce((map, data) => reducePacks(data, map), {})
 );