Update to frontend-shared 8.16

package.json

@@ -14,7 +14,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.16.7",
     "@hypothesis/frontend-build": "^3.0.0",
-    "@hypothesis/frontend-shared": "^8.13.0",
+    "@hypothesis/frontend-shared": "^8.16.0",
     "@hypothesis/frontend-testing": "^1.3.1",
     "@npmcli/arborist": "^9.0.0",
     "@octokit/rest": "^21.0.0",

src/annotator/bucket-bar-client.ts

@@ -1,4 +1,5 @@
-import { ListenerCollection } from '../shared/listener-collection';
+import { ListenerCollection } from '@hypothesis/frontend-shared';
+
 import type { PortRPC } from '../shared/messaging';
 import type { Anchor, Destroyable } from '../types/annotator';
 import type {

src/annotator/guest.ts

@@ -1,6 +1,6 @@
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 import { TinyEmitter } from 'tiny-emitter';
 
-import { ListenerCollection } from '../shared/listener-collection';
 import { PortFinder, PortRPC } from '../shared/messaging';
 import { generateHexString } from '../shared/random';
 import { matchShortcut } from '../shared/shortcut';

src/annotator/integrations/image-text-layer.ts

@@ -1,7 +1,7 @@
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 import debounce from 'lodash.debounce';
 import type { DebouncedFunction } from 'lodash.debounce';
 
-import { ListenerCollection } from '../../shared/listener-collection';
 import {
   rectCenter,
   rectsOverlapHorizontally,

src/annotator/integrations/pdf.tsx

@@ -1,7 +1,7 @@
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 import debounce from 'lodash.debounce';
 import { TinyEmitter } from 'tiny-emitter';
 
-import { ListenerCollection } from '../../shared/listener-collection';
 import type {
   Anchor,
   AnnotationData,

src/annotator/integrations/vitalsource.ts

@@ -1,7 +1,7 @@
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 import { TinyEmitter } from 'tiny-emitter';
 
 import { documentCFI, stripCFIAssertions } from '../../shared/cfi';
-import { ListenerCollection } from '../../shared/listener-collection';
 import type {
   Anchor,
   AnnotationData,

src/annotator/selection-observer.ts

@@ -1,4 +1,5 @@
-import { ListenerCollection } from '../shared/listener-collection';
+import { ListenerCollection } from '@hypothesis/frontend-shared';
+
 import { selectedRange } from './range-util';
 
 /**

src/annotator/sidebar.tsx

@@ -1,10 +1,10 @@
 import type { ToastMessage } from '@hypothesis/frontend-shared';
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 import classnames from 'classnames';
 import { render } from 'preact';
 
 import { addConfigFragment } from '../shared/config-fragment';
 import { sendErrorsTo } from '../shared/frame-error-capture';
-import { ListenerCollection } from '../shared/listener-collection';
 import { PortRPC } from '../shared/messaging';
 import type {
   AnchorPosition,

src/annotator/util/drag-handler.tsx

@@ -1,4 +1,5 @@
-import { ListenerCollection } from '../../shared/listener-collection';
+import { ListenerCollection } from '@hypothesis/frontend-shared';
+
 import type { Destroyable } from '../../types/annotator';
 
 /**

src/annotator/util/navigation-observer.ts

@@ -1,5 +1,5 @@
 /* global Navigation */
-import { ListenerCollection } from '../../shared/listener-collection';
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 
 /**
  * Monkey-patch an object to observe calls to a method.

src/shared/messaging/port-finder.ts

@@ -1,5 +1,6 @@
+import { ListenerCollection } from '@hypothesis/frontend-shared';
+
 import type { Destroyable } from '../../types/annotator';
-import { ListenerCollection } from '../listener-collection';
 import { generateHexString } from '../random';
 import { isMessage } from './port-util';
 import type { Frame } from './port-util';

src/shared/messaging/port-provider.ts

@@ -1,8 +1,8 @@
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 import { TinyEmitter } from 'tiny-emitter';
 
 import type { Destroyable } from '../../types/annotator';
 import { captureErrors, sendError } from '../frame-error-capture';
-import { ListenerCollection } from '../listener-collection';
 import { isMessage, isMessageEqual, isSourceWindow } from './port-util';
 import type { Message } from './port-util';
 

src/shared/messaging/port-rpc.ts

@@ -1,5 +1,6 @@
+import { ListenerCollection } from '@hypothesis/frontend-shared';
+
 import type { Destroyable } from '../../types/annotator';
-import { ListenerCollection } from '../listener-collection';
 
 /*
   This module was adapted from `index.js` in https://github.com/substack/frame-rpc.

src/shared/test/integration/messaging-test.js

@@ -1,6 +1,6 @@
+import { ListenerCollection as ListenerCollection_ } from '@hypothesis/frontend-shared';
 import { delay } from '@hypothesis/frontend-testing';
 
-import { ListenerCollection as ListenerCollection_ } from '../../listener-collection';
 import {
   PortFinder as PortFinder_,
   PortProvider as PortProvider_,

src/sidebar/components/ThreadList.tsx

@@ -1,8 +1,8 @@
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 import classnames from 'classnames';
 import debounce from 'lodash.debounce';
 import { useEffect, useLayoutEffect, useMemo, useState } from 'preact/hooks';
 
-import { ListenerCollection } from '../../shared/listener-collection';
 import type { Annotation, EPUBContentSelector } from '../../types/api';
 import type { Thread } from '../helpers/build-thread';
 import {

src/sidebar/services/frame-sync.ts

@@ -1,9 +1,9 @@
 import type { ToastMessage } from '@hypothesis/frontend-shared';
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 import debounce from 'lodash.debounce';
 import type { DebouncedFunction } from 'lodash.debounce';
 import shallowEqual from 'shallowequal';
 
-import { ListenerCollection } from '../../shared/listener-collection';
 import {
   PortFinder,
   PortRPC,

src/sidebar/util/observe-element-size.ts

@@ -1,4 +1,4 @@
-import { ListenerCollection } from '../../shared/listener-collection';
+import { ListenerCollection } from '@hypothesis/frontend-shared';
 
 /**
  * Watch for changes in the size (`clientWidth` and `clientHeight`) of

yarn.lock

@@ -2228,15 +2228,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hypothesis/frontend-shared@npm:^8.13.0":
-  version: 8.15.0
-  resolution: "@hypothesis/frontend-shared@npm:8.15.0"
+"@hypothesis/frontend-shared@npm:^8.16.0":
+  version: 8.16.0
+  resolution: "@hypothesis/frontend-shared@npm:8.16.0"
   dependencies:
     highlight.js: ^11.6.0
     wouter-preact: ^3.0.0
   peerDependencies:
     preact: ^10.25.1
-  checksum: 7489c92e3f0887a01ad541983a097e717fb57155bbaea1c83caaf26476c98f17061e4b195331b8a800790a523ed801e0fe93c0aa65b58d6918bdaca932691b79
+  checksum: 3eaebe55fed28cae226405a2d847020d9ecfa3991a0628a4df1b09b8133455151172467824abad20b704f22c55b66c0e11ec0083571987ecc348d10f03d27bd5
   languageName: node
   linkType: hard
 
@@ -8705,7 +8705,7 @@ __metadata:
     "@babel/preset-react": ^7.0.0
     "@babel/preset-typescript": ^7.16.7
     "@hypothesis/frontend-build": ^3.0.0
-    "@hypothesis/frontend-shared": ^8.13.0
+    "@hypothesis/frontend-shared": ^8.16.0
     "@hypothesis/frontend-testing": ^1.3.1
     "@npmcli/arborist": ^9.0.0
     "@octokit/rest": ^21.0.0