Place `$imports` in the same import line

src/boot/test/boot-test.js

-import { bootHypothesisClient, bootSidebarApp } from '../boot';
-import { $imports } from '../boot';
+import { bootHypothesisClient, bootSidebarApp, $imports } from '../boot';
 
 function assetUrl(url) {
   return `https://marginal.ly/client/build/${url}`;

src/sidebar/components/Annotation/test/AnnotationActionBar-test.js

 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import AnnotationActionBar from '../AnnotationActionBar';
-import { $imports } from '../AnnotationActionBar';
+import AnnotationActionBar, { $imports } from '../AnnotationActionBar';
 
 import * as fixtures from '../../../test/annotation-fixtures';
 

src/sidebar/components/hooks/test/use-filter-options-test.js

 import { mount } from 'enzyme';
 
-import { useUserFilterOptions } from '../use-filter-options';
-import { $imports } from '../use-filter-options';
+import { useUserFilterOptions, $imports } from '../use-filter-options';
 
 describe('sidebar/components/hooks/use-user-filter-options', () => {
   let fakeAccountId;

src/sidebar/components/test/AutocompletList-test.js

 import { mount } from 'enzyme';
 
-import AutocompleteList from '../AutocompleteList';
-import { $imports } from '../AutocompleteList';
+import AutocompleteList, { $imports } from '../AutocompleteList';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/Excerpt-test.js

 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import Excerpt from '../Excerpt';
-import { $imports } from '../Excerpt';
+import Excerpt, { $imports } from '../Excerpt';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 

src/sidebar/components/test/FilterSelect-test.js

 import { mount } from 'enzyme';
 
-import FilterSelect from '../FilterSelect';
-import { $imports } from '../FilterSelect';
+import FilterSelect, { $imports } from '../FilterSelect';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 

src/sidebar/components/test/HelpPanel-test.js

 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import HelpPanel from '../HelpPanel';
-import { $imports } from '../HelpPanel';
+import HelpPanel, { $imports } from '../HelpPanel';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/LoggedOutMessage-test.js

 import { mount } from 'enzyme';
 
-import LoggedOutMessage from '../LoggedOutMessage';
-import { $imports } from '../LoggedOutMessage';
+import LoggedOutMessage, { $imports } from '../LoggedOutMessage';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/LoginPromptPanel-test.js

 import { mount } from 'enzyme';
 
-import LoginPromptPanel from '../LoginPromptPanel';
-import { $imports } from '../LoginPromptPanel';
+import LoginPromptPanel, { $imports } from '../LoginPromptPanel';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/MarkdownEditor-test.js

@@ -3,8 +3,7 @@ import { render } from 'preact';
 import { act } from 'preact/test-utils';
 
 import { LinkType } from '../../markdown-commands';
-import MarkdownEditor from '../MarkdownEditor';
-import { $imports } from '../MarkdownEditor';
+import MarkdownEditor, { $imports } from '../MarkdownEditor';
 
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';
 import { checkAccessibility } from '../../../test-util/accessibility';

src/sidebar/components/test/MenuKeyboardNavigation-test.js

 import { mount } from 'enzyme';
 
-import MenuKeyboardNavigation from '../MenuKeyboardNavigation';
-import { $imports } from '../MenuKeyboardNavigation';
+import MenuKeyboardNavigation, { $imports } from '../MenuKeyboardNavigation';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/ModerationBanner-test.js

 import { mount } from 'enzyme';
 
 import * as fixtures from '../../test/annotation-fixtures';
-import ModerationBanner from '../ModerationBanner';
-import { $imports } from '../ModerationBanner';
+import ModerationBanner, { $imports } from '../ModerationBanner';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/NotebookResultCount-test.js

@@ -2,8 +2,7 @@ import { mount } from 'enzyme';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 
-import NotebookResultCount from '../NotebookResultCount';
-import { $imports } from '../NotebookResultCount';
+import NotebookResultCount, { $imports } from '../NotebookResultCount';
 
 describe('NotebookResultCount', () => {
   let fakeCountVisible;

src/sidebar/components/test/SelectionTabs-test.js

 import { mount } from 'enzyme';
 
-import SelectionTabs from '../SelectionTabs';
-import { $imports } from '../SelectionTabs';
+import SelectionTabs, { $imports } from '../SelectionTabs';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/ShareLinks-test.js

 import { mount } from 'enzyme';
 
-import ShareLinks from '../ShareLinks';
-import { $imports } from '../ShareLinks';
+import ShareLinks, { $imports } from '../ShareLinks';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/SidebarPanel-test.js

 import { mount } from 'enzyme';
 
-import SidebarPanel from '../SidebarPanel';
-import { $imports } from '../SidebarPanel';
+import SidebarPanel, { $imports } from '../SidebarPanel';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/StreamSearchInput-test.js

 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import StreamSearchInput from '../StreamSearchInput';
-import { $imports } from '../StreamSearchInput';
+import StreamSearchInput, { $imports } from '../StreamSearchInput';
 
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';
 

src/sidebar/components/test/TagList-test.js

 import { mount } from 'enzyme';
 
-import TagList from '../TagList';
-import { $imports } from '../TagList';
+import TagList, { $imports } from '../TagList';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/ThreadCard-test.js

 import { mount } from 'enzyme';
 
-import ThreadCard from '../ThreadCard';
-import { $imports } from '../ThreadCard';
+import ThreadCard, { $imports } from '../ThreadCard';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/components/test/Tutorial-test.js

 import { mount } from 'enzyme';
 
-import Tutorial from '../Tutorial';
-import { $imports } from '../Tutorial';
+import Tutorial, { $imports } from '../Tutorial';
 
 import { checkAccessibility } from '../../../test-util/accessibility';
 import { mockImportedComponents } from '../../../test-util/mock-imported-components';

src/sidebar/helpers/test/is-third-party-service-test.js

-import { isThirdPartyService } from '../is-third-party-service';
-import { $imports } from '../is-third-party-service';
+import { isThirdPartyService, $imports } from '../is-third-party-service';
 
 describe('sidebar/helpers/is-third-party-service', () => {
   let fakeServiceConfig;