Merge pull request #108 from bollwyvl/fix-lsp-ws-meta

lsp-ws-connection in repo (follow up)

packages/jupyterlab-lsp/package.json

@@ -34,12 +34,11 @@
     "bundle": "npm pack .",
     "clean": "rimraf lib",
     "lab:link": "jupyter labextension link . --no-build",
-    "test": "jlpm jest --coverage --coverageReporters=cobertura --coverageReporters=html --coverageReporters=text-summary",
-    "watch": "tsc -b -w"
+    "test": "jlpm jest --coverage --coverageReporters=cobertura --coverageReporters=html --coverageReporters=text-summary"
   },
   "dependencies": {
     "@krassowski/jupyterlab_go_to_definition": "^0.7.1",
-    "lsp-ws-connection": "~0.1.1"
+    "lsp-ws-connection": "*"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.4.3",

packages/lsp-ws-connection/karma.conf.js

@@ -23,19 +23,16 @@ module.exports = function(config) {
 
     frameworks: ['mocha'],
 
-    reporters: ['mocha'],
+    reporters: ['mocha', 'junit'],
 
     preprocessors: {
       '**/*!(.d).ts': 'webpack',
       '**/*!(.d).js': 'webpack'
     },
 
-    plugins: [
-      'karma-mocha',
-      'karma-chrome-launcher',
-      'karma-webpack',
-      'karma-mocha-reporter'
-    ],
+    junitReporter: {
+      outputFile: 'junit.xml'
+    },
 
     webpack: {
       mode: 'development',

packages/lsp-ws-connection/package.json

@@ -47,7 +47,8 @@
     "karma-chrome-launcher": "^2.2.0",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.5",
-    "karma-webpack": "^4.0.0-rc.6",
+    "karma-junit-reporter": "^2.0.1",
+    "karma-webpack": "^4.0.2",
     "mocha": "^6.1.4",
     "puppeteer": "^1.17.0",
     "rimraf": "^2.6.3",

packages/metapackage/package.json

@@ -26,8 +26,8 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@krassowski/jupyterlab-lsp": "^0.6.1",
-    "lsp-ws-connection": "^0.2.0"
+    "@krassowski/jupyterlab-lsp": "file:../jupyterlab-lsp",
+    "lsp-ws-connection": "file:../lsp-ws-connection"
   },
   "devDependencies": {
     "fs-extra": "^8.0.1",

yarn.lock

@@ -1312,6 +1312,12 @@
     react "~16.8.4"
     typestyle "^2.0.1"
 
+"@krassowski/jupyterlab-lsp@file:packages/jupyterlab-lsp":
+  version "0.6.1"
+  dependencies:
+    "@krassowski/jupyterlab_go_to_definition" "^0.7.1"
+    lsp-ws-connection "*"
+
 "@krassowski/jupyterlab_go_to_definition@^0.7.1":
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/@krassowski/jupyterlab_go_to_definition/-/jupyterlab_go_to_definition-0.7.1.tgz#62c45e5869b0099fd1878734b103f75d05d4a773"
@@ -6848,6 +6854,14 @@ karma-chrome-launcher@^2.2.0:
     fs-access "^1.0.0"
     which "^1.2.1"
 
+karma-junit-reporter@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-junit-reporter/-/karma-junit-reporter-2.0.1.tgz#d34eef7f0b2fd064e0896954e8851a90cf14c8f3"
+  integrity sha512-VtcGfE0JE4OE1wn0LK8xxDKaTP7slN8DO3I+4xg6gAi1IoAHAXOJ1V9G/y45Xg6sxdxPOR3THCFtDlAfBo9Afw==
+  dependencies:
+    path-is-absolute "^1.0.0"
+    xmlbuilder "12.0.0"
+
 karma-mocha-reporter@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz#15120095e8ed819186e47a0b012f3cd741895560"
@@ -6864,7 +6878,7 @@ karma-mocha@^1.3.0:
   dependencies:
     minimist "1.2.0"
 
-karma-webpack@^4.0.0-rc.6:
+karma-webpack@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-4.0.2.tgz#23219bd95bdda853e3073d3874d34447c77bced0"
   integrity sha512-970/okAsdUOmiMOCY8sb17A2I8neS25Ad9uhyK3GHgmRSIFJbDcNEFE8dqqUhNe9OHiCC9k3DMrSmtd/0ymP1A==
@@ -7207,12 +7221,10 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-lsp-ws-connection@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/lsp-ws-connection/-/lsp-ws-connection-0.1.1.tgz#5e259a5079aa91f9bb55453d03df14f3e526fa6b"
-  integrity sha512-JLGsBbJc5NlNkvo8hyjVqOG2jZrCtXnz65d1pPPnp6mRl++J3pa0M0e2/jOGeDx+emDNk31/pUlLDOSHhphE4w==
+"lsp-ws-connection@file:packages/lsp-ws-connection":
+  version "0.2.0"
   dependencies:
-    vscode-jsonrpc "^4.0.0"
+    vscode-jsonrpc "^4.1.0-next"
     vscode-languageclient "^5.2.1"
     vscode-languageserver-protocol "^3.14.1"
     vscode-languageserver-types "^3.14.0"
@@ -12064,6 +12076,11 @@ xml@^1.0.1:
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
   integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
 
+[email protected]:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-12.0.0.tgz#e2ed675e06834a089ddfb84db96e2c2b03f78c1a"
+  integrity sha512-lMo8DJ8u6JRWp0/Y4XLa/atVDr75H9litKlb2E5j3V3MesoL50EBgZDWoLT3F/LztVnG67GjPXLZpqcky/UMnQ==
+
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"