lighthouse 8.5.1-dev.20211012 → 8.5.1

package/flow-report/assets/styles.css

@@ -10,28 +10,17 @@
   --category-summary-font-size: 18px;
   --double-base-spacing: calc(var(--base-spacing) * 2);
   --gather-mode-icon-size: 16px;
-  --header-adjacent-title-font-size: 14px;
-  --header-adjacent-title-width: minmax(var(--min-text-width), 1fr);
-  --header-current-description-font-size: 12px;
-  --header-current-title-font-size: 20px;
-  --header-margin: minmax(0px, calc(var(--base-spacing) * 4));
   --half-base-spacing: calc(var(--base-spacing) / 2);
-  --min-text-width: 20ch;
-  --dialog-border-color: var(--color-gray-700);
   --separator-color: var(--color-gray-300);
   --sidebar-flow-step-navigation-font-size: 14px;
   --sidebar-selected-bg-color: #DDEEFF;
   --sidebar-summary-font-size: 14px;
   --sidebar-title-font-size: 16px;
-  --sidebar-max-width: 400px;
   --summary-flow-step-label-font-size: 16px;
   --summary-subtitle-font-size: 16px;
   --summary-title-font-size: 32px;
   --summary-tooltip-box-shadow-color: rgba(0, 0, 0, 0.25);
-  --topbar-button-font-size: 14px;
-  --topbar-button-size: 45px;
   --topbar-title-font-size: 14px;
-  --dialog-title-font-size: 20px;
 }
 
 .App {
@@ -52,59 +41,23 @@
   display: none;
 }
 
-@media print {
-  .App {
-    grid-template-rows: 0px auto !important;
-    grid-template-columns: 0px auto !important;
-  }
-
-  .Topbar {
-    display: none !important;
-  }
-
-  .Sidebar {
-    display: none !important;
-  }
-
-  .Content {
-    overflow-y: visible !important;
-  }
-
-  .SummaryFlow {
-    grid-template-columns: repeat(7, min-content) !important;
-  }
-}
-
 .Topbar {
-  position: relative;
-  padding-right: var(--base-spacing);
   grid-area: topbar;
   display: flex;
   align-items: center;
   border-bottom: 1px solid var(--separator-color);
 }
 
-.TopbarButton {
-  height: var(--topbar-button-size);
-  min-width: var(--topbar-button-size);
+.Topbar__menu {
+  padding: var(--base-spacing);
   cursor: pointer;
   display: flex;
-  align-items: center;
-  justify-content: center;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
   -khtml-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-  cursor: pointer;
-  background: none;
-  color: inherit;
-  border: none;
-  font: inherit;
-  outline: inherit;
-  font-size: var(--topbar-button-font-size);
-  margin-right: var(--base-spacing);
 }
 
 .Topbar__logo {
@@ -115,7 +68,6 @@
 .Topbar__title {
   font-size: var(--topbar-title-font-size);
   font-weight: bold;
-  margin-right: var(--double-base-spacing);
 }
 
 .Content {
@@ -148,10 +100,6 @@
 .Sidebar {
   grid-area: sidebar;
   border-right: 1px solid var(--separator-color);
-  width: min-content;
-  max-width: var(--sidebar-max-width);
-  overflow-x: hidden;
-  overflow-y: auto;
 }
 .Sidebar a {
   color: var(--color-gray-800);
@@ -233,8 +181,6 @@
   grid-column: 2;
   margin: var(--half-base-spacing) 0px;
   justify-self: left;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
 }
 .SidebarFlowStep__label--navigation {
   font-size: var(--sidebar-flow-step-navigation-font-size);
@@ -277,14 +223,14 @@
 
 .SummarySectionHeader__content {
   margin: var(--base-spacing) 0px;
-  text-transform: uppercase;
 }
 
 .SummaryFlow {
   width: 100%;
+  max-width: max-content;
   display: grid;
   grid-auto-rows: min-content;
-  grid-template-columns: min-content min-content minmax(var(--min-text-width), 4fr) 1fr 1fr 1fr 1fr;
+  grid-template-columns: min-content min-content 4fr 1fr 1fr 1fr 1fr;
   align-items: center;
   margin: var(--base-spacing) 0px;
 }
@@ -320,24 +266,21 @@
 .SummaryFlowStep .FlowSegment {
   grid-column: 2;
 }
-.SummaryFlowStep .FlowStepThumbnail {
-  margin: var(--base-spacing) var(--half-base-spacing);
-}
 
-.FlowStepThumbnail {
+.SummaryFlowStep__screenshot {
   align-self: center;
   justify-self: center;
+  margin: var(--base-spacing) var(--half-base-spacing);
   object-fit: cover;
   object-position: top left;
+}
+.SummaryFlowStep__screenshot[src] {
   border: 1px solid var(--color-gray);
 }
 
 .SummaryFlowStep__label {
   grid-column: 3;
   margin: var(--half-base-spacing);
-  width: 100%;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
 }
 
 .SummaryFlowStep__mode {
@@ -348,8 +291,6 @@
   font-size: var(--summary-flow-step-label-font-size);
   color: var(--color-gray-800);
   text-decoration: underline;
-  width: 100%;
-  overflow-x: hidden;
 }
 
 .SummaryCategory__content {
@@ -373,7 +314,7 @@
   width: max-content;
   background-color: var(--report-background-color);
   border: 1px solid var(--color-gray-900);
-  border-radius: 3px;
+  border-radius: 5px;
   padding: var(--base-spacing);
   right: 0;
   box-shadow: 0px 4px 4px var(--summary-tooltip-box-shadow-color);
@@ -419,7 +360,6 @@
   justify-content: center;
   padding: var(--half-base-spacing);
   background-color: var(--color-gray-100);
-  color: var(--color-gray-700);
   border-top: 1px solid var(--color-gray-300);
   text-align: center;
 }
@@ -427,11 +367,6 @@
   justify-content: start;
   text-align: left;
 }
-.SummaryNavigationHeader__url > a {
-  color: inherit;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-}
 
 .SummaryFlowStep__separator {
   display: contents;
@@ -448,201 +383,3 @@
   margin: auto;
   background-color: var(--color-gray-700);
 }
-
-.Header {
-  display: grid;
-  grid-template-areas:
-    ".        .          .             current-tn    .             .          ."
-    "prev-seg prev-tn    prev-tn       current-tn    next-tn       next-tn    next-seg"
-    ".        prev-title .             current-tn    .             next-title ."
-    ".        prev-title current-title current-title current-title next-title .";
-  grid-template-rows: 1fr auto 1fr auto;
-  grid-template-columns: var(--header-margin) var(--header-adjacent-title-width) auto auto auto var(--header-adjacent-title-width) var(--header-margin);
-  align-items: center;
-  margin: var(--double-base-spacing) 0px;
-}
-.Header a {
-  color: var(--color-gray-800);
-}
-.Header > .Header__segment:first-child {
-  grid-area: prev-seg;
-}
-.Header > .Header__segment:last-child {
-  grid-area: next-seg;
-}
-
-.Header__prev-thumbnail {
-  display: flex;
-  align-items: center;
-  grid-area: prev-tn;
-}
-.Header__current-thumbnail {
-  display: flex;
-  align-items: center;
-  grid-area: current-tn;
-}
-.Header__next-thumbnail {
-  display: flex;
-  align-items: center;
-  grid-area: next-tn;
-}
-.Header__prev-thumbnail .Header__segment,
-.Header__next-thumbnail .Header__segment {
-  flex-grow: 1;
-}
-
-.Header__segment {
-  height: 2px;
-  background-color: var(--color-blue-A700);
-}
-
-.HeaderThumbnail {
-  position: relative;
-  display: flex;
-  margin: var(--base-spacing) 0px;
-}
-.HeaderThumbnail--main .FlowStepThumbnail {
-  border: 2px solid var(--color-blue-A700);
-}
-.HeaderThumbnail--prev .HeaderThumbnail__icon {
-  top: 50%;
-  left: 100%;
-}
-.HeaderThumbnail--next .HeaderThumbnail__icon {
-  top: 50%;
-  left: 0;
-}
-.HeaderThumbnail--main .HeaderThumbnail__icon {
-  top: 100%;
-  left: 50%;
-}
-
-.HeaderThumbnail__icon {
-  position: absolute;
-  display: flex;
-  padding: calc(var(--base-spacing) * 0.25);
-  background-color: var(--report-background-color);
-  border-radius: 50%;
-  transform: translate(-50%, -50%);
-  color: var(--color-blue-A700)
-}
-
-.Header__prev-title {
-  grid-area: prev-title;
-  text-align: left;
-}
-
-.Header__next-title {
-  grid-area: next-title;
-  text-align: right;
-  justify-self: end;
-}
-
-.Header__prev-title,
-.Header__next-title {
-  font-size: var(--header-adjacent-title-font-size);
-  align-self: start;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  width: 100%;
-}
-
-.Header__current-title {
-  grid-area: current-title;
-  text-align: center;
-  font-size: var(--header-current-title-font-size);
-  font-weight: bold;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-}
-
-.Header__current-description {
-  text-align: center;
-  font-size: var(--header-current-description-font-size);
-  font-weight: normal;
-}
-
-.HelpDialog {
-  position: absolute;
-  top: 100%;
-  right: var(--base-spacing);
-  z-index: 100;
-  max-width: 720px;
-
-  background: var(--color-white);
-  color: var(--color-gray-800);
-  border-radius: 3px;
-  border: 1px solid var(--dialog-border-color);
-  box-shadow: 0px 4px 12px var(--summary-tooltip-box-shadow-color);
-
-  padding: var(--base-spacing) calc(var(--base-spacing) * 1.5);
-}
-
-.HelpDialog__title {
-  display: flex;
-  align-items: center;
-
-  font-size: var(--dialog-title-font-size);
-  font-weight: bold;
-
-  margin-bottom: calc(var(--base-spacing) * 2);
-}
-
-.HelpDialog__close {
-  background: none;
-  border: none;
-  cursor: pointer;
-  line-height: 0;
-}
-
-.HelpDialog__columns {
-  display: grid;
-  grid-auto-flow: column;
-  grid-template-rows: repeat(4, auto);
-  grid-template-columns: repeat(3, 1fr);
-  grid-column-gap: var(--base-spacing);
-}
-
-.HelpDialogColumn {
-  display: contents;
-}
-
-.HelpDialogColumn__header-title {
-  font-size: var(--category-summary-font-size);
-  font-weight: bold;
-}
-
-.HelpDialogColumn__legend-label {
-  color: var(--color-blue-A700);
-  font-weight: bold;
-}
-
-.HelpDialogColumn ul {
-  padding-left: var(--base-spacing);
-}
-
-.HelpDialogColumn__use-cases p,
-.HelpDialogColumn__categories p {
-  font-weight: bold;
-  color: var(--color-gray-700);
-}
-
-.HelpDialogColumnTimeline {
-  display: flex;
-  align-items: center;
-
-  height: var(--double-base-spacing);
-  color: var(--color-blue-A700);
-  margin-right: calc(var(--base-spacing) * -1);
-}
-
-.HelpDialogColumn:last-child .HelpDialogColumnTimeline {
-  margin-right: 0;
-}
-
-.HelpDialogColumnTimeline__line {
-  height: 2px;
-  flex-grow: 1;
-
-  background: var(--color-blue-A700);
-}

package/flow-report/jest.config.js

@@ -4,7 +4,7 @@
  * 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.
  */
 
-export default {
+module.exports = {
   testEnvironment: 'node',
   preset: 'ts-jest',
   globalSetup: './test/setup/global-setup.ts',

package/flow-report/src/app.tsx

@@ -5,43 +5,23 @@
  */
 
 import {FunctionComponent} from 'preact';
-import {useEffect, useRef, useState} from 'preact/hooks';
+import {useState} from 'preact/hooks';
 
 import {ReportRendererProvider} from './wrappers/report-renderer';
 import {Sidebar} from './sidebar/sidebar';
 import {Summary} from './summary/summary';
-import {classNames, FlowResultContext, useCurrentLhr, useHashParam} from './util';
+import {classNames, FlowResultContext, useCurrentLhr} from './util';
 import {Report} from './wrappers/report';
 import {Topbar} from './topbar';
-import {Header} from './header';
-import {I18nProvider} from './i18n/i18n';
 
 const Content: FunctionComponent = () => {
   const currentLhr = useCurrentLhr();
-  const anchor = useHashParam('anchor');
-  const ref = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    if (anchor) {
-      const el = document.getElementById(anchor);
-      if (el) {
-        el.scrollIntoView({behavior: 'smooth'});
-        return;
-      }
-    }
-
-    // Scroll to top no anchor is found.
-    if (ref.current) ref.current.scrollTop = 0;
-  }, [anchor, currentLhr]);
 
   return (
-    <div ref={ref} className="Content">
+    <div className="Content">
       {
         currentLhr ?
-          <>
-            <Header currentLhr={currentLhr}/>
-            <Report currentLhr={currentLhr}/>
-          </> :
+          <Report/> :
           <Summary/>
       }
     </div>
@@ -53,13 +33,11 @@ export const App: FunctionComponent<{flowResult: LH.FlowResult}> = ({flowResult}
   return (
     <FlowResultContext.Provider value={flowResult}>
       <ReportRendererProvider>
-        <I18nProvider>
-          <div className={classNames('App', {'App--collapsed': collapsed})} data-testid="App">
-            <Topbar onMenuClick={() => setCollapsed(c => !c)} />
-            <Sidebar/>
-            <Content/>
-          </div>
-        </I18nProvider>
+        <div className={classNames('App', {'App--collapsed': collapsed})}>
+          <Topbar onMenuClick={() => setCollapsed(c => !c)} />
+          <Sidebar/>
+          <Content/>
+        </div>
       </ReportRendererProvider>
     </FlowResultContext.Provider>
   );

package/flow-report/src/common.tsx

@@ -5,106 +5,27 @@
  */
 
 import {FunctionComponent} from 'preact';
-import {useEffect, useState} from 'preact/hooks';
 
 import {NavigationIcon, SnapshotIcon, TimespanIcon} from './icons';
-import {getFilmstripFrames, getScreenDimensions, getScreenshot} from './util';
-
-const ANIMATION_FRAME_DURATION_MS = 250;
 
 export const Separator: FunctionComponent = () => {
   return <div className="Separator" role="separator"></div>;
 };
 
-export const FlowStepIcon: FunctionComponent<{mode: LH.Result.GatherMode}> = ({mode}) => {
-  return <>
-    {
-      mode === 'navigation' && <NavigationIcon/>
-    }
-    {
-      mode === 'timespan' && <TimespanIcon/>
-    }
-    {
-      mode === 'snapshot' && <SnapshotIcon/>
-    }
-  </>;
-};
-
 export const FlowSegment: FunctionComponent<{mode?: LH.Result.GatherMode}> = ({mode}) => {
   return (
     <div className="FlowSegment">
       <div className="FlowSegment__top-line"/>
       {
-        mode && <FlowStepIcon mode={mode}/>
+        mode === 'navigation' && <NavigationIcon/>
+      }
+      {
+        mode === 'timespan' && <TimespanIcon/>
+      }
+      {
+        mode === 'snapshot' && <SnapshotIcon/>
       }
       <div className="FlowSegment__bottom-line"/>
     </div>
   );
 };
-
-const FlowStepAnimatedThumbnail: FunctionComponent<{
-  frames: Array<{data: string}>,
-  width: number,
-  height: number,
-}> = ({frames, width, height}) => {
-  const [frameIndex, setFrameIndex] = useState(0);
-  // Handle a frame array of a different length being set.
-  const effectiveFrameIndex = frameIndex % frames.length;
-
-  useEffect(() => {
-    const interval = setInterval(
-      () => setFrameIndex(i => (i + 1) % frames.length),
-      ANIMATION_FRAME_DURATION_MS
-    );
-
-    return () => clearInterval(interval);
-  }, [frames.length]);
-
-  return (
-    <img
-      className="FlowStepThumbnail"
-      data-testid="FlowStepAnimatedThumbnail"
-      src={frames[effectiveFrameIndex].data}
-      style={{width, height}}
-      alt="Animated screenshots of a page tested by Lighthouse"
-    />
-  );
-};
-
-export const FlowStepThumbnail: FunctionComponent<{
-  reportResult: LH.ReportResult,
-  width?: number,
-  height?: number,
-}> = ({reportResult, width, height}) => {
-  const screenshot = getScreenshot(reportResult);
-  const frames = getFilmstripFrames(reportResult);
-
-  // Resize the image to fit the viewport aspect ratio.
-  const dimensions = getScreenDimensions(reportResult);
-  if (width && height === undefined) {
-    height = dimensions.height * width / dimensions.width;
-  } else if (height && width === undefined) {
-    width = dimensions.width * height / dimensions.height;
-  }
-
-  if (!width || !height) {
-    console.warn(new Error('FlowStepThumbnail requested without any dimensions').stack);
-    return <></>;
-  }
-
-  if (reportResult.gatherMode === 'timespan' && frames && frames.length) {
-    return <FlowStepAnimatedThumbnail frames={frames} width={width} height={height} />;
-  }
-
-  return <>
-    {
-      screenshot &&
-        <img
-          className="FlowStepThumbnail"
-          src={screenshot}
-          style={{width, height}}
-          alt="Screenshot of a page tested by Lighthouse"
-        />
-    }
-  </>;
-};

package/flow-report/src/icons.tsx

@@ -79,23 +79,6 @@ export const SnapshotIcon: FunctionComponent = () => {
   );
 };
 
-export const CloseIcon: FunctionComponent = () => {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      height="24px"
-      viewBox="0 0 24 24"
-      width="24px"
-      fill="currentColor"
-      role="img"
-      aria-label="Icon representing a close action"
-    >
-      <path d="M0 0h24v24H0V0z" fill="none" />
-      <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z" />
-    </svg>
-  );
-};
-
 export const EnvIcon: FunctionComponent = () => {
   return (
     <svg width="15" height="12" viewBox="0 0 15 12" fill="none" role="img">
@@ -115,9 +98,9 @@ export const CpuIcon: FunctionComponent = () => {
 export const HamburgerIcon: FunctionComponent = () => {
   return (
     <svg viewBox="0 0 18 12" width="18" height="12" role="img">
-      <rect width="18" height="2" fill="currentColor"></rect>
-      <rect y="5" width="18" height="2" fill="currentColor"></rect>
-      <rect y="10" width="18" height="2" fill="currentColor"></rect>
+      <rect width="18" height="2"></rect>
+      <rect y="5" width="18" height="2"></rect>
+      <rect y="10" width="18" height="2"></rect>
     </svg>
   );
 };

package/flow-report/src/sidebar/sidebar.tsx

@@ -5,17 +5,15 @@
  */
 
 import {FunctionComponent} from 'preact';
+import {useMemo} from 'preact/hooks';
 
 import {Separator} from '../common';
-import {useI18n, useUIStrings} from '../i18n/i18n';
 import {CpuIcon, EnvIcon, SummaryIcon} from '../icons';
-import {classNames, useCurrentLhr, useFlowResult} from '../util';
+import {classNames, useCurrentLhr, useFlowResult, useLocale} from '../util';
 import {SidebarFlow} from './flow';
 
 export const SidebarSummary: FunctionComponent = () => {
   const currentLhr = useCurrentLhr();
-  const strings = useUIStrings();
-
   const url = new URL(location.href);
   url.hash = '#';
   return (
@@ -27,14 +25,12 @@ export const SidebarSummary: FunctionComponent = () => {
       <div className="SidebarSummary__icon">
         <SummaryIcon/>
       </div>
-      <div className="SidebarSummary__label">{strings.summary}</div>
+      <div className="SidebarSummary__label">Summary</div>
     </a>
   );
 };
 
 const SidebarRuntimeSettings: FunctionComponent<{settings: LH.ConfigSettings}> = ({settings}) => {
-  const strings = useUIStrings();
-
   return (
     <div className="SidebarRuntimeSettings">
       <div className="SidebarRuntimeSettings__item">
@@ -42,7 +38,8 @@ const SidebarRuntimeSettings: FunctionComponent<{settings: LH.ConfigSettings}> =
           <EnvIcon/>
         </div>
         {
-          settings.formFactor === 'desktop' ? strings.desktop : strings.mobile
+          `${settings.formFactor === 'desktop' ? 'Desktop' : 'Mobile'} | ` +
+          `${settings.screenEmulation.height}x${settings.screenEmulation.width}px`
         }
       </div>
       <div className="SidebarRuntimeSettings__item">
@@ -58,11 +55,19 @@ const SidebarRuntimeSettings: FunctionComponent<{settings: LH.ConfigSettings}> =
 };
 
 export const SidebarHeader: FunctionComponent<{title: string, date: string}> = ({title, date}) => {
-  const i18n = useI18n();
+  const locale = useLocale();
+  const formatter = useMemo(() => {
+    const options: Intl.DateTimeFormatOptions = {
+      month: 'short', day: 'numeric', year: 'numeric',
+      hour: 'numeric', minute: 'numeric', timeZoneName: 'short',
+    };
+    return new Intl.DateTimeFormat(locale, options);
+  }, [locale]);
+  const dateString = useMemo(() => formatter.format(new Date(date)), [date, formatter]);
   return (
     <div className="SidebarHeader">
       <div className="SidebarHeader__title">{title}</div>
-      <div className="SidebarHeader__date">{i18n.formatDateTime(date)}</div>
+      <div className="SidebarHeader__date">{dateString}</div>
     </div>
   );
 };
@@ -72,7 +77,7 @@ export const Sidebar: FunctionComponent = () => {
   const firstLhr = flowResult.steps[0].lhr;
   return (
     <div className="Sidebar">
-      <SidebarHeader title={flowResult.name} date={firstLhr.fetchTime}/>
+      <SidebarHeader title="Lighthouse User Flow Report" date={firstLhr.fetchTime}/>
       <Separator/>
       <SidebarSummary/>
       <Separator/>