diff --git a/lib/plugins/browsertime/index.js b/lib/plugins/browsertime/index.js index bfbb596aa..aa7c810af 100644 --- a/lib/plugins/browsertime/index.js +++ b/lib/plugins/browsertime/index.js @@ -356,6 +356,11 @@ export default class BrowsertimePlugin extends SitespeedioPlugin { run.cpu = result[resultIndex].cpu[runIndex]; } + if (result[resultIndex].powerConsumption) { + run.powerConsumption = + result[resultIndex].powerConsumption[runIndex]; + } + if (result[resultIndex].memory) { run.memory = result[resultIndex].memory[runIndex]; } diff --git a/lib/plugins/html/templates/url/iteration/index.pug b/lib/plugins/html/templates/url/iteration/index.pug index 4e2dd31cd..1b0f15f47 100644 --- a/lib/plugins/html/templates/url/iteration/index.pug +++ b/lib/plugins/html/templates/url/iteration/index.pug @@ -66,6 +66,11 @@ block content tr td Memory td #{h.size.format(memory)} + - cpuPower = get(d, 'browsertime.run.cpuConsumption') + if cpuConsumption + tr + td Firefox CPU power consumption + td #{cpuConsumption} µWh - requests = get(d, 'pagexray.run.requests') if (requests) tr diff --git a/lib/plugins/html/templates/url/summary/index.pug b/lib/plugins/html/templates/url/summary/index.pug index 9df3ef49c..2a7e59ae7 100644 --- a/lib/plugins/html/templates/url/summary/index.pug +++ b/lib/plugins/html/templates/url/summary/index.pug @@ -96,6 +96,11 @@ block content tr td Memory td #{h.size.format(memory)} + - powerConsumption = get(d, 'browsertime.pageSummary.statistics.powerConsumption.median') + if powerConsumption + tr + td Firefox CPU Power Consumption + td #{powerConsumption} µWh - requests = get(d, 'pagexray.pageSummary.requests') if requests tr @@ -142,7 +147,6 @@ block content tr td Cumulative Layout Shift (CLS) [median] td #{cls.toFixed(2)} - - tbt = get(d, 'browsertime.pageSummary.statistics.cpu.longTasks.totalBlockingTime.median') if inp tr td Interaction To Next Paint (INP) [median] diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 5873b6150..94aab2354 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -15,7 +15,7 @@ "@tgwf/co2": "0.14.2", "aws-sdk": "2.1327.0", "axe-core": "4.8.2", - "browsertime": "21.5.0", + "browsertime": "21.5.1", "cli-color": "2.0.3", "coach-core": "8.0.2", "concurrent-queue": "7.0.2", @@ -1759,9 +1759,9 @@ } }, "node_modules/browsertime": { - "version": "21.5.0", - "resolved": "https://registry.npmjs.org/browsertime/-/browsertime-21.5.0.tgz", - "integrity": "sha512-9t10vVc9/WolALi4cXsTvQ0Y+SWf2j2I5SMUtWC/uFADKJAaZauEbO+EcZTqz6ezzNOxD1AoblxPO5uMbgWtug==", + "version": "21.5.1", + "resolved": "https://registry.npmjs.org/browsertime/-/browsertime-21.5.1.tgz", + "integrity": "sha512-71F3RVkD3RvgfOmovhBkIPV537T/HFXsRnZmo9nQVJtB7l/1qUVNC/hNrbFjtiW43gFuqjLC1Hn6eOLJ3dE90A==", "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "3.2.6", @@ -10601,9 +10601,9 @@ } }, "browsertime": { - "version": "21.5.0", - "resolved": "https://registry.npmjs.org/browsertime/-/browsertime-21.5.0.tgz", - "integrity": "sha512-9t10vVc9/WolALi4cXsTvQ0Y+SWf2j2I5SMUtWC/uFADKJAaZauEbO+EcZTqz6ezzNOxD1AoblxPO5uMbgWtug==", + "version": "21.5.1", + "resolved": "https://registry.npmjs.org/browsertime/-/browsertime-21.5.1.tgz", + "integrity": "sha512-71F3RVkD3RvgfOmovhBkIPV537T/HFXsRnZmo9nQVJtB7l/1qUVNC/hNrbFjtiW43gFuqjLC1Hn6eOLJ3dE90A==", "requires": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "3.2.6", diff --git a/package.json b/package.json index 7a1f967ac..b575c6fa3 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "@tgwf/co2": "0.14.2", "aws-sdk": "2.1327.0", "axe-core": "4.8.2", - "browsertime": "21.5.0", + "browsertime": "21.5.1", "coach-core": "8.0.2", "cli-color": "2.0.3", "concurrent-queue": "7.0.2",