Merge branch 'jupyterlab3' of ssh://github.com/martinRenou/jupyterlab-lsp into martinRenou-jupyterlab3

Author: krassowski

.github/workflows/job.test.yml

@@ -35,9 +35,9 @@ jobs:
       # TODO: maybe turn back on
       fail-fast: false
       matrix:
-        os: [ubuntu, macos, windows]
         python: [3.6, 3.7, 3.8]
-        lab: ['>=2.2.0,<3.0.0a0']
+        os: [ubuntu-16.04, macos-10.14, vs2017-win2016]
+        lab: ['>=3.0.0rc8,<4.0.0a0']
         include:
           # if using 3.6, use an old node
           - python: 3.6
@@ -111,9 +111,6 @@ jobs:
       - name: Build python distributions
         run: python setup.py sdist bdist_wheel
 
-      - name: Build npm bundles
-        run: jlpm lerna run bundle
-
       - name: Install python wheel
         run: cd dist && python -m pip install jupyter_lsp-${{ env.PY_JLSP_VERSION }}-py3-none-any.whl --no-deps
 

.gitignore

@@ -116,3 +116,6 @@ coverage/
 _*.d.ts
 _build
 .virtual_documents/
+
+# Built labextensions
+py_src/jupyter_lsp/labextensions/

.prettierignore

@@ -2,6 +2,7 @@
 .mypy_cache
 .pytest_cache
 .yarn-packages
+**/_*.d.ts
 **/.ipynb_checkpoints
 **/*.egg-info
 **/build

CONTRIBUTING.md

@@ -29,11 +29,11 @@ You can contribute to the project through:
 
 Development requires, at a minimum:
 
-- `nodejs >=10.12,<15`
+- `nodejs >=12,<15`
 - `python >=3.6,<3.9.0a0`
   - Python 3.6 and 3.8 are also tested on CI
   - Python 3.6 has issues on Windows
-- `jupyterlab >=2.2.0,<3.0.0a0`
+- `jupyterlab >=3.0.0rc10,<4.0.0a0`
 
 It is recommended to use a virtual environment (e.g. `virtualenv` or `conda env`)
 for development.
@@ -67,7 +67,7 @@ This performs all of the basic setup steps, and is used for the binder demo.
 Install `jupyter-lsp` from source in your virtual environment:
 
 ```bash
-python -m pip install -e .
+python -m pip install -e . --ignore-installed --no-deps -vv
 ```
 
 Enable the server extension:
@@ -80,9 +80,8 @@ Install `npm` dependencies, build TypeScript packages, and link
 to JupyterLab for development:
 
 ```bash
-jlpm
-jlpm build
-jlpm lab:link
+jlpm bootstrap
+pip install .
 ```
 
 ### Frontend Development

MANIFEST.in

@@ -1,2 +1,3 @@
 include LICENSE README.md
 recursive-include py_src *.json *.R
+recursive-include py_src/jupyter_lsp/labextensions

README.md

@@ -77,9 +77,9 @@ Use context menu on rows in the panel to filter out diagnostics or copy their me
 
 You will need to have all of the following installed:
 
-- JupyterLab >=2.2.0,<3.0.0a0
+- JupyterLab >=3.0.0,<4.0.0a0
 - Python 3.6+
-- nodejs 10.12+
+- nodejs 12+
 
 ## Installation
 
@@ -97,9 +97,9 @@ Use of a python `virtualenv` or a conda env is also recommended.
 1. install JupyterLab and the server extension
 
    ```bash
-   conda install -c conda-forge 'jupyterlab>=2.2,<3.0.0a0' jupyter-lsp
+   conda install -c conda-forge 'jupyterlab>=3.0.0-rc.10,<4.0.0a0' jupyter-lsp
    # or
-   pip install 'jupyterlab>=2.2,<3.0.0a0' jupyter-lsp
+   pip install 'jupyterlab>=3.0.0-rc.10,<4.0.0a0' jupyter-lsp
    ```
 
    > Note: With conda, you could take advantage of the bundles: `jupyter-lsp-python`

binder/environment.yml

@@ -7,7 +7,7 @@ channels:
 dependencies:
   # runtime dependencies
   - python >=3.6,<3.9.0a0
-  - jupyterlab >=2.2.0,<3.0.0a0
+  - jupyterlab >=3.0.0,<4.0.0a0
   - notebook >=4.3.1
   # build dependencies
   - nodejs >=10.12,<15

binder/postBuild

@@ -1,24 +1,12 @@
 #!/usr/bin/env bash
 set -eux
 
-# do a dev install of the server side
-python -m pip install -e . --ignore-installed --no-deps -vv
-jupyter serverextension enable --sys-prefix --py jupyter_lsp
-
-# should have no extensions
-jupyter labextension list
-
-# do a dev build of the client side
+# Build labextensions
 jlpm bootstrap
 
-# link all pieces to lab (no build)
-jlpm lab:link && jupyter labextension list
-
-# list extensions before build
-jupyter labextension list
-
-# actually build
-jupyter lab build --debug --dev-build=False --minimize=True
+# Do a dev install of the server side
+python -m pip install -e . --ignore-installed --no-deps -vv
+jupyter serverextension enable --sys-prefix --py jupyter_lsp
 
-# list extensions again
+# List extensions
 jupyter labextension list

package.json

@@ -38,18 +38,18 @@
   "private": true,
   "scripts": {
     "bootstrap": "jlpm --no-optional --prefer-offline && lerna bootstrap && jlpm lint && jlpm clean && jlpm build",
-    "build": "jlpm build:schema && jlpm build:completion-theme && jlpm build:theme-material && jlpm build:theme-vscode && jlpm build:jump && jlpm build:meta && jlpm build:ws",
+    "build": "jlpm build:schema && jlpm build:completion-theme && jlpm build:theme-material && jlpm build:theme-vscode && jlpm build:meta && jlpm build:ws && jlpm build:jupyterlab-lsp",
     "build:schema": "lerna run build:schema --stream",
     "build:meta": "lerna run build --stream --scope @krassowski/jupyterlab-lsp-metapackage",
     "build:completion-theme": "lerna run build --stream --scope @krassowski/completion-theme",
     "build:theme-vscode": "lerna run build --stream --scope @krassowski/theme-vscode",
     "build:theme-material": "lerna run build --stream --scope @krassowski/theme-material",
+    "build:jupyterlab-lsp": "lerna run build --stream --scope @krassowski/jupyterlab-lsp",
     "build:ws": "lerna run build --stream --scope lsp-ws-connection",
     "build:jump": "lerna run build --stream --scope @krassowski/code-jumpers",
     "watch": "lerna run --parallel watch",
     "bundle": "lerna run --parallel bundle",
     "clean": "lerna run --parallel clean",
-    "lab:link": "lerna run lab:link",
     "lint:check": "jlpm prettier:check && jlpm eslint:check",
     "lint": "jlpm prettier && jlpm eslint",
     "prettier:check": "prettier --check \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md,.yml}\"",

packages/.eslintrc.js

@@ -17,6 +17,7 @@ module.exports = {
   ],
   ignorePatterns: [
     '**/node_modules/**/*',
+    'packages/jupyterlab-lsp/labextension/**/*',
     '**/lib/**/*',
     '**/_*.ts',
     '**/_*.d.ts',