backport fixes from PR#10452 missing in merge e839b63

openstreetmap · Oct 16, 2024 · b4e55c2 · b4e55c2
1 parent 108893c
commit b4e55c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modules/globals.d.ts b/modules/globals.d.ts
@@ -2,7 +2,7 @@ import type { FetchMockStatic } from 'fetch-mock';
 
 declare global {
   declare var iD: typeof import('.');
-  declare var d3: import('d3');
+  declare var d3: typeof import('d3');
   declare var fetchMock: FetchMockStatic;
   declare var before: typeof beforeEach;
   declare var after: typeof afterEach;

diff --git a/test/spec_helpers.mts b/test/spec_helpers.mts
@@ -131,10 +131,11 @@ cached.deprecated = [];
 // Initializing `coreContext` initializes `_uploader`, which tries loading:
 cached.discarded = {};
 
+// @ts-expect-error
 window.d3 = iD.d3; // Remove this if we can avoid exporting all of d3.js
 
 // @ts-expect-error
-delete window.PointerEvent; // force the browser to use mouse events
+delete window.PointerEvent;  // force the browser to use mouse events
 
 // some sticky fallbacks
 const capabilities = `<?xml version="1.0" encoding="UTF-8"?>