From 8e60963584e64904c6dc689de2775d1e9fab9882 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Tue, 5 Jul 2022 23:49:52 -0400 Subject: [PATCH 01/13] fix(ci): vercel --- .github/scripts/preview.mjs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index 8763bec790b..c50af8246e1 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -56,7 +56,6 @@ fs.copyFile(paths.join(__web, "style.vars.css"), paths.join(__preview_css, "styl fs.copyFile(paths.join(__node_modules, "prismjs/themes/prism-tomorrow.css"), paths.join(__preview_css, "style.prism.css")) //Scripts fs.writeFile(paths.join(__preview_js, "app.js"), `${await fs.readFile(paths.join(__web, "app.js"))}`) -fs.writeFile(paths.join(__preview_js, "app.placeholder.js"), `${await fs.readFile(paths.join(__web, "app.placeholder.js"))}`) fs.copyFile(paths.join(__node_modules, "ejs/ejs.min.js"), paths.join(__preview_js, "ejs.min.js")) fs.writeFile(paths.join(__preview_js, "faker.min.js"), "import {faker} from '/.js/faker/index.mjs';globalThis.faker=faker;globalThis.placeholder.init(globalThis)") for (const path of [[], ["locale"]]) { @@ -76,8 +75,13 @@ fs.copyFile(paths.join(__node_modules, "prismjs/components/prism-yaml.min.js"), fs.copyFile(paths.join(__node_modules, "prismjs/components/prism-markdown.min.js"), paths.join(__preview_js, "prism.markdown.min.js")) fs.copyFile(paths.join(__node_modules, "clipboard/dist/clipboard.min.js"), paths.join(__preview_js, "clipboard.min.js")) //Meta +fs.writeFile(paths.join(__preview, ".modes"), JSON.stringify(["embed", "insights"])) fs.writeFile(paths.join(__preview, ".version"), JSON.stringify(`${conf.package.version}-preview`)) fs.writeFile(paths.join(__preview, ".hosted"), JSON.stringify({by: "metrics", link: "https://github.com/lowlighter/metrics"})) +//Embed +fs.writeFile(paths.join(__preview_js, "embed/index.html"), `${await fs.readFile(paths.join(__web, "embed/index.html"))}`) +fs.writeFile(paths.join(__preview_js, "embed/app.js"), `${await fs.readFile(paths.join(__web, "embed/app.js"))}`) +fs.writeFile(paths.join(__preview_js, "embed/app.placeholder.js"), `${await fs.readFile(paths.join(__web, "embed/app.placeholder.js"))}`) //Insights for (const insight of ["insights", "about"]) { const __web_insights = paths.join(paths.join(__web, insight)) From 90df0cffd8dc5ca7011e619feee4d79a2cc04e5c Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Tue, 5 Jul 2022 23:53:32 -0400 Subject: [PATCH 02/13] Update preview.mjs --- .github/scripts/preview.mjs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index c50af8246e1..3f2df554d23 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -79,9 +79,16 @@ fs.writeFile(paths.join(__preview, ".modes"), JSON.stringify(["embed", "insights fs.writeFile(paths.join(__preview, ".version"), JSON.stringify(`${conf.package.version}-preview`)) fs.writeFile(paths.join(__preview, ".hosted"), JSON.stringify({by: "metrics", link: "https://github.com/lowlighter/metrics"})) //Embed -fs.writeFile(paths.join(__preview_js, "embed/index.html"), `${await fs.readFile(paths.join(__web, "embed/index.html"))}`) -fs.writeFile(paths.join(__preview_js, "embed/app.js"), `${await fs.readFile(paths.join(__web, "embed/app.js"))}`) -fs.writeFile(paths.join(__preview_js, "embed/app.placeholder.js"), `${await fs.readFile(paths.join(__web, "embed/app.placeholder.js"))}`) +{ + const __web_embed = paths.join(paths.join(__web, "embed")) + const __preview_embed = paths.join(__preview, `${insight}/.statics`) + const __preview_embed_js = paths.join(__preview_embed, ".js/embed") + await fs.mkdir(__preview_embed, {recursive: true}) + await fs.mkdir(__preview_embed_js, {recursive: true}) + fs.writeFile(paths.join(__preview_embed, "index.html"), `${await fs.readFile(paths.join(__web_embed, "index.html"))}`) + fs.writeFile(paths.join(__preview_embed_js, "app.js"), `${await fs.readFile(paths.join(__web_embed, "app.js"))}`) + fs.writeFile(paths.join(__preview_embed_js, "app.placeholder.js"), `${await fs.readFile(paths.join(__web_embed, "app.placeholder.js"))}`) +} //Insights for (const insight of ["insights", "about"]) { const __web_insights = paths.join(paths.join(__web, insight)) From 251a7e6647bc71298e8645de5f8fd93fd0c7563f Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Tue, 5 Jul 2022 23:54:40 -0400 Subject: [PATCH 03/13] Update preview.mjs --- .github/scripts/preview.mjs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index 3f2df554d23..02a273a4c82 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -90,12 +90,12 @@ fs.writeFile(paths.join(__preview, ".hosted"), JSON.stringify({by: "metrics", li fs.writeFile(paths.join(__preview_embed_js, "app.placeholder.js"), `${await fs.readFile(paths.join(__web_embed, "app.placeholder.js"))}`) } //Insights -for (const insight of ["insights", "about"]) { - const __web_insights = paths.join(paths.join(__web, insight)) - const __preview_insights = paths.join(__preview, `${insight}/.statics`) +for (const insights of ["insights", "about"]) { + const __web_insights = paths.join(paths.join(__web, "insight")) + const __preview_insights = paths.join(__preview, `${insights}/.statics`) await fs.mkdir(__preview_insights, {recursive: true}) - fs.copyFile(paths.join(__web, insight, "index.html"), paths.join(__preview, insight, "index.html")) + fs.copyFile(paths.join(__web, insights, "index.html"), paths.join(__preview, insights, "index.html")) for (const file of await fs.readdir(__web_insights)) { if (file !== ".statics") fs.copyFile(paths.join(__web_insights, file), paths.join(__preview_insights, file)) From 795bd462dace629d63be35e5ead3766475c7eb7a Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Tue, 5 Jul 2022 23:56:52 -0400 Subject: [PATCH 04/13] Update preview.mjs --- .github/scripts/preview.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index 02a273a4c82..221d87a93a7 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -81,7 +81,7 @@ fs.writeFile(paths.join(__preview, ".hosted"), JSON.stringify({by: "metrics", li //Embed { const __web_embed = paths.join(paths.join(__web, "embed")) - const __preview_embed = paths.join(__preview, `${insight}/.statics`) + const __preview_embed = paths.join(__preview, "embed") const __preview_embed_js = paths.join(__preview_embed, ".js/embed") await fs.mkdir(__preview_embed, {recursive: true}) await fs.mkdir(__preview_embed_js, {recursive: true}) From 8b9620576cc51dd96d6efa38deccc133550296c8 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Tue, 5 Jul 2022 23:58:30 -0400 Subject: [PATCH 05/13] Update preview.mjs --- .github/scripts/preview.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index 221d87a93a7..8bde82eaeae 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -91,7 +91,7 @@ fs.writeFile(paths.join(__preview, ".hosted"), JSON.stringify({by: "metrics", li } //Insights for (const insights of ["insights", "about"]) { - const __web_insights = paths.join(paths.join(__web, "insight")) + const __web_insights = paths.join(paths.join(__web, "insights")) const __preview_insights = paths.join(__preview, `${insights}/.statics`) await fs.mkdir(__preview_insights, {recursive: true}) From 6f08f913080eef0891be38ff83a86f27194ccb65 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:01:34 -0400 Subject: [PATCH 06/13] update --- .github/scripts/preview.mjs | 2 +- source/app/web/statics/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index 8bde82eaeae..66ad3ffdea4 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -82,7 +82,7 @@ fs.writeFile(paths.join(__preview, ".hosted"), JSON.stringify({by: "metrics", li { const __web_embed = paths.join(paths.join(__web, "embed")) const __preview_embed = paths.join(__preview, "embed") - const __preview_embed_js = paths.join(__preview_embed, ".js/embed") + const __preview_embed_js = paths.join(__preview_js, "embed") await fs.mkdir(__preview_embed, {recursive: true}) await fs.mkdir(__preview_embed_js, {recursive: true}) fs.writeFile(paths.join(__preview_embed, "index.html"), `${await fs.readFile(paths.join(__web_embed, "index.html"))}`) diff --git a/source/app/web/statics/index.html b/source/app/web/statics/index.html index 10c9b0a9b2a..2b0469cf3ef 100644 --- a/source/app/web/statics/index.html +++ b/source/app/web/statics/index.html @@ -65,7 +65,7 @@

- Metrics insights are rendered by metrics.lecoq.io in preview mode.
+ Metrics are rendered by metrics.lecoq.io in preview mode.
Any backend editions won't be reflected but client-side rendering can still be tested.
From 15716100c6d71c715f0852e5332d4d3f2906af54 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:02:08 -0400 Subject: [PATCH 07/13] Update vercel.json --- vercel.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vercel.json b/vercel.json index e8e62f092cc..3c0a11c334e 100644 --- a/vercel.json +++ b/vercel.json @@ -6,8 +6,8 @@ {"source": "/:login([-\\w]+)/:repository([-\\w]+)", "destination": "https://metrics.lecoq.io/:login/:repository"}, {"source": "/about/query/:login", "destination": "https://metrics.lecoq.io/about/query/:login"}, {"source": "/about/query/:login/:plugin", "destination": "https://metrics.lecoq.io/about/query/:login/:plugin"}, - {"source": "/insights/query/:login", "destination": "https://metrics.lecoq.io/insights/query/:login"}, - {"source": "/insights/query/:login/:plugin", "destination": "https://metrics.lecoq.io/insights/query/:login/:plugin"}, + {"source": "/insights/query/:login", "destination": "https://metrics.lecoq.io/about/query/:login"}, + {"source": "/insights/query/:login/:plugin", "destination": "https://metrics.lecoq.io/about/query/:login/:plugin"}, {"source": "/.uncache", "destination": "https://metrics.lecoq.io/.uncache"}, {"source": "/.requests", "destination": "https://metrics.lecoq.io/.requests"} ], From 33c0c04478ce622c2b921e65e4d7417ffebc3c07 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:04:32 -0400 Subject: [PATCH 08/13] Update preview.mjs --- .github/scripts/preview.mjs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index 66ad3ffdea4..38e4f857c16 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -94,8 +94,7 @@ for (const insights of ["insights", "about"]) { const __web_insights = paths.join(paths.join(__web, "insights")) const __preview_insights = paths.join(__preview, `${insights}/.statics`) await fs.mkdir(__preview_insights, {recursive: true}) - - fs.copyFile(paths.join(__web, insights, "index.html"), paths.join(__preview, insights, "index.html")) + fs.copyFile(paths.join(__web_insights, "index.html"), paths.join(__preview, insights, "index.html")) for (const file of await fs.readdir(__web_insights)) { if (file !== ".statics") fs.copyFile(paths.join(__web_insights, file), paths.join(__preview_insights, file)) From ff91dfe82bfcb6565d693edd00c4f07e5707dfc8 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:07:27 -0400 Subject: [PATCH 09/13] Update preview.mjs --- .github/scripts/preview.mjs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index 38e4f857c16..cf2a5422bce 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -81,13 +81,18 @@ fs.writeFile(paths.join(__preview, ".hosted"), JSON.stringify({by: "metrics", li //Embed { const __web_embed = paths.join(paths.join(__web, "embed")) + const __web_embed_placeholders = paths.join(__web_embed, "placeholders") const __preview_embed = paths.join(__preview, "embed") + const __preview_embed_placeholders = paths.join(__preview_embed, "placeholders") const __preview_embed_js = paths.join(__preview_js, "embed") await fs.mkdir(__preview_embed, {recursive: true}) + await fs.mkdir(__preview_embed_placeholders, {recursive: true}) await fs.mkdir(__preview_embed_js, {recursive: true}) fs.writeFile(paths.join(__preview_embed, "index.html"), `${await fs.readFile(paths.join(__web_embed, "index.html"))}`) fs.writeFile(paths.join(__preview_embed_js, "app.js"), `${await fs.readFile(paths.join(__web_embed, "app.js"))}`) fs.writeFile(paths.join(__preview_embed_js, "app.placeholder.js"), `${await fs.readFile(paths.join(__web_embed, "app.placeholder.js"))}`) + for (const file of await fs.readdir(__web_embed_placeholders)) + fs.copyFile(paths.join(__web_embed_placeholders, file), paths.join(__preview_embed_placeholders, file)) } //Insights for (const insights of ["insights", "about"]) { From 51bf64459a38fb8410767276e15c9344a64f920e Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:10:42 -0400 Subject: [PATCH 10/13] Update preview.mjs --- .github/scripts/preview.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/preview.mjs b/.github/scripts/preview.mjs index cf2a5422bce..30ca0e2b525 100644 --- a/.github/scripts/preview.mjs +++ b/.github/scripts/preview.mjs @@ -83,7 +83,7 @@ fs.writeFile(paths.join(__preview, ".hosted"), JSON.stringify({by: "metrics", li const __web_embed = paths.join(paths.join(__web, "embed")) const __web_embed_placeholders = paths.join(__web_embed, "placeholders") const __preview_embed = paths.join(__preview, "embed") - const __preview_embed_placeholders = paths.join(__preview_embed, "placeholders") + const __preview_embed_placeholders = paths.join(__preview, ".placeholders") const __preview_embed_js = paths.join(__preview_js, "embed") await fs.mkdir(__preview_embed, {recursive: true}) await fs.mkdir(__preview_embed_placeholders, {recursive: true}) From a9b5e27d1724393f4c837d71773c757a0c8429d6 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:39:44 -0400 Subject: [PATCH 11/13] Update metrics.test.js --- tests/metrics.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/metrics.test.js b/tests/metrics.test.js index a09a4c3db9e..3ca533145d6 100644 --- a/tests/metrics.test.js +++ b/tests/metrics.test.js @@ -40,7 +40,7 @@ web.start = async () => web.stop = async () => await web.instance.kill("SIGKILL") //Web instance placeholder -require("./../source/app/web/statics/app.placeholder.js") +require("./../source/app/web/statics/embed/app.placeholder.js") const placeholder = globalThis.placeholder delete globalThis.placeholder placeholder.init({ From 15ecc320885153d435e2d27165ec70eb675f8640 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Wed, 6 Jul 2022 22:07:57 -0400 Subject: [PATCH 12/13] continue --- source/plugins/core/index.mjs | 7 ++++++- tests/metrics.test.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/source/plugins/core/index.mjs b/source/plugins/core/index.mjs index 669acdc0a7b..376397d474b 100644 --- a/source/plugins/core/index.mjs +++ b/source/plugins/core/index.mjs @@ -53,6 +53,11 @@ export default async function({login, q}, {conf, data, rest, graphql, plugins, q data.animated = animations console.debug(`metrics/compute/${login} > animations ${data.animated ? "enabled" : "disabled"}`) + //Extras features + const extras = conf.settings?.extras?.features ?? conf.settings?.extras?.default ?? false + console.debug(`metrics/compute/${login} > extras > ${JSON.stringify(conf.settings?.extras)}`) + console.debug(`metrics/compute/${login} > extras > ${JSON.stringify(extras)}`) + //Plugins for (const name of Object.keys(imports.plugins)) { if ((!plugins[name]?.enabled) || (!q[name])) @@ -60,7 +65,7 @@ export default async function({login, q}, {conf, data, rest, graphql, plugins, q pending.push((async () => { try { console.debug(`metrics/compute/${login}/plugins > ${name} > started`) - data.plugins[name] = await imports.plugins[name]({login, q, imports, data, computed, rest, graphql, queries, account}, {extras: conf.settings?.extras?.features ?? conf.settings?.extras?.default ?? false, sandbox: conf.settings?.sandbox ?? false, ...plugins[name]}) + data.plugins[name] = await imports.plugins[name]({login, q, imports, data, computed, rest, graphql, queries, account}, {extras, sandbox: conf.settings?.sandbox ?? false, ...plugins[name]}) console.debug(`metrics/compute/${login}/plugins > ${name} > completed`) } catch (error) { diff --git a/tests/metrics.test.js b/tests/metrics.test.js index 3ca533145d6..c8bf9595cf4 100644 --- a/tests/metrics.test.js +++ b/tests/metrics.test.js @@ -119,7 +119,7 @@ describe("GitHub Action", () => if ((skip.includes(template)) || ((modes.length) && (!modes.includes("action")))) test.skip(name, () => null) else - test(name, async () => expect(await action.run({template, base: "", query: JSON.stringify(query), plugins_errors_fatal: true, dryrun: true, use_mocked_data: true, verify: true, ...input})).toBe(true), timeout) + test(name, async () => expect(await action.run({template, base: "", query: JSON.stringify(query), plugins_errors_fatal: true, dryrun: true, use_mocked_data: true, verify: true, retries:1, ...input})).toBe(true), timeout) } })) From 91da9b1e1442e9dd610a09b71cf74af79f8a2447 Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Wed, 6 Jul 2022 22:26:47 -0400 Subject: [PATCH 13/13] fix extras checker --- source/app/metrics/metadata.mjs | 2 +- source/plugins/core/index.mjs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/source/app/metrics/metadata.mjs b/source/app/metrics/metadata.mjs index f6129352620..930ce8ae9c6 100644 --- a/source/app/metrics/metadata.mjs +++ b/source/app/metrics/metadata.mjs @@ -224,7 +224,7 @@ metadata.plugin = async function({__plugins, __templates, name, logger}) { console.debug(`metrics/extras > ${name} > ${key} > require [${required}]`) //Legacy handling - const enabled = extras?.features ?? extras?.default ?? false + const enabled = extras?.features ?? extras?.default ?? (typeof extras === "boolean" ? extras : false) if (typeof enabled === "boolean") { console.debug(`metrics/extras > ${name} > ${key} > extras features is set to ${enabled}`) if (!enabled) diff --git a/source/plugins/core/index.mjs b/source/plugins/core/index.mjs index 376397d474b..bb4c0d742fc 100644 --- a/source/plugins/core/index.mjs +++ b/source/plugins/core/index.mjs @@ -55,7 +55,6 @@ export default async function({login, q}, {conf, data, rest, graphql, plugins, q //Extras features const extras = conf.settings?.extras?.features ?? conf.settings?.extras?.default ?? false - console.debug(`metrics/compute/${login} > extras > ${JSON.stringify(conf.settings?.extras)}`) console.debug(`metrics/compute/${login} > extras > ${JSON.stringify(extras)}`) //Plugins