diff --git a/.github/workflows/compile.yaml b/.github/workflows/compile.yaml
index cab64f35..de4ff29b 100644
--- a/.github/workflows/compile.yaml
+++ b/.github/workflows/compile.yaml
@@ -1,6 +1,12 @@
 name: Compile
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
diff --git a/client/package-lock.json b/client/package-lock.json
index f08015f0..f5a09885 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1379,32 +1379,32 @@
       "dev": true
     },
     "vscode-jsonrpc": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-      "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
+      "version": "6.0.0-next.7",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz",
+      "integrity": "sha512-1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug=="
     },
     "vscode-languageclient": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz",
-      "integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==",
+      "version": "7.0.0-next.14",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.14.tgz",
+      "integrity": "sha512-QUccfXK2F6AXXRFR8QJCaIz7N2BhJK6ok8E1aO8LHq2IBU33+5hTSJBXs7nEqrqZ/cY2VlDDbMWtMvCxz+/y1w==",
       "requires": {
         "semver": "^6.3.0",
-        "vscode-languageserver-protocol": "^3.15.3"
+        "vscode-languageserver-protocol": "3.16.0-next.11"
       }
     },
     "vscode-languageserver-protocol": {
-      "version": "3.15.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
-      "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+      "version": "3.16.0-next.11",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.11.tgz",
+      "integrity": "sha512-31FmupmSmfznuMuGp7qN6h3d/hKUbexbvcwTvrUE/igqRlzFU542s8MtGICx1ERbVuDOLGp96W2Z92qbUbmBPA==",
       "requires": {
-        "vscode-jsonrpc": "^5.0.1",
-        "vscode-languageserver-types": "3.15.1"
+        "vscode-jsonrpc": "6.0.0-next.7",
+        "vscode-languageserver-types": "3.16.0-next.5"
       }
     },
     "vscode-languageserver-types": {
-      "version": "3.15.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-      "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+      "version": "3.16.0-next.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.5.tgz",
+      "integrity": "sha512-lf8Y1XXMtF1r2oDDAmJe+drizNXkybSRXAQQk5dPy2rYJsY9SPXYNO074L3THu9zNYepzV5fRJZUPo/V/TLBRQ=="
     },
     "vscode-test": {
       "version": "1.4.1",
diff --git a/client/package.json b/client/package.json
index eebb4665..a8cc4adf 100644
--- a/client/package.json
+++ b/client/package.json
@@ -17,7 +17,7 @@
     "lint": "eslint -c .eslintrc.js --ext .ts src"
   },
   "dependencies": {
-    "vscode-languageclient": "^6.1.3"
+    "vscode-languageclient": "^7.0.0-next.14"
   },
   "devDependencies": {
     "@types/request": "^2.48.5",
diff --git a/client/src/exposeUnexposeAction.ts b/client/src/exposeUnexposeAction.ts
index e3da13e3..8888dfd6 100644
--- a/client/src/exposeUnexposeAction.ts
+++ b/client/src/exposeUnexposeAction.ts
@@ -1,4 +1,4 @@
-import { LanguageClient } from "vscode-languageclient";
+import { LanguageClient } from "vscode-languageclient/node";
 import { ExtensionContext, commands } from "vscode";
 import {
   ExposeRequest,
diff --git a/client/src/extension.ts b/client/src/extension.ts
index 5b4d243c..5c80b4d9 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -15,15 +15,18 @@ import {
   WorkspaceFolder,
 } from "vscode";
 import {
-  LanguageClient,
   LanguageClientOptions,
   Middleware,
   ResolveCodeLensSignature,
   RevealOutputChannelOn,
-  TransportKind,
   ProvideCodeLensesSignature,
   DidChangeConfigurationNotification,
 } from "vscode-languageclient";
+import {
+  LanguageClient,
+  ServerOptions,
+  TransportKind,
+} from "vscode-languageclient/node";
 import * as Package from "./elmPackage";
 import * as RefactorAction from "./refactorAction";
 import * as ExposeUnexposeAction from "./exposeUnexposeAction";
@@ -114,13 +117,16 @@ export function activate(context: ExtensionContext): void {
       const debugOptions = {
         execArgv: ["--nolazy", `--inspect=${6010 + clients.size}`],
       };
-      const serverOptions = {
+      const serverOptions: ServerOptions = {
         debug: {
           module,
           options: debugOptions,
           transport: TransportKind.ipc,
         },
-        run: { module, transport: TransportKind.ipc },
+        run: {
+          module,
+          transport: TransportKind.ipc,
+        },
       };
       const clientOptions: LanguageClientOptions = {
         diagnosticCollectionName: "Elm",
diff --git a/client/src/protocol.ts b/client/src/protocol.ts
index abb37441..e3a9a175 100644
--- a/client/src/protocol.ts
+++ b/client/src/protocol.ts
@@ -4,13 +4,10 @@ import { CodeActionParams, RequestType } from "vscode-languageclient";
 export const GetMoveDestinationRequest = new RequestType<
   IMoveParams,
   IMoveDestinationsResponse,
-  void,
   void
 >("elm/getMoveDestinations");
 
-export const MoveRequest = new RequestType<IMoveParams, void, void, void>(
-  "elm/move",
-);
+export const MoveRequest = new RequestType<IMoveParams, void, void>("elm/move");
 
 export interface IMoveParams {
   sourceUri: string;
@@ -28,12 +25,9 @@ export interface IMoveDestination {
   uri: string;
 }
 
-export const ExposeRequest = new RequestType<
-  IExposeUnexposeParams,
-  void,
-  void,
-  void
->("elm/expose");
+export const ExposeRequest = new RequestType<IExposeUnexposeParams, void, void>(
+  "elm/expose",
+);
 
 export interface IExposeUnexposeParams {
   uri: string;
@@ -43,7 +37,6 @@ export interface IExposeUnexposeParams {
 export const UnexposeRequest = new RequestType<
   IExposeUnexposeParams,
   void,
-  void,
   void
 >("elm/unexpose");
 
@@ -54,13 +47,11 @@ export interface IOnDidCreateFilesParams {
 export const OnDidCreateFilesRequest = new RequestType<
   FileCreateEvent,
   void,
-  void,
   void
 >("elm/ondidCreateFiles");
 
 export const OnDidRenameFilesRequest = new RequestType<
   FileRenameEvent,
   void,
-  void,
   void
 >("elm/ondidRenameFiles");
diff --git a/client/src/refactorAction.ts b/client/src/refactorAction.ts
index b1dbf38e..cd0aea2b 100644
--- a/client/src/refactorAction.ts
+++ b/client/src/refactorAction.ts
@@ -1,5 +1,6 @@
 import { commands, ExtensionContext, window } from "vscode";
-import { CodeActionParams, LanguageClient } from "vscode-languageclient";
+import { CodeActionParams } from "vscode-languageclient";
+import { LanguageClient } from "vscode-languageclient/node";
 import { GetMoveDestinationRequest, MoveRequest } from "./protocol";
 
 export function registerCommands(
diff --git a/client/src/restart.ts b/client/src/restart.ts
index c33eec4f..6a84e8b6 100644
--- a/client/src/restart.ts
+++ b/client/src/restart.ts
@@ -1,6 +1,6 @@
 "use strict";
 import * as vscode from "vscode";
-import { LanguageClient } from "vscode-languageclient";
+import { LanguageClient } from "vscode-languageclient/node";
 
 export function registerCommand(
   langClients: Map<string, LanguageClient>,
diff --git a/server b/server
index f21912f6..26fa2669 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit f21912f6efd50ffd1b82987c8b05b3322477e5cd
+Subproject commit 26fa2669e34de53880e7627c955b0591509922fe