From 82ac35983bf61951cb0733d20fef83fd85f187ed Mon Sep 17 00:00:00 2001 From: Tom Schneider Date: Mon, 5 Aug 2019 20:04:03 +0200 Subject: [PATCH 01/11] added jet icon --- _data/simple-icons.json | 5 +++++ icons/jet.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/jet.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 34c61010f980..9c750ad3f2d3 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1480,6 +1480,11 @@ "hex": "C21325", "source": "https://jestjs.io/" }, + { + "title": "JET", + "hex": "FBBA00", + "source": "https://de.wikipedia.org/wiki/Datei:JET.svg" + }, { "title": "Jira", "hex": "172B4D", diff --git a/icons/jet.svg b/icons/jet.svg new file mode 100644 index 000000000000..f3fbf7f1ab2f --- /dev/null +++ b/icons/jet.svg @@ -0,0 +1 @@ +JET \ No newline at end of file From fdf755bf3e9406483de997b1ad5139c39334cf3c Mon Sep 17 00:00:00 2001 From: Tom Schneider Date: Mon, 5 Aug 2019 20:23:57 +0200 Subject: [PATCH 02/11] fix icon suffix in title --- icons/jet.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/jet.svg b/icons/jet.svg index f3fbf7f1ab2f..0ee777624706 100644 --- a/icons/jet.svg +++ b/icons/jet.svg @@ -1 +1 @@ -JET \ No newline at end of file +JET icon From 392f2db4712b563af1807318efbc2a5217ec4e19 Mon Sep 17 00:00:00 2001 From: Tom Schneider Date: Mon, 5 Aug 2019 20:31:14 +0200 Subject: [PATCH 03/11] remove final new line --- icons/jet.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/jet.svg b/icons/jet.svg index 0ee777624706..3c5c69707046 100644 --- a/icons/jet.svg +++ b/icons/jet.svg @@ -1 +1 @@ -JET icon +JET icon \ No newline at end of file From 06630058d94d96ca3895e15ee5b64de88c7c830d Mon Sep 17 00:00:00 2001 From: Fatih Mehmet Ozcan <34105974+fatihmeh@users.noreply.github.com> Date: Wed, 14 Aug 2019 18:24:42 +0300 Subject: [PATCH 04/11] Socket.io Icon Added (#1583) * Socket.io Icon Added * Update _data/simple-icons.json Socket.io source updated * Socket.io icon file name updated --- Closes #1564 --- _data/simple-icons.json | 5 +++++ icons/socket-dot-io.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/socket-dot-io.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 574f736a6631..60271bf116f4 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -2645,6 +2645,11 @@ "hex": "000000", "source": "https://blog.society6.com/app/themes/society6/dist/images/mark.svg" }, + { + "title": "Socket.io", + "hex": "010101", + "source": "https://socket.io" + }, { "title": "Sogou", "hex": "FB6022", diff --git a/icons/socket-dot-io.svg b/icons/socket-dot-io.svg new file mode 100644 index 000000000000..29a09b52f6c7 --- /dev/null +++ b/icons/socket-dot-io.svg @@ -0,0 +1 @@ +Socket.io icon \ No newline at end of file From fee1c3aa250f2ab195563e94edee343069edc51f Mon Sep 17 00:00:00 2001 From: Fatih Mehmet Ozcan <34105974+fatihmeh@users.noreply.github.com> Date: Thu, 15 Aug 2019 13:59:11 +0300 Subject: [PATCH 05/11] Realm Icon Added (#1586) Closes #1567 --- _data/simple-icons.json | 5 +++++ icons/realm.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/realm.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 60271bf116f4..7a56668e1d89 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -2390,6 +2390,11 @@ "hex": "8CA1AF", "source": "https://github.com/rtfd/readthedocs.org/blob/master/media/readthedocsbranding.ai" }, + { + "title": "Realm", + "hex": "39477F", + "source": "https://realm.io/press" + }, { "title": "Reason", "hex": "DD4B39", diff --git a/icons/realm.svg b/icons/realm.svg new file mode 100644 index 000000000000..d23862e09379 --- /dev/null +++ b/icons/realm.svg @@ -0,0 +1 @@ +Realm icon \ No newline at end of file From 96a8ab301b1ecb3cdd7334f921be0a0ad2020447 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 15 Aug 2019 13:16:28 +0200 Subject: [PATCH 06/11] Add Travis CI deploy step for release tags (#1558) * Add sample Travis CI deploy step to tag commits on master and push that TODO: should find the version number from ./package.json * Get git name and email for tagging from env * Extract current version number from manifest Attempt... * Update .travis.yml Fix whitespace issue and command error * Switch sed order and escape double qoutes * Replace curly braces by parentheses * Test deploy of release tag to GitHub * Convert deploy back to script And update actual deploy step commands * Remove test deploy stage * Fix api_key value and remove leftover configuration --- .travis.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6f9d1a82e501..8b09d5630802 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,19 @@ jobs: - npm run test - stage: deploy - name: "NPM Package" + name: "Git tag" + if: branch = master + + before_deploy: + - git config --local user.name "$GITHUB_USERNAME" + - git config --local user.email "$GITHUB_EMAIL" + - export PACKAGE_VERSION=$(cat package.json | grep 'version' | sed 's/[ \",:]//g' | sed 's/version//') + - git tag $PACKAGE_VERSION + deploy: + provider: releases + api_key: "$GITHUB_TOKEN" + skip_cleanup: true + - name: "NPM Package" language: node_js node_js: 8 if: branch = master From 87ab9c43a74146fb8fc604c49a34a7d465cfb4d4 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Thu, 15 Aug 2019 13:23:35 +0200 Subject: [PATCH 07/11] Refactor prepublish script to use template file for icon objects (#1547) * Refactor prepublish script to use template file for icon objects ... to hopefully increase readability * Fix build and test issues * Add missing semi-colon * Explicitly check for errors when writing individual static .js files --- scripts/build-package.js | 35 ++++++++++++++++++++++++-------- scripts/templates/icon-object.js | 10 +++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 scripts/templates/icon-object.js diff --git a/scripts/build-package.js b/scripts/build-package.js index 287b2f2e06f8..74b5d78dc8e8 100644 --- a/scripts/build-package.js +++ b/scripts/build-package.js @@ -11,10 +11,17 @@ const fs = require("fs"); const util = require("util"); const minify = require("uglify-js").minify; +const UTF8 = "utf8"; + const dataFile = "../_data/simple-icons.json"; const indexFile = `${__dirname}/../index.js`; const iconsDir = `${__dirname}/../icons`; + const indexTemplateFile = `${__dirname}/templates/index.js`; +const iconObjectTemplateFile = `${__dirname}/templates/icon-object.js`; + +const indexTemplate = fs.readFileSync(indexTemplateFile, UTF8); +const iconObjectTemplate = fs.readFileSync(iconObjectTemplateFile, UTF8); const data = require(dataFile); const { titleToFilename } = require("./utils"); @@ -27,27 +34,37 @@ function iconToKeyValue(icon) { return `'${icon.title}':${iconToObject(icon)}`; } function iconToObject(icon) { - return `{title:'${escape(icon.title)}',slug:'${escape(icon.slug)}',svg:'${escape(icon.svg)}',get path(){return this.svg.match(/ { const filename = titleToFilename(icon.title); - icon.svg = fs.readFileSync(`${iconsDir}/${filename}.svg`, "utf8"); + icon.svg = fs.readFileSync(`${iconsDir}/${filename}.svg`, UTF8); icon.slug = filename; - icons.push(icon) + icons.push(icon); // write the static .js file for the icon - fs.writeFileSync( - `${iconsDir}/${filename}.js`, - `module.exports=${iconToObject(icon)};` - ); + const { error, code } = minify(`module.exports=${iconToObject(icon)};`); + if (error) { + console.error(error); + process.exit(1); + } else { + fs.writeFileSync(`${iconsDir}/${filename}.js`, code); + } + }); // write our generic index.js -const indexTemplate = fs.readFileSync(indexTemplateFile, "utf8"); -const { error, code } = minify(util.format(indexTemplate, icons.map(iconToKeyValue).join(','))); +const rawIndexJs = util.format(indexTemplate, icons.map(iconToKeyValue).join(',')); +const { error, code } = minify(rawIndexJs); if (error) { console.error(error); process.exit(1); diff --git a/scripts/templates/icon-object.js b/scripts/templates/icon-object.js new file mode 100644 index 000000000000..407316ea7525 --- /dev/null +++ b/scripts/templates/icon-object.js @@ -0,0 +1,10 @@ +{ + title: '%s', + slug: '%s', + svg: '%s', + get path() { + return this.svg.match(/ Date: Sun, 18 Aug 2019 11:21:43 +0200 Subject: [PATCH 08/11] Add a .gitattributes files (#1559) * Create .gitattributes * Update list of 'export-ignore' files in .gitattributes --- .gitattributes | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000000..20db8b630a2f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +* text=auto + +# SVGs are treated as binary by default +*.svg text + +# Don't diff machine generated files +package-lock.json -diff + +# Treat images as binary +*.ico binary +*.png binary + +# Don't export/archive these files +.github export-ignore +.gitpod.yml export-ignore +.travis.yml export-ignore +CNAME export-ignore From e435e5322444209492b94b471a9b1dbdc0635374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Moraes?= Date: Fri, 23 Aug 2019 04:10:18 -0300 Subject: [PATCH 09/11] Added Linux Deepin icon (#1495) * Added Distro Deepin Linux icon * update svg address * minor corrections * fix deepin svg --- _data/simple-icons.json | 5 +++++ icons/deepin.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/deepin.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 066b80572099..b9318b418719 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -665,6 +665,11 @@ "hex": "A81D33", "source": "https://www.debian.org/logos" }, + { + "title": "deepin", + "hex": "007CFF", + "source": "https://commons.wikimedia.org/wiki/File:Deepin_logo.svg" + }, { "title": "Deezer", "hex": "00C7F2", diff --git a/icons/deepin.svg b/icons/deepin.svg new file mode 100644 index 000000000000..eea4cf9a1bba --- /dev/null +++ b/icons/deepin.svg @@ -0,0 +1 @@ +deepin icon \ No newline at end of file From 3e5e9200105fd8d010dfc9bea1a035f5d2af9b46 Mon Sep 17 00:00:00 2001 From: Eric Cornelisesn Date: Sun, 25 Aug 2019 14:52:05 +0300 Subject: [PATCH 10/11] 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 666818667348..b82d97198121 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "1.13.0", + "version": "1.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0c289ccfd871..4be8f846e888 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "1.13.0", + "version": "1.14.0", "description": "SVG icons for popular brands https://simpleicons.org", "homepage": "https://www.simpleicons.org", "keywords": [ From 1a116d3112a24a743e979bcfeadfdaa363d5a1e8 Mon Sep 17 00:00:00 2001 From: Eric Cornelisesn Date: Sun, 25 Aug 2019 23:06:08 +0300 Subject: [PATCH 11/11] Specify "git tag" stage language --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8b09d5630802..c5cf27cf16b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ jobs: - stage: deploy name: "Git tag" + language: minimal if: branch = master before_deploy: