diff --git a/.eslintrc.js b/.eslintrc.cjs
similarity index 93%
rename from .eslintrc.js
rename to .eslintrc.cjs
index 0e89b915..22262e30 100644
--- a/.eslintrc.js
+++ b/.eslintrc.cjs
@@ -1,5 +1,7 @@
+/** @type {import('eslint').Linter.Config} */
 module.exports = {
 	root: true,
+	ignorePatterns: ["**/dist/*", "**/out/*", "**/out.*/*"],
 	parserOptions: {
 		parser: "@typescript-eslint/parser"
 	},
@@ -26,6 +28,7 @@ module.exports = {
 		"@typescript-eslint/prefer-as-const": ["error"],
 		"no-restricted-globals": ["error", "$"],
 		"no-restricted-imports": ["error", "vue/types/umd"],
+		"vue/multi-word-component-names": ["off"],
 
 		"constructor-super": ["error"],
 		"for-direction": ["error"],
@@ -82,7 +85,9 @@ module.exports = {
 	},
 	"settings": {
 		"import/resolver": {
-			"typescript": {}
+			"typescript": {
+				"project": "*/tsconfig.json",
+			}
 		},
 	}
 };
\ No newline at end of file
diff --git a/frontend/build.js b/frontend/build.js
index c7e444b6..0d63caa5 100644
--- a/frontend/build.js
+++ b/frontend/build.js
@@ -16,6 +16,7 @@ export const paths = {
     manifest: `${dist}/manifest.json`,
 };
 
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export async function serve(inlineConfig = {}) {
     return await createServer({
         root,
diff --git a/package.json b/package.json
index db63aec2..155973e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "facilmap-root",
   "private": true,
+  "type": "module",
   "workspaces": [
     "types",
     "client",
@@ -10,7 +11,7 @@
     "server"
   ],
   "scripts": {
-    "lint": "eslint **/*.ts",
+    "lint": "eslint --ext .js,.mjs,.cjs,.ts,.mts,.cts,.vue ./",
     "clean": "yarn workspaces foreach -v run clean",
     "build": "yarn workspaces foreach -vt run build",
     "build:frontend:app": "yarn workspace facilmap-frontend run build:app",
@@ -21,6 +22,7 @@
     "check-types": "yarn workspaces foreach -vt run check-types"
   },
   "devDependencies": {
+    "@types/eslint": "^8.56.0",
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
     "eslint": "^8.56.0",
diff --git a/server/src/database/helpers.ts b/server/src/database/helpers.ts
index 899a2857..144e2cd8 100644
--- a/server/src/database/helpers.ts
+++ b/server/src/database/helpers.ts
@@ -322,7 +322,7 @@ export default class DatabaseHelpers {
 				Sequelize.where(
 					Sequelize.fn("ST_MakeLine", Sequelize.fn("St_Point", bbox.left, bbox.bottom), Sequelize.fn("St_Point", bbox.right, bbox.top)),
 					"~",
-					 Sequelize.col(posField))
+					Sequelize.col(posField))
 			);
 		} else {
 			conditions.push(
diff --git a/server/src/database/migrations.ts b/server/src/database/migrations.ts
index d7bd0604..2b34e253 100644
--- a/server/src/database/migrations.ts
+++ b/server/src/database/migrations.ts
@@ -422,7 +422,7 @@ export default class DatabaseMigrations {
 	}
 
 	/** Clear "Untitled marker", "Untitled line" and "New FacilMap" names. These are now rendered in the frontend instead. */
-	async _untitledMigration() {
+	async _untitledMigration(): Promise<void> {
 		if(await this._db.meta.getMeta("untitledMigrationCompleted") == "1")
 			return;
 
diff --git a/yarn.lock b/yarn.lock
index 36c7f709..1757b7f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -885,7 +885,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:^1.0.0":
+"@types/eslint@npm:^8.56.0":
+  version: 8.56.0
+  resolution: "@types/eslint@npm:8.56.0"
+  dependencies:
+    "@types/estree": "*"
+    "@types/json-schema": "*"
+  checksum: 8eca14c1ca8a4dbbcbf6bed67775db9dd2f9947802d6da39fa0c4c297a1e5465e898332232bb51980586a9a45b1b21bc13fd79fcc81adcd4c86062372e9bab6d
+  languageName: node
+  linkType: hard
+
+"@types/estree@npm:*, @types/estree@npm:^1.0.0":
   version: 1.0.5
   resolution: "@types/estree@npm:1.0.5"
   checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a
@@ -973,7 +983,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:^7.0.12":
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12":
   version: 7.0.15
   resolution: "@types/json-schema@npm:7.0.15"
   checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98
@@ -3470,6 +3480,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "facilmap-root@workspace:."
   dependencies:
+    "@types/eslint": ^8.56.0
     "@typescript-eslint/eslint-plugin": ^6.16.0
     "@typescript-eslint/parser": ^6.16.0
     eslint: ^8.56.0