Merge pull request #279 from bollwyvl/upgrade-dev-tools

Upgrade dev tools [squash]

Author: krassowski

.prettierignore

@@ -24,6 +24,7 @@ envs
 examples/app/build
 examples/app/schemas
 examples/app/themes
+htmlcov
 jupyterlab/geckodriver
 jupyterlab/schemas
 jupyterlab/staging/index.js

atest/Keywords.robot

@@ -66,18 +66,18 @@ Tear Down Everything
     Terminate All Processes    kill=${True}
 
 Wait For Splash
-    Wait Until Page Contains Element    ${SPLASH}    timeout=180s
-    Wait Until Page Does Not Contain Element    ${SPLASH}    timeout=180s
+    Go To    ${URL}lab?reset&token=${TOKEN}
+    Set Window Size    1024    768
+    Wait Until Page Contains Element    ${SPLASH}    timeout=30s
+    Wait Until Page Does Not Contain Element    ${SPLASH}    timeout=10s
     Execute Javascript    window.onbeforeunload \= function (){}
 
 Open JupyterLab
     Set Environment Variable    MOZ_HEADLESS    ${HEADLESS}
     ${firefox} =    Which    firefox
     ${geckodriver} =    Which    geckodriver
     Create WebDriver    Firefox    executable_path=${geckodriver}    firefox_binary=${firefox}    service_log_path=${OUTPUT DIR}${/}geckodriver.log
-    Wait Until Keyword Succeeds    20x    3s    Go To    ${URL}lab?reset&token=${TOKEN}
-    Set Window Size    1024    768
-    Wait For Splash
+    Wait Until Keyword Succeeds    3x    5s    Wait For Splash
 
 Close JupyterLab
     Close All Browsers
@@ -95,7 +95,7 @@ Reset Application State
     Accept Default Dialog Option
     Ensure All Kernels Are Shut Down
     Lab Command    Reset Application State
-    Wait For Splash
+    Wait Until Keyword Succeeds    3x    5s    Wait For Splash
 
 Accept Default Dialog Option
     [Documentation]    Accept a dialog, if it exists

binder/environment.yml

@@ -10,7 +10,7 @@ dependencies:
   - jupyterlab >=2,<3.0.0a0
   - notebook >=4.3.1
   # build dependencies
-  - nodejs
+  - nodejs >=10,<14
   # for python language server (and development)
   - black
   - flake8 >=3.5

ci/env-test.yml.in

@@ -30,4 +30,4 @@ dependencies:
   - firefox
   - geckodriver
   - robotframework-seleniumlibrary
-  - robotframework <3.2
+  - robotframework >=3.2

docs/Architecture.ipynb

@@ -22,7 +22,6 @@
     "import IPython\n",
     "\n",
     "\n",
-    "\n",
     "@IPython.core.magic.register_line_cell_magic\n",
     "def dot(line, cell=None):\n",
     "    src = graphviz.Source(pathlib.Path(line).read_text() if line else cell)._repr_svg_()\n",
@@ -171,4 +170,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

package.json

@@ -1,22 +1,22 @@
 {
   "dependencies": {},
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^2.27.0",
+    "@typescript-eslint/parser": "^2.27.0",
     "bash-language-server": "^1.6.1",
     "dictionary-en": "^3.0.0",
     "dockerfile-language-server-nodejs": "^0.0.22",
-    "eslint": "^5.16.0",
-    "eslint-config-prettier": "^4.1.0",
-    "eslint-plugin-prettier": "^3.0.1",
+    "eslint-config-prettier": "^6.7.0",
+    "eslint-plugin-jest": "^23.8.2",
+    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-react": "^7.19.0",
+    "eslint": "^6.8.0",
     "husky": "^3.0.9",
     "javascript-typescript-langserver": "^2.11.3",
     "lerna": "^3.13.2",
     "precise-commits": "^1.0.2",
-    "prettier": "^1.19.1",
-    "tslint": "^5.15.0",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-plugin-prettier": "^2.0.1",
-    "tslint-react": "^4.0.0",
-    "typescript": "~3.7.2",
+    "prettier": "^2.0.5",
+    "typescript": "~3.9.5",
     "unified-language-server": "^0.3.0",
     "vscode-css-languageserver-bin": "^1.4.0",
     "vscode-html-languageserver-bin": "^1.4.0",
@@ -29,7 +29,9 @@
     }
   },
   "prettier": {
-    "singleQuote": true
+    "arrowParens": "avoid",
+    "singleQuote": true,
+    "trailingComma": "none"
   },
   "private": true,
   "scripts": {
@@ -42,13 +44,13 @@
     "bundle": "lerna run --parallel bundle",
     "clean": "lerna run --parallel clean",
     "lab:link": "lerna run lab:link",
-    "lint:check": "jlpm prettier:check && jlpm tslint:check",
-    "lint": "jlpm prettier && jlpm tslint",
+    "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}'",
-    "test": "lerna run --stream --concurrency=1 test",
     "prettier": "prettier --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md,.yml}'",
-    "tslint": "tslint --fix -c ./packages/tslint.json --project ./packages/tsconfigbase.json 'packages/**/*{.ts,.tsx}'",
-    "tslint:check": "tslint -c ./packages/tslint.json --project ./packages/tsconfigbase.json 'packages/**/*{.ts,.tsx}'"
+    "eslint": "eslint --config packages/.eslintrc.js --ext .js,.jsx,.ts,.tsx --fix packages",
+    "eslint:check": "eslint --config packages/.eslintrc.js --ext .js,.jsx,.ts,.tsx packages",
+    "test": "lerna run --stream --concurrency=1 test"
   },
   "workspaces": {
     "packages": [

packages/.eslintrc.js

@@ -0,0 +1,72 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    commonjs: true,
+    node: true,
+    'jest/globals': true
+  },
+  root: true,
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier/@typescript-eslint',
+    'plugin:react/recommended',
+    'plugin:jest/recommended'
+  ],
+  ignorePatterns: [
+    '**/node_modules/**/*',
+    '**/lib/**/*',
+    '**/_*.ts',
+    '**/_*.d.ts',
+    '**/typings/**/*.d.ts',
+    '**/dist/*'
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: 'packages/tsconfig.eslint.json'
+  },
+  plugins: ['@typescript-eslint', 'jest'],
+  rules: {
+    '@typescript-eslint/ban-ts-ignore': 'warn',
+    '@typescript-eslint/camelcase': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/interface-name-prefix': [
+      'error',
+      { prefixWithI: 'always' }
+    ],
+    '@typescript-eslint/no-empty-interface': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-floating-promises': ['error', { ignoreVoid: true }],
+    '@typescript-eslint/no-inferrable-types': 'off',
+    '@typescript-eslint/no-namespace': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
+    '@typescript-eslint/no-use-before-define': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
+    'jest/expect-expect': 'off',
+    'jest/no-export': 'warn',
+    'jest/no-jest-import': 'off',
+    'jest/no-try-expect': 'warn',
+    'no-case-declarations': 'warn',
+    'no-control-regex': 'warn',
+    'no-inner-declarations': 'off',
+    'no-prototype-builtins': 'off',
+    'no-undef': 'warn',
+    'no-useless-escape': 'off',
+    'prefer-const': 'off',
+    // deviations from jupyterlab, should probably be fixed
+    '@typescript-eslint/triple-slash-reference': 'off',
+    'jest/no-test-callback': 'off',
+    'jest/valid-expect': 'off',
+    'no-async-promise-executor': 'off',
+    'prefer-spread': 'off',
+    'react/display-name': 'off'
+  },
+  settings: {
+    react: {
+      version: 'detect'
+    }
+  }
+};

packages/jupyterlab-go-to-definition/jest.config.js

@@ -20,7 +20,7 @@ let local = {
   transformIgnorePatterns: ['/node_modules/(?!(@jupyterlab/.*)/)']
 };
 
-for (option of reuseFromUpstream) {
+for (const option of reuseFromUpstream) {
   local[option] = upstream[option];
 }
 

packages/jupyterlab-go-to-definition/package.json

@@ -69,7 +69,7 @@
     "jest-junit": "^8.0.0",
     "rimraf": "^2.6.1",
     "ts-jest": "^24.0.2",
-    "typescript": "~3.7.2",
+    "typescript": "~3.9.5",
     "@babel/preset-env": "^7.4.3"
   },
   "jupyterlab": {

packages/jupyterlab-go-to-definition/src/editors/codemirror/extension.ts

@@ -190,7 +190,7 @@ export class CodeMirrorExtension extends CodeMirrorTokensProvider
         usagesBeforeTarget += 1;
       }
 
-      let nextSibling = sibling.previousSibling;
+      let nextSibling = sibling.previousSibling as Node;
 
       while (nextSibling == null) {
         while (!sibling.previousSibling) {