Follow-ups after Vitest 4 upgrade (internal-7845)

GitOrigin-RevId: 1a7b11bf6e75d6b00557f541cdb59aa95e74aaaa

Author: underoot

package-lock.json

@@ -65,7 +65,6 @@
     "@types/offscreencanvas": "^2019.7.3",
     "@typescript-eslint/eslint-plugin": "^8.48.1",
     "@typescript-eslint/parser": "^8.48.1",
-    "@vitest/browser": "^4.0.6",
     "@vitest/browser-playwright": "^4.0.6",
     "@vitest/ui": "^4.0.6",
     "address": "^2.0.3",

package.json

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import-x/extensions
-import {server} from '@vitest/browser/context';
+import {server} from 'vitest/browser';
 import ignoresAll from '../../ignores/all.js';
 import ignoreWindowsChrome from '../../ignores/windows-chrome.js';
 import ignoreMacChrome from '../../ignores/mac-chrome.js';

test/integration/query-tests/index.test.ts

@@ -1,5 +1,4 @@
-// eslint-disable-next-line import-x/extensions
-import {server} from '@vitest/browser/context';
+import {server} from 'vitest/browser';
 import {test, assert, afterEach, afterAll} from 'vitest';
 import ignoresAll from '../../ignores/all.js';
 import ignoreWindowsChrome from '../../ignores/windows-chrome.js';
@@ -14,8 +13,6 @@ import {getStatsHTML, updateHTML} from '../../util/html_generator';
 import {mapboxgl} from '../lib/mapboxgl.js';
 import {sendFragment} from '../lib/utils';
 
-const errors = [];
-
 function getEnvironmentParams() {
     let timeout = 30000;
     if (import.meta.env.VITE_CI === 'true') {
@@ -100,7 +97,6 @@ type TestMetadata = {
     name: string;
     minDiff: number;
     status: string;
-    errors: Error[];
     actual?: string;
     expected?: string;
     expectedPath?: string;
@@ -109,7 +105,7 @@ type TestMetadata = {
 
 let reportFragment: string | undefined;
 
-const getTest = (renderTestName) => async () => {
+const getTest = (renderTestName: string) => async () => {
     let errorMessage: string | undefined;
     try {
         const renderTest = integrationTests[renderTestName];
@@ -136,7 +132,6 @@ const getTest = (renderTestName) => async () => {
             name: renderTestName,
             minDiff: Math.round(100000 * minDiff) / 100000,
             status: pass ? 'passed' : 'failed',
-            errors
         };
 
         if (minDiffImage && expectedIndex !== -1 && (import.meta.env.VITE_CI === 'false' || !pass)) {
@@ -169,7 +164,6 @@ const getTest = (renderTestName) => async () => {
             name: renderTestName,
             status: 'failed',
             error,
-            errors: []
         });
 
         errorMessage = `Render test ${renderTestName} failed with error: ${error}`;

test/integration/render-tests/index.test.ts

@@ -1,5 +1,5 @@
 import Pbf from 'pbf';
-import {server, page} from '@vitest/browser/context';
+import {server, page} from 'vitest/browser';
 import pixelmatch from 'pixelmatch';
 import {describe, test, expect, afterEach, afterAll, onTestFailed, onTestFinished} from 'vitest';
 import {readIconSet} from '../../src/data/usvg/usvg_pb_decoder';

test/usvg/usvg.test.ts

@@ -34,17 +34,6 @@ const generateResultHTML = template(`
             <pre><%- r.error.stack %></pre>
           </p>
       <% } %>
-      <% if (r.errors && r.errors.length !== 0) { %>
-          <p style="color: red">
-            <strong>Errors:</strong>
-            <dl>
-                <% r.errors.forEach(function(error) { %>
-                    <dt><%- error.message %></dt>
-                    <dd><pre><%- error.stack %></pre></dd>
-                <% }); %>
-            </dl>
-          </p>
-      <% } %>
     </div>
   </div>
 `);

test/util/html_generator.ts

@@ -1,4 +1,4 @@
-import {server} from '@vitest/browser/context';
+import {server} from 'vitest/browser';
 
 export async function readArrayBuffer(path: string) {
     const data = await server.commands.readFile(path, 'binary');