tests(devtools): fix after renaming standalone-template.html (#12765)

GoogleChrome · Jul 13, 2021 · 8c17786 · 8c17786
1 parent 2bd13d6
commit 8c17786
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 29 deletions.
diff --git a/build/build-dt-report-resources.js b/build/build-dt-report-resources.js
@@ -38,8 +38,8 @@ writeFile('report-generator.d.ts', 'export {}');
 
 const pathToReportAssets = require.resolve('../clients/devtools-report-assets.js');
 browserify(generatorFilename, {standalone: 'Lighthouse.ReportGenerator'})
-  // Shims './html/html-report-assets.js' to resolve to devtools-report-assets.js
-  .require(pathToReportAssets, {expose: './html/html-report-assets.js'})
+  // Shims './report/report-assets.js' to resolve to devtools-report-assets.js
+  .require(pathToReportAssets, {expose: './report-assets.js'})
   .bundle((err, src) => {
     if (err) throw err;
     fs.writeFileSync(bundleOutFile, src.toString());

diff --git a/report/assets/standalone-template.html b/report/assets/standalone-template.html
@@ -33,6 +33,7 @@
 
   <script>window.__LIGHTHOUSE_JSON__ = %%LIGHTHOUSE_JSON%%;</script>
   <script>%%LIGHTHOUSE_JAVASCRIPT%%
+  __initLighthouseReport__();
   //# sourceURL=compiled-reportrenderer.js
   </script>
   <script>console.log('window.__LIGHTHOUSE_JSON__', __LIGHTHOUSE_JSON__);</script>

diff --git a/report/clients/standalone.js b/report/clients/standalone.js
@@ -7,7 +7,9 @@
 
 /* global document window ga DOM ReportRenderer ReportUIFeatures Logger */
 
-(function __initLighthouseReport__() {
+// Used by standalone.html
+// eslint-disable-next-line no-unused-vars
+function __initLighthouseReport__() {
   const dom = new DOM(document);
   const renderer = new ReportRenderer(dom);
   const container = dom.find('main', document);
@@ -20,33 +22,33 @@
   // is in the document.
   const features = new ReportUIFeatures(dom);
   features.initFeatures(lhr);
-})();
 
-document.addEventListener('lh-analytics', /** @param {Event} e */ e => {
-  // @ts-expect-error
-  if (window.ga) ga(e.detail.cmd, e.detail.fields);
-});
+  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 = document.querySelector('#lh-log');
-  if (!el) return;
+  document.addEventListener('lh-log', /** @param {Event} e */ e => {
+    const el = document.querySelector('#lh-log');
+    if (!el) return;
 
-  const logger = new Logger(el);
-  // @ts-expect-error
-  const detail = e.detail;
+    const logger = new Logger(el);
+    // @ts-expect-error
+    const detail = e.detail;
 
-  switch (detail.cmd) {
-    case 'log':
-      logger.log(detail.msg);
-      break;
-    case 'warn':
-      logger.warn(detail.msg);
-      break;
-    case 'error':
-      logger.error(detail.msg);
-      break;
-    case 'hide':
-      logger.hide();
-      break;
-  }
-});
+    switch (detail.cmd) {
+      case 'log':
+        logger.log(detail.msg);
+        break;
+      case 'warn':
+        logger.warn(detail.msg);
+        break;
+      case 'error':
+        logger.error(detail.msg);
+        break;
+      case 'hide':
+        logger.hide();
+        break;
+    }
+  });
+}