GoogleChrome · devtools-bot · Nov 3, 2021 · Jul 9, 2021 · Jul 10, 2021 · Jul 10, 2021
diff --git a/build/build-report-components.js b/build/build-report-components.js
@@ -143,7 +143,7 @@ function compileTemplate(tmpEl) {
   }
 
   const fragmentVarName = makeOrGetVarName(tmpEl);
-  lines.push(`const ${fragmentVarName} = dom.document().createDocumentFragment();`);
+  lines.push(`const ${fragmentVarName} = dom.createFragment();`);
 
   for (const topLevelEl of tmpEl.content.children) {
     process(topLevelEl);

diff --git a/flow-report/assets/standalone-flow-template.html b/flow-report/assets/standalone-flow-template.html
@@ -23,11 +23,12 @@
   <title>Lighthouse Flow Report</title>
   <style>/*%%LIGHTHOUSE_CSS%%*/</style>
   <style>/*%%LIGHTHOUSE_FLOW_CSS%%*/</style>
+  <style>body {margin: 0}</style>
 </head>
-<body class="flow-vars lh-root lh-vars">
+<body>
   <noscript>Lighthouse report requires JavaScript. Please enable.</noscript>
 
-  <main><!-- report populated here --></main>
+  <main class="flow-vars lh-root lh-vars"><!-- report populated here --></main>
 
   <script>window.__LIGHTHOUSE_FLOW_JSON__ = %%LIGHTHOUSE_FLOW_JSON%%;</script>
   <script>%%LIGHTHOUSE_FLOW_JAVASCRIPT%%

diff --git a/flow-report/src/wrappers/report-renderer.tsx b/flow-report/src/wrappers/report-renderer.tsx
@@ -29,6 +29,7 @@ function useReportRenderer() {
 
 const ReportRendererProvider: FunctionComponent = ({children}) => {
   const globals = useMemo(() => {
+    // @ts-expect-error Still using legacy
     const dom = new DOM(document);
     const detailsRenderer = new DetailsRenderer(dom);
     const categoryRenderer = new CategoryRenderer(dom, detailsRenderer);

diff --git a/flow-report/src/wrappers/report.tsx b/flow-report/src/wrappers/report.tsx
@@ -50,11 +50,10 @@ const Report: FunctionComponent<{hashState: LH.FlowResult.HashState}> =
       convertChildAnchors(ref.current, hashState.index);
       const fullPageScreenshot = getFullPageScreenshot(hashState.currentLhr);
       if (fullPageScreenshot) {
-        const container = dom.find('.lh-container', ref.current);
         ElementScreenshotRenderer.installOverlayFeature({
           dom,
-          reportEl: container,
-          overlayContainerEl: container,
+          rootEl: ref.current,
+          overlayContainerEl: ref.current,
           fullPageScreenshot,
         });
       }

diff --git a/flow-report/standalone-flow.tsx b/flow-report/standalone-flow.tsx
@@ -15,9 +15,10 @@ import {App} from './src/app';
 
 // Used by standalone-flow.html
 function __initLighthouseFlowReport__() {
-  const root = document.body.querySelector('main');
-  if (!root) throw Error('Root element not found');
-  render(<App flowResult={window.__LIGHTHOUSE_FLOW_JSON__} />, root);
+  // TODO(adamraine): add lh-vars, etc classes programmatically instead of in the HTML template
+  const container = document.body.querySelector('main');
+  if (!container) throw Error('Container element not found');
+  render(<App flowResult={window.__LIGHTHOUSE_FLOW_JSON__} />, container);
 }
 
 window.__initLighthouseFlowReport__ = __initLighthouseFlowReport__;
diff --git a/report/assets/standalone-template.html b/report/assets/standalone-template.html
@@ -21,12 +21,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
   <link rel="icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAEhklEQVR4AWJxL/BhIAesev1U5tcflpncgNrKIsqNIwzC9feMpDUzs70kOczMzMzJJcxwCTMzncPMnOwtzBwzMzPb0vRfeZPp0VhPS5I39V5fdiXV1/VD+9QC7OVn9BsyH1XIoEI1PfmJvLFowVV564+34DFUHudbmfDh4kVXh//7XwE+WjS/YfXZe3yr4j2rqj1AIhSB7hZ8ZtPZu/zw8cK523U4wE1/rvPfWrz4zs0m9ZdC9yUJAlASdBAgocRegfF/f3/h/PuaFsxMdwjAR0vm1+06eMMfIrhLqTWqdH4EumU2SPfMhigJAlRQbZrgrRsl9U+Y2DYDFCz3ILC9kiAiqSrMwbWT0nceEnR+9Kggc2zjOJCASDENkg0a5HfZZgDP81CM3CrQs2Z1+o7DJ6ePr8sK0AOCHv5Jjdt3evyYSaZ351VIStIxPRAUtrBYbxC6w+BZ0ivVSBKkIhJhemSyZpfB00EiPO2VjzYkxhcqXQqCWCShGplvi3y0QxqbuBurMjyJeWnkHZuAEgIQGsUBqwrfjZ+IlBgKyRJzVVYF8O6qFWdh86YzQzMrZigYmxAyfvHgLZQ/LC1CbeniW2Hkqr/PH16SgvGuf2/uzNMBwJA/njxizGPtSyAf7EziJCMGRDRdhoAC4PL1A/SrKQMAAQkEfpJAcRQdrBJ7gNwjSpJsdwK+CANBkqa1LgQB4IicV9nYUct7gaxuDJUErQIiEAiMxLVOFlKzIktPpT0ggpdpC/8YAHnxbgkUY4tAAFSR7AAXNyAAWHJrA/kHGjzg5nleuwFO7Nd/IoDw4Pm58+4jNLmYG0wRA5bErc2Mr3Y+dXTDW1VvwqbJkzMCHQ4S1GTCBOIgUHJrGdEwqzR+jAp/o2qAZelUDoQnruEEdDclJI6576AlNVfc+22XN/+Y1vnJD0Yind6UpEEvn/Hqq15EYjCW7jZCJEpnNvDgkyelDjs106kuux2AAXCSobULOWP8mLhYlpoDMK4qAFXJGk+grtH8YXVz5KJblqaG1+VUdTc0I290bmUQAriGITRbdQnom0aoFj8kx1+wMD2ifncAXUQE4SkDqN1hE0jEophs1SUwZAOhUAiMCLwRtamtTZtbbmZErSAUHbSysaoEmnrsakiMiUAURi283gN6wans9oX8rOCrj7/JP35DFD+iQ7Au/K2KE1jzx6ujjUnXFH9KjEq6ZlhsTBICrNLJf47Pv/pkHzvup1w4dmUbEei0+bcXRqJuh5kVARQ8byyYxOwNGr7A87xh1tp8sGT+uMInrwi++Xj7TQz2d27NvwEkrOflAFQGIDA5khASBCGdO2/Z/MnLPwYfv5TFhjW7QhVKAB6afwe2LpFlFsCnlQEosgQgDsdOG1/LKeNqJS4JCSPJ/i+TakwEARor7gER1Iva5JmPOJK0RUqmoPnnlzFCtmIAhAAQEIQRgDaiYPIauNXcnDlRIrWNFY3hm7PG9YRqr7IV7HrCgAC17befjEvRq2nGhAHtBqDpOuI/I1diUUAMYIxEdyejBJqLnNoszGZtfiX/CztGv2mq+sdaAAAAAElFTkSuQmCC">
   <title>Lighthouse Report</title>
+  <style>body {margin: 0}</style>
 </head>
-<body class="lh-root lh-vars">
+<body>
   <noscript>Lighthouse report requires JavaScript. Please enable.</noscript>
 
-  <main><!-- report populated here --></main>
-
   <div id="lh-log"></div>
 
   <script>window.__LIGHTHOUSE_JSON__ = %%LIGHTHOUSE_JSON%%;</script>

diff --git a/report/assets/styles.css b/report/assets/styles.css
diff --git a/report/clients/bundle.js b/report/clients/bundle.js
@@ -15,3 +15,4 @@
 export {DOM} from '../renderer/dom.js';
 export {ReportRenderer} from '../renderer/report-renderer.js';
 export {ReportUIFeatures} from '../renderer/report-ui-features.js';
+export {renderReport} from '../renderer/api.js';
diff --git a/report/clients/standalone.js b/report/clients/standalone.js
@@ -13,32 +13,25 @@
 
 /* global ga */
 
-import {DOM} from '../renderer/dom.js';
+import {renderReport} from '../renderer/api.js';
 import {Logger} from '../renderer/logger.js';
-import {ReportRenderer} from '../renderer/report-renderer.js';
-import {ReportUIFeatures} from '../renderer/report-ui-features.js';
 
 function __initLighthouseReport__() {
-  const dom = new DOM(document);
-  const renderer = new ReportRenderer(dom);
-  const container = dom.find('main', document);
-  /** @type {LH.ReportResult} */
+  /** @type {LH.Result} */
   // @ts-expect-error
   const lhr = window.__LIGHTHOUSE_JSON__;
-  renderer.renderReport(lhr, container);
 
-  // Hook in JS features and page-level event listeners after the report
-  // is in the document.
-  const features = new ReportUIFeatures(dom);
-  features.initFeatures(lhr);
+  const reportRootEl = renderReport(lhr);
+  document.body.append(reportRootEl);
 
   document.addEventListener('lh-analytics', /** @param {Event} e */ e => {
     // @ts-expect-error
     if (window.ga) ga(e.detail.cmd, e.detail.fields);
   });
 
   document.addEventListener('lh-log', /** @param {Event} e */ e => {
-    const el = dom.find('div#lh-log', document);
+    const el = document.querySelector('div#lh-log');
+    if (!el) return;
 
     const logger = new Logger(el);
     // @ts-expect-error

diff --git a/report/renderer/api.js b/report/renderer/api.js
@@ -0,0 +1,32 @@
+/**
+ * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+
+import {DOM} from '../renderer/dom.js';
+import {ReportRenderer} from '../renderer/report-renderer.js';
+import {ReportUIFeatures} from '../renderer/report-ui-features.js';
+
+/**
+ * @param {LH.Result} lhr
+ * @param {LH.Renderer.Options} opts
+ * @return {HTMLElement}
+ */
+export function renderReport(lhr, opts = {}) {
+  const rootEl = document.createElement('article');
+  rootEl.classList.add('lh-root', 'lh-vars');
+
+  const dom = new DOM(rootEl.ownerDocument, rootEl);
+  const renderer = new ReportRenderer(dom);
+
+  renderer.renderReport(lhr, rootEl, opts);
+
+  // Hook in JS features and page-level event listeners after the report
+  // is in the document.
+  const features = new ReportUIFeatures(dom, opts);
+  features.initFeatures(lhr);
+  return rootEl;
+}
diff --git a/report/renderer/category-renderer.js b/report/renderer/category-renderer.js
@@ -133,7 +133,7 @@ export class CategoryRenderer {
     const warningsEl = this.dom.createChildOf(summaryEl, 'div', 'lh-warnings');
     this.dom.createChildOf(warningsEl, 'span').textContent = strings.warningHeader;
     if (warnings.length === 1) {
-      warningsEl.appendChild(this.dom.document().createTextNode(warnings.join('')));
+      warningsEl.appendChild(this.dom.createTextNode(warnings.join('')));
     } else {
       const warningsUl = this.dom.createChildOf(warningsEl, 'ul');
       for (const warning of warnings) {