Merge once instead of twice #1901 (#1909)

* Merge once instead of twice #1901 * move helpers to init
sitespeedio · Feb 8, 2018 · 4ee8a51 · 4ee8a51
1 parent abd5aba
commit 4ee8a51
Showing 1 changed file with 32 additions and 32 deletions.
diff --git a/lib/plugins/html/htmlBuilder.js b/lib/plugins/html/htmlBuilder.js
@@ -153,7 +153,8 @@ class HTMLBuilder {
           {
             options,
             noPages: dataCollector.getURLs().length,
-            css
+            css,
+            h: helpers
           },
           dataCollector.getSummary(name),
           this.summary[name]
@@ -204,7 +205,8 @@ class HTMLBuilder {
         browser,
         hasScreenShots: dataCollector.browsertimeScreenshots,
         screenShotType: dataCollector.browsertimeScreenshotsType,
-        css
+        css,
+        h: helpers
       }).tap(() =>
         Promise.resolve(Object.keys(runPages)).map(runIndex =>
           this._renderUrlRunPage(url, runIndex, {
@@ -217,7 +219,8 @@ class HTMLBuilder {
             browser,
             hasScreenShots: dataCollector.browsertimeScreenshots,
             screenShotType: dataCollector.browsertimeScreenshotsType,
-            css
+            css,
+            h: helpers
           })
         )
       );
@@ -242,6 +245,17 @@ class HTMLBuilder {
       'pageInfo.data.browsertime.pageSummary.timestamp',
       this.timestamp
     );
+
+    const pugs = {};
+    const pageSummaries = this.pageSummaries.filter(
+      summary => !!get(locals.pageInfo.data, [summary.id, 'pageSummary'])
+    );
+
+    for (const summary of pageSummaries) {
+      pugs[summary.id] = renderer.renderTemplate(summary.id, locals);
+      locals = merge({ pugs }, locals);
+    }
+
     locals = merge(
       {
         JSON: JSON,
@@ -257,23 +271,12 @@ class HTMLBuilder {
         headers: this.summary,
         version: packageInfo.version,
         timestamp: summaryTimestamp,
-        h: helpers,
-        context: this.context
+        context: this.context,
+        pageSummaries
       },
       locals
     );
 
-    const pugs = {};
-    const pageSummaries = this.pageSummaries.filter(
-      summary => !!get(locals.pageInfo.data, [summary.id, 'pageSummary'])
-    );
-    for (const summary of pageSummaries) {
-      pugs[summary.id] = renderer.renderTemplate(summary.id, locals);
-      locals = merge({ pugs }, locals);
-    }
-
-    locals = merge({ pageSummaries }, locals);
-
     return this.storageManager.writeHtmlForUrl(
       renderer.renderTemplate('url/' + name, locals),
       name + '.html',
@@ -288,6 +291,17 @@ class HTMLBuilder {
       'pageInfo.data.browsertime.run.timestamp',
       this.timestamp
     );
+
+    const pugs = {};
+    const pageRuns = this.pageRuns.filter(
+      run => !!get(locals.pageInfo.data, [run.id, 'run'])
+    );
+
+    for (const run of pageRuns) {
+      pugs[run.id] = renderer.renderTemplate(run.id, locals);
+      locals = merge({ pugs }, locals);
+    }
+
     locals = merge(
       {
         urlLink: './index.html',
@@ -301,24 +315,11 @@ class HTMLBuilder {
         headers: this.summary,
         version: packageInfo.version,
         timestamp: runTimestamp,
-        h: helpers,
-        context: this.context
+        context: this.context,
+        pageRuns
       },
       locals
     );
-
-    const pugs = {};
-    const pageRuns = this.pageRuns.filter(
-      run => !!get(locals.pageInfo.data, [run.id, 'run'])
-    );
-
-    for (const run of pageRuns) {
-      pugs[run.id] = renderer.renderTemplate(run.id, locals);
-      locals = merge({ pugs }, locals);
-    }
-
-    locals = merge({ pageRuns }, locals);
-
     return this.storageManager.writeHtmlForUrl(
       renderer.renderTemplate('url/run', locals),
       name + '.html',
@@ -337,7 +338,6 @@ class HTMLBuilder {
         headers: this.summary,
         version: packageInfo.version,
         timestamp: this.timestamp,
-        h: helpers,
         context: this.context
       },
       locals