feat: Update dependencies, fix vscode material-icon-theme patch

sudosubin · Jul 17, 2024 · d406a7f · d406a7f
1 parent c94dfe9
commit d406a7f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/shared/programs/vscode/files/settings.json b/modules/shared/programs/vscode/files/settings.json
@@ -17,7 +17,6 @@
   "workbench.colorTheme": "One Dark Pro",
   "workbench.iconTheme": "material-icon-theme",
   "workbench.productIconTheme": "material-product-icons",
-  "material-icon-theme.activeIconPack": "react",
   "material-icon-theme.hidesExplorerArrows": true,
   "material-icon-theme.files.associations": {
     "*.gotmpl": "template"

diff --git a/modules/shared/programs/vscode/scripts/patch-material-icon-theme.js b/modules/shared/programs/vscode/scripts/patch-material-icon-theme.js
@@ -12,17 +12,11 @@ const vscodeConfig = parse(fs.readFileSync(argument));
 const extensionConfig = parse(fs.readFileSync("./dist/material-icons.json"));
 
 // vscode settings.json "material-icon-theme.*"
-const options = Object.entries(vscodeConfig).reduce((prev, [key, value]) => {
-  if (!key.startsWith("material-icon-theme.")) {
-    return prev;
-  }
-
-  const keys = key.replace("material-icon-theme.", "").split(".");
-  const last = keys.pop();
-
-  keys.reduce((o, k) => (o[k] = o[k] || {}), prev)[last] = value;
-  return prev;
-}, extensionConfig.options);
+const options = Object.fromEntries(
+  Object.entries(vscodeConfig)
+    .filter(([key, _]) => key.startsWith("material-icon-theme."))
+    .map(([key, value]) => [key.replace("material-icon-theme.", ""), value])
+);
 
 // extension material-icons.json
 const data = {