diff --git a/src/imports/background/data-sources.js b/src/imports/background/data-sources.js index 9821ca38ef..58e32e1e94 100644 --- a/src/imports/background/data-sources.js +++ b/src/imports/background/data-sources.js @@ -9,7 +9,6 @@ import { startOfDay, WEEK_IN_MS, } from '@worldbrain/memex-common/lib/utils/date-time' -import { browser } from 'webextension-polyfill-ts' const getDirNestedCollectionName = (dirNode) => { const parentCollectionName = dirNode.collectionName ?? '' diff --git a/src/imports/background/index.ts b/src/imports/background/index.ts index 2de0d25e32..5cb1298370 100644 --- a/src/imports/background/index.ts +++ b/src/imports/background/index.ts @@ -6,7 +6,7 @@ import TagsBackground from 'src/tags/background' import CustomListBackground from 'src/custom-lists/background' import { PageIndexingBackground } from 'src/page-indexing/background' import BookmarksBackground from 'src/bookmarks/background' -import type { Runtime, Storage } from 'webextension-polyfill-ts' +import type { Runtime, Storage } from 'webextension-polyfill' // Constants export const importStateStorageKey = 'import_items' diff --git a/src/imports/background/progress-manager.test.ts b/src/imports/background/progress-manager.test.ts index 17c2135b0c..b78a11c525 100644 --- a/src/imports/background/progress-manager.test.ts +++ b/src/imports/background/progress-manager.test.ts @@ -8,7 +8,8 @@ import Processor from './item-processor' import * as urlLists from './url-list.test.data' import initData, { TestData, diff } from './state-manager.test.data' -import { browser } from 'webextension-polyfill-ts' +import browser from 'webextension-polyfill' +import { Browser } from 'webextension-polyfill' jest.mock('src/blacklist/background/interface') jest.mock('src/activity-logger') @@ -24,7 +25,7 @@ const runSuite = (DATA: TestData, skip = false) => () => { const dataSources = new DataSources({ history: DATA.history as any, bookmarks: DATA.bookmarks as any, - browserAPIs: browser, + browserAPIs: browser as Browser, }) const itemCreator = new ItemCreator({ @@ -33,6 +34,7 @@ const runSuite = (DATA: TestData, skip = false) => () => { histKeys: new Set(), bmKeys: new Set(), }), + browserAPIs: browser as Browser, }) stateManager = new ImportStateManager({ storageManager: null, diff --git a/src/imports/background/state-manager.test.ts b/src/imports/background/state-manager.test.ts index 7ee045b7f4..6b7fb5791a 100644 --- a/src/imports/background/state-manager.test.ts +++ b/src/imports/background/state-manager.test.ts @@ -7,7 +7,8 @@ import { ImportItem } from './types' import * as urlLists from './url-list.test.data' import initData, { TestData, diff } from './state-manager.test.data' -import { browser } from 'webextension-polyfill-ts' +import browser from 'webextension-polyfill' +import { Browser } from 'webextension-polyfill' type ForEachChunkCb = ( values: [string, ImportItem][], @@ -27,10 +28,11 @@ const runSuite = (DATA: TestData) => () => { const dataSources = new DataSources({ history: DATA.history as any, bookmarks: DATA.bookmarks as any, - browserAPIs: browser, + browserAPIs: browser as Browser, }) const itemCreator = new ItemCreator({ + browserAPIs: browser as Browser, dataSources, existingKeySource: async () => ({ histKeys: new Set(), @@ -60,6 +62,7 @@ const runSuite = (DATA: TestData) => () => { histKeys: new Set(), bmKeys: new Set(), }), + browserAPIs: browser as Browser, }) const localState = new State({ itemCreator,