Fix vscode build

hyperjump-io · Mar 12, 2024 · 20ee596 · 20ee596
1 parent 64c283f
commit 20ee596
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/vscode/package.json b/vscode/package.json
@@ -8,7 +8,7 @@
     "vscode:prepublish": "npm run build-client -- --minify && npm run build-server -- --minify",
     "build": "npm run build-client -- --sourcemap && npm run build-server -- --sourcemap",
     "build-client": "esbuild ./src/extension.js --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node",
-    "build-server": "esbuild ../language-server/src/server.js --bundle --outfile=out/server.js --external:vscode --format=cjs --platform=node",
+    "build-server": "esbuild ../language-server/src/server.js --bundle --main-fields=module,main --outfile=out/server.js --external:vscode --format=cjs --platform=node",
     "package": "vsce package --out=dist",
     "publish": "vsce publish"
   },

diff --git a/vscode/src/extension.js b/vscode/src/extension.js
@@ -1,30 +1,24 @@
 "use strict";
 const path = require("node:path");
-const { LanguageClient } = require("vscode-languageclient/node.js");
+const { LanguageClient, TransportKind } = require("vscode-languageclient/node.js");
 
 
 let client;
 
 const activate = (context) => {
-  // const serverModule = context.asAbsolutePath(path.join("out", "server.js"));
-  // const serverOptions = {
-  //   run: {
-  //     module: serverModule,
-  //     transport: TransportKind.ipc
-  //   },
-  //   debug: {
-  //     module: serverModule,
-  //     transport: TransportKind.ipc,
-  //     options: {
-  //       execArgc: ["--nolazy", "--inspect=6009"]
-  //     }
-  //   }
-  // };
-
-  // Temporary Hack. Get the above code working.
+  const serverModule = context.asAbsolutePath(path.join("out", "server.js"));
   const serverOptions = {
-    command: "node",
-    args: [context.asAbsolutePath(path.join("..", "language-server", "src", "server.js")), "--stdio"]
+    run: {
+      module: serverModule,
+      transport: TransportKind.ipc
+    },
+    debug: {
+      module: serverModule,
+      transport: TransportKind.ipc,
+      options: {
+        execArgc: ["--nolazy", "--inspect=6009"]
+      }
+    }
   };
 
   const clientOptions = {