Prepare 0.2.1 release - works JLab3.0 and fixes windows path issue

Author: amit1rrr

jupyterlab_gitplus/__init__.py

@@ -4,4 +4,4 @@ def _jupyter_server_extension_paths():
     }]
 
 
-__version__ = "0.1.15"
+__version__ = "0.2.1"

package-lock.json

@@ -15,7 +15,8 @@
   "author": "Amit Rathi",
   "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}"
+    "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}",
+    "style/index.js"
   ],
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,29 +26,53 @@
     "url": "https://github.com/ReviewNB/jupyterlab-gitplus.git"
   },
   "scripts": {
-    "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo",
+    "build": "jlpm run build:lib && jlpm run build:labextension:dev",
+    "build:labextension": "jupyter labextension build .",
+    "build:labextension:dev": "jupyter labextension build --development True .",
+    "build:lib": "tsc",
+    "build:prod": "jlpm run clean && jlpm run build:lib && jlpm run build:labextension",
+    "clean": "jlpm run clean:lib",
+    "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
+    "clean:labextension": "rimraf jupyterlab_gitplus/labextension",
+    "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
+    "eslint": "eslint . --ext .ts,.tsx --fix",
+    "eslint:check": "eslint . --ext .ts,.tsx",
+    "install:extension": "jlpm run build",
     "prepare": "jlpm run clean && jlpm run build",
-    "watch": "tsc -w"
+    "watch": "run-p watch:src watch:labextension",
+    "watch:labextension": "jupyter labextension watch .",
+    "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^2.0.0",
-    "@jupyterlab/apputils": "^2.0.0",
-    "@jupyterlab/docregistry": "^2.0.0",
-    "@jupyterlab/fileeditor": "^2.0.0",
-    "@jupyterlab/mainmenu": "^2.0.0",
-    "@jupyterlab/notebook": "^2.0.0",
-    "@lumino/disposable": "^1.3.5",
+    "@jupyterlab/application": "^3.0.11",
+    "@jupyterlab/apputils": "^3.0.9",
+    "@jupyterlab/docregistry": "^3.0.11",
+    "@jupyterlab/fileeditor": "^3.0.11",
+    "@jupyterlab/mainmenu": "^3.0.9",
+    "@jupyterlab/notebook": "^3.0.11",
+    "@lumino/disposable": "^1.4.3",
     "axios": "^0.19.2"
   },
   "devDependencies": {
-    "rimraf": "^2.6.1",
-    "typescript": "~3.7.0"
+    "@jupyterlab/builder": "^3.0.0",
+    "@typescript-eslint/eslint-plugin": "^4.8.1",
+    "@typescript-eslint/parser": "^4.8.1",
+    "eslint": "^7.14.0",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "mkdirp": "^1.0.3",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.1.1",
+    "rimraf": "^3.0.2",
+    "typescript": "~4.1.3"
   },
   "sideEffects": [
-    "style/*.css"
+    "style/*.css",
+    "style/index.js"
   ],
   "jupyterlab": {
-    "extension": true
-  }
-}
+    "extension": true,
+    "outputDir": "jupyterlab_gitplus/labextension"
+  },
+  "styleModule": "style/index.js"
+}

package.json

@@ -296,12 +296,16 @@ export function show_spinner() {
 
 function get_open_files(editorTracker: IEditorTracker, notebookTracker: INotebookTracker, base_dir: string) {
   let result: string[] = []
+  let separator: string = '/'
+  if (base_dir.includes('\\')) {
+    separator = '\\'
+  }
 
   notebookTracker.forEach(notebook => {
-    result.push(base_dir + '/' + notebook.context.path);
+    result.push(base_dir + separator + notebook.context.path);
   });
   editorTracker.forEach(editor => {
-    result.push(base_dir + '/' + editor.context.path);
+    result.push(base_dir + separator + editor.context.path);
   });
 
   return result;

src/index.ts

@@ -74,7 +74,9 @@ export class DropDown extends Widget {
         options: string[][] = [],
         label: string = "",
         styles: {} = {}) {
-        let body_style, label_style, select_style = {};
+        let body_style = {};
+        let label_style = {};
+        let select_style = {};
 
         if ("body_style" in styles) {
             body_style = styles["body_style"];
@@ -150,6 +152,7 @@ export class CommitPRMessageDialog extends Widget {
                 return textarea.value;
             }
         }
+        return '';
     }
 
     public getPRTitle(): string {
@@ -159,6 +162,7 @@ export class CommitPRMessageDialog extends Widget {
                 return textarea.value;
             }
         }
+        return '';
     }
 }
 
@@ -180,6 +184,7 @@ export class CommitMessageDialog extends Widget {
                 return textarea.value;
             }
         }
+        return '';
     }
 }
 

src/ui_elements.ts

@@ -16,7 +16,7 @@
     "outDir": "lib",
     "rootDir": "src",
     "strict": true,
-    "strictNullChecks": false,
+    "strictNullChecks": true,
     "target": "es2017",
     "types": []
   },

tsconfig.json

@@ -1015,8 +1015,8 @@ popper.js@^1.14.4, popper.js@^1.15.0:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
-postcss@^7.0.5:
-  version "7.0.27"
+postcss@^7.0.36:
+  version "7.0.36"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
   integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
   dependencies: