diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index 977138a2..68681f3e 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -18,8 +18,8 @@ export class HistoryView extends ItemView {
 	>();
 
 	public constructor(
-		leaf: WorkspaceLeaf,
-		private readonly client: SyncClient
+		private readonly client: SyncClient,
+		leaf: WorkspaceLeaf
 	) {
 		super(leaf);
 		this.icon = HistoryView.ICON;
diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 2b5a803d..8a193c3e 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -12,7 +12,16 @@ module.exports = (env, argv) => ({
 		ignored: "**/node_modules"
 	},
 	externals: {
-		obsidian: "commonjs obsidian"
+		obsidian: "commonjs obsidian",
+		electron: "commonjs electron",
+		"@codemirror/autocomplete": "commonjs @codemirror/autocomplete",
+		"@codemirror/collab": "commonjs @codemirror/collab",
+		"@codemirror/commands": "commonjs @codemirror/commands",
+		"@codemirror/language": "commonjs @codemirror/language",
+		"@codemirror/lint": "commonjs @codemirror/lint",
+		"@codemirror/search": "commonjs @codemirror/search",
+		"@codemirror/state": "commonjs @codemirror/state",
+		"@codemirror/view": "commonjs @codemirror/view"
 	},
 	optimization: {
 		minimizer: [
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 1498fbfa..57d99f14 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -9,7 +9,7 @@ import type { Logger } from "../tracing/logger";
 import PQueue from "p-queue";
 import { hash } from "../utils/hash";
 import { v4 as uuidv4 } from "uuid";
-import type { components } from "../services/types";
+import type { components } from "../services/types/http-api";
 import type { Settings, SyncSettings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
 import { findMatchingFile } from "../utils/find-matching-file";
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index b9780939..76470120 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -17,7 +17,7 @@ import type {
 } from "../tracing/sync-history";
 import { SyncStatus, SyncType } from "../tracing/sync-history";
 import { EMPTY_HASH, hash } from "../utils/hash";
-import type { components } from "../services/types";
+import type { components } from "../services/types/http-api";
 import { deserialize } from "../utils/deserialize";
 import type { Settings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";