Skip to content

Commit 7d68521

Browse files
brendankennybrendankenny
authored
tests: update to typescript 3.9.7 (#11158)
1 parent 43042e1 commit 7d68521

File tree

72 files changed

+205
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+205
-194
lines changed

‎build/build-bundle.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const locales = fs.readdirSync(__dirname + '/../lighthouse-core/lib/i18n/locales
3535

3636
// HACK: manually include the lighthouse-plugin-publisher-ads audits.
3737
/** @type {Array<string>} */
38-
// @ts-ignore
38+
// @ts-expect-error
3939
const pubAdsAudits = require('lighthouse-plugin-publisher-ads/plugin.js').audits.map(a => a.path);
4040

4141
/** @param {string} file */
@@ -84,7 +84,7 @@ async function browserifyFile(entryPath, distPath) {
8484

8585
// Don't include locales in DevTools.
8686
if (isDevtools(entryPath)) {
87-
// @ts-ignore bundle.ignore does accept an array of strings.
87+
// @ts-expect-error bundle.ignore does accept an array of strings.
8888
bundle.ignore(locales);
8989
}
9090

@@ -171,7 +171,7 @@ async function cli(argv) {
171171
build(entryPath, distPath);
172172
}
173173

174-
// @ts-ignore Test if called from the CLI or as a module.
174+
// @ts-expect-error Test if called from the CLI or as a module.
175175
if (require.main === module) {
176176
cli(process.argv);
177177
} else {

‎clients/devtools-entry.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,25 @@ if (typeof module !== 'undefined' && module.exports) {
5959
// work for LH because of https://github.com/browserify/browserify/issues/968
6060
// Instead, since this file is only ever run in node for testing, expose a
6161
// bundle entry point as global.
62-
// @ts-ignore
62+
// @ts-expect-error
6363
global.runBundledLighthouse = lighthouse;
6464
}
6565

6666
// Expose only in DevTools' worker
67-
// @ts-ignore
6867
if (typeof self !== 'undefined') {
6968
// TODO: refactor and delete `global.isDevtools`.
7069
global.isDevtools = true;
7170

72-
// @ts-ignore
71+
// @ts-expect-error
7372
self.setUpWorkerConnection = setUpWorkerConnection;
74-
// @ts-ignore
73+
// @ts-expect-error
7574
self.runLighthouse = lighthouse;
76-
// @ts-ignore
75+
// @ts-expect-error
7776
self.createConfig = createConfig;
78-
// @ts-ignore
77+
// @ts-expect-error
7978
self.listenForStatus = listenForStatus;
80-
// @ts-ignore
79+
// @ts-expect-error
8180
self.registerLocaleData = registerLocaleData;
82-
// @ts-ignore
81+
// @ts-expect-error
8382
self.lookupLocale = lookupLocale;
8483
}

‎clients/devtools-report-assets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/* global Runtime */
1515

16-
// @ts-ignore: Runtime.cachedResources exists in Devtools. https://source.chromium.org/chromium/chromium/src/+/master:third_party/devtools-frontend/src/front_end/root/Runtime.js;l=1169
16+
// @ts-expect-error: Runtime.cachedResources exists in Devtools. https://source.chromium.org/chromium/chromium/src/+/master:third_party/devtools-frontend/src/front_end/root/Runtime.js;l=1169
1717
const cachedResources = Runtime.cachedResources;
1818

1919
// Getters are necessary because the DevTools bundling processes

‎clients/lightrider/lightrider-entry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ if (typeof module !== 'undefined' && module.exports) {
101101

102102
// Expose on window for browser-residing consumers of file.
103103
if (typeof window !== 'undefined') {
104-
// @ts-ignore
104+
// @ts-expect-error - not worth typing a property on `window`.
105105
window.runLighthouseInLR = runLighthouseInLR;
106106
}

‎lighthouse-cli/bin.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ async function begin() {
9696
cliFlags.outputPath = 'stdout';
9797
}
9898

99-
// @ts-ignore - deprecation message for removed disableDeviceEmulation; can remove warning in v6.
99+
// @ts-expect-error - deprecation message for removed disableDeviceEmulation; can remove warning in v6.
100100
if (cliFlags.disableDeviceEmulation) {
101101
log.warn('config', 'The "--disable-device-emulation" has been removed in v5.' +
102102
' Please use "--emulated-form-factor=none" instead.');
@@ -107,8 +107,8 @@ async function begin() {
107107
// copied over to LH.Settings.extraHeaders, which is LH.Crdp.Network.Headers. Force
108108
// the conversion here, but long term either the CLI flag or the setting should have
109109
// a different name.
110-
// @ts-ignore
111-
let extraHeadersStr = /** @type {string} */ (cliFlags.extraHeaders);
110+
/** @type {string} */
111+
let extraHeadersStr = cliFlags.extraHeaders;
112112
// If not a JSON object, assume it's a path to a JSON file.
113113
if (extraHeadersStr.substr(0, 1) !== '{') {
114114
extraHeadersStr = fs.readFileSync(extraHeadersStr, 'utf-8');

‎lighthouse-cli/cli-flags.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function flatten(arr) {
2727
* @return {LH.CliFlags}
2828
*/
2929
function getFlags(manualArgv) {
30-
// @ts-ignore yargs() is incorrectly typed as not accepting a single string.
30+
// @ts-expect-error yargs() is incorrectly typed as not accepting a single string.
3131
const y = manualArgv ? yargs(manualArgv) : yargs;
3232
// Intentionally left as type `any` because @types/yargs doesn't chain correctly.
3333
const argv = y.help('help')

‎lighthouse-cli/sentry-prompt.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function prompt() {
4040

4141
const timeoutPromise = new Promise((resolve) => {
4242
timeout = setTimeout(() => {
43-
// @ts-ignore Promise returned by prompt is decorated with `ui`
43+
// @ts-expect-error Promise returned by prompt is decorated with `ui`
4444
prompt.ui.close();
4545
process.stdout.write('\n');
4646
log.warn('CLI', 'No response to error logging preference, errors will not be reported.');

‎lighthouse-cli/test/cli/bin-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ describe('CLI bin', function() {
147147

148148
describe('extraHeaders', () => {
149149
it('should convert extra headers to object', async () => {
150-
// @ts-ignore - see TODO: in bin.js
150+
// @ts-expect-error - see TODO: in bin.js
151151
cliFlags = {...cliFlags, extraHeaders: '{"foo": "bar"}'};
152152
await bin.begin();
153153

@@ -156,7 +156,7 @@ describe('CLI bin', function() {
156156

157157
it('should read extra headers from file', async () => {
158158
const headersFile = require.resolve('../fixtures/extra-headers/valid.json');
159-
// @ts-ignore - see TODO: in bin.js
159+
// @ts-expect-error - see TODO: in bin.js
160160
cliFlags = {...cliFlags, extraHeaders: headersFile};
161161
await bin.begin();
162162

‎lighthouse-cli/test/cli/cli-flags-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ describe('CLI bin', function() {
1414
getFlags('chrome://version');
1515
const yargs = require('yargs');
1616

17-
// @ts-ignore - getGroups is private
17+
// @ts-expect-error - getGroups is private
1818
const optionGroups = yargs.getGroups();
1919
/** @type {string[]} */
2020
const allOptions = [];
2121
Object.keys(optionGroups).forEach(key => {
2222
allOptions.push(...optionGroups[key]);
2323
});
24-
// @ts-ignore - getUsageInstance is private
24+
// @ts-expect-error - getUsageInstance is private
2525
const optionsWithDescriptions = Object.keys(yargs.getUsageInstance().getDescriptions());
2626

2727
allOptions.forEach(opt => {

‎lighthouse-cli/test/smokehouse/lighthouse-runners/bundle.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ const ChromeLauncher = require('chrome-launcher');
1515
const ChromeProtocol = require('../../../../lighthouse-core/gather/connections/cri.js');
1616

1717
// Load bundle, which creates a `global.runBundledLighthouse`.
18-
// @ts-ignore - file won't exist until `yarn build-all`, but not used for types anyways.
18+
// @ts-ignore - file exists if `yarn build-all` is run, but not used for types anyways.
1919
require('../../../../dist/lighthouse-dt-bundle.js'); // eslint-disable-line
2020

2121
/** @type {import('../../../../lighthouse-core/index.js')} */
22-
// @ts-ignore - not worth giving test global an actual type.
22+
// @ts-expect-error - not worth giving test global an actual type.
2323
const lighthouse = global.runBundledLighthouse;
2424

2525
/**

‎lighthouse-cli/test/smokehouse/report-assert.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,9 @@ function isPlainObject(obj) {
277277
* @param {Comparison} assertion
278278
*/
279279
function reportAssertion(localConsole, assertion) {
280-
// @ts-ignore - this doesn't exist now but could one day, so try not to break the future
280+
// @ts-expect-error - this doesn't exist now but could one day, so try not to break the future
281281
const _toJSON = RegExp.prototype.toJSON;
282-
// @ts-ignore
282+
// @ts-expect-error
283283
// eslint-disable-next-line no-extend-native
284284
RegExp.prototype.toJSON = RegExp.prototype.toString;
285285

@@ -312,7 +312,7 @@ function reportAssertion(localConsole, assertion) {
312312
}
313313
}
314314

315-
// @ts-ignore
315+
// @ts-expect-error
316316
// eslint-disable-next-line no-extend-native
317317
RegExp.prototype.toJSON = _toJSON;
318318
}

‎lighthouse-core/audits/byte-efficiency/offscreen-images.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class OffscreenImages extends ByteEfficiencyAudit {
215215
// Filter out images that were loaded after all CPU activity
216216
items = context.settings.throttlingMethod === 'simulate' ?
217217
OffscreenImages.filterLanternResults(unfilteredResults, lanternInteractive) :
218-
// @ts-ignore - .timestamp will exist if throttlingMethod isn't lantern
218+
// @ts-expect-error - .timestamp will exist if throttlingMethod isn't lantern
219219
OffscreenImages.filterObservedResults(unfilteredResults, interactive.timestamp);
220220
} catch (err) {
221221
// if the error is during a Lantern run, end of trace may also be inaccurate, so rethrow

‎lighthouse-core/audits/byte-efficiency/render-blocking-resources.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,14 @@ class RenderBlockingResources extends Audit {
135135
const wastedCssBytes = await RenderBlockingResources.computeWastedCSSBytes(artifacts, context);
136136

137137
const metricSettings = {throttlingMethod: 'simulate'};
138+
139+
/** @type {LH.Artifacts.MetricComputationData} */
140+
// @ts-expect-error - TODO(bckenny): allow optional `throttling` settings
138141
const metricComputationData = {trace, devtoolsLog, simulator, settings: metricSettings};
139-
// @ts-ignore - TODO(bckenny): allow optional `throttling` settings
140-
const fcpSimulation = await FirstContentfulPaint.request(metricComputationData, context);
142+
143+
// Cast to just `LanternMetric` since we explicitly set `throttlingMethod: 'simulate'`.
144+
const fcpSimulation = /** @type {LH.Artifacts.LanternMetric} */
145+
(await FirstContentfulPaint.request(metricComputationData, context));
141146
const fcpTsInMs = traceOfTab.timestamps.firstContentfulPaint / 1000;
142147

143148
const nodesByUrl = getNodesAndTimingByUrl(fcpSimulation.optimisticEstimate.nodeTimings);

‎lighthouse-core/audits/font-display.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class FontDisplay extends Audit {
8383

8484
// Finally convert the raw font URLs to the absolute URLs and add them to the set.
8585
const relativeURLs = rawFontURLs
86-
// @ts-ignore - guaranteed to match from previous regex, pull URL group out
86+
// @ts-expect-error - guaranteed to match from previous regex, pull URL group out
8787
.map(s => s.match(CSS_URL_REGEX)[1].trim())
8888
.map(s => {
8989
// remove any quotes surrounding the URL

‎lighthouse-core/audits/predictive-perf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class PredictivePerf extends Audit {
4646
const trace = artifacts.traces[Audit.DEFAULT_PASS];
4747
const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
4848
/** @type {LH.Config.Settings} */
49-
// @ts-ignore - TODO(bckenny): allow optional `throttling` settings
49+
// @ts-expect-error - TODO(bckenny): allow optional `throttling` settings
5050
const settings = {}; // Use default settings.
5151
const fcp = await LanternFcp.request({trace, devtoolsLog, settings}, context);
5252
const fmp = await LanternFmp.request({trace, devtoolsLog, settings}, context);

‎lighthouse-core/audits/screenshot-thumbnails.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class ScreenshotThumbnails extends Audit {
105105
const targetTimestamp = speedline.beginning + timelineEnd * i / NUMBER_OF_THUMBNAILS;
106106

107107
/** @type {SpeedlineFrame} */
108-
// @ts-ignore - there will always be at least one frame by this point. TODO: use nonnullable assertion in TS2.9
108+
// @ts-expect-error - there will always be at least one frame by this point. TODO: use nonnullable assertion in TS2.9
109109
let frameForTimestamp = null;
110110
if (i === NUMBER_OF_THUMBNAILS) {
111111
frameForTimestamp = analyzedFrames[analyzedFrames.length - 1];

‎lighthouse-core/audits/seo/hreflang.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
3838
* @return {Array<string>}
3939
*/
4040
function importValidLangs() {
41-
// @ts-ignore - global switcheroo to load axe valid-langs
41+
// @ts-expect-error - global switcheroo to load axe valid-langs
4242
const axeCache = global.axe;
43-
// @ts-ignore
43+
// @ts-expect-error
4444
global.axe = {utils: {}};
45-
// @ts-ignore
45+
// @ts-expect-error
4646
require('axe-core/lib/core/utils/valid-langs.js');
47-
// @ts-ignore
47+
// @ts-expect-error
4848
const validLangs = global.axe.utils.validLangs();
49-
// @ts-ignore
49+
// @ts-expect-error
5050
global.axe = axeCache;
5151

5252
return validLangs;

‎lighthouse-core/audits/uses-rel-preload.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class UsesRelPreloadAudit extends Audit {
172172
// Once we've modified the dependencies, simulate the new graph with flexible ordering.
173173
const simulationAfterChanges = simulator.simulate(modifiedGraph, {flexibleOrdering: true});
174174
const originalNodesByRecord = Array.from(simulationBeforeChanges.nodeTimings.keys())
175-
// @ts-ignore we don't care if all nodes without a record collect on `undefined`
175+
// @ts-expect-error we don't care if all nodes without a record collect on `undefined`
176176
.reduce((map, node) => map.set(node.record, node), new Map());
177177

178178
const results = [];

‎lighthouse-core/computed/js-bundles.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ function computeGeneratedFileSizes(map, content) {
2626
// denotes nothing is mapped.
2727
const failureResult = {files: {}, unmappedBytes, totalBytes};
2828

29-
// @ts-ignore: This function is added in SDK.js. This will eventually be added to CDT.
29+
// @ts-expect-error: This function is added in SDK.js. This will eventually be added to CDT.
3030
map.computeLastGeneratedColumns();
3131

3232
for (const mapping of map.mappings()) {
3333
const source = mapping.sourceURL;
3434
const lineNum = mapping.lineNumber;
3535
const colNum = mapping.columnNumber;
36-
// @ts-ignore: `lastColumnNumber` is not on types yet. This will eventually be added to CDT.
36+
// @ts-expect-error: `lastColumnNumber` is not on types yet. This will eventually be added to CDT.
3737
const lastColNum = /** @type {number=} */ (mapping.lastColumnNumber);
3838

3939
// Webpack sometimes emits null mappings.
@@ -99,7 +99,7 @@ class JSBundles {
9999

100100
const compiledUrl = SourceMap.scriptUrl || 'compiled.js';
101101
const mapUrl = SourceMap.sourceMapUrl || 'compiled.js.map';
102-
// @ts-ignore: CDT expects undefined properties to be explicit.
102+
// Hack: CDT expects undefined properties to be explicit.
103103
const rawMapForCdt = /** @type {any} */ (rawMap);
104104
const map = new SDK.TextSourceMap(compiledUrl, mapUrl, rawMapForCdt);
105105

‎lighthouse-core/computed/page-dependency-graph.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,12 @@ class PageDependencyGraph {
253253

254254
switch (evt.name) {
255255
case 'TimerInstall':
256-
// @ts-ignore - 'TimerInstall' event means timerId exists.
256+
// @ts-expect-error - 'TimerInstall' event means timerId exists.
257257
timers.set(evt.args.data.timerId, node);
258258
stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
259259
break;
260260
case 'TimerFire': {
261-
// @ts-ignore - 'TimerFire' event means timerId exists.
261+
// @ts-expect-error - 'TimerFire' event means timerId exists.
262262
const installer = timers.get(evt.args.data.timerId);
263263
if (!installer || installer.endTime > node.startTime) break;
264264
installer.addDependent(node);
@@ -273,37 +273,37 @@ class PageDependencyGraph {
273273

274274
case 'EvaluateScript':
275275
addDependencyOnFrame(node, evt.args.data.frame);
276-
// @ts-ignore - 'EvaluateScript' event means argsUrl is defined.
276+
// @ts-expect-error - 'EvaluateScript' event means argsUrl is defined.
277277
addDependencyOnUrl(node, argsUrl);
278278
stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
279279
break;
280280

281281
case 'XHRReadyStateChange':
282282
// Only create the dependency if the request was completed
283-
// @ts-ignore - 'XHRReadyStateChange' event means readyState is defined.
283+
// 'XHRReadyStateChange' event means readyState is defined.
284284
if (evt.args.data.readyState !== 4) break;
285285

286-
// @ts-ignore - 'XHRReadyStateChange' event means argsUrl is defined.
286+
// @ts-expect-error - 'XHRReadyStateChange' event means argsUrl is defined.
287287
addDependencyOnUrl(node, argsUrl);
288288
stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
289289
break;
290290

291291
case 'FunctionCall':
292292
case 'v8.compile':
293293
addDependencyOnFrame(node, evt.args.data.frame);
294-
// @ts-ignore - events mean argsUrl is defined.
294+
// @ts-expect-error - events mean argsUrl is defined.
295295
addDependencyOnUrl(node, argsUrl);
296296
break;
297297

298298
case 'ParseAuthorStyleSheet':
299299
addDependencyOnFrame(node, evt.args.data.frame);
300-
// @ts-ignore - 'ParseAuthorStyleSheet' event means styleSheetUrl is defined.
300+
// @ts-expect-error - 'ParseAuthorStyleSheet' event means styleSheetUrl is defined.
301301
addDependencyOnUrl(node, evt.args.data.styleSheetUrl);
302302
break;
303303

304304
case 'ResourceSendRequest':
305305
addDependencyOnFrame(node, evt.args.data.frame);
306-
// @ts-ignore - 'ResourceSendRequest' event means requestId is defined.
306+
// @ts-expect-error - 'ResourceSendRequest' event means requestId is defined.
307307
addDependentNetworkRequest(node, evt.args.data.requestId);
308308
stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
309309
break;
@@ -432,7 +432,7 @@ class PageDependencyGraph {
432432
const length = Math.ceil((node.endTime - node.startTime) / timePerCharacter);
433433
const bar = padRight('', offset) + padRight('', length, '=');
434434

435-
// @ts-ignore -- disambiguate displayName from across possible Node types.
435+
// @ts-expect-error -- disambiguate displayName from across possible Node types.
436436
const displayName = node.record ? node.record.url : node.type;
437437
// eslint-disable-next-line
438438
console.log(padRight(bar, widthInCharacters), `| ${displayName.slice(0, 30)}`);

‎lighthouse-core/computed/unused-javascript-summary.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ class UnusedJavascriptSummary {
121121
return retVal;
122122
});
123123

124-
// @ts-ignore: We will upstream computeLastGeneratedColumns to CDT eventually.
124+
// @ts-expect-error: We will upstream computeLastGeneratedColumns to CDT eventually.
125125
bundle.map.computeLastGeneratedColumns();
126126
for (const mapping of bundle.map.mappings()) {
127127
let offset = lineOffsets[mapping.lineNumber];
128128

129129
offset += mapping.columnNumber;
130130
const lastColumnOfMapping =
131-
// @ts-ignore: We will upstream lastColumnNumber to CDT eventually.
131+
// @ts-expect-error: We will upstream lastColumnNumber to CDT eventually.
132132
(mapping.lastColumnNumber - 1) || lineLengths[mapping.lineNumber];
133133
for (let i = mapping.columnNumber; i <= lastColumnOfMapping; i++) {
134134
if (wasteData.every(data => data.unusedByIndex[offset] === 1)) {

0 commit comments

Comments
 (0)