Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

misc(treemap): add placeholder, gist and file upload features #12511

Merged
merged 20 commits into from
May 20, 2021
Merged

misc(treemap): add placeholder, gist and file upload features #12511

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6872f93
wip
connorjclark May 19, 2021
d9ecc0d
uhhh
connorjclark May 19, 2021
45e953a
fix test
connorjclark May 19, 2021
46e599b
update
connorjclark May 19, 2021
f6e7eea
Update lighthouse-viewer/app/src/lighthouse-report-viewer.js
connorjclark May 19, 2021
a0e2122
pr
connorjclark May 19, 2021
c828f3e
update
connorjclark May 19, 2021
9b1faed
update
connorjclark May 19, 2021
95f90ce
umd
connorjclark May 19, 2021
697f2c5
types
connorjclark May 19, 2021
1ba79ce
lolhtml
connorjclark May 19, 2021
7b1198b
types
connorjclark May 19, 2021
4797825
fix
connorjclark May 20, 2021
6b5aca6
morefix
connorjclark May 20, 2021
396fa06
Merge remote-tracking branch 'origin/master' into treemap-appify
connorjclark May 20, 2021
0e5e9fe
oops
connorjclark May 20, 2021
8c6e56e
pr
connorjclark May 20, 2021
0332c86
Update lighthouse-treemap/app/styles/treemap.css
connorjclark May 20, 2021
df55b1e
fixtest
connorjclark May 20, 2021
316613b
Update build/build-treemap.js
connorjclark May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions build/build-treemap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/
'use strict';

/** @typedef {import('../lighthouse-core/lib/i18n/locales').LhlMessages} LhlMessages */

const fs = require('fs');
const GhPagesApp = require('./gh-pages-app.js');

Expand All @@ -15,8 +17,11 @@ const GhPagesApp = require('./gh-pages-app.js');
*/
function buildStrings() {
const locales = require('../lighthouse-core/lib/i18n/locales.js');
const UIStrings = require('../lighthouse-treemap/app/src/util.js').UIStrings;
const strings = /** @type {import('../lighthouse-treemap/types/treemap').Strings} */ ({});
const UIStrings = require(
// Prevent tsc from evaluating util.js
connorjclark marked this conversation as resolved.
Show resolved Hide resolved
'' + '../lighthouse-treemap/app/src/util.js'
).UIStrings;
const strings = /** @type {Record<LH.Locale, LhlMessages>} */ ({});

for (const [locale, lhlMessages] of Object.entries(locales)) {
const localizedStrings = Object.fromEntries(
Expand Down Expand Up @@ -49,17 +54,24 @@ async function run() {
],
javascripts: [
/* eslint-disable max-len */
fs.readFileSync(require.resolve('idb-keyval/dist/idb-keyval-min.js'), 'utf8'),
fs.readFileSync(require.resolve('event-target-shim/umd'), 'utf8'),
fs.readFileSync(require.resolve('webtreemap-cdt'), 'utf8'),
fs.readFileSync(require.resolve('tabulator-tables/dist/js/tabulator_core.js'), 'utf8'),
fs.readFileSync(require.resolve('tabulator-tables/dist/js/modules/sort.js'), 'utf8'),
fs.readFileSync(require.resolve('tabulator-tables/dist/js/modules/format.js'), 'utf8'),
fs.readFileSync(require.resolve('tabulator-tables/dist/js/modules/resize_columns.js'), 'utf8'),
/* eslint-enable max-len */
buildStrings(),
{path: '../../lighthouse-core/report/html/renderer/logger.js'},
{path: '../../lighthouse-core/report/html/renderer/i18n.js'},
{path: '../../lighthouse-viewer/app/src/drag-and-drop.js'},
{path: '../../lighthouse-viewer/app/src/github-api.js'},
{path: '../../lighthouse-viewer/app/src/firebase-auth.js'},
{path: 'src/**/*'},
],
assets: [
{path: 'images/**/*'},
{path: 'debug.json'},
],
});
Expand Down
4 changes: 2 additions & 2 deletions lighthouse-core/lib/i18n/i18n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/
'use strict';

/** @typedef {import('../../lib/i18n/locales').LhlMessages} LhlMessages */

const path = require('path');
const MessageFormat = require('intl-messageformat').default;
const lookupClosestLocale = require('lookup-closest-locale');
Expand Down Expand Up @@ -508,8 +510,6 @@ function replaceIcuMessages(inputObject, locale) {
return icuMessagePaths;
}

/** @typedef {import('./locales').LhlMessages} LhlMessages */

/**
* Populate the i18n string lookup dict with locale data
* Used when the host environment selects the locale and serves lighthouse the intended locale file
Expand Down
4 changes: 2 additions & 2 deletions lighthouse-core/scripts/i18n/count-translated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
*/
'use strict';

/** @typedef {import('../../lib/i18n/locales').LhlMessages} LhlMessages */

const fs = require('fs');
const glob = require('glob');

/** @typedef {import('../../lib/i18n/locales.js').LhlMessages} LhlMessages */

const lhRoot = `${__dirname}/../../../`;
const enUsLhlFilename = lhRoot + 'lighthouse-core/lib/i18n/locales/en-US.json';
/** @type {LhlMessages} */
Expand Down
Binary file added lighthouse-treemap/app/images/lh_favicon_32px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lighthouse-treemap/app/images/lh_favicon_76px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
116 changes: 116 additions & 0 deletions lighthouse-treemap/app/images/lighthouse-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lighthouse-treemap/app/images/lighthouse-logo_512px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 25 additions & 1 deletion lighthouse-treemap/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,29 @@
</head>

<body class="vars">
<main class="lh-main lh-main--show-table">
<div class="drop_zone"></div>

<div class="treemap-placeholder">
<div class="treemap-placeholder-inner">
<div>
<img src="images/lighthouse-logo.svg" class="treemap-placeholder-logo" alt="Lighthouse logo">
</div>
<div>
<h1 class="treemap-placeholder__heading">Lighthouse Treemap</h1>
<div class="treemap-placeholder__help">To view a treemap: Paste the Lighthouse result json or a Gist URL.<br>
You can also drag 'n drop the file or click here to select it.<br><br>
</div>
<input type="url" class="treemap-placeholder__url js-gist-url"
placeholder="Enter or paste Gist URL">
</div>
</div>
</div>

<div id="lh-log"></div>

<input id="hidden-file-input" type="file" hidden accept="application/json">

<main class="hidden lh-main lh-main--show-table">
<div class="lh-settings">
<header>
<div class="lh-header--section">
Expand Down Expand Up @@ -85,6 +107,8 @@
</div>
</main>

<script src="https://www.gstatic.com/firebasejs/4.1.2/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/4.1.2/firebase-auth.js"></script>
<script src="src/bundled.js"></script>

<!-- Global site tag (gtag.js) - Google Analytics -->
Expand Down
Loading