From e1bd4104b13b473a974bc4218312bd0fcd08ff8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar=20Rubio?= Date: Sun, 13 Oct 2024 04:31:07 +0200 Subject: [PATCH 01/12] Use lychee instead of markdown-link-check on CI (#12001) --- .github/markdown-link-check.json | 7 ------- .github/workflows/verify.yml | 11 +++++++---- package.json | 1 - 3 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 .github/markdown-link-check.json diff --git a/.github/markdown-link-check.json b/.github/markdown-link-check.json deleted file mode 100644 index db3f68aeaea0..000000000000 --- a/.github/markdown-link-check.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ignorePatterns": [ - { - "pattern": "^https://www.similarweb.com" - } - ] -} diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 611f41ae6573..f77c900116e1 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -58,11 +58,14 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Check documentation links if: steps.changes.outputs.docs == true - run: | - npx markdown-link-check --retry \ - --config .github/markdown-link-check.json \ + uses: lycheeverse/lychee-action@v2 + with: + args: --exclude ^https://www.similarweb.com -- \ ${{ steps.changes.outputs.docs_files }} - continue-on-error: ${{ github.ref == 'refs/heads/develop' }} + fail: ${{ github.ref != 'refs/heads/develop' }} + jobSummary: true + format: markdown + token: ${{ secrets.GITHUB_TOKEN }} - name: Verify file permissions run: | CHECK_DIRS="icons/ _data/" diff --git a/package.json b/package.json index f66fdc500f0b..405b3bd85647 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,6 @@ "husky": "9.0.11", "inquirer-autocomplete-standalone": "0.8.1", "jsonschema": "1.4.1", - "markdown-link-check": "3.12.1", "mocha": "10.4.0", "named-html-entities-json": "1.0.0", "spdx-license-ids": "3.0.20", From 01a5f11457d7556bb1c9626898b20c0071f31a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar=20Rubio?= Date: Sun, 13 Oct 2024 18:55:51 +0200 Subject: [PATCH 02/12] Fix changed documentation files not detected on CI (#12004) --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index f77c900116e1..e1777dc9bcd0 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -57,7 +57,7 @@ jobs: # Authorise GitHub API requests for editorconfig-checker GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Check documentation links - if: steps.changes.outputs.docs == true + if: steps.changes.outputs.docs == 'true' uses: lycheeverse/lychee-action@v2 with: args: --exclude ^https://www.similarweb.com -- \ From 051f5f5c6b1b6d97e00c045cf6086d762721ea05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Mond=C3=A9jar=20Rubio?= Date: Sun, 13 Oct 2024 19:53:19 +0200 Subject: [PATCH 03/12] Don't use newlines in lychee action args (#12005) --- .github/workflows/verify.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index e1777dc9bcd0..4e246e66f378 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -60,8 +60,7 @@ jobs: if: steps.changes.outputs.docs == 'true' uses: lycheeverse/lychee-action@v2 with: - args: --exclude ^https://www.similarweb.com -- \ - ${{ steps.changes.outputs.docs_files }} + args: --exclude ^https://www.similarweb.com -- ${{ steps.changes.outputs.docs_files }} fail: ${{ github.ref != 'refs/heads/develop' }} jobSummary: true format: markdown From c2fa1b851f63d17340f033df231d5517af7eaa49 Mon Sep 17 00:00:00 2001 From: LitoMore Date: Mon, 14 Oct 2024 02:23:50 +0800 Subject: [PATCH 04/12] Use lychee config file (#12006) --- .github/workflows/verify.yml | 2 +- lychee.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 lychee.toml diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 4e246e66f378..f3c88485268c 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -60,7 +60,7 @@ jobs: if: steps.changes.outputs.docs == 'true' uses: lycheeverse/lychee-action@v2 with: - args: --exclude ^https://www.similarweb.com -- ${{ steps.changes.outputs.docs_files }} + args: -- ${{ steps.changes.outputs.docs_files }} fail: ${{ github.ref != 'refs/heads/develop' }} jobSummary: true format: markdown diff --git a/lychee.toml b/lychee.toml new file mode 100644 index 000000000000..a2a6beea612b --- /dev/null +++ b/lychee.toml @@ -0,0 +1 @@ +exclude = ['^https://www\.similarweb\.com', '^https://www\.figma\.com/community/plugin'] From 297ee5a111c40567b0de2f90337748d99da1559a Mon Sep 17 00:00:00 2001 From: Carsten Igel <1760987+carstencodes@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:25:13 +0200 Subject: [PATCH 05/12] doc: New python wheel (#12003) Added new Python Wheel simplepycons --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 102747951d2a..03578413e848 100644 --- a/README.md +++ b/README.md @@ -187,6 +187,7 @@ The below are known third-party libraries for use in your own projects. We only | [Kirby plugin](https://github.com/runxel/kirby3-simpleicons) Kirby | [@runxel](https://github.com/runxel) | ![](https://img.shields.io/github/license/runxel/kirby3-simpleicons) | ![](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Frunxel%2Fkirby3-simpleicons%2Fmaster%2Fcomposer.json&query=%24..%5B'simple-icons%2Fsimple-icons'%5D&logo=simpleicons&label=version) | | [LaTeX package](https://github.com/ineshbose/simple-icons-latex) LaTeX | [@ineshbose](https://github.com/ineshbose) | ![](https://img.shields.io/github/license/ineshbose/simple-icons-latex) | ![](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fineshbose%2Fsimple-icons-latex%2Fdevelop%2Fpackage.json&query=%24..%5B'simple-icons-font'%5D&logo=simpleicons&label=version) | | [Laravel package](https://github.com/ublabs/blade-simple-icons) Laravel | [@adrian-ub](https://github.com/adrian-ub) | ![](https://img.shields.io/github/license/ublabs/blade-simple-icons) | ![](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fsimple-icons%2Fsimple-icons%2Fmaster%2Fpackage.json&query=%24.version&logo=simpleicons&label=version) | +| [Python wheel](https://github.com/carstencodes/simplepycons) Python | [@carstencodes](https://github.com/carstencodes) | ![](https://img.shields.io/github/license/carstencodes/simplepycons) | ![](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcarstencodes%2Fsimplepycons%2Fmaster%2Fsimple-icons.json&query=%24.simple-icons.version&logo=simpleicons&label=version) | | [React package](https://github.com/icons-pack/react-simple-icons) React | [@wootsbot](https://github.com/wootsbot) | ![](https://img.shields.io/github/license/icons-pack/react-simple-icons) | ![](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Ficons-pack%2Freact-simple-icons%2Fmain%2Fpackage.json&query=%24..%5B'simple-icons'%5D&logo=simpleicons&label=version) | | [Ruby gem](https://rubygems.org/gems/simple-icons-rails) Ruby | [@thepew](https://github.com/the-pew-inc) | ![](https://img.shields.io/github/license/the-pew-inc/simple-icons-rails) | ![](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fsimple-icons%2Fsimple-icons%2Fmaster%2Fpackage.json&query=%24.version&logo=simpleicons&label=version) | | [Svelte package](https://github.com/icons-pack/svelte-simple-icons) Svelte | [@wootsbot](https://github.com/wootsbot) | ![](https://img.shields.io/github/license/icons-pack/svelte-simple-icons) | ![](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Ficons-pack%2Fsvelte-simple-icons%2Fmain%2Fpackage.json&query=%24..%5B'simple-icons'%5D&logo=simpleicons&label=version) | From 9f00c164e31149283f353fa7c6b087b3b73ac1d5 Mon Sep 17 00:00:00 2001 From: Joseph <61133303+zcraber@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:14:48 +0530 Subject: [PATCH 06/12] Update Envato (#11948) Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com> --- _data/simple-icons.json | 2 +- icons/envato.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 096755f1072b..52c1af0a51d3 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -4936,7 +4936,7 @@ }, { "title": "Envato", - "hex": "81B441", + "hex": "87E64B", "source": "https://envato.com" }, { diff --git a/icons/envato.svg b/icons/envato.svg index 3b04590da26e..4b92febecf18 100644 --- a/icons/envato.svg +++ b/icons/envato.svg @@ -1 +1 @@ -Envato \ No newline at end of file +Envato \ No newline at end of file From dbe10ea9b5fb2c86e7ba76243055fac020b8b80b Mon Sep 17 00:00:00 2001 From: Omar <180954465+somerand0mcatt@users.noreply.github.com> Date: Mon, 14 Oct 2024 08:15:04 +0300 Subject: [PATCH 07/12] Update Lubuntu icon (#11993) --- icons/lubuntu.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/lubuntu.svg b/icons/lubuntu.svg index 7a49c0ba9b24..c04826b2a4fa 100644 --- a/icons/lubuntu.svg +++ b/icons/lubuntu.svg @@ -1 +1 @@ -Lubuntu \ No newline at end of file +Lubuntu \ No newline at end of file From 55d2e2aa414d7e8fd341d8f323069eb5c582f75a Mon Sep 17 00:00:00 2001 From: Joseph <61133303+zcraber@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:47:45 +0530 Subject: [PATCH 08/12] Update daisyui (#11950) --- _data/simple-icons.json | 4 ++-- icons/daisyui.svg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/simple-icons.json b/_data/simple-icons.json index 52c1af0a51d3..b51026654dbe 100644 --- a/_data/simple-icons.json +++ b/_data/simple-icons.json @@ -3961,8 +3961,8 @@ }, { "title": "DaisyUI", - "hex": "5A0EF8", - "source": "https://github.com/saadeghi/files/blob/5c82a1f4428b7c0af6ecfe921a424ebc9d92dc2c/daisyui/logo-4.svg" + "hex": "1AD1A5", + "source": "https://daisyui.com" }, { "title": "Dapr", diff --git a/icons/daisyui.svg b/icons/daisyui.svg index d5b5c8d738c2..38389bc23c06 100644 --- a/icons/daisyui.svg +++ b/icons/daisyui.svg @@ -1 +1 @@ -DaisyUI \ No newline at end of file +DaisyUI \ No newline at end of file From 361e22120b9bf238921c61a25509b6a7f584dd35 Mon Sep 17 00:00:00 2001 From: sebastien46 <57289288+sebastien46@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:49:07 +0200 Subject: [PATCH 09/12] Update Rossmann icon (#11666) --- icons/rossmann.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/rossmann.svg b/icons/rossmann.svg index 32d498f50328..4e811bd7953e 100644 --- a/icons/rossmann.svg +++ b/icons/rossmann.svg @@ -1 +1 @@ -Rossmann \ No newline at end of file +Rossmann \ No newline at end of file From afd656872537b6c47241c70191ae0e4824ef0c88 Mon Sep 17 00:00:00 2001 From: LitoMore Date: Thu, 17 Oct 2024 00:11:55 +0800 Subject: [PATCH 10/12] Fix SPDX license usages in `add-icon-data` script --- scripts/add-icon-data.js | 9 +++------ scripts/lint/ourlint.js | 17 ++--------------- scripts/utils.js | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/scripts/add-icon-data.js b/scripts/add-icon-data.js index 91c05890ce83..38138481438f 100644 --- a/scripts/add-icon-data.js +++ b/scripts/add-icon-data.js @@ -21,7 +21,7 @@ import { titleToSlug, urlRegex, } from '../sdk.mjs'; -import {getJsonSchemaData, writeIconsData} from './utils.js'; +import {getJsonSchemaData, getSpdxLicenseIds, writeIconsData} from './utils.js'; /** @type {{icons: import('../sdk.js').IconData[]}} */ const iconsData = JSON.parse(await getIconsDataString()); @@ -34,11 +34,8 @@ const aliasTypes = ['aka', 'old'].map((key) => ({ value: key, })); -/** @type {{name: string, value: string}[]} */ -const licenseTypes = - jsonSchema.definitions.brand.properties.license.oneOf[0].properties.type.enum.map( - (/** @type {string} */ license) => ({name: license, value: license}), - ); +const spdxLicenseIds = await getSpdxLicenseIds(); +const licenseTypes = spdxLicenseIds.map((id) => ({name: id, value: id})); /** * Whether an input is a valid URL. diff --git a/scripts/lint/ourlint.js b/scripts/lint/ourlint.js index 43aec4872e02..f43078acb170 100644 --- a/scripts/lint/ourlint.js +++ b/scripts/lint/ourlint.js @@ -10,17 +10,16 @@ * @typedef {IconData[]} IconsData */ -import fs from 'node:fs/promises'; import path from 'node:path'; import process from 'node:process'; import fakeDiff from 'fake-diff'; import { collator, - getDirnameFromImportMeta, getIconsDataString, normalizeNewlines, titleToSlug, } from '../../sdk.mjs'; +import {getSpdxLicenseIds} from '../utils.js'; /** * Contains our tests so they can be isolated from each other. @@ -208,19 +207,7 @@ const TESTS = { /* Check if all licenses are valid SPDX identifiers */ async checkLicense(data) { - const spdxLicenseIds = new Set( - JSON.parse( - await fs.readFile( - path.join( - getDirnameFromImportMeta(import.meta.url), - '..', - '..', - 'node_modules/spdx-license-ids/index.json', - ), - 'utf8', - ), - ), - ); + const spdxLicenseIds = new Set(await getSpdxLicenseIds()); const badLicenses = []; for (const {title, slug, license} of data.icons) { if ( diff --git a/scripts/utils.js b/scripts/utils.js index 2ee6b2f7fada..686bed828358 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -45,3 +45,21 @@ export const writeIconsData = async ( 'utf8', ); }; + +/** + * Get SPDX license IDs from `spdx-license-ids` package. + * @param {string} rootDirectory Path to the root directory of the project. + * @returns {Promise} Set of SPDX license IDs. + */ +export const getSpdxLicenseIds = async ( + rootDirectory = path.resolve(__dirname, '..'), +) => { + const getSpdxLicenseJson = path.resolve( + rootDirectory, + 'node_modules', + 'spdx-license-ids', + 'index.json', + ); + const getSpdxLicenseString = await fs.readFile(getSpdxLicenseJson, 'utf8'); + return JSON.parse(getSpdxLicenseString); +}; From 81dd508af73e2c332cc33967ee0387ef3cff6f99 Mon Sep 17 00:00:00 2001 From: David Legrand <1110600+davlgd@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:42:29 +0200 Subject: [PATCH 11/12] Update Clever Cloud (#12058) --- icons/clevercloud.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/clevercloud.svg b/icons/clevercloud.svg index 7612e0af0501..cea811c0a282 100644 --- a/icons/clevercloud.svg +++ b/icons/clevercloud.svg @@ -1 +1 @@ -Clever Cloud \ No newline at end of file +Clever Cloud \ No newline at end of file From 5e650b0e2121ce73223aaff4ebba54c3f96646a1 Mon Sep 17 00:00:00 2001 From: "simple-icons[bot]" Date: Sun, 20 Oct 2024 00:32:40 +0000 Subject: [PATCH 12/12] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 405b3bd85647..b06a5b67fefe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-icons", - "version": "13.14.0", + "version": "13.14.1", "description": "SVG icons for popular brands https://simpleicons.org", "homepage": "https://simpleicons.org", "keywords": [