From b2cf3885ce82351a74b3562c7a19b9e7a45ce67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar?= Date: Sun, 8 May 2022 06:48:32 -0500 Subject: [PATCH 01/12] expose `getIconsData*` util functions (#7394) --- scripts/utils.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/utils.js b/scripts/utils.js index 194dc2ecae75..db0fed588c19 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -95,24 +95,28 @@ export const htmlFriendlyToTitle = (htmlFriendlyTitle) => /** * Get contents of _data/simple-icons.json. + * @param {String|undefined} rootDir Path to the root directory of the project. */ -export const getIconsDataString = () => { - const __dirname = getDirnameFromImportMeta(import.meta.url); - const rootDir = path.resolve(__dirname, '..'); +export const getIconsDataString = (rootDir) => { + if (rootDir === undefined) { + rootDir = path.resolve(getDirnameFromImportMeta(import.meta.url), '..'); + } const iconDataPath = path.resolve(rootDir, '_data', 'simple-icons.json'); return fs.readFile(iconDataPath, 'utf8'); }; /** - * Get icon data as object from _data/simple-icons.json. + * Get icons data as object from _data/simple-icons.json. + * @param {String|undefined} rootDir Path to the root directory of the project. */ -export const getIconsData = async () => { - const fileContents = await getIconsDataString(); +export const getIconsData = async (rootDir) => { + const fileContents = await getIconsDataString(rootDir); return JSON.parse(fileContents).icons; }; /** - * Get the directory name from import.meta.url. + * Get the directory name where this file is located from `import.meta.url`, + * equivalent to the `__dirname` global variable in CommonJS. * @param {String} importMetaUrl import.meta.url */ export const getDirnameFromImportMeta = (importMetaUrl) => From a2b7b2a20d3677a756ce012bb13695fc2f6b2dfc Mon Sep 17 00:00:00 2001 From: Isaac Caires Date: Sun, 8 May 2022 14:30:03 -0300 Subject: [PATCH 02/12] Add Rubocop icon (#7380) * Add Rubocop icon * Add Rubocop icon * Add Rubocop icon * Add Rubocop icon * Update icons/rubocop.svg Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> * Update _data/simple-icons.json Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> * Update _data/simple-icons.json Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> --- _data/simple-icons.json | 8 ++++++++ icons/rubocop.svg | 1 + 2 files changed, 9 insertions(+) create mode 100644 icons/rubocop.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 70391b465bfa..7a95353f4e07 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -8992,6 +8992,14 @@ "hex": "00BCF6", "source": "https://www.rtl2.de/" }, + { + "title": "RuboCop", + "hex": "000000", + "source": "https://github.com/rubocop-semver/rubocop-ruby2_0/blob/5302f93058f7b739a73a7a6c11c566a2b196b96e/docs/images/logo/rubocop-light.svg", + "license": { + "type": "CC-BY-NC-4.0" + } + }, { "title": "Ruby", "hex": "CC342D", diff --git a/icons/rubocop.svg b/icons/rubocop.svg new file mode 100644 index 000000000000..adc974fa3197 --- /dev/null +++ b/icons/rubocop.svg @@ -0,0 +1 @@ +RuboCop \ No newline at end of file From 4867c03d69d851500584ae42ad2d7c544b4cdb27 Mon Sep 17 00:00:00 2001 From: Isaac Caires Date: Sun, 8 May 2022 14:33:01 -0300 Subject: [PATCH 03/12] Add GTK icon (#7340) * Add GTK icon * Update icons/gtk.svg Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> * Update _data/simple-icons.json Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> --- _data/simple-icons.json | 6 ++++++ icons/gtk.svg | 1 + 2 files changed, 7 insertions(+) create mode 100644 icons/gtk.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 7a95353f4e07..854c9e935552 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -4345,6 +4345,12 @@ "source": "https://github.com/gruntjs/gruntjs.com/blob/70f43898d9ce8e6cc862ad72bf8a7aee5ca199a9/src/media/grunt-logo-no-wordmark.svg", "guidelines": "https://github.com/gruntjs/grunt-docs/blob/main/Grunt-Brand-Guide.md" }, + { + "title": "GTK", + "hex": "7FE719", + "source": "https://commons.wikimedia.org/wiki/File:GTK_logo.svg", + "guidelines": "https://foundation.gnome.org/logo-and-trademarks/" + }, { "title": "Guangzhou Metro", "hex": "C51935", diff --git a/icons/gtk.svg b/icons/gtk.svg new file mode 100644 index 000000000000..302429be0c82 --- /dev/null +++ b/icons/gtk.svg @@ -0,0 +1 @@ +GTK \ No newline at end of file From 4f8cc1ce4a5162121710f5e091e10e685c4d5341 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 13:17:22 +0200 Subject: [PATCH 04/12] Update all dependencies (#7397) Co-authored-by: Renovate Bot --- .github/workflows/create-release.yml | 4 ++-- .github/workflows/publish.yml | 14 +++++++------- .github/workflows/verify.yml | 18 +++++++++--------- Dockerfile | 2 +- package.json | 10 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 435452f14fea..c53d6b39dbad 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -35,7 +35,7 @@ jobs: needs.release-pr.outputs.did-create-pr == 'true' steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: # Ensure the commit can be pushed regardless of branch protections (must belong to an admin of this repo) token: ${{ secrets.RELEASE_TOKEN }} @@ -50,7 +50,7 @@ jobs: - name: Update slugs table run: node ./scripts/release/update-slugs-table.js - name: Commit version bump - uses: stefanzweifel/git-auto-commit-action@v4.13.1 + uses: stefanzweifel/git-auto-commit-action@v4.14.1 with: commit_message: version bump commit_user_name: 'github-actions[bot]' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 969882c68196..b17c0024d621 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,13 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js 16.x - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }} @@ -36,13 +36,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js 16.x - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }} @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Get commit message (for release title and body) id: commit uses: kceb/git-message-action@v1 diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 6db8d1fbfaf6..2ebe97c4b0dc 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -7,13 +7,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js 16.x - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }} @@ -28,13 +28,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js 16.x - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }} @@ -67,13 +67,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Use Node.js 16.x - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }} diff --git a/Dockerfile b/Dockerfile index 4ba56f92c94e..6cd532e79177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:17-alpine +FROM node:18-alpine RUN apk add --no-cache \ git diff --git a/package.json b/package.json index e02420b34601..08df702f60f6 100644 --- a/package.json +++ b/package.json @@ -39,17 +39,17 @@ }, "devDependencies": { "editorconfig-checker": "4.0.2", - "esbuild": "0.14.21", + "esbuild": "0.14.38", "fake-diff": "1.0.0", - "husky": "7.0.4", + "husky": "8.0.1", "is-ci": "3.0.1", "jsonschema": "1.4.0", - "mocha": "9.2.0", + "mocha": "10.0.0", "named-html-entities-json": "1.0.0", "npm-run-all": "4.1.5", - "prettier": "2.5.1", + "prettier": "2.6.2", "rimraf": "3.0.2", - "svg-path-bbox": "1.0.2", + "svg-path-bbox": "1.2.0", "svg-path-segments": "1.0.0", "svglint": "2.1.0", "svgo": "2.8.0", From f988200d99cee9a0a702a77d772cdc423d341751 Mon Sep 17 00:00:00 2001 From: zyw_271828 Date: Tue, 10 May 2022 07:39:09 +0800 Subject: [PATCH 05/12] Add mdBook icon (#7289) --- _data/simple-icons.json | 5 +++++ icons/mdbook.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/mdbook.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 854c9e935552..b767eff947bb 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -6269,6 +6269,11 @@ "hex": "FF0000", "source": "https://cars.mclaren.com/" }, + { + "title": "mdBook", + "hex": "000000", + "source": "https://github.com/rust-lang/mdBook/blob/cdfa5ad9909e2cba8390688f3f0686fb70cb4bef/src/theme/favicon.svg" + }, { "title": "MDN Web Docs", "hex": "000000", diff --git a/icons/mdbook.svg b/icons/mdbook.svg new file mode 100644 index 000000000000..1727c21bc092 --- /dev/null +++ b/icons/mdbook.svg @@ -0,0 +1 @@ +mdBook \ No newline at end of file From b3f4375a4d9bfc89c44cd833ef4f8c689c4feaf8 Mon Sep 17 00:00:00 2001 From: Sachin Raja Date: Mon, 9 May 2022 20:14:44 -0700 Subject: [PATCH 06/12] remove alexa rank references (#7400) * Update icon_request.yml * Update icon_request.yml --- .github/ISSUE_TEMPLATE/icon_request.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/icon_request.yml b/.github/ISSUE_TEMPLATE/icon_request.yml index 5bb1c63837eb..17ae7121469d 100644 --- a/.github/ISSUE_TEMPLATE/icon_request.yml +++ b/.github/ISSUE_TEMPLATE/icon_request.yml @@ -43,16 +43,12 @@ body: label: Popularity Metric description: >- Provide either a [Similarweb rank] or the number of GitHub stars. If - Similarweb does not have a rank for your brand or the rank fails to meet our - requirements, we can also accept an [Alexa rank] as an alternative. If these - are not available or too low you can still open the issue. In this case, - please provide any information regarding the brand's popularity you think is - relevant. + Similarweb does not have a rank for your brand or it is too low, you can + still open the issue. In this case, please provide any information regarding + the brand's popularity you think is relevant. [Similarweb rank]: https://www.similarweb.com - - [Alexa rank]: https://www.alexa.com/siteinfo placeholder: 'Example: The Similarweb rank is 261,758. See https://www.similarweb.com/website/simpleicons.org' validations: required: true From 374297eaadd768d235d4fe871c1c51fc5e98c8e2 Mon Sep 17 00:00:00 2001 From: Sachin Raja Date: Mon, 9 May 2022 20:22:59 -0700 Subject: [PATCH 07/12] include rank requirements in issue template (#7401) * include rank requirements in issue template * clarify * remove extra space --- .github/ISSUE_TEMPLATE/icon_request.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/icon_request.yml b/.github/ISSUE_TEMPLATE/icon_request.yml index 17ae7121469d..df29ded6e133 100644 --- a/.github/ISSUE_TEMPLATE/icon_request.yml +++ b/.github/ISSUE_TEMPLATE/icon_request.yml @@ -42,10 +42,11 @@ body: attributes: label: Popularity Metric description: >- - Provide either a [Similarweb rank] or the number of GitHub stars. If - Similarweb does not have a rank for your brand or it is too low, you can - still open the issue. In this case, please provide any information regarding - the brand's popularity you think is relevant. + Provide either a [Similarweb rank], which must range from 0-500,000 to qualify + or the number of GitHub stars, which must be above 5,000 to qualify. If + Similarweb does not have a rank for your brand or these numbers do not meet + our requirements, you can still open the issue. In this case, please provide + any information regarding the brand's popularity you think is relevant. [Similarweb rank]: https://www.similarweb.com From 0935b98d6b3791accd637d6a70b5fd3ec393711b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar?= Date: Wed, 11 May 2022 05:35:59 -0500 Subject: [PATCH 08/12] Specify release action version with tag (#7406) --- .github/workflows/create-release.yml | 2 +- .github/workflows/merge-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index c53d6b39dbad..5129f1ce61aa 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -23,7 +23,7 @@ jobs: did-create-pr: ${{ steps.release.outputs.did-create-pr }} new-version: ${{ steps.release.outputs.new-version }} steps: - - uses: simple-icons/release-action@master + - uses: simple-icons/release-action@v1 id: release with: repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/merge-release.yml b/.github/workflows/merge-release.yml index 29e654f975b5..cf7db3b53232 100644 --- a/.github/workflows/merge-release.yml +++ b/.github/workflows/merge-release.yml @@ -8,6 +8,6 @@ jobs: runs-on: ubuntu-latest if: contains(github.event.pull_request.labels.*.name, 'release') steps: - - uses: simple-icons/release-action@master + - uses: simple-icons/release-action@v1 with: repo-token: ${{ secrets.RELEASE_TOKEN }} From f2b197ff890432935e728ebeb15f0b2a676651f8 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 13 May 2022 13:34:30 +0800 Subject: [PATCH 09/12] Update Ubuntu icon (#7407) * Update Ubuntu icon * update source Co-authored-by: Sachin Raja --- _data/simple-icons.json | 2 +- icons/ubuntu.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/simple-icons.json b/_data/simple-icons.json index b767eff947bb..24f38b0f85fe 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -10934,7 +10934,7 @@ { "title": "Ubuntu", "hex": "E95420", - "source": "https://design.ubuntu.com/brand/ubuntu-logo/", + "source": "https://design.ubuntu.com/downloads/", "guidelines": "https://design.ubuntu.com/brand/ubuntu-logo/" }, { diff --git a/icons/ubuntu.svg b/icons/ubuntu.svg index a2917063d4ac..227f86aa329d 100644 --- a/icons/ubuntu.svg +++ b/icons/ubuntu.svg @@ -1 +1 @@ -Ubuntu \ No newline at end of file +Ubuntu \ No newline at end of file From cc2f0a691c87d9bb68d2adf2918d16c8ecfaa8f1 Mon Sep 17 00:00:00 2001 From: Jan Wojtecki Date: Sun, 15 May 2022 01:51:28 +0200 Subject: [PATCH 10/12] add Steam Deck icon (#7410) (#7411) * add Steam Deck icon (#7410) * optimize Steam Deck icon Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> Co-authored-by: Sigurd Spieckermann <2206639+sisp@users.noreply.github.com> --- _data/simple-icons.json | 6 ++++++ icons/steamdeck.svg | 1 + 2 files changed, 7 insertions(+) create mode 100644 icons/steamdeck.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 24f38b0f85fe..e3770b6bb210 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -10013,6 +10013,12 @@ "source": "https://partner.steamgames.com/doc/marketing/branding", "guidelines": "https://partner.steamgames.com/doc/marketing/branding" }, + { + "title": "Steam Deck", + "hex": "1A9FFF", + "source": "https://partner.steamgames.com/doc/marketing/branding", + "guidelines": "https://partner.steamgames.com/doc/marketing/branding" + }, { "title": "SteamDB", "hex": "000000", diff --git a/icons/steamdeck.svg b/icons/steamdeck.svg new file mode 100644 index 000000000000..1d1562f24851 --- /dev/null +++ b/icons/steamdeck.svg @@ -0,0 +1 @@ +Steam Deck \ No newline at end of file From c8618bafe0c88b7411e124232fc29017c6aa078b Mon Sep 17 00:00:00 2001 From: Isaac Caires Date: Sat, 14 May 2022 20:55:39 -0300 Subject: [PATCH 11/12] Add EnterpriseDB icon (#7379) --- _data/simple-icons.json | 5 +++++ icons/enterprisedb.svg | 1 + 2 files changed, 6 insertions(+) create mode 100644 icons/enterprisedb.svg diff --git a/_data/simple-icons.json b/_data/simple-icons.json index e3770b6bb210..729b452bbd17 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -3100,6 +3100,11 @@ "hex": "0D47A1", "source": "https://www.enpass.io/press/" }, + { + "title": "EnterpriseDB", + "hex": "FF3E00", + "source": "https://www.enterprisedb.com/" + }, { "title": "Envato", "hex": "81B441", diff --git a/icons/enterprisedb.svg b/icons/enterprisedb.svg new file mode 100644 index 000000000000..9d087a0be13b --- /dev/null +++ b/icons/enterprisedb.svg @@ -0,0 +1 @@ +EnterpriseDB \ No newline at end of file From ebfcfb0f8f046d36fa8147556f5748654b727cca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 16 May 2022 08:50:18 +0000 Subject: [PATCH 12/12] version bump --- package.json | 2 +- slugs.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 08df702f60f6..5ac8cbc0df98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "6.21.0", + "version": "6.22.0", "description": "SVG icons for popular brands https://simpleicons.org", "homepage": "https://simpleicons.org", "keywords": [ diff --git a/slugs.md b/slugs.md index b08b05c1bc75..30c44bcd44cc 100644 --- a/slugs.md +++ b/slugs.md @@ -605,6 +605,7 @@ update the script at 'scripts/release/update-slugs-table.js'. | `Emlakjet` | `emlakjet` | | `Empire Kred` | `empirekred` | | `Enpass` | `enpass` | +| `EnterpriseDB` | `enterprisedb` | | `Envato` | `envato` | | `EPEL` | `epel` | | `Epic Games` | `epicgames` | @@ -834,6 +835,7 @@ update the script at 'scripts/release/update-slugs-table.js'. | `Groupon` | `groupon` | | `Grubhub` | `grubhub` | | `Grunt` | `grunt` | +| `GTK` | `gtk` | | `Guangzhou Metro` | `guangzhoumetro` | | `Guilded` | `guilded` | | `gulp` | `gulp` | @@ -1187,6 +1189,7 @@ update the script at 'scripts/release/update-slugs-table.js'. | `McAfee` | `mcafee` | | `McDonald's` | `mcdonalds` | | `McLaren` | `mclaren` | +| `mdBook` | `mdbook` | | `MDN Web Docs` | `mdnwebdocs` | | `MDX` | `mdx` | | `MediaFire` | `mediafire` | @@ -1683,6 +1686,7 @@ update the script at 'scripts/release/update-slugs-table.js'. | `RTÉ` | `rte` | | `RTL` | `rtl` | | `RTLZWEI` | `rtlzwei` | +| `RuboCop` | `rubocop` | | `Ruby` | `ruby` | | `Ruby on Rails` | `rubyonrails` | | `Ruby Sinatra` | `rubysinatra` | @@ -1866,6 +1870,7 @@ update the script at 'scripts/release/update-slugs-table.js'. | `Statuspage` | `statuspage` | | `Statuspal` | `statuspal` | | `Steam` | `steam` | +| `Steam Deck` | `steamdeck` | | `SteamDB` | `steamdb` | | `Steamworks` | `steamworks` | | `Steelseries` | `steelseries` |