Pre-fix for packages bump

When updating the packages in package.json some new issue were found.
I fix them in this CL to split them up.

Bug: none.
Change-Id: I8339de288a2816679867fcfe4791e33ce92abc44
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6764815
Commit-Queue: Nikolay Vitkov <nvitkov@chromium.org>
Reviewed-by: Danil Somsikov <dsv@chromium.org>
Auto-Submit: Nikolay Vitkov <nvitkov@chromium.org>
Commit-Queue: Danil Somsikov <dsv@chromium.org>

Author: Lightning00Blade

front_end/panels/media/MainView.test.ts

@@ -27,7 +27,7 @@ describeWithMockConnection('MediaMainView', () => {
       inScope: boolean) => async () => {
     SDK.TargetManager.TargetManager.instance().setScopeTarget(inScope ? target : null);
     const downloadStore = new Media.MainView.PlayerDataDownloadManager();
-    const expectedCall = sinon.stub(downloadStore, expectedMethod).returns();
+    const expectedCall = sinon.stub(downloadStore, expectedMethod);
     const mainView = new Media.MainView.MainView(downloadStore);
     renderElementIntoDOM(mainView);
     const model = target.model(Media.MediaModel.MediaModel);

front_end/panels/sources/SourcesView.test.ts

@@ -149,7 +149,7 @@ describeWithEnvironment('SourcesView', () => {
       const uiSourceCodeFrame = widget;
 
       // Skip creating the DebuggerPlugin, which times out and simulate DOM attach/showing.
-      sinon.stub(uiSourceCodeFrame, 'loadPlugins' as keyof typeof uiSourceCodeFrame).callsFake(() => {});
+      sinon.stub(uiSourceCodeFrame, 'loadPlugins' as keyof typeof uiSourceCodeFrame);
       uiSourceCodeFrame.wasShown();
 
       await contentLoadedPromise;

test/shared/screenshots.ts

@@ -68,7 +68,10 @@ const DEFAULT_MS_BETWEEN_RETRIES = 150;
 const DEFAULT_SCREENSHOT_THRESHOLD_PERCENT = 0.1;
 
 export const assertElementScreenshotUnchanged = async (
-    element: puppeteer.ElementHandle|null, fileName: string, options: Partial<puppeteer.ScreenshotOptions> = {}) => {
+    element: puppeteer.ElementHandle|null,
+    fileName: NonNullable<puppeteer.ScreenshotOptions['path']>,
+    options: Partial<puppeteer.ScreenshotOptions> = {},
+    ) => {
   if (!element) {
     assert.fail(`Given element for test ${fileName} was not found.`);
   }
@@ -95,8 +98,8 @@ function getFrontend() {
 }
 
 const assertScreenshotUnchangedWithRetries = async (
-    elementOrPage: puppeteer.ElementHandle|puppeteer.Page, fileName: string, maximumDiffThreshold: number,
-    maximumRetries: number, options: Partial<puppeteer.ScreenshotOptions> = {}) => {
+    elementOrPage: puppeteer.ElementHandle|puppeteer.Page, fileName: NonNullable<puppeteer.ScreenshotOptions['path']>,
+    maximumDiffThreshold: number, maximumRetries: number, options: Partial<puppeteer.ScreenshotOptions> = {}) => {
   const frontend = getFrontend();
   try {
     await frontend?.evaluate(() => window.dispatchEvent(new Event('hidecomponentdocsui')));
@@ -107,7 +110,8 @@ const assertScreenshotUnchangedWithRetries = async (
      */
     const fileNameForPlatform = fileName.split('/').join(path.sep);
     const goldenScreenshotPath = path.join(GOLDENS_FOLDER, fileNameForPlatform);
-    const generatedScreenshotPath = path.join(generatedScreenshotFolder, fileNameForPlatform);
+    const generatedScreenshotPath =
+        path.join(generatedScreenshotFolder, fileNameForPlatform) as NonNullable<puppeteer.ScreenshotOptions['path']>;
 
     /**
      * Ensure that the directories for the golden/generated file exist. We need
@@ -133,7 +137,7 @@ const assertScreenshotUnchangedWithRetries = async (
 
 interface ScreenshotAssertionOptions {
   goldenScreenshotPath: string;
-  generatedScreenshotPath: string;
+  generatedScreenshotPath: NonNullable<puppeteer.ScreenshotOptions['path']>;
   screenshotOptions: Partial<puppeteer.ScreenshotOptions>;
   elementOrPage: puppeteer.ElementHandle|puppeteer.Page;
   fileName: string;
@@ -153,7 +157,7 @@ const assertScreenshotUnchanged = async (options: ScreenshotAssertionOptions) =>
     retryCount = 1,
   } = options;
   const screenshotOptions = {...defaultScreenshotOpts, ...options.screenshotOptions, path: generatedScreenshotPath};
-  await (elementOrPage as puppeteer.Page).screenshot(screenshotOptions);
+  await elementOrPage.screenshot(screenshotOptions);
 
   /**
    * The user can do UPDATE_GOLDEN=accordion/basic.png npm run screenshotstest

test/unit/karma.conf.ts

@@ -5,7 +5,7 @@
 /* eslint @typescript-eslint/no-explicit-any: 0 */
 
 import * as path from 'path';
-import type {Page, Target} from 'puppeteer-core';
+import type {Page, ScreenshotOptions, Target} from 'puppeteer-core';
 import puppeteer from 'puppeteer-core';
 
 import {formatAsPatch, resultAssertionsDiff, ResultsDBReporter} from '../../test/conductor/karma-resultsdb-reporter.js';
@@ -59,23 +59,28 @@ const CustomChrome = function(this: any, _baseBrowserDecorator: unknown, args: B
     const page = await browser.newPage();
 
     async function setupBindings(page: Page) {
-      await page.exposeFunction('assertScreenshot', async (elementSelector: string, filename: string) => {
-        try {
-          // Karma sometimes runs tests in an iframe or in the main frame.
-          const testFrame = page.frames()[1] ?? page.mainFrame();
-          const element = await testFrame.waitForSelector(elementSelector);
-
-          await assertElementScreenshotUnchanged(element, filename, {
-            captureBeyondViewport: false,
+      await page.exposeFunction(
+          'assertScreenshot',
+          async (
+              elementSelector: string,
+              filename: NonNullable<ScreenshotOptions['path']>,
+              ) => {
+            try {
+              // Karma sometimes runs tests in an iframe or in the main frame.
+              const testFrame = page.frames()[1] ?? page.mainFrame();
+              const element = await testFrame.waitForSelector(elementSelector);
+
+              await assertElementScreenshotUnchanged(element, filename, {
+                captureBeyondViewport: false,
+              });
+              return undefined;
+            } catch (error) {
+              if (error instanceof ScreenshotError) {
+                ScreenshotError.errors.push(error);
+              }
+              return `ScreenshotError: ${error.message}`;
+            }
           });
-          return undefined;
-        } catch (error) {
-          if (error instanceof ScreenshotError) {
-            ScreenshotError.errors.push(error);
-          }
-          return `ScreenshotError: ${error.message}`;
-        }
-      });
     }
 
     async function disableAnimations(page: Page) {