add lerna, metapackage, integrity checks, and move src (76 1️⃣ ) (#79)

* move src into packages

* move more package things

* finish rest of moving to packages

* update ci to look for test artifacts

* modify strategy for provisioning lab in ci, binder

* move lint check up, call test correctly

* chomp whitespace on azure variables

* use prettier check instead of list different

* add integrity script, add to separate job with linting

* give lint a uniue name

* check integrity of schema

* check schemas in integrity, linting

* add ruamel_yaml to test env

* remove integrity from main test job

* rename integrity tests

* add ruamel.yaml for pip

* linting

* check lab versions

* catch readme version issue

Author: bollwyvl

.gitignore

@@ -107,6 +107,7 @@ venv.bak/
 node_modules
 .yarn-packages
 *.tsbuildinfo
+*.tgz
 
 atest/output/
 junit.xml

README.md

@@ -64,7 +64,7 @@ If a feature you need is not on the lists above, please feel free to suggest it
 
 ## Prerequisites
 
-- JupyterLab
+- JupyterLab >=1.1,<1.2
 
 ## Installation
 
@@ -120,7 +120,7 @@ jupyter labextension update @krassowski/jupyterlab-lsp
 Use install command (update does not seem to work) appending `@version` to the extension name, like this:
 
 ```bash
-jupyter labextension install @krassowski/jupyterlab-lsp@0.5.0-rc.0
+jupyter labextension install @krassowski/jupyterlab-lsp@0.6.0
 ```
 
 ## Development
@@ -131,10 +131,10 @@ run the following in the repository directory:
 ```bash
 jlpm
 jlpm build
-jupyter labextension install .
+jlpm lab:link
 ```
 
-To rebuild the package and the JupyterLab app:
+To rebuild the packages and the JupyterLab app:
 
 ```bash
 jlpm build
@@ -144,7 +144,7 @@ jupyter lab build
 To watch the files and build continuously:
 
 ```bash
-jlpm watch           # leave this running...
+jlpm build --watch   # leave this running...
 jupyter lab --watch  # ...in another terminal
 ```
 

atest/01_Editor.robot

@@ -11,7 +11,7 @@ ${CM CURSORS}     css:.CodeMirror-cursors:not([style='visibility: hidden'])
 
 *** Test Cases ***
 Bash
-    [Documentation]  TODO: figure out why the first server is extra flaky 
+    [Documentation]    TODO: figure out why the first server is extra flaky
     Wait Until Keyword Succeeds    3x    10s    Editor Shows Features for Language    Bash    example.sh    Diagnostics=Failed to parse expression
     ...    Jump to Definition=fib
 

azure-pipelines.yml

@@ -11,9 +11,17 @@ pr:
 variables:
   PYTHONUNBUFFERED: 1
   YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn
+
   PY_JLSP_VERSION: 0.6.0b0
   JS_JLLSP_VERSION: 0.6.0
 
+  FIRST_PARTY_LABEXTENSIONS: >-
+    packages/jupyterlab-lsp/krassowski-jupyterlab-lsp-$(JS_JLLSP_VERSION).tgz
+
+  THIRD_PARTY_LABEXTENSIONS: >-
+    @krassowski/jupyterlab_go_to_definition
+
 jobs:
+  - template: ci/job.lint.yml
   - template: ci/job.test.yml
   - template: ci/job.combine.yml

ci/env-test.yml.in

@@ -24,6 +24,7 @@ dependencies:
   - pytest-cov
   - pytest-flake8
   - pytest-runner
+  - ruamel_yaml
   # browser testing
   - robotframework-seleniumlibrary
   - firefox

ci/job.lint.yml

@@ -0,0 +1,35 @@
+parameters:
+  platforms:
+    - name: Linux
+      vmImage: ubuntu-16.04
+      activate: source activate
+  pythons:
+    - name: ThreeSeven
+      spec: '>=3.7,<3.8.0a0'
+  env_update: conda env update -n jupyterlab-lsp --file env-test.yml --quiet
+
+jobs:
+  - ${{ each platform in parameters.platforms }}:
+      - ${{ each python in parameters.pythons}}:
+          - job: Lint
+            pool:
+              vmImage: ${{ platform.vmImage }}
+            steps:
+              - template: steps.conda.yml
+                parameters:
+                  name: ${{ platform.name }}
+
+              - script: ${{ platform.activate }} && cd ci && python env_template.py "${{ python.spec }}"
+                displayName: update environment with python version
+
+              - script: ${{ parameters.env_update }} || ${{ parameters.env_update }} || ${{ parameters.env_update }}
+                displayName: update conda environment with test dependencies
+
+              - script: ${{ platform.activate }} jupyterlab-lsp && python scripts/integrity.py
+                displayName: check integrity of package versions
+
+              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm || jlpm || jlpm
+                displayName: install npm dependencies
+
+              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm lint:check
+                displayName: lint frontend

ci/job.test.yml

@@ -15,7 +15,7 @@ parameters:
     - name: ThreeSeven
       spec: '>=3.7,<3.8.0a0'
   env_update: conda env update -n jupyterlab-lsp --file env-test.yml --quiet
-  lab_build: jupyter labextension install krassowski-jupyterlab-lsp-$(JS_JLLSP_VERSION).tgz @krassowski/jupyterlab_go_to_definition
+  lab_ext: jupyter labextension install --no-build $(THIRD_PARTY_LABEXTENSIONS) $(FIRST_PARTY_LABEXTENSIONS)
 
 jobs:
   - ${{ each platform in parameters.platforms }}:
@@ -52,37 +52,40 @@ jobs:
               - script: ${{ platform.activate }} jupyterlab-lsp && python setup.py sdist bdist_wheel
                 displayName: build python distributions
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && cd dist && npm pack ..
-                displayName: build npm bundle
+              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm lerna run bundle
+                displayName: build npm bundles
 
               - script: ${{ platform.activate }} jupyterlab-lsp && cd dist && python -m pip install jupyter_lsp-$(PY_JLSP_VERSION)-py3-none-any.whl --no-deps
                 displayName: install python wheel
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm tslint:check && jlpm test:jest
+              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm test
                 displayName: run frontend unit tests
 
               - task: PublishTestResults@2
                 displayName: publish frontend test results
                 inputs:
-                  testResultsFiles: junit.xml
+                  testResultsFiles: packages/**/junit.xml
                   testRunTitle: 'Jest ${{ platform.name }}${{ python.name }}'
                   mergeTestResults: true
                 condition: always()
 
               - task: PublishCodeCoverageResults@1
                 inputs:
                   codeCoverageTool: Cobertura
-                  summaryFileLocation: 'coverage/cobertura-coverage.xml'
+                  summaryFileLocation: 'packages/**/coverage/cobertura-coverage.xml'
 
               - script: ${{ platform.activate }} jupyterlab-lsp && jupyter serverextension list
                 displayName: list server extensions
 
               - script: ${{ platform.activate }} jupyterlab-lsp && python scripts/utest.py --test-run-title="Pytest ${{ platform.name }}${{ python.name }}"
                 displayName: run python tests
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && cd dist && ${{ parameters.lab_build }} || ${{ parameters.lab_build }} || ${{ parameters.lab_build }}
+              - script: ${{ platform.activate }} jupyterlab-lsp && ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }}
                 displayName: install labextensions
 
+              - script: ${{ platform.activate }} jupyterlab-lsp && jupyter lab build || jupyter lab build --debug || jupyter lab build --debug
+                displayName: build lab
+
               - script: ${{ platform.activate }} jupyterlab-lsp && jupyter labextension list
                 displayName: list labextensions
 

environment.yml

@@ -18,6 +18,7 @@ dependencies:
   - pip
   - pylint
   - python-language-server
+  - ruamel_yaml
   - pip: # not-yet-appearing-in-conda-forge
       - pyls-black
       - pyls-isort

lerna.json

@@ -0,0 +1,6 @@
+{
+  "lerna": "3.2.1",
+  "version": "independent",
+  "npmClient": "yarn",
+  "useWorkspaces": true
+}

package.json

@@ -1,137 +1,54 @@
 {
-  "name": "@krassowski/jupyterlab-lsp",
-  "version": "0.6.0",
-  "description": "Language Server Protocol integration for JupyterLab",
-  "keywords": [
-    "jupyter",
-    "jupyterlab",
-    "jupyterlab-extension",
-    "lsp",
-    "language-server-protocol",
-    "intellisense",
-    "code-intelligence",
-    "linting"
-  ],
-  "homepage": "https://github.com/krassowski/jupyterlab-lsp",
-  "husky": {
-    "hooks": {
-      "pre-commit": "precise-commits"
-    }
-  },
-  "bugs": {
-    "url": "https://github.com/krassowski/jupyterlab-lsp/issues"
-  },
-  "license": "BSD-3-Clause",
-  "author": "Michał Krassowski",
-  "files": [
-    "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
-    "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}",
-    "schema/*.json"
-  ],
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/krassowski/jupyterlab-lsp.git"
-  },
-  "scripts": {
-    "bootstrap": "jlpm && jlpm clean && jlpm lint && jlpm build",
-    "build": "tsc -b",
-    "clean": "rimraf lib",
-    "watch": "tsc -b -w",
-    "lint": "jlpm prettier && jlpm tslint",
-    "lint:check": "jlpm prettier:check && jlpm tslint:check",
-    "prettier": "prettier --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md,.yml}'",
-    "prettier:check": "prettier --list-different '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md,.yml}'",
-    "tslint": "tslint --fix -c tslint.json --project tsconfig.json '**/*{.ts,.tsx}'",
-    "tslint:check": "tslint -c tslint.json --project tsconfig.json '**/*{.ts,.tsx}'",
-    "test": "jlpm lint:check && jlpm test:jest",
-    "test:jest": "jlpm jest --coverage --coverageReporters=cobertura --coverageReporters=html --coverageReporters=text-summary"
-  },
   "dependencies": {
-    "@krassowski/jupyterlab_go_to_definition": "^0.7.1",
-    "lsp-editor-adapter": "0.0.10"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.4.3",
-    "@jupyterlab/application": "~1.1.3",
-    "@jupyterlab/apputils": "~1.1.3",
-    "@jupyterlab/cells": "~1.1.3",
-    "@jupyterlab/codeeditor": "~1.1.0",
-    "@jupyterlab/codemirror": "~1.1.3",
-    "@jupyterlab/completer": "~1.1.3",
-    "@jupyterlab/coreutils": "~3.1.0",
-    "@jupyterlab/docmanager": "~1.1.3",
-    "@jupyterlab/docregistry": "~1.1.3",
-    "@jupyterlab/fileeditor": "~1.1.3",
-    "@jupyterlab/notebook": "~1.1.3",
-    "@jupyterlab/rendermime": "~1.1.3",
-    "@jupyterlab/services": "~4.1.1",
-    "@jupyterlab/statusbar": "~1.1.3",
-    "@jupyterlab/testutils": "^1.0.0-alpha.6",
-    "@jupyterlab/tooltip": "~1.1.3",
-    "@phosphor/algorithm": "^1.1.3",
-    "@types/chai": "^4.1.7",
-    "@types/codemirror": "^0.0.74",
-    "@types/events": "^3.0.0",
-    "@types/jest": "^23.3.11",
+    "@types/mocha": "^5.2.6",
     "bash-language-server": "^1.6.1",
-    "chai": "^4.2.0",
-    "codemirror": "~5.47.0",
     "dockerfile-language-server-nodejs": "^0.0.21",
-    "events": "^3.0.0",
+    "eslint": "^5.16.0",
+    "eslint-config-prettier": "^4.1.0",
+    "eslint-plugin-prettier": "^3.0.1",
     "husky": "^3.0.9",
     "javascript-typescript-langserver": "^2.11.3",
-    "jest": "^24.7.1",
-    "jest-junit": "^8.0.0",
     "jsonrpc-ws-proxy": "0.0.5",
+    "lerna": "^3.13.2",
     "precise-commits": "^1.0.2",
     "prettier": "^1.18.2",
-    "react": "~16.8.4",
-    "rimraf": "^2.6.1",
-    "ts-jest": "^24.0.2",
-    "tslint": "^5.15.0",
     "tslint-config-prettier": "^1.18.0",
     "tslint-plugin-prettier": "^2.0.1",
     "tslint-react": "^4.0.0",
+    "tslint": "^5.15.0",
     "typescript": "~3.5.1",
     "unified-language-server": "^0.3.0",
     "vscode-css-languageserver-bin": "^1.4.0",
     "vscode-html-languageserver-bin": "^1.4.0",
     "vscode-json-languageserver-bin": "^1.0.1",
-    "yaml-language-server": "^0.4.0"
+    "yaml-language-server": "^0.4.0",
+    "yarn": "1.15.2"
   },
-  "peerDependencies": {
-    "@jupyterlab/application": "~1.1.3",
-    "@jupyterlab/apputils": "~1.1.3",
-    "@jupyterlab/cells": "~1.1.3",
-    "@jupyterlab/codeeditor": "~1.1.0",
-    "@jupyterlab/codemirror": "~1.1.3",
-    "@jupyterlab/completer": "~1.1.3",
-    "@jupyterlab/coreutils": "~3.1.0",
-    "@jupyterlab/docmanager": "~1.1.3",
-    "@jupyterlab/docregistry": "~1.1.3",
-    "@jupyterlab/fileeditor": "~1.1.3",
-    "@jupyterlab/notebook": "~1.1.3",
-    "@jupyterlab/rendermime": "~1.1.3",
-    "@jupyterlab/services": "~4.1.1",
-    "@jupyterlab/tooltip": "~1.1.3",
-    "@phosphor/algorithm": "^1.1.3",
-    "codemirror": "~5.47.0",
-    "react": "~16.8.4"
+  "husky": {
+    "hooks": {
+      "pre-commit": "precise-commits"
+    }
+  },
+  "private": true,
+  "scripts": {
+    "bootstrap": "jlpm && lerna bootstrap && jlpm lint && jlpm clean && jlpm build",
+    "build": "cd packages/metapackage && jlpm build",
+    "bundle": "lerna run bundle",
+    "clean": "lerna run clean",
+    "lab:link": "lerna run lab:link",
+    "lint:check": "jlpm prettier:check && jlpm tslint:check",
+    "lint": "jlpm prettier && jlpm tslint",
+    "prettier:check": "prettier --check '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md,.yml}'",
+    "prettier": "prettier --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md,.yml}'",
+    "test": "lerna run test",
+    "tslint": "tslint --fix -c tslint.json --project tsconfigbase.json 'packages/**/*{.ts,.tsx}'",
+    "tslint:check": "tslint -c tslint.json --project tsconfigbase.json 'packages/**/*{.ts,.tsx}'"
   },
-  "jupyterlab": {
-    "extension": true,
-    "discovery": {
-      "server": {
-        "base": {
-          "name": "jupyter-lsp"
-        },
-        "managers": [
-          "pip"
-        ]
-      }
-    },
-    "schemaDir": "schema"
+  "workspaces": {
+    "packages": [
+      "packages/*"
+    ]
   }
 }