diff --git a/client/src/www/app/cordova_main.ts b/client/src/www/app/cordova_main.ts
index e7fbdb73449..a6c2a587855 100644
--- a/client/src/www/app/cordova_main.ts
+++ b/client/src/www/app/cordova_main.ts
@@ -18,10 +18,8 @@
 import '@babel/polyfill';
 import 'web-animations-js/web-animations-next-lite.min.js';
 import '@webcomponents/webcomponentsjs/webcomponents-bundle.js';
-
 import {setRootPath} from '@polymer/polymer/lib/utils/settings.js';
 setRootPath(location.pathname.substring(0, location.pathname.lastIndexOf('/') + 1));
-
 import * as Sentry from '@sentry/browser';
 
 import {AbstractClipboard} from './clipboard';
diff --git a/client/src/www/views/contact_view/index.ts b/client/src/www/views/contact_view/index.ts
index 17f14202115..fba24450551 100644
--- a/client/src/www/views/contact_view/index.ts
+++ b/client/src/www/views/contact_view/index.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import {SingleSelectedEvent} from '@material/mwc-list/mwc-list';
+import {Radio} from '@material/mwc-radio';
 import {html, css, LitElement, TemplateResult, nothing} from 'lit';
 import {customElement, property, state} from 'lit/decorators.js';
 import {Ref, createRef, ref} from 'lit/directives/ref.js';
@@ -22,8 +24,6 @@ import '@material/mwc-circular-progress';
 import '@material/mwc-radio';
 import '@material/mwc-select';
 import '@material/mwc-formfield';
-import {Radio} from '@material/mwc-radio';
-import {SingleSelectedEvent} from '@material/mwc-list/mwc-list';
 
 import './support_form';
 import {AppType} from './app_type';
diff --git a/client/src/www/views/contact_view/support_form/index.ts b/client/src/www/views/contact_view/support_form/index.ts
index e2cd52e7cc6..e2c499b286c 100644
--- a/client/src/www/views/contact_view/support_form/index.ts
+++ b/client/src/www/views/contact_view/support_form/index.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import {SelectedDetail} from '@material/mwc-menu/mwc-menu-base';
+import {TextField} from '@material/mwc-textfield';
 import {html, css, LitElement, TemplateResult, nothing, PropertyValues} from 'lit';
 import {customElement, property, state} from 'lit/decorators.js';
 import {live} from 'lit/directives/live.js';
@@ -26,9 +28,6 @@ import '@material/mwc-textfield';
 import {Localizer} from '../../../../../infrastructure/i18n';
 import {AppType} from '../app_type';
 
-import {TextField} from '@material/mwc-textfield';
-import {SelectedDetail} from '@material/mwc-menu/mwc-menu-base';
-
 type FormControl = HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
 
 /** Interface for tracking form data. */
diff --git a/package.json b/package.json
index 8aae0e741ed..01c033aa8fb 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "clean": "npm run clean --workspaces && rm -rf output node_modules third_party/jsign/*.jar && go run github.com/go-task/task/v3/cmd/task clean",
     "format:all": "prettier --write \"**/*.{cjs,mjs,html,js,json,md,ts}\"",
     "format": "pretty-quick --staged --pattern \"**/*.{cjs,mjs,html,js,json,md,ts}\"",
-    "lint:ts": "eslint --ext ts,mjs client/src",
+    "lint:ts": "eslint --ext ts,mjs .",
     "lint": "npm run lint:ts",
     "reset": "npm run clean && npm ci"
   },