Replace icons.js with standalone package

2018-12-11 17:53:15 +08:00 · 2018-12-11 17:53:15 +08:00 · ac7a61ee52
commit ac7a61ee52
--- a/libs/icons.js
+++ b/libs/icons.js
@ -1,37 +0,0 @@
-const fs = require('fs')
-const { join, parse } = require('path')
-
-const genIcons = (iconFolder, whiten) => {
-  const icons = {}
-
-  fs.readdirSync(join(__dirname, iconFolder)).forEach(filename => {
-    const imageType = {
-      '.svg': 'svg+xml',
-      '.png': 'png'
-    }[parse(filename).ext]
-
-    if (!imageType) return
-
-    const key = parse(filename).name
-    const iconFile = join(__dirname, iconFolder, filename)
-    const svgSource = fs.readFileSync(iconFile, 'utf8')
-    const svg = whiten ? whitenSVG(svgSource) : svgSource
-    const b64 = Buffer.from(svg).toString('base64')
-
-    icons[key] = `data:image/${imageType};base64,${b64}`
-  })
-
-  return icons
-}
-
-const whitenSVG = (svg, whiten) => {
-  return svg
-    .replace(/fill="#\w{3,6}"/g, 'fill="white"')
-    .replace(/stroke="#\w{3,6}"/g, 'stroke="white"')
-    .replace(/<path /g, '<path fill="white" ')
-}
-
-module.exports = {
-  builtin: genIcons('icons')
-  // simple: genIcons('../node_modules/simple-icons/icons', true)
-}
--- a/libs/serve-badge.js
+++ b/libs/serve-badge.js
@ -1,13 +1,8 @@
 const badgen = require('badgen')
 const { send } = require('micro')
-const { builtin } = require('./icons.js')
+const icons = require('badgen-icons')

 const CACHE_CONTROL = `public, max-age=60, stale-while-revalidate=604800, stale-if-error=604800`
-const noneSquareIconWidths = {
-  awesome: 20,
-  codeclimate: 18,
-  lgtm: 19
-}

 module.exports = (req, res, options = {}) => {
  const { code = 200, sMaxAge = '604800', params } = options
@ -15,14 +10,18 @@ module.exports = (req, res, options = {}) => {
  const hostStyle = req.headers.host === 'flat.badgen.net' ? 'flat' : undefined
  const { subject, status, color } = params || req.params
  const { style, label, list, icon, iconWidth, color: queryColor } = req.query
+  const _icon = icons[icon === '' ? subject : icon] || {
+    base64: icon,
+    width: iconWidth
+  }

  const badge = badgen({
    subject: typeof label !== 'undefined' ? label : subject,
    status: String(list ? status.replace(/,/g, ' | ') : status),
    color: queryColor || color,
    style: style || hostStyle,
-    icon: builtin[icon === '' ? subject : icon],
-    iconWidth: iconWidth || noneSquareIconWidths[icon]
+    icon: _icon.base64,
+    iconWidth: _icon.width
  })

  res.setHeader('Content-Type', 'image/svg+xml;charset=utf-8')
--- a/libs/serve-metadata.js
+++ b/libs/serve-metadata.js
@ -1,11 +1,11 @@
 const { send } = require('micro')
-const { builtin } = require('./icons.js')
+const icons = require('badgen-icons')

 module.exports = (req, res) => {
  const code = 200

  const info = {
-    icons: Object.keys(builtin)
+    icons: Object.keys(icons)
  }

  res.setHeader('Content-Type', 'application/json')
--- a/package-lock.json
+++ b/package-lock.json
@ -2349,7 +2349,7 @@
      "dependencies": {
        "chalk": {
          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
          "dev": true,
          "requires": {
@ -2476,6 +2476,11 @@
      "resolved": "https://registry.npmjs.org/badgen/-/badgen-2.5.0.tgz",
      "integrity": "sha512-ZWS4Hv2MTQU1D0TEgzAhr68xTETM24G5l5tcXMZaLHQZqhwn7YMJvCAOaWoLiUOffAntLKgxvduy33qny1lVkQ=="
    },
+    "badgen-icons": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/badgen-icons/-/badgen-icons-0.2.0.tgz",
+      "integrity": "sha512-ueVjg5DZ8O90O5ZCVbjwgnYcJ5kZtmvcUaxaMgRT4cFM4UIZMBd3Wy7Dw+2CmAiEXzxO5OuzNBhj8Ymt1xIb9A=="
+    },
    "bail": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
@ -3374,7 +3379,7 @@
    },
    "core-js": {
      "version": "2.5.7",
-      "resolved": "http://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
      "dev": true
    },
@ -4737,7 +4742,7 @@
      "dependencies": {
        "chalk": {
          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
          "dev": true,
          "requires": {
@ -4815,8 +4820,7 @@
          "version": "2.1.1",
          "resolved": false,
          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "aproba": {
          "version": "1.2.0",
@ -4840,15 +4844,13 @@
          "version": "1.0.0",
          "resolved": false,
          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "resolved": false,
          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
          "dev": true,
-          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -4865,22 +4867,19 @@
          "version": "1.1.0",
          "resolved": false,
          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "concat-map": {
          "version": "0.0.1",
          "resolved": false,
          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "resolved": false,
          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -5011,8 +5010,7 @@
          "version": "2.0.3",
          "resolved": false,
          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "ini": {
          "version": "1.3.5",
@ -5026,7 +5024,6 @@
          "resolved": false,
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
          "dev": true,
-          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@ -5043,7 +5040,6 @@
          "resolved": false,
          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
          "dev": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@ -5052,15 +5048,13 @@
          "version": "0.0.8",
          "resolved": false,
          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "minipass": {
          "version": "2.2.4",
          "resolved": false,
          "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
          "dev": true,
-          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.1",
            "yallist": "^3.0.0"
@ -5081,7 +5075,6 @@
          "resolved": false,
          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
          "dev": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@ -5170,8 +5163,7 @@
          "version": "1.0.1",
          "resolved": false,
          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "object-assign": {
          "version": "4.1.1",
@ -5185,7 +5177,6 @@
          "resolved": false,
          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
          "dev": true,
-          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@ -5281,8 +5272,7 @@
          "version": "5.1.1",
          "resolved": false,
          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@ -5324,7 +5314,6 @@
          "resolved": false,
          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
          "dev": true,
-          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@ -5346,7 +5335,6 @@
          "resolved": false,
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
          "dev": true,
-          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@ -5395,15 +5383,13 @@
          "version": "1.0.2",
          "resolved": false,
          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "yallist": {
          "version": "3.0.2",
          "resolved": false,
          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true,
-          "optional": true
+          "dev": true
        }
      }
    },
@ -7127,7 +7113,7 @@
        },
        "minimist": {
          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
          "dev": true
        },
@ -7314,7 +7300,6 @@
          "version": "0.1.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "kind-of": "^3.0.2",
            "longest": "^1.0.1",
@ -7639,8 +7624,7 @@
        "is-buffer": {
          "version": "1.1.6",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "is-builtin-module": {
          "version": "1.0.0",
@ -7724,7 +7708,6 @@
          "version": "3.2.2",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "is-buffer": "^1.1.5"
          }
@ -7771,8 +7754,7 @@
        "longest": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "lru-cache": {
          "version": "4.1.3",
@ -8038,8 +8020,7 @@
        "repeat-string": {
          "version": "1.6.1",
          "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
        },
        "require-directory": {
          "version": "2.1.1",
--- a/package.json
+++ b/package.json
@ -22,6 +22,7 @@
  },
  "dependencies": {
    "badgen": "^2.5.0",
+    "badgen-icons": "^0.2.0",
    "byte-size": "^4.0.4",
    "cheerio": "^1.0.0-rc.2",
    "chrome-webstore": "^1.2.1",