(glyphs): move svg optimization to export.py

glyphs/export.py

@@ -6,6 +6,7 @@
 import json
 import os
 import re
+import subprocess
 
 
 def main(jsonPath: str):
@@ -20,6 +21,8 @@ def main(jsonPath: str):
 		res[glyph.name] = path
 	Font.gridSubDivisions = 1
 
+	res = optimize(res)
+
 	with open(os.path.join(os.path.dirname(Font.filepath), jsonPath), "w") as fp:
 		json.dump(res, fp, indent=2)
 
@@ -59,4 +62,13 @@ def sub(s: str) -> str:
 	return s
 
 
-main(jsonPath="glyphs.json")
+def optimize(res: dict[str, str]) -> dict[str, str]:
+	svg = "".join(f"<path d=\"{path}\"/>" for path in res.values())
+	output = subprocess.run(["svgo", "-s", svg], capture_output=True).stdout.decode()
+	return dict(zip(res.keys(), output.split("\"")[1:-1:2]))
+
+
+if __name__ == "__main__":
+	if "/usr/local/bin/" not in os.environ["PATH"]:
+		os.environ["PATH"] = os.environ["PATH"] + ":/usr/local/bin/"
+	main(jsonPath="glyphs.json")

glyphs/generate-src.js

@@ -1,7 +1,6 @@
 import { readFileSync, writeFileSync } from 'fs'
 import { join } from 'path'
 import { fileURLToPath } from 'url'
-import { optimize } from 'svgo'
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url))
 const iconsPath = join(__dirname, 'icons.csv')
@@ -20,9 +19,6 @@ import React from 'react'
 import type { DinkieIconProps } from './index'
 `
 
-const optimizePath = (path) =>
-  optimize(`<path d="${path}"/>`).data.replace(/<path d="(.+)"\/>/g, '$1')
-
 const basename = (glyph) => glyph.replace('.small', '').replace('.filled', '')
 const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1)
 const toComponentName = (map, glyph) =>
@@ -60,7 +56,7 @@ const main = () => {
     ([glyph, path]) => ({
       name: toComponentName(glyphNameMap, glyph),
       size: glyph.includes('.small') ? 10 : 12,
-      path: optimizePath(path),
+      path,
     })
   )
   writeFileSync(vueSrcPath, banner + vueImports + icons.map(generateVueComponent).join(''))

package.json

@@ -13,7 +13,6 @@
     "build": "pnpm -r --filter=./packages/** run build"
   },
   "devDependencies": {
-    "svgo": "^3.0.2",
     "typescript": "^5.2.2",
     "vite": "^4.4.9"
   }

packages/react/package.json

@@ -32,7 +32,7 @@
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@types/node": "^20.6.0",
+    "@types/node": "^20.6.2",
     "@vitejs/plugin-react": "^4.0.4",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",

packages/vue-example/package.json

@@ -20,11 +20,11 @@
   },
   "devDependencies": {
     "@dinkie-icons/vue": "workspace:^",
-    "@types/node": "^20.6.0",
+    "@types/node": "^20.6.2",
     "@vitejs/plugin-vue": "^4.3.4",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
     "vue": "^3.3.4",
-    "vue-tsc": "^1.8.10"
+    "vue-tsc": "^1.8.11"
   }
 }

packages/vue/package.json

@@ -31,7 +31,7 @@
     "vue": "^3.3.4"
   },
   "devDependencies": {
-    "@types/node": "^20.6.0",
+    "@types/node": "^20.6.2",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
     "vite-plugin-dts": "^3.5.3"