From 412b1b01e656c549cafd5130167ec0ec1d9e978b Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Fri, 19 Jul 2019 07:48:51 +0100 Subject: [PATCH 01/14] Update SVGLint to v1.0.5 To make use of the fix for https://github.com/birjolaxew/svglint/issues/5 --- package-lock.json | 33 ++++++++++++++++----------------- package.json | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index b072556f0..6a0ad0345 100644 --- a/package-lock.json +++ b/package-lock.json @@ -182,9 +182,9 @@ } }, "@types/node": { - "version": "11.13.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.0.tgz", - "integrity": "sha512-rx29MMkRdVmzunmiA4lzBYJNnXsW/PhG4kMBy2ATsYaDjGGR75dCFEVVROKpNwlVdcUX3xxlghKQOeDPBJobng==", + "version": "12.6.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz", + "integrity": "sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg==", "dev": true }, "@types/q": { @@ -698,13 +698,13 @@ } }, "cheerio": { - "version": "1.0.0-rc.2", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz", - "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=", + "version": "1.0.0-rc.3", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz", + "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==", "dev": true, "requires": { "css-select": "~1.2.0", - "dom-serializer": "~0.1.0", + "dom-serializer": "~0.1.1", "entities": "~1.1.1", "htmlparser2": "^3.9.1", "lodash": "^4.15.0", @@ -1606,13 +1606,12 @@ "dev": true }, "fast-xml-parser": { - "version": "3.12.16", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.12.16.tgz", - "integrity": "sha512-7ePrHTK4K9BLzY3+6ZOv2YEPOpdYJg3ohyMHxacG6kp1A0Y8KNyjrFfEHJuo8G4T7vT7cIlIXGWoHdIWu9U41A==", + "version": "3.12.17", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.12.17.tgz", + "integrity": "sha512-gyvL0R5PGOW3gQssS/IVhANnsz1ANMK7tmE7YwqcdS7sAN8vDVKwXdQPZw5KH+nrSKSl5sXiGfhFnNflZwSgPQ==", "dev": true, "requires": { "configstore": "^4.0.0", - "lodash": "^4.17.11", "nimnjs": "^1.3.2" } }, @@ -2462,9 +2461,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz", - "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", + "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -5465,9 +5464,9 @@ } }, "svglint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/svglint/-/svglint-1.0.4.tgz", - "integrity": "sha512-yq/uVpZQ4yWONvpLAC4J9Gkzu55EPsCLx3D02MCkEJwQHk0ccTEtk5fIVtE2+2X4+JbFX6EMFi6NMz1Aumflag==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/svglint/-/svglint-1.0.5.tgz", + "integrity": "sha512-GztnFzJjzW0ccfrTmIzOeme+6aWpDhXOlU1o2/toqWr3FhxlTOoHEcVAuL9uzYW375UCMfBdeaYgeUEBdRY10A==", "dev": true, "requires": { "ansi-regex": "^3.0.0", diff --git a/package.json b/package.json index 581177fcd..60d6ccc91 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "editorconfig-checker": "^2.0.8", "jest": "^24.1.0", "jsonlint2": "^1.7.1", - "svglint": "^1.0.4", + "svglint": "^1.0.5", "svgo": "^1.3.0", "uglify-js": "^3.6.0" }, From 16f3bcea1220cb3964af98d6ff9838aa47c28bca Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Tue, 23 Jul 2019 07:01:11 +0100 Subject: [PATCH 02/14] Fix deploy failure due to missing node_modules The deploy script failed in the last build[1] due to a missing dependency. Skipping cleanup prevents the node_modules from being deleted and the build script form failing. I encountered this exact problem with simple-icons-font[2][3][4] and this fixed it. For now I manually releaesd v1.12.0[5]. --- 1. https://travis-ci.com/simple-icons/simple-icons/jobs/218315055#L547 2. https://github.com/simple-icons/simple-icons-font/pull/15 3. https://github.com/simple-icons/simple-icons-font/pull/17 4. https://github.com/simple-icons/simple-icons-font/pull/18 5. https://github.com/simple-icons/simple-icons/pull/1549 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 57d1766ff..6f9d1a82e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ jobs: deploy: provider: npm + skip_cleanup: true email: "johanringmann@gmail.com" api_key: "$NPM_KEY" on: From cf0e11138b741ff5aaa449b2d650825d6f345d86 Mon Sep 17 00:00:00 2001 From: Fatih Mehmet Ozcan <34105974+fatihmeh@users.noreply.github.com> Date: Wed, 24 Jul 2019 14:18:14 +0300 Subject: [PATCH 03/14] Add Cassandra Icon (#1541) --- _data/simple-icons.json | 5 +++++ icons/cassandra.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/cassandra.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 0e2a88924..91b16f804 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -420,6 +420,11 @@ "hex": "00B265", "source": "http://supertop.co/castro/press/" }, + { + "title": "Cassandra", + "hex": "1287B1", + "source": "https://upload.wikimedia.org/wikipedia/commons/5/5e/Cassandra_logo.svg" + }, { "title": "CEVO", "hex": "1EABE2", diff --git a/icons/cassandra.svg b/icons/cassandra.svg new file mode 100644 index 000000000..ae79760ae --- /dev/null +++ b/icons/cassandra.svg @@ -0,0 +1 @@ +Cassandra icon \ No newline at end of file From 0c275b7173b88a21a432de6fa7d7c5ab7b0d12f9 Mon Sep 17 00:00:00 2001 From: David Klebanoff Date: Wed, 24 Jul 2019 04:19:23 -0700 Subject: [PATCH 04/14] Added Lyft. (#1545) --- _data/simple-icons.json | 5 +++++ icons/lyft.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/lyft.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 91b16f804..0c3571279 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1705,6 +1705,11 @@ "hex": "2C2D72", "source": "https://www.lua.org/docs.html" }, + { + "title": "Lyft", + "hex": "FF00BF", + "source": "https://www.lyft.com/press" + }, { "title": "Macy’s", "hex": "E21A2C", diff --git a/icons/lyft.svg b/icons/lyft.svg new file mode 100644 index 000000000..533ea151f --- /dev/null +++ b/icons/lyft.svg @@ -0,0 +1 @@ +Lyft icon \ No newline at end of file From b1b2f339b846631b8137a180785916d9afc7b66e Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Wed, 24 Jul 2019 20:17:46 +0100 Subject: [PATCH 05/14] Don't enumerate the get method (#1555) * Test that all elements when iterating simpleIcons are objects * Refactor index template to hide .get method from enumeration --- scripts/templates/index.js | 28 ++++++++++++++++------------ tests/index.test.js | 8 ++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/scripts/templates/index.js b/scripts/templates/index.js index 8dda40576..58cf0f508 100644 --- a/scripts/templates/index.js +++ b/scripts/templates/index.js @@ -1,17 +1,21 @@ var icons = {%s}; -module.exports = icons; -module.exports.get = function(targetName) { - if (icons[targetName]) { - return icons[targetName]; - } else { - var normalizedName = targetName.toLowerCase(); - for (var iconName in icons) { - var icon = icons[iconName]; - if ((icon.title && icon.title.toLowerCase() === normalizedName) - || (icon.slug && icon.slug === normalizedName)) { - return icon; +Object.defineProperty(icons, "get", { + enumerate: false, + value: function(targetName) { + if (icons[targetName]) { + return icons[targetName]; + } else { + var normalizedName = targetName.toLowerCase(); + for (var iconName in icons) { + var icon = icons[iconName]; + if ((icon.title && icon.title.toLowerCase() === normalizedName) + || (icon.slug && icon.slug === normalizedName)) { + return icon; + } } } } -} +}); + +module.exports = icons; diff --git a/tests/index.test.js b/tests/index.test.js index f040045bd..5a01f200b 100644 --- a/tests/index.test.js +++ b/tests/index.test.js @@ -44,3 +44,11 @@ icons.forEach(icon => { expect(found.title).toEqual(icon.title); }); }); + +test(`Iterating over simpleIcons only exposes icons`, () => { + const iconArray = Object.values(simpleIcons); + for (let icon of iconArray) { + expect(icon).toBeDefined(); + expect(typeof icon).toBe('object'); + } +}); From d27c51ed4c74ac5b17ac64208fad0107901b5668 Mon Sep 17 00:00:00 2001 From: Fatih Mehmet Ozcan <34105974+fatihmeh@users.noreply.github.com> Date: Thu, 25 Jul 2019 15:43:55 +0300 Subject: [PATCH 06/14] Add OpenVPN & WireGuard Icon (#1535) * OpenVPN Added * Add openvpn.svg * Update title inside openvpn.svg * Add WireGuard Icon * Update wireguard.svg * OpenVPN Icon Updated * Vertically centered As @birjolaxew requested --- _data/simple-icons.json | 10 ++++++++++ icons/openvpn.svg | 1 + icons/wireguard.svg | 1 + 3 files changed, 12 insertions(+) create mode 100644 icons/openvpn.svg create mode 100644 icons/wireguard.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 0c3571279..34c61010f 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -2085,6 +2085,11 @@ "hex": "73BA25", "source": "https://en.opensuse.org/Portal:Artwork" }, + { + "title": "OpenVPN", + "hex": "EA7E20", + "source": "https://openvpn.net/wp-content/themes/openvpn/assets/images/logo.svg" + }, { "title": "Opera", "hex": "FF1B2D", @@ -3200,6 +3205,11 @@ "hex": "000000", "source": "http://brand.wire.com" }, + { + "title": "WireGuard", + "hex": "88171A", + "source": "https://www.wireguard.com/img/wireguard.svg" + }, { "title": "Wix", "hex": "FAAD4D", diff --git a/icons/openvpn.svg b/icons/openvpn.svg new file mode 100644 index 000000000..a464dd2f9 --- /dev/null +++ b/icons/openvpn.svg @@ -0,0 +1 @@ +OpenVPN icon \ No newline at end of file diff --git a/icons/wireguard.svg b/icons/wireguard.svg new file mode 100644 index 000000000..fac39dda8 --- /dev/null +++ b/icons/wireguard.svg @@ -0,0 +1 @@ +WireGuard icon \ No newline at end of file From ddc3fe09d445aa81ece4ca90b0445e084650ffdc Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 25 Jul 2019 23:26:27 +0100 Subject: [PATCH 07/14] Fix name of "enumerable" property in Object.defineProperty As discussed in https://github.com/simple-icons/simple-icons/pull/1555 --- scripts/templates/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/templates/index.js b/scripts/templates/index.js index 58cf0f508..7a4d025a5 100644 --- a/scripts/templates/index.js +++ b/scripts/templates/index.js @@ -1,7 +1,7 @@ var icons = {%s}; Object.defineProperty(icons, "get", { - enumerate: false, + enumerable: false, value: function(targetName) { if (icons[targetName]) { return icons[targetName]; From 7665782042ceaeb59bf4b5ca4bfd301f84f595b6 Mon Sep 17 00:00:00 2001 From: Tom Schneider Date: Tue, 6 Aug 2019 12:23:53 +0200 Subject: [PATCH 08/14] Added aral icon (#1575) * added aral icon * fix icon suffix in title * remove final new line --- _data/simple-icons.json | 5 +++++ icons/aral.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/aral.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 34c61010f..6c287c575 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -180,6 +180,11 @@ "hex": "00B3E0", "source": "https://commons.wikimedia.org/wiki/File:Appveyor_logo.svg" }, + { + "title": "ARAL", + "hex": "0063CB", + "source": "https://upload.wikimedia.org/wikipedia/commons/6/60/Aral_Logo.svg" + }, { "title": "Arch Linux", "hex": "1793D1", diff --git a/icons/aral.svg b/icons/aral.svg new file mode 100644 index 000000000..9b8c400ad --- /dev/null +++ b/icons/aral.svg @@ -0,0 +1 @@ +ARAL icon \ No newline at end of file From 6c875c727789aedccf58dc1ba41cebb4163b1bc2 Mon Sep 17 00:00:00 2001 From: Jan Keromnes Date: Tue, 6 Aug 2019 17:52:52 +0200 Subject: [PATCH 09/14] Add Gitpod icon. (#1579) * Improve Gitpod first load experience. * Add Gitpod icon. --- .gitpod.yml | 3 ++- _data/simple-icons.json | 5 +++++ icons/gitpod.svg | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 icons/gitpod.svg diff --git a/.gitpod.yml b/.gitpod.yml index e2bfa09c6..04b0b104e 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,6 +1,7 @@ ports: - port: 4000 - onOpen: open-preview + onOpen: ignore tasks: + - command: gp await-port 4000 && sleep 3 && gp preview $(gp url 4000) - init: gem install jekyll bundler command: jekyll serve --host 0.0.0.0 diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 6c287c575..35bb6a597 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1090,6 +1090,11 @@ "hex": "E24329", "source": "https://about.gitlab.com/press/" }, + { + "title": "Gitpod", + "hex": "1AA6E4", + "source": "https://www.gitpod.io/" + }, { "title": "Gitter", "hex": "ED1965", diff --git a/icons/gitpod.svg b/icons/gitpod.svg new file mode 100644 index 000000000..8331c331f --- /dev/null +++ b/icons/gitpod.svg @@ -0,0 +1 @@ +Gitpod icon \ No newline at end of file From 0726b9e07e20e98480f02d4d44e48deb2523e00e Mon Sep 17 00:00:00 2001 From: David Klebanoff Date: Tue, 6 Aug 2019 17:09:22 -0700 Subject: [PATCH 10/14] Added Godot. (#1577) --- _data/simple-icons.json | 5 +++++ icons/godotengine.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/godotengine.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 35bb6a597..e9625eed7 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1120,6 +1120,11 @@ "hex": "A22430", "source": "https://www.gnu.org/graphics/social.html" }, + { + "title": "Godot Engine", + "hex": "478CBF", + "source": "https://godotengine.org/themes/godotengine/assets/download/godot_logo.svg" + }, { "title": "GOG.com", "hex": "86328A", diff --git a/icons/godotengine.svg b/icons/godotengine.svg new file mode 100644 index 000000000..87304b228 --- /dev/null +++ b/icons/godotengine.svg @@ -0,0 +1 @@ +Godot Engine icon \ No newline at end of file From e1232f366b14a893705adeadeb7fd0345f6a339e Mon Sep 17 00:00:00 2001 From: Tom Schneider Date: Thu, 8 Aug 2019 09:38:14 +0200 Subject: [PATCH 11/14] Added shell icon (#1576) * added shell icon * fix icon suffix in title * using english wikipedia * rename Royal Dutch Shell to just Shell --- _data/simple-icons.json | 5 +++++ icons/shell.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/shell.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index e9625eed7..fdf1a976f 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -2555,6 +2555,11 @@ "hex": "0088FF", "source": "https://brandfolder.com/shazam" }, + { + "title": "Shell", + "hex": "FFD500", + "source": "https://en.wikipedia.org/wiki/File:Shell_logo.svg" + }, { "title": "Shopify", "hex": "7AB55C", diff --git a/icons/shell.svg b/icons/shell.svg new file mode 100644 index 000000000..bbfe9dbe8 --- /dev/null +++ b/icons/shell.svg @@ -0,0 +1 @@ +Shell icon \ No newline at end of file From 1abcf6f57a4ad4de0adba38dfbebca70e198d8cd Mon Sep 17 00:00:00 2001 From: Fatih Mehmet Ozcan <34105974+fatihmeh@users.noreply.github.com> Date: Sat, 10 Aug 2019 12:09:38 +0300 Subject: [PATCH 12/14] Added Dashlane Icon (#1582) * Dashlane Icon Added * Create dashlane.svg * dashlane.svg aligned properly * Dashlane hex updated --- Closes #1570 --- _data/simple-icons.json | 5 +++++ icons/dashlane.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/dashlane.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index fdf1a976f..574f736a6 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -640,6 +640,11 @@ "hex": "0066DC", "source": "http://press.dailymotion.com/?page_id=346" }, + { + "title": "Dashlane", + "hex": "007C97", + "source": "https://www.dashlane.com/" + }, { "title": "Dassault Systèmes", "hex": "005386", diff --git a/icons/dashlane.svg b/icons/dashlane.svg new file mode 100644 index 000000000..4429ce837 --- /dev/null +++ b/icons/dashlane.svg @@ -0,0 +1 @@ +Dashlane icon \ No newline at end of file From 3435a3e4ff2ea95160ed6a8f44c3ce7e07f282ed Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Sun, 11 Aug 2019 13:27:39 +0300 Subject: [PATCH 13/14] Fix error in Cloudbees path (#1556) --- icons/cloudbees.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/cloudbees.svg b/icons/cloudbees.svg index 1d5475581..52ca703c9 100644 --- a/icons/cloudbees.svg +++ b/icons/cloudbees.svg @@ -1 +1 @@ -CloudBees icon \ No newline at end of file +CloudBees icon \ No newline at end of file From 186d4ab1e95a10ec0d21760ad5066d5ad403cc6d Mon Sep 17 00:00:00 2001 From: Eric Cornelisesn Date: Sun, 11 Aug 2019 12:54:12 +0200 Subject: [PATCH 14/14] version bump --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97143e0ff..666818667 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "1.12.0", + "version": "1.13.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9d839bdad..0c289ccfd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "1.12.0", + "version": "1.13.0", "description": "SVG icons for popular brands https://simpleicons.org", "homepage": "https://www.simpleicons.org", "keywords": [