Merge pull request #615 from fcollonval/auto-backport-of-pr-581-on-0.10.x

Backport PR #581 on branch 0.10.x

Author: fcollonval

.eslintignore

@@ -0,0 +1,5 @@
+node_modules
+dist
+coverage
+**/*.d.ts
+tests

.eslintrc.js

@@ -0,0 +1,46 @@
+module.exports = {
+    extends: [
+      'eslint:recommended',
+      'plugin:@typescript-eslint/eslint-recommended',
+      'plugin:@typescript-eslint/recommended',
+      'plugin:prettier/recommended',
+      'plugin:react/recommended'
+    ],
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+      project: 'tsconfig.json',
+      sourceType: 'module'
+    },
+    plugins: ['@typescript-eslint'],
+    rules: {
+      '@typescript-eslint/camelcase': 'off',
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/interface-name-prefix': [
+        'error',
+        { prefixWithI: 'always' }
+      ],
+      '@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-namespace': 'off',
+      '@typescript-eslint/no-this-alias': [
+        'error',
+        {
+          allowedNames: ['self'], // Allow `const self = this`
+        },
+      ],
+      '@typescript-eslint/no-use-before-define': 'off',
+      '@typescript-eslint/quotes': [
+        'error',
+        'single',
+        { avoidEscape: true, allowTemplateLiterals: false }
+      ],
+      curly: ['error', 'all'],
+      eqeqeq: 'error',
+      'prefer-arrow-callback': 'error'
+    },
+    settings: {
+      react: {
+        version: 'detect'
+      }
+    }
+  };

.prettierignore

@@ -0,0 +1,4 @@
+node_modules
+**/node_modules
+**/lib
+**/package.json

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "singleQuote": true
+}

.travis.yml

@@ -11,16 +11,16 @@ install: pip install --upgrade --upgrade-strategy=eager pytest pytest-asyncio "j
 script:
   # Build the sdist (identical to what will be uploaded to eg pypi on release)
   - python setup.py sdist
+  # Linter checks
+  - jlpm run eslint-check
+
   # Install the extension from the sdist ensuring the cache is unused
   - pip install jupyterlab_git[test] --pre --no-index --find-links=dist --no-deps --no-cache-dir -v
   # Install the extension dependencies based on the current setup.py
   - pip install jupyterlab_git[test]
   # Log the current state of jupyterlab's extensions
   - jupyter labextension list
 
-  # Do a tslint check
-  - jlpm run lint
-
   # Rebuild jupyterlab to include our extension
   - jupyter lab build
 

package.json

@@ -20,9 +20,9 @@
     "clean:labextension": "rimraf jupyterlab_git/labextension",
     "clean:slate": "jlpm clean:more && jlpm clean:labextension && rimraf node_modules",
     "contributors:generate": "jlpm run all-contributors generate",
-    "lint": "tslint --project .",
+    "lint": "eslint . --ext .ts,.tsx --fix",
     "test": "jest",
-    "tslint-check": "tslint-config-prettier-check ./tslint.json",
+    "eslint-check": "eslint . --ext .ts,.tsx",
     "watch": "tsc -w"
   },
   "files": [
@@ -80,9 +80,15 @@
     "@types/react": "~16.8.13",
     "@types/react-dom": "~16.0.5",
     "@types/react-textarea-autosize": "^4.3.5",
+    "@typescript-eslint/eslint-plugin": "^2.25.0",
+    "@typescript-eslint/parser": "^2.25.0",
     "all-contributors-cli": "6.14.0",
     "enzyme": "3.7.0",
     "enzyme-adapter-react-16": "1.7.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.1",
+    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-react": "^7.19.0",
     "husky": "1.3.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^24",
@@ -93,11 +99,7 @@
     "puppeteer": "^1.10.0",
     "rimraf": "^2.6.1",
     "ts-jest": "^24",
-    "tslint": "^5.11.0",
-    "tslint-config-prettier": "1.18.0",
-    "tslint-plugin-prettier": "^2.0.0",
-    "typescript": "~3.5.1",
-    "typescript-tslint-plugin": "^0.5.4"
+    "typescript": "~3.5.1"
   },
   "peerDependencies": {
     "codemirror": "^5.0.0"
@@ -112,7 +114,7 @@
   },
   "lint-staged": {
     "*.{ts,tsx}": [
-      "tslint --fix",
+      "eslint . --ext .ts,.tsx --fix",
       "git add"
     ]
   },

src/components/FileList.tsx

@@ -198,7 +198,8 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
   discardAllUnstagedFiles = async () => {
     const result = await showDialog({
       title: 'Discard all changes',
-      body: `Are you sure you want to permanently discard changes to all files? This action cannot be undone.`,
+      body:
+        'Are you sure you want to permanently discard changes to all files? This action cannot be undone.',
       buttons: [Dialog.cancelButton(), Dialog.warnButton({ label: 'Discard' })]
     });
     if (result.button.accept) {
@@ -214,7 +215,8 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
   discardAllChanges = async () => {
     const result = await showDialog({
       title: 'Discard all changes',
-      body: `Are you sure you want to permanently discard changes to all files? This action cannot be undone.`,
+      body:
+        'Are you sure you want to permanently discard changes to all files? This action cannot be undone.',
       buttons: [Dialog.cancelButton(), Dialog.warnButton({ label: 'Discard' })]
     });
     if (result.button.accept) {

src/components/GitPanel.tsx

@@ -93,7 +93,7 @@ export class GitPanel extends React.Component<
   refreshHistory = async () => {
     if (this.props.model.pathRepository !== null) {
       // Get git log for current branch
-      let logData = await this.props.model.log(this.props.settings.composite[
+      const logData = await this.props.model.log(this.props.settings.composite[
         'historyCount'
       ] as number);
       let pastCommits = new Array<Git.ISingleCommitInfo>();
@@ -402,7 +402,7 @@ export class GitPanel extends React.Component<
    * List of sorted modified files.
    */
   private get _sortedFiles(): Git.IStatusFile[] {
-    let { files } = this.state;
+    const { files } = this.state;
 
     files.sort((a, b) => a.to.localeCompare(b.to));
     return files;

src/components/diff/DiffWidget.tsx

@@ -26,7 +26,7 @@ export async function openDiffView(
 ) {
   if (isDiffSupported(filePath) || isText) {
     const id = `nbdiff-${filePath}-${getRefValue(diffContext.currentRef)}`;
-    let mainAreaItems = model.shell.widgets('main');
+    const mainAreaItems = model.shell.widgets('main');
     let mainAreaItem = mainAreaItems.next();
     while (mainAreaItem) {
       if (mainAreaItem.id === id) {

src/components/diff/NbDiff.tsx

@@ -195,9 +195,9 @@ export class NBDiff extends React.Component<IDiffProps, INBDiffState> {
               });
             } else {
               // Handle response
-              let base = data.base;
-              let diff = data.diff;
-              let nbdModel = new NotebookDiffModel(base, diff);
+              const base = data.base;
+              const diff = data.diff;
+              const nbdModel = new NotebookDiffModel(base, diff);
               this.setState({
                 nbdModel: nbdModel
               });