Remove `-util` suffix from modules in src/sidebar/util

Fix a naming inconsistency for modules in src/sidebar/util where some
had a `-util` suffix and some did not.

src/sidebar/components/hypothesis-app.js

@@ -6,7 +6,7 @@ const serviceConfig = require('../service-config');
 const bridgeEvents = require('../../shared/bridge-events');
 const uiConstants = require('../ui-constants');
 const isSidebar = require('../util/is-sidebar');
-const { shouldAutoDisplayTutorial } = require('../util/session-util');
+const { shouldAutoDisplayTutorial } = require('../util/session');
 
 /**
  * Return the user's authentication status from their profile.

src/sidebar/components/selection-tabs.js

@@ -6,7 +6,7 @@ const { createElement } = require('preact');
 const { Fragment } = require('preact');
 
 const NewNoteBtn = require('./new-note-btn');
-const sessionUtil = require('../util/session-util');
+const sessionUtil = require('../util/session');
 const uiConstants = require('../ui-constants');
 const useStore = require('../store/use-store');
 const { withServices } = require('../util/service-context');

src/sidebar/components/test/hypothesis-app-test.js

@@ -49,7 +49,7 @@ describe('sidebar.components.hypothesis-app', function() {
     hypothesisApp.$imports.$mock({
       '../util/is-sidebar': fakeIsSidebar,
       '../service-config': fakeServiceConfig,
-      '../util/session-util': {
+      '../util/session': {
         shouldAutoDisplayTutorial: fakeShouldAutoDisplayTutorial,
       },
     });

src/sidebar/services/api.js

@@ -3,7 +3,7 @@
 const get = require('lodash.get');
 const queryString = require('query-string');
 
-const { replaceURLParams } = require('../util/url-util');
+const { replaceURLParams } = require('../util/url');
 
 /**
  * Translate the response from a failed API call into an Error-like object.

src/sidebar/services/groups.js

@@ -14,7 +14,7 @@ const DEFAULT_ORGANIZATION = {
 };
 
 const events = require('../events');
-const { awaitStateChange } = require('../util/state-util');
+const { awaitStateChange } = require('../util/state');
 const { combineGroups } = require('../util/groups');
 const serviceConfig = require('../service-config');
 

src/sidebar/services/oauth-auth.js

 'use strict';
 
 const events = require('../events');
-const resolve = require('../util/url-util').resolve;
+const resolve = require('../util/url').resolve;
 const serviceConfig = require('../service-config');
 
 /**

src/sidebar/services/service-url.js

 'use strict';
 
-const urlUtil = require('../util/url-util');
+const urlUtil = require('../util/url');
 
 /**
  * A function that returns an absolute URL given a link name and params, by

src/sidebar/services/test/service-url-test.js

@@ -21,7 +21,7 @@ function createServiceUrl(linksPromise) {
     .returns({ url: 'EXPANDED_URL', params: {} });
 
   serviceUrlFactory.$imports.$mock({
-    '../util/url-util': { replaceURLParams: replaceURLParams },
+    '../util/url': { replaceURLParams: replaceURLParams },
   });
 
   const store = fakeStore();

src/sidebar/store/modules/annotations.js

@@ -7,7 +7,7 @@
 
 const { createSelector } = require('reselect');
 
-const arrayUtil = require('../../util/array-util');
+const arrayUtil = require('../../util/array');
 const metadata = require('../../util/annotation-metadata');
 const uiConstants = require('../../ui-constants');
 

src/sidebar/store/modules/selection.js

@@ -19,9 +19,9 @@
 const { createSelector } = require('reselect');
 const immutable = require('seamless-immutable');
 
-const arrayUtil = require('../../util/array-util');
+const arrayUtil = require('../../util/array');
 const metadata = require('../../util/annotation-metadata');
-const toSet = require('../../util/array-util').toSet;
+const toSet = require('../../util/array').toSet;
 const uiConstants = require('../../ui-constants');
 
 const util = require('../util');

src/sidebar/util/test/session-util-test.js → src/sidebar/util/test/session-test.js

 'use strict';
 
-const sessionUtil = require('../session-util');
+const sessionUtil = require('../session');
 
-describe('sidebar.util.session-util', () => {
+describe('sidebar/util/session', () => {
   describe('#shouldShowSidebarTutorial', () => {
     it('shows sidebar tutorial if the settings object has the show_sidebar_tutorial key set', function() {
       const sessionState = {

src/sidebar/util/test/state-util-test.js → src/sidebar/util/test/state-test.js

 'use strict';
 
 const fakeStore = require('../../test/fake-redux-store');
-const stateUtil = require('../state-util');
+const stateUtil = require('../state');
 
-describe('state-util', function() {
+describe('sidebar/util/state', function() {
   let store;
 
   beforeEach(function() {

src/sidebar/util/test/url-util-test.js → src/sidebar/util/test/url-test.js

 'use strict';
 
-const urlUtil = require('../url-util');
+const urlUtil = require('../url');
 
-describe('url-util', function() {
+describe('sidebar/util/url', function() {
   describe('replaceURLParams()', function() {
     it('should replace params in URLs', function() {
       const replaced = urlUtil.replaceURLParams('http://foo.com/things/:id', {