From bf28dfe9dc2545177c867d425b5625bd2041686a Mon Sep 17 00:00:00 2001 From: Piotr Hylicki Date: Wed, 17 Apr 2019 11:20:07 +0200 Subject: [PATCH 01/17] Added Jest icon #1326 (#1355) --- _data/simple-icons.json | 5 +++++ icons/jest.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/jest.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 9026fcc8..60281d26 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1270,6 +1270,11 @@ "hex": "D24939", "source": "https://wiki.jenkins-ci.org/display/JENKINS/Logo" }, + { + "title": "Jest", + "hex": "C21325", + "source": "https://jestjs.io/" + }, { "title": "Jira", "hex": "172B4D", diff --git a/icons/jest.svg b/icons/jest.svg new file mode 100644 index 00000000..ea2bdf76 --- /dev/null +++ b/icons/jest.svg @@ -0,0 +1 @@ +Jest icon \ No newline at end of file From 112b78f48c12e047730a80dd9ad5c34c8fc4226f Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Wed, 17 Apr 2019 12:41:37 +0300 Subject: [PATCH 02/17] Update Travis CI build (#1348) * Remove xmlstarlet from Travis CI "Lint" build With https://github.com/birjolaxew/svglint/pull/6 merged some time ago, we no longer need xmlstarlet to verify that SVGs are valid XML. Essentially reverting the changes in #1112 and #1159 This should also make it easier for contributors to reproduce the build on their own machines, specifically if they don't use Linux. --- .travis.yml | 3 - package-lock.json | 136 ++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 3 files changed, 107 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc0a8a39..ed5774e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,8 @@ jobs: - stage: "Test" name: "Lint" language: node_js - before_install: - - sudo apt-get install -y xmlstarlet node_js: 8 script: - - xmlstarlet validate --err --list-bad --well-formed icons/*.svg - npm run jsonlint - npm run svglint - name: "Build website" diff --git a/package-lock.json b/package-lock.json index 7f28bd61..a133f5d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -182,9 +182,9 @@ } }, "@types/node": { - "version": "10.12.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.24.tgz", - "integrity": "sha512-GWWbvt+z9G5otRBW8rssOFgRY87J9N/qbhqfjMZ+gUuL6zoL+Hm6gP/8qQBG4jjimqdaNLCehcVapZ/Fs2WjCQ==", + "version": "11.13.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.0.tgz", + "integrity": "sha512-rx29MMkRdVmzunmiA4lzBYJNnXsW/PhG4kMBy2ATsYaDjGGR75dCFEVVROKpNwlVdcUX3xxlghKQOeDPBJobng==", "dev": true }, "JSV": { @@ -883,6 +883,20 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, + "configstore": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", + "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==", + "dev": true, + "requires": { + "dot-prop": "^4.1.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "unique-string": "^1.0.0", + "write-file-atomic": "^2.0.0", + "xdg-basedir": "^3.0.0" + } + }, "convert-source-map": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", @@ -917,6 +931,12 @@ "which": "^1.2.9" } }, + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", + "dev": true + }, "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", @@ -930,9 +950,9 @@ } }, "css-what": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz", - "integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", + "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", "dev": true }, "cssom": { @@ -1105,21 +1125,13 @@ "dev": true }, "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", + "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", "dev": true, "requires": { - "domelementtype": "~1.1.1", - "entities": "~1.1.1" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } + "domelementtype": "^1.3.0", + "entities": "^1.1.1" } }, "domelementtype": { @@ -1156,6 +1168,15 @@ "domelementtype": "1" } }, + "dot-prop": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "dev": true, + "requires": { + "is-obj": "^1.0.0" + } + }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -1487,6 +1508,17 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "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==", + "dev": true, + "requires": { + "configstore": "^4.0.0", + "lodash": "^4.17.11", + "nimnjs": "^1.3.2" + } + }, "fb-watchman": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz", @@ -2310,23 +2342,23 @@ } }, "htmlparser2": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz", - "integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", + "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", "dev": true, "requires": { - "domelementtype": "^1.3.0", + "domelementtype": "^1.3.1", "domhandler": "^2.3.0", "domutils": "^1.5.1", "entities": "^1.1.1", "inherits": "^2.0.1", - "readable-stream": "^3.0.6" + "readable-stream": "^3.1.1" }, "dependencies": { "readable-stream": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz", - "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz", + "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -2560,6 +2592,12 @@ } } }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true + }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -4001,6 +4039,28 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "nimn-date-parser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nimn-date-parser/-/nimn-date-parser-1.0.0.tgz", + "integrity": "sha512-1Nf+x3EeMvHUiHsVuEhiZnwA8RMeOBVTQWfB1S2n9+i6PYCofHd2HRMD+WOHIHYshy4T4Gk8wQoCol7Hq3av8Q==", + "dev": true + }, + "nimn_schema_builder": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/nimn_schema_builder/-/nimn_schema_builder-1.1.0.tgz", + "integrity": "sha512-DK5/B8CM4qwzG2URy130avcwPev4uO0ev836FbQyKo1ms6I9z/i6EJyiZ+d9xtgloxUri0W+5gfR8YbPq7SheA==", + "dev": true + }, + "nimnjs": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/nimnjs/-/nimnjs-1.3.2.tgz", + "integrity": "sha512-TIOtI4iqkQrUM1tiM76AtTQem0c7e56SkDZ7sj1d1MfUsqRcq2ZWQvej/O+HBTZV7u/VKnwlKTDugK/75IRPPw==", + "dev": true, + "requires": { + "nimn-date-parser": "^1.0.0", + "nimn_schema_builder": "^1.0.0" + } + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -5216,14 +5276,15 @@ } }, "svglint": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/svglint/-/svglint-1.0.3.tgz", - "integrity": "sha512-htgL8WnLgKOVVq1faZHrof1jD8o7sPX+xTMCvAXRECRaqvbJXj2Jyr5xoUeJyHJ1YpVTv/a3flFBpg9OhzAVVg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/svglint/-/svglint-1.0.4.tgz", + "integrity": "sha512-yq/uVpZQ4yWONvpLAC4J9Gkzu55EPsCLx3D02MCkEJwQHk0ccTEtk5fIVtE2+2X4+JbFX6EMFi6NMz1Aumflag==", "dev": true, "requires": { "ansi-regex": "^3.0.0", "chalk": "^2.4.1", "cheerio": "^1.0.0-rc.2", + "fast-xml-parser": "^3.12.13", "glob": "^7.1.2", "htmlparser2": "^3.9.1", "log-update": "^2.3.0", @@ -5531,6 +5592,15 @@ } } }, + "unique-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", + "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", + "dev": true, + "requires": { + "crypto-random-string": "^1.0.0" + } + }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -5763,6 +5833,12 @@ "async-limiter": "~1.0.0" } }, + "xdg-basedir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", + "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=", + "dev": true + }, "xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", diff --git a/package.json b/package.json index 114642d5..4108fb44 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "devDependencies": { "jest": "^24.1.0", "jsonlint2": "^1.7.1", - "svglint": "^1.0.3" + "svglint": "^1.0.4" }, "scripts": { "jsonlint": "jsonlint _data/simple-icons.json -q -V .jsonlintschema", From 9d4a9cb65251d4f9dcef4dde3993f09cf5f36fdf Mon Sep 17 00:00:00 2001 From: Piotr Hylicki Date: Wed, 17 Apr 2019 11:51:19 +0200 Subject: [PATCH 03/17] Added Electron icon #1334 (#1358) --- _data/simple-icons.json | 5 +++++ icons/electron.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/electron.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 60281d26..6456f69e 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -695,6 +695,11 @@ "hex": "005571", "source": "https://www.elastic.co/brand" }, + { + "title": "Electron", + "hex": "47848F", + "source": "https://electronjs.org/images/electron-logo.svg" + }, { "title": "elementary", "hex": "64BAFF", diff --git a/icons/electron.svg b/icons/electron.svg new file mode 100644 index 00000000..b37fa6c5 --- /dev/null +++ b/icons/electron.svg @@ -0,0 +1 @@ +Electron icon \ No newline at end of file From 579d439e6081ed58754115f598efa0d36f889e8b Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Wed, 17 Apr 2019 12:59:44 +0300 Subject: [PATCH 04/17] Lint file formatting (primarily whitespace) (#1349) * Add editorconfig-checker and .editorconfig * Fix wslint errors --- .editorconfig | 21 +++++++++ .gitpod.yml | 2 +- .travis.yml | 1 + index.html | 2 +- package-lock.json | 106 +++++++++++++++++++++++++++++++++------------- package.json | 2 + scripts/utils.js | 2 +- 7 files changed, 103 insertions(+), 33 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..6796ca85 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +root=true + +[*] +charset=utf-8 +insert_final_newline=true + +[LICENSE.md] +indent_size=unset +indent_style=space + +[*.{json,yml}] +indent_size=2 +indent_style=space + +[.github/**/*.md] +trim_trailing_whitespace=false # Templates with trailing whitespace are more usable + +[_data/simple-icons.json] +indent_style=space +indent_size=4 +trim_trailing_whitespace=true diff --git a/.gitpod.yml b/.gitpod.yml index ee6ae17d..e2bfa09c 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -3,4 +3,4 @@ ports: onOpen: open-preview tasks: - init: gem install jekyll bundler - command: jekyll serve --host 0.0.0.0 \ No newline at end of file + command: jekyll serve --host 0.0.0.0 diff --git a/.travis.yml b/.travis.yml index ed5774e4..57d1766f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ jobs: script: - npm run jsonlint - npm run svglint + - npm run wslint - name: "Build website" language: ruby rvm: 2.4.1 diff --git a/index.html b/index.html index f0a8bc77..7783d5c5 100644 --- a/index.html +++ b/index.html @@ -256,4 +256,4 @@ - \ No newline at end of file + diff --git a/package-lock.json b/package-lock.json index a133f5d2..db8904ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -705,6 +705,12 @@ "parse5": "^3.0.1" } }, + "chownr": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", + "dev": true + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -1187,6 +1193,16 @@ "safer-buffer": "^2.1.0" } }, + "editorconfig-checker": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/editorconfig-checker/-/editorconfig-checker-2.0.6.tgz", + "integrity": "sha512-/p3egFALNsTSt0YM7gOAGxhIVTX/GHUwwlPKixykpyMbBh5+Hebg0OaxVu3UdPoGttHM2ajPFJfqSIxUL+ytbg==", + "dev": true, + "requires": { + "request": "^2.88.0", + "tar": "^4.4.8" + } + }, "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", @@ -1603,6 +1619,15 @@ "map-cache": "^0.2.2" } }, + "fs-minipass": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "dev": true, + "requires": { + "minipass": "^2.2.1" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1629,8 +1654,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -1651,14 +1675,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1673,20 +1695,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -1803,8 +1822,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -1816,7 +1834,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1831,7 +1848,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1839,14 +1855,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1865,7 +1879,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -1946,8 +1959,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -1959,7 +1971,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -2045,8 +2056,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -2082,7 +2092,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2102,7 +2111,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2146,14 +2154,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -3957,6 +3963,25 @@ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, + "minipass": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "dev": true, + "requires": { + "minipass": "^2.2.1" + } + }, "mixin-deep": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", @@ -5329,6 +5354,21 @@ "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", "dev": true }, + "tar": { + "version": "4.4.8", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "dev": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" + } + }, "test-exclude": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz", @@ -5851,6 +5891,12 @@ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", "dev": true }, + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "dev": true + }, "yargs": { "version": "12.0.5", "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", diff --git a/package.json b/package.json index 4108fb44..84b0c68a 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "author": "Simple Icons Collaborators", "license": "CC0-1.0", "devDependencies": { + "editorconfig-checker": "^2.0.6", "jest": "^24.1.0", "jsonlint2": "^1.7.1", "svglint": "^1.0.4" @@ -25,6 +26,7 @@ "scripts": { "jsonlint": "jsonlint _data/simple-icons.json -q -V .jsonlintschema", "svglint": "svglint icons/* --ci", + "wslint": "editorconfig-checker", "prepublishOnly": "node scripts/prepublish.js", "postpublish": "rm icons/*.js index.js", "test": "jest", diff --git a/scripts/utils.js b/scripts/utils.js index 80e6a44c..f8c6d775 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -14,4 +14,4 @@ module.exports = { .replace(/&/g, "-and-") .replace(/[ !’]/g, "") ) -} \ No newline at end of file +} From d91df7c8295206d6943df89d8f293470bd540c6e Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 19 Apr 2019 17:26:54 +0400 Subject: [PATCH 05/17] Added Unity (#1361) --- _data/simple-icons.json | 5 +++++ icons/unity.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/unity.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 6456f69e..7b1df675 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -2665,6 +2665,11 @@ "hex": "00BEC1", "source": "https://umbraco.com/" }, + { + "title": "Unity", + "hex": "000000", + "source": "https://unity.com/" + }, { "title": "Unsplash", "hex": "000000", diff --git a/icons/unity.svg b/icons/unity.svg new file mode 100644 index 00000000..781b2d1b --- /dev/null +++ b/icons/unity.svg @@ -0,0 +1 @@ +Unity icon \ No newline at end of file From 92c2d47db7f274d20d9b7e770fad6230877b67bf Mon Sep 17 00:00:00 2001 From: Piotr Hylicki Date: Fri, 19 Apr 2019 17:13:03 +0200 Subject: [PATCH 06/17] Added Hackaday icon #1142 (#1356) --- _data/simple-icons.json | 5 +++++ icons/hackaday.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/hackaday.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 7b1df675..0131c74f 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1075,6 +1075,11 @@ "hex": "72EF36", "source": "https://www.gumtree.com" }, + { + "title": "Hackaday", + "hex": "1A1A1A", + "source": "https://hackaday.com/" + }, { "title": "HackerRank", "hex": "2EC866", diff --git a/icons/hackaday.svg b/icons/hackaday.svg new file mode 100644 index 00000000..e1241493 --- /dev/null +++ b/icons/hackaday.svg @@ -0,0 +1 @@ +Hackaday icon \ No newline at end of file From 48e51962cae96860b76ed9b6220d1470bf6383ec Mon Sep 17 00:00:00 2001 From: Piotr Hylicki Date: Fri, 19 Apr 2019 17:15:50 +0200 Subject: [PATCH 07/17] Renamed 'Adobe Lightromm' to 'Adobe Lightroom Classic' #1364 (#1365) --- _data/simple-icons.json | 4 ++-- icons/adobelightroom.svg | 1 - icons/adobelightroomclassic.svg | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 icons/adobelightroom.svg create mode 100644 icons/adobelightroomclassic.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 0131c74f..10736bde 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -61,9 +61,9 @@ "source": "https://wwwimages2.adobe.com/etc/clientlibs/beagle/ace/source/font/aceui-fonts.svg" }, { - "title": "Adobe Lightroom", + "title": "Adobe Lightroom Classic", "hex": "ADD5EC", - "source": "https://wwwimages2.adobe.com/etc/clientlibs/beagle/ace/source/font/aceui-fonts.svg" + "source": "https://www.adobe.com/products/photoshop-lightroom-classic.html" }, { "title": "Adobe Photoshop", diff --git a/icons/adobelightroom.svg b/icons/adobelightroom.svg deleted file mode 100644 index 998b3a50..00000000 --- a/icons/adobelightroom.svg +++ /dev/null @@ -1 +0,0 @@ -Adobe Lightroom icon \ No newline at end of file diff --git a/icons/adobelightroomclassic.svg b/icons/adobelightroomclassic.svg new file mode 100644 index 00000000..5425f190 --- /dev/null +++ b/icons/adobelightroomclassic.svg @@ -0,0 +1 @@ +Adobe Lightroom Classic icon \ No newline at end of file From 10804b2f6e598bd9d4bf46327526e3d61331c3c9 Mon Sep 17 00:00:00 2001 From: Guy Saar <38220324+guysaar223@users.noreply.github.com> Date: Sat, 20 Apr 2019 14:07:42 +0300 Subject: [PATCH 08/17] Added bit icon (#1360) --- _data/simple-icons.json | 5 +++++ icons/bit.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/bit.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 10736bde..9fbf9b5a 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -250,6 +250,11 @@ "hex": "008373", "source": "https://commons.wikimedia.org/wiki/File:Bing_logo_(2016).svg" }, + { + "title": "Bit", + "hex": "73398D", + "source": "https://bit.dev" + }, { "title": "Bitbucket", "hex": "0052CC", diff --git a/icons/bit.svg b/icons/bit.svg new file mode 100644 index 00000000..c06dfc65 --- /dev/null +++ b/icons/bit.svg @@ -0,0 +1 @@ +Bit icon \ No newline at end of file From f69ea6f28a3c864c79421e962103ebebbda7bb70 Mon Sep 17 00:00:00 2001 From: Piotr Hylicki Date: Sun, 21 Apr 2019 11:08:21 +0200 Subject: [PATCH 09/17] Added Adobe Lightroom CC icon #1363 (#1366) --- _data/simple-icons.json | 5 +++++ icons/adobelightroomcc.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/adobelightroomcc.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 9fbf9b5a..3efc77b8 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -60,6 +60,11 @@ "hex": "FD3F93", "source": "https://wwwimages2.adobe.com/etc/clientlibs/beagle/ace/source/font/aceui-fonts.svg" }, + { + "title": "Adobe Lightroom CC", + "hex": "3DF0F0", + "source": "https://www.adobe.com/products/photoshop-lightroom.html" + }, { "title": "Adobe Lightroom Classic", "hex": "ADD5EC", diff --git a/icons/adobelightroomcc.svg b/icons/adobelightroomcc.svg new file mode 100644 index 00000000..7a07ffa6 --- /dev/null +++ b/icons/adobelightroomcc.svg @@ -0,0 +1 @@ +Adobe Lightroom CC icon \ No newline at end of file From 27ee19106ddee43b6b46db5bbd4155a9e3dce415 Mon Sep 17 00:00:00 2001 From: Piotr Hylicki Date: Mon, 22 Apr 2019 22:09:08 +0200 Subject: [PATCH 10/17] Added Adobe Xd icon (#1354) --- _data/simple-icons.json | 5 +++++ icons/adobexd.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/adobexd.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 3efc77b8..6a8e3309 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -85,6 +85,11 @@ "hex": "87EC00", "source": "https://helpx.adobe.com/content/dam/help/mnemonics/tk_appicon_RGB.svg" }, + { + "title": "Adobe Xd", + "hex": "FF2BC2", + "source": "https://www.adobe.com/products/xd.html" + }, { "title": "Airbnb", "hex": "FF5A5F", diff --git a/icons/adobexd.svg b/icons/adobexd.svg new file mode 100644 index 00000000..57b9d932 --- /dev/null +++ b/icons/adobexd.svg @@ -0,0 +1 @@ +Adobe Xd icon \ No newline at end of file From 0a0586a04e196ed28da6b8c1ba153aae844e37da Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Tue, 23 Apr 2019 01:41:13 +0300 Subject: [PATCH 11/17] Lint SVG files for final newlines (#1367) * Update editorconfig-checker dependency At least v2.0.7 [1] is required to check that a file does not contain a final newline. -- 1. https://github.com/editorconfig-checker/editorconfig-checker.javascript/releases/tag/2.0.7 * Add *.svg to editorconfig and enable checking in editorconfig-checker * Remove final newline from existing SVG files ... to fix the `$ npm run wslint` command --- .editorconfig | 3 +++ icons/chase.svg | 2 +- icons/conda-forge.svg | 2 +- icons/creativecommons.svg | 2 +- icons/flutter.svg | 2 +- icons/itch-dot-io.svg | 2 +- icons/jsdelivr.svg | 2 +- icons/markdown.svg | 2 +- icons/mega.svg | 2 +- icons/nativescript.svg | 2 +- icons/stadia.svg | 2 +- icons/typescript.svg | 2 +- icons/v8.svg | 2 +- package-lock.json | 6 +++--- package.json | 4 ++-- 15 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6796ca85..48c0b4e2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,6 +12,9 @@ indent_style=space indent_size=2 indent_style=space +[*.svg] +insert_final_newline=false + [.github/**/*.md] trim_trailing_whitespace=false # Templates with trailing whitespace are more usable diff --git a/icons/chase.svg b/icons/chase.svg index cd4aa045..907ed878 100644 --- a/icons/chase.svg +++ b/icons/chase.svg @@ -1 +1 @@ -Chase icon +Chase icon \ No newline at end of file diff --git a/icons/conda-forge.svg b/icons/conda-forge.svg index 9553551b..f058664c 100644 --- a/icons/conda-forge.svg +++ b/icons/conda-forge.svg @@ -1 +1 @@ -Conda-Forge icon +Conda-Forge icon \ No newline at end of file diff --git a/icons/creativecommons.svg b/icons/creativecommons.svg index 014d679d..c9cc3e95 100644 --- a/icons/creativecommons.svg +++ b/icons/creativecommons.svg @@ -1 +1 @@ -Creative Commons icon +Creative Commons icon \ No newline at end of file diff --git a/icons/flutter.svg b/icons/flutter.svg index baa38fa1..c9857495 100644 --- a/icons/flutter.svg +++ b/icons/flutter.svg @@ -1 +1 @@ -Flutter icon +Flutter icon \ No newline at end of file diff --git a/icons/itch-dot-io.svg b/icons/itch-dot-io.svg index 002cf8fa..edea81e8 100644 --- a/icons/itch-dot-io.svg +++ b/icons/itch-dot-io.svg @@ -1 +1 @@ -Itch.io Icon +Itch.io Icon \ No newline at end of file diff --git a/icons/jsdelivr.svg b/icons/jsdelivr.svg index 2c506ecf..eb72be13 100644 --- a/icons/jsdelivr.svg +++ b/icons/jsdelivr.svg @@ -1 +1 @@ -jsDelivr icon +jsDelivr icon \ No newline at end of file diff --git a/icons/markdown.svg b/icons/markdown.svg index 2bf6bd42..3009973d 100644 --- a/icons/markdown.svg +++ b/icons/markdown.svg @@ -1 +1 @@ -Markdown icon +Markdown icon \ No newline at end of file diff --git a/icons/mega.svg b/icons/mega.svg index 744b86fb..6e182eba 100644 --- a/icons/mega.svg +++ b/icons/mega.svg @@ -1 +1 @@ -MEGA icon +MEGA icon \ No newline at end of file diff --git a/icons/nativescript.svg b/icons/nativescript.svg index daf363e9..b920ac56 100644 --- a/icons/nativescript.svg +++ b/icons/nativescript.svg @@ -1 +1 @@ -NativeScript icon +NativeScript icon \ No newline at end of file diff --git a/icons/stadia.svg b/icons/stadia.svg index 912d69a7..51fb893c 100644 --- a/icons/stadia.svg +++ b/icons/stadia.svg @@ -1 +1 @@ -Stadia icon +Stadia icon \ No newline at end of file diff --git a/icons/typescript.svg b/icons/typescript.svg index 52bc950f..a99640bc 100644 --- a/icons/typescript.svg +++ b/icons/typescript.svg @@ -1 +1 @@ -TypeScript icon +TypeScript icon \ No newline at end of file diff --git a/icons/v8.svg b/icons/v8.svg index ec47566b..36eef48d 100644 --- a/icons/v8.svg +++ b/icons/v8.svg @@ -1 +1 @@ -V8 icon +V8 icon \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index db8904ef..ef916181 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1194,9 +1194,9 @@ } }, "editorconfig-checker": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/editorconfig-checker/-/editorconfig-checker-2.0.6.tgz", - "integrity": "sha512-/p3egFALNsTSt0YM7gOAGxhIVTX/GHUwwlPKixykpyMbBh5+Hebg0OaxVu3UdPoGttHM2ajPFJfqSIxUL+ytbg==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/editorconfig-checker/-/editorconfig-checker-2.0.8.tgz", + "integrity": "sha512-3uj37kvyI9WeiprooUsNg+UkmymqgpIpN4ExYajT+Lhe4z16Q82xYXSPNbD1bFN+hkj+2cZkghsiHlPGRXgA4g==", "dev": true, "requires": { "request": "^2.88.0", diff --git a/package.json b/package.json index 84b0c68a..3ba449a6 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "author": "Simple Icons Collaborators", "license": "CC0-1.0", "devDependencies": { - "editorconfig-checker": "^2.0.6", + "editorconfig-checker": "^2.0.8", "jest": "^24.1.0", "jsonlint2": "^1.7.1", "svglint": "^1.0.4" @@ -26,7 +26,7 @@ "scripts": { "jsonlint": "jsonlint _data/simple-icons.json -q -V .jsonlintschema", "svglint": "svglint icons/* --ci", - "wslint": "editorconfig-checker", + "wslint": "editorconfig-checker --ignore", "prepublishOnly": "node scripts/prepublish.js", "postpublish": "rm icons/*.js index.js", "test": "jest", From 354d4041a6243812749d3c5e0fa0e7fc2c83804d Mon Sep 17 00:00:00 2001 From: David Klebanoff Date: Tue, 23 Apr 2019 04:09:35 -0700 Subject: [PATCH 12/17] Capitalize XD in Adobe XD (#1369) --- _data/simple-icons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 6a8e3309..0667dea3 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -86,7 +86,7 @@ "source": "https://helpx.adobe.com/content/dam/help/mnemonics/tk_appicon_RGB.svg" }, { - "title": "Adobe Xd", + "title": "Adobe XD", "hex": "FF2BC2", "source": "https://www.adobe.com/products/xd.html" }, From a6249cc9426b65480bc38c87915dc835c9892c28 Mon Sep 17 00:00:00 2001 From: Metaa Date: Fri, 26 Apr 2019 12:48:59 +0200 Subject: [PATCH 13/17] Added Material Design icon. (#1320) --- _data/simple-icons.json | 5 +++++ icons/materialdesign.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/materialdesign.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 0667dea3..3d961c2c 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -1560,6 +1560,11 @@ "hex": "3088D4", "source": "https://source.joinmastodon.org/mastodon/joinmastodon/blob/master/public/press-kit.zip" }, + { + "title": "Material Design", + "hex": "757575", + "source": "https://material.io/design/" + }, { "title": "Mathworks", "hex": "0076A8", diff --git a/icons/materialdesign.svg b/icons/materialdesign.svg new file mode 100644 index 00000000..3d0011a7 --- /dev/null +++ b/icons/materialdesign.svg @@ -0,0 +1 @@ +Material Design icon \ No newline at end of file From e05787520a71c02c44786fb7d3e726197a15b219 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Sat, 27 Apr 2019 22:32:02 +0300 Subject: [PATCH 14/17] 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 ef916181..764b016c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "1.9.25", + "version": "1.9.26", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3ba449a6..b7850278 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "1.9.25", + "version": "1.9.26", "description": "SVG icons for popular brands https://simpleicons.org", "homepage": "https://www.simpleicons.org", "keywords": [ From ff35beb3838a588ed8006a14b0d131000ee1cf1b Mon Sep 17 00:00:00 2001 From: Piotr Hylicki Date: Tue, 30 Apr 2019 05:12:36 +0200 Subject: [PATCH 15/17] Added Angular Universal icon (#1378) Closes #1345. --- _data/simple-icons.json | 5 +++++ icons/angularuniversal.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/angularuniversal.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 3d961c2c..8abc84db 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -130,6 +130,11 @@ "hex": "DD0031", "source": "https://angular.io/assets/images/logos/angular/angular_solidBlack.svg" }, + { + "title": "Angular Universal", + "hex": "00ACC1", + "source": "https://angular.io/presskit" + }, { "title": "Apache", "hex": "D22128", diff --git a/icons/angularuniversal.svg b/icons/angularuniversal.svg new file mode 100644 index 00000000..dd6630fe --- /dev/null +++ b/icons/angularuniversal.svg @@ -0,0 +1 @@ +Angular Universal \ No newline at end of file From 265bdeacafbd99491eb9cbc5de8256e36b7310f0 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Fri, 3 May 2019 13:50:17 +0300 Subject: [PATCH 16/17] Add 'icon' to Angular Universal SVG --- icons/angularuniversal.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/angularuniversal.svg b/icons/angularuniversal.svg index dd6630fe..55bce85a 100644 --- a/icons/angularuniversal.svg +++ b/icons/angularuniversal.svg @@ -1 +1 @@ -<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Angular Universal \ No newline at end of file +Angular Universal icon \ No newline at end of file From 0794f0186a3df56808a3f2b868dd5d1068671a79 Mon Sep 17 00:00:00 2001 From: Eric Cornelissen Date: Fri, 3 May 2019 17:16:52 +0300 Subject: [PATCH 17/17] Add backwards compatability for Adobe Lightroom Because it was renamed it may result in unexpected errors --> breaking changes. This is a temporary solution to circumvent the problem. This can be removed once some other breaking changes are also present and a major new version is released. I propose removing this change when https://github.com/simple-icons/simple-icons/issues/1362 is implemented --- scripts/prepublish.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/prepublish.js b/scripts/prepublish.js index 00c0e998..a767cfac 100755 --- a/scripts/prepublish.js +++ b/scripts/prepublish.js @@ -27,5 +27,19 @@ data.icons.forEach(icon => { ); }); +/* Backwards compatibility */ +// https://github.com/simple-icons/simple-icons/pull/1365 +const adobeLightroom = icons["Adobe Lightroom Classic"]; +adobeLightroom.title = "Adobe Lightroom"; +icons["Adobe Lightroom"] = adobeLightroom; +fs.writeFileSync( + `${iconsDir}/adobelightroom.svg`, + adobeLightroom.svg +); +fs.writeFileSync( + `${iconsDir}/adobelightroom.js`, + `module.exports=${JSON.stringify(adobeLightroom)};` +); + // write our generic index.js fs.writeFileSync(indexFile, `module.exports=${JSON.stringify(icons)};`);