From 168db118bc1acad9e724b339cdf93dcf2e4c0595 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Jul 2021 20:24:59 +0200 Subject: [PATCH 1/2] Bump @primer/css from 17.4.0 to 17.5.1 (#426) [skip ci] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index d88ca16e..c46f81b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@actions/github": "^4.0.0", "@octokit/graphql": "^4.6.2", "@octokit/rest": "^18.5.3", - "@primer/css": "^17.4.0", + "@primer/css": "^17.5.1", "axios": "^0.21.1", "clipboard": "^2.0.8", "compression": "^1.7.4", @@ -1818,9 +1818,9 @@ "integrity": "sha1-XUGq4K61gnqbjuFcqsSnCgWBETo=" }, "node_modules/@primer/css": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@primer/css/-/css-17.4.0.tgz", - "integrity": "sha512-Zqb7z7pi+iySb2+RAmw9b/3HeDtNwqmlW4wJWq61VBqlY+xDdyauf5LVlVtXAXTxRsBarLqTpDcz4DyRJfAIMA==", + "version": "17.5.1", + "resolved": "https://registry.npmjs.org/@primer/css/-/css-17.5.1.tgz", + "integrity": "sha512-7+bv6MMGfeu4m5w/YGck2wupQ+XDxh5nWjIWXjAP4t0ol27r3VsDZEauCaHplZCHUAF6h2sfLFZSmxVM0O3MGw==", "dependencies": { "@primer/primitives": "^4.3.5" } @@ -11346,9 +11346,9 @@ } }, "@primer/css": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@primer/css/-/css-17.4.0.tgz", - "integrity": "sha512-Zqb7z7pi+iySb2+RAmw9b/3HeDtNwqmlW4wJWq61VBqlY+xDdyauf5LVlVtXAXTxRsBarLqTpDcz4DyRJfAIMA==", + "version": "17.5.1", + "resolved": "https://registry.npmjs.org/@primer/css/-/css-17.5.1.tgz", + "integrity": "sha512-7+bv6MMGfeu4m5w/YGck2wupQ+XDxh5nWjIWXjAP4t0ol27r3VsDZEauCaHplZCHUAF6h2sfLFZSmxVM0O3MGw==", "requires": { "@primer/primitives": "^4.3.5" } diff --git a/package.json b/package.json index 62c42222..378118bd 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@actions/github": "^4.0.0", "@octokit/graphql": "^4.6.2", "@octokit/rest": "^18.5.3", - "@primer/css": "^17.4.0", + "@primer/css": "^17.5.1", "axios": "^0.21.1", "clipboard": "^2.0.8", "compression": "^1.7.4", From 73562fbf50edf4697b06e259cd60942afa44050c Mon Sep 17 00:00:00 2001 From: Simon Lecoq <22963968+lowlighter@users.noreply.github.com> Date: Fri, 30 Jul 2021 20:25:10 +0200 Subject: [PATCH 2/2] Normalize licenses display (#429) --- source/plugins/core/index.mjs | 6 ++++-- source/templates/classic/partials/base.repositories.ejs | 2 +- source/templates/repository/partials/licenses.ejs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/plugins/core/index.mjs b/source/plugins/core/index.mjs index a0b4c3b4..df77386a 100644 --- a/source/plugins/core/index.mjs +++ b/source/plugins/core/index.mjs @@ -10,7 +10,7 @@ export default async function({login, q}, {conf, data, rest, graphql, plugins, q imports.metadata.templates[template].check({q, account, format:convert}) //Init - const computed = {commits:0, sponsorships:0, licenses:{favorite:"", used:{}}, token:{}, repositories:{watchers:0, stargazers:0, issues_open:0, issues_closed:0, pr_open:0, pr_closed:0, pr_merged:0, forks:0, forked:0, releases:0}} + const computed = {commits:0, sponsorships:0, licenses:{favorite:"", used:{}, about:{}}, token:{}, repositories:{watchers:0, stargazers:0, issues_open:0, issues_closed:0, pr_open:0, pr_closed:0, pr_merged:0, forks:0, forked:0, releases:0}} const avatar = imports.imgb64(data.user.avatarUrl) data.computed = computed console.debug(`metrics/compute/${login} > formatting common metrics`) @@ -72,8 +72,10 @@ export default async function({login, q}, {conf, data, rest, graphql, plugins, q if (repository.isFork) computed.repositories.forked++ //License - if (repository.licenseInfo) + if (repository.licenseInfo) { computed.licenses.used[repository.licenseInfo.spdxId] = (computed.licenses.used[repository.licenseInfo.spdxId] ?? 0) + 1 + computed.licenses.about[repository.licenseInfo.spdxId] = repository.licenseInfo + } } //Total disk usage diff --git a/source/templates/classic/partials/base.repositories.ejs b/source/templates/classic/partials/base.repositories.ejs index 93798ec1..0bc7e238 100644 --- a/source/templates/classic/partials/base.repositories.ejs +++ b/source/templates/classic/partials/base.repositories.ejs @@ -11,7 +11,7 @@
<% if (computed.licenses.favorite.length) { %> - Prefers <%= computed.licenses.favorite %> license + Prefers <%= f.license(computed.licenses.about[computed.licenses.favorite]) %> license <% } else { %> No license preference <% } %> diff --git a/source/templates/repository/partials/licenses.ejs b/source/templates/repository/partials/licenses.ejs index a8b96b1a..c9d46abc 100644 --- a/source/templates/repository/partials/licenses.ejs +++ b/source/templates/repository/partials/licenses.ejs @@ -16,7 +16,7 @@
- <%= plugins.licenses.default?.spdxId ?? "No license provided" %> + <%= plugins.licenses.default ? f.license(plugins.licenses.default) : "No license provided" %>