GoogleChrome · adamraine · Aug 23, 2021 · Jul 28, 2021 · Aug 2, 2021 · Aug 2, 2021
diff --git a/build/build-report.js b/build/build-report.js
@@ -41,13 +41,6 @@ async function buildFlowReport() {
       commonjs(),
       typescript({
         tsconfig: 'flow-report/tsconfig.json',
-        // rollup-plugin-commonjs 10.1.0 does not work here.
-        // https://github.com/ezolenko/rollup-plugin-typescript2#plugin-options
-        tsconfigOverride: {
-          compilerOptions: {
-            module: 'ES6',
-          },
-        },
       }),
       terser(),
     ],

diff --git a/flow-report/assets/standalone-flow-template.html b/flow-report/assets/standalone-flow-template.html
@@ -22,8 +22,9 @@
   <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 Flow Report</title>
   <style>/*%%LIGHTHOUSE_CSS%%*/</style>
+  <style>/*%%LIGHTHOUSE_FLOW_CSS%%*/</style>
 </head>
-<body class="lh-root lh-vars">
+<body class="flow-vars lh-root lh-vars">
   <noscript>Lighthouse report requires JavaScript. Please enable.</noscript>
 
   <main><!-- report populated here --></main>

diff --git a/flow-report/assets/styles.css b/flow-report/assets/styles.css
@@ -0,0 +1,158 @@
+/**
+ * @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.
+ */
+
+.flow-vars {
+  --app-font-size: 12px;
+  --sidebar-title-font-size: 16px;
+  --sidebar-summary-font-size: 14px;
+  --sidebar-flow-step-navigation-font-size: 14px;
+  --base-spacing: 16px;
+}
+
+.App {
+  display: grid;
+  grid-template-areas: "side report";
+  grid-template-columns: min-content auto;
+  height: 100vh;
+  max-width: 100vw;
+  font-size: var(--app-font-size);
+}
+.App a {
+  color: var(--color-gray-800);
+  text-decoration: none;
+}
+
+.Separator {
+  height: 1px;
+  width: 100%;
+  background-color: var(--color-gray-300);
+  margin-top: 12px;
+  margin-bottom: 12px;
+}
+
+.Sidebar {
+  border-right: 1px solid var(--color-gray-300);
+}
+
+.Sidebar--current {
+  background-color: var(--color-gray-200);
+  font-weight: bold;
+}
+
+.SidebarSectionTitle {
+  height: 16px;
+  margin: 32px 16px 0px 16px;
+  color: var(--color-gray-700);
+}
+
+.SidebarHeader {
+  margin: var(--base-spacing);
+}
+.SidebarHeader__title {
+  font-size: var(--sidebar-title-font-size);
+  font-weight: bold;
+  width: max-content;
+}
+.SidebarHeader__date {
+  color: var(--color-gray-700);
+  width: max-content;
+}
+
+.SidebarRuntimeSettings > summary {
+  padding: 4px 16px;
+  list-style: none;
+  color: var(--color-gray-700);
+}
+
+.SidebarSummary {
+  width: 100%;
+  display: flex;
+  padding: 8px 16px;
+  align-items: center;
+}
+
+.SidebarSummary__icon {
+  display: flex;
+  height: 16px;
+  width: 16px;
+  align-items: center;
+  justify-content: center;
+  /* Flex column-gap workaround for safari */
+  margin-right: var(--base-spacing);
+}
+.SidebarSummary__icon::before {
+  content: '☰';
+  font-weight: normal;
+  color: var(--color-blue-A700);
+}
+
+.SidebarSummary__label {
+  font-size: var(--sidebar-summary-font-size);
+}
+
+.SidebarFlowStep {
+  display: flex;
+  padding-left: var(--base-spacing);
+  padding-right: var(--base-spacing);
+}
+
+.SidebarFlowStep__label {
+  grid-column: 2;
+  margin-top: 14px;
+  margin-bottom: 14px;
+  justify-self: left;
+}
+.SidebarFlowStep__label--navigation {
+  font-size: var(--sidebar-flow-step-navigation-font-size);
+}
+
+.SidebarFlowStep__icon {
+  grid-column: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  /* Flex column-gap workaround for safari */
+  margin-right: var(--base-spacing);
+}
+.SidebarFlowStep__icon--line {
+  width: 2px;
+  flex-grow: 1;
+  background-color: var(--color-blue-A700);
+}
+
+.FlowStepIcon {
+  display: flex;
+  width: 16px;
+  height: 16px;
+  align-items: center;
+  justify-content: center;
+}
+.FlowStepIcon--navigation::before {
+  content: '';
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  border: 2px solid var(--color-blue-A700);
+  display: block;
+}
+.FlowStepIcon--timespan::before {
+  content: '';
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: var(--color-blue-A700);
+  display: block;
+}
+.FlowStepIcon--snapshot::before {
+  content: '';
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: var(--color-blue-A700);
+  display: block;
+}
diff --git a/flow-report/jest.config.js b/flow-report/jest.config.js
@@ -7,7 +7,9 @@
 module.exports = {
   testEnvironment: 'jsdom',
   preset: 'ts-jest',
+  globalSetup: './test/setup/global-setup.ts',
   testMatch: [
+    '**/test/**/*-test.ts',
     '**/test/**/*-test.tsx',
   ],
 };
diff --git a/flow-report/App.tsx → flow-report/src/app.tsx b/flow-report/App.tsx → flow-report/src/app.tsx
@@ -5,38 +5,40 @@
  */
 
 import {FunctionComponent} from 'preact';
-import {useState} from 'preact/hooks';
+import {Sidebar} from './sidebar/sidebar';
+import {FlowResultContext, useCurrentLhr} from './util';
 
-export const Report: FunctionComponent<{lhr: LH.Result}> = ({lhr}) => {
+const Report: FunctionComponent<{lhr: LH.Result}> = ({lhr}) => {
   // TODO(FR-COMPAT): Render an actual report here.
   return (
-    <div>
+    <div data-testid="Report">
       <h1>{lhr.finalUrl}</h1>
       {
         Object.values(lhr.categories).map((category) =>
-          <h2>{category.id}: {category.score}</h2>
+          <h2 key={category.id}>{category.id}: {category.score}</h2>
         )
       }
     </div>
   );
 };
 
+const Summary: FunctionComponent = () => {
+  // TODO(FR-COMPAT): Design summary page.
+  return <h1 data-testid="Summary">SUMMARY</h1>;
+};
+
+const Content: FunctionComponent = () => {
+  const currentLhr = useCurrentLhr();
+  return currentLhr ? <Report lhr={currentLhr.value}/> : <Summary/>;
+};
+
 export const App: FunctionComponent<{flowResult: LH.FlowResult}> = ({flowResult}) => {
-  const [currentLhrIndex, setCurrentLhrIndex] = useState(0);
   return (
-    <>
-      <select onChange={e => setCurrentLhrIndex(Number(e.currentTarget.value))}>
-        {
-          flowResult.lhrs.map((lhr, i) =>
-            <option key={lhr.fetchTime} value={i}>
-              [{lhr.fetchTime}] [{lhr.gatherMode}] {lhr.finalUrl}
-            </option>
-          )
-        }
-      </select>
-      <div>
-        <Report lhr={flowResult.lhrs[currentLhrIndex]}/>
+    <FlowResultContext.Provider value={flowResult}>
+      <div className="App">
+        <Sidebar/>
+        <Content/>
       </div>
-    </>
+    </FlowResultContext.Provider>
   );
 };
diff --git a/flow-report/src/sidebar/flow.tsx b/flow-report/src/sidebar/flow.tsx
@@ -0,0 +1,82 @@
+/**
+ * @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.
+ */
+
+import {FunctionComponent} from 'preact';
+import {classNames, useCurrentLhr, useFlowResult} from '../util';
+
+const FlowStepIcon: FunctionComponent<{mode: LH.Result.GatherMode}> = ({mode}) => {
+  return <div className={`FlowStepIcon FlowStepIcon--${mode}`}></div>;
+};
+
+const SidebarFlowStep: FunctionComponent<{
+  mode: LH.Result.GatherMode,
+  href: string,
+  label: string,
+  hideTopLine: boolean,
+  hideBottomLine: boolean,
+  isCurrent: boolean,
+}> = ({href, label, mode, hideTopLine, hideBottomLine, isCurrent}) => {
+  return (
+    <a
+      className={classNames('SidebarFlowStep', {'Sidebar--current': isCurrent})}
+      href={href}
+    >
+      <div className="SidebarFlowStep__icon">
+        <div
+          className="SidebarFlowStep__icon--line"
+          style={hideTopLine ? {background: 'transparent'} : undefined}
+        />
+        <FlowStepIcon mode={mode}/>
+        <div
+          className="SidebarFlowStep__icon--line"
+          style={hideBottomLine ? {background: 'transparent'} : undefined}
+        />
+      </div>
+      <div className={`SidebarFlowStep__label SidebarFlowStep__label--${mode}`}>{label}</div>
+    </a>
+  );
+};
+
+export const SidebarFlow: FunctionComponent = () => {
+  const flowResult = useFlowResult();
+  const currentLhr = useCurrentLhr();
+
+  let numNavigation = 1;
+  let numTimespan = 1;
+  let numSnapshot = 1;
+
+  return (
+    <>
+      {flowResult.lhrs.map((lhr, index) => {
+        let name;
+        switch (lhr.gatherMode) {
+          case 'navigation':
+            name = `Navigation (${numNavigation++})`;
+            break;
+          case 'timespan':
+            name = `Timespan (${numTimespan++})`;
+            break;
+          case 'snapshot':
+            name = `Snapshot (${numSnapshot++})`;
+            break;
+        }
+        const url = new URL(location.href);
+        url.hash = `#index=${index}`;
+        return (
+          <SidebarFlowStep
+            key={lhr.fetchTime}
+            mode={lhr.gatherMode}
+            href={url.href}
+            label={name}
+            hideTopLine={index === 0}
+            hideBottomLine={index === flowResult.lhrs.length - 1}
+            isCurrent={index === (currentLhr && currentLhr.index)}
+          />
+        );
+      })}
+    </>
+  );
+};