Merge pull request #858 from krassowski/bump-webpack-in-ws-lsp-connection

Bump webpack in ws lsp connection

Author: krassowski

binder/postBuild

@@ -1,14 +1,6 @@
 #!/usr/bin/env bash
 set -eux
 
-# Avoid OpenSSL error when Node.js > 16
-# https://stackoverflow.com/questions/73144960
-nodeversion="$(node -v | cut -d 'v' -f 2 | cut -d '.' -f 1)"
-if (( "$nodeversion" > 16 ))
-then
-    export NODE_OPTIONS="--openssl-legacy-provider"
-fi
-
 # Build labextensions
 jlpm bootstrap
 

packages/jupyterlab-lsp/jest.config.js

@@ -4,7 +4,6 @@ const upstream = func('jupyterlab-lsp', __dirname);
 const reuseFromUpstream = [
   'moduleFileExtensions',
   'moduleNameMapper',
-  'setupFiles',
   'setupFilesAfterEnv',
   'testPathIgnorePatterns'
 ];
@@ -28,7 +27,11 @@ let local = {
   },
   transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`],
   testLocationInResults: true,
-  reporters: [...upstream['reporters'], 'jest-github-actions-reporter']
+  reporters: [...upstream['reporters'], 'jest-github-actions-reporter'],
+  setupFiles: [
+    ...upstream['setupFiles'],
+    '@krassowski/jupyterlab-lsp/lib/jest-shim.js'
+  ]
 };
 
 for (const option of reuseFromUpstream) {

packages/jupyterlab-lsp/src/connection.ts

@@ -452,7 +452,7 @@ export class LSPConnection extends LspWsConnection {
           method,
           message: params
         });
-        this.connection.sendNotification(method, params);
+        this.connection.sendNotification(method, params).catch(console.error);
       });
     }
 
@@ -618,10 +618,9 @@ export class LSPConnection extends LspWsConnection {
       } as lsp.VersionedTextDocumentIdentifier,
       contentChanges: changeEvents
     };
-    this.connection.sendNotification(
-      'textDocument/didChange',
-      textDocumentChange
-    );
+    this.connection
+      .sendNotification('textDocument/didChange', textDocumentChange)
+      .catch(console.error);
     documentInfo.version++;
   }
 

packages/jupyterlab-lsp/src/jest-shim.ts

@@ -0,0 +1,4 @@
+// TODO: remove after upgrading to JupyterLab 4.0
+const util = require('util');
+(global as any).TextDecoder = util.TextDecoder;
+(global as any).TextEncoder = util.TextEncoder;

packages/lsp-ws-connection/package.json

@@ -27,10 +27,9 @@
   "homepage": "https://github.com/krassowski/jupyterlab-lsp/tree/master/packages/lsp-ws-connection",
   "repository": "github:krassowski/jupyterlab-lsp",
   "dependencies": {
-    "vscode-jsonrpc": "^6.0.0",
     "vscode-languageserver-protocol": "^3.16.0",
     "vscode-languageserver-types": "^3.16.0",
-    "vscode-ws-jsonrpc": "0.2.0"
+    "vscode-ws-jsonrpc": "~1.0.2"
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",
@@ -43,7 +42,7 @@
     "rimraf": "^3.0.2",
     "sinon": "^7.3.2",
     "typescript": "~4.1.3",
-    "webpack": "^4.32.2",
-    "webpack-cli": "^3.3.0"
+    "webpack": "^5.54.0",
+    "webpack-cli": "^4.1.0"
   }
 }

packages/lsp-ws-connection/src/ws-connection.ts

@@ -186,7 +186,7 @@ export class LspWsConnection
         version: documentInfo.version
       } as protocol.TextDocumentItem
     };
-    this.connection.sendNotification(
+    void this.connection.sendNotification(
       'textDocument/didOpen',
       textDocumentMessage
     );
@@ -209,7 +209,7 @@ export class LspWsConnection
       } as protocol.VersionedTextDocumentIdentifier,
       contentChanges: [{ text: documentInfo.text }]
     };
-    this.connection.sendNotification(
+    void this.connection.sendNotification(
       'textDocument/didChange',
       textDocumentChange
     );
@@ -228,7 +228,7 @@ export class LspWsConnection
       } as protocol.VersionedTextDocumentIdentifier,
       text: documentInfo.text
     };
-    this.connection.sendNotification(
+    void this.connection.sendNotification(
       'textDocument/didSave',
       textDocumentChange
     );
@@ -241,7 +241,7 @@ export class LspWsConnection
       return;
     }
 
-    this.connection.sendNotification(
+    void this.connection.sendNotification(
       'workspace/didChangeConfiguration',
       settings
     );
@@ -606,8 +606,8 @@ export class LspWsConnection
   protected onServerInitialized(params: protocol.InitializeResult) {
     this.isInitialized = true;
     this.serverCapabilities = params.capabilities;
-    this.connection.sendNotification('initialized', {});
-    this.connection.sendNotification('workspace/didChangeConfiguration', {
+    void this.connection.sendNotification('initialized', {});
+    void this.connection.sendNotification('workspace/didChangeConfiguration', {
       settings: {}
     });
     this.emit('serverInitialized', this.serverCapabilities);

packages/lsp-ws-connection/webpack.config.js

@@ -6,12 +6,14 @@ module.exports = {
     index: './lib/index.js'
   },
   resolve: {
-    extensions: ['.js']
+    extensions: ['.js'],
+    fallback: {
+      net: false,
+      path: false,
+      crypto: false
+    }
   },
   target: 'web',
-  node: {
-    net: 'mock'
-  },
   output: {
     filename: '[name].js',
     path: path.resolve(__dirname, 'dist'),