Merge branch 'master' into fix-switch-new-branch

Author: fcollonval

.travis.yml

@@ -9,10 +9,11 @@ before_install:
   - nvm install 10
 install: pip install pytest "jupyterlab~=1.1"
 script:
+  # Build the sdist (identical to what will be uploaded to eg pypi on release)
   - python setup.py sdist
-  # Install the extension ensuring the cache is unused
+  # 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
+  # Install the extension dependencies based on the current setup.py
   - pip install jupyterlab_git[test]
   - jupyter labextension list
   - jupyter lab build

MANIFEST.in

@@ -3,23 +3,6 @@ include README.md
 
 include setupbase.py
 
-include package.json
-include *.config.js
-include setupJest.js
-include ts*.json
-include jupyterlab_git/labextension/*.tgz
-
-# Tests
-graft tests
-prune tests/build
-
-# Javascript files
-graft schema
-graft src
-graft style
-prune **/node_modules
-prune lib
-
 # Patterns to exclude from any directory
 global-exclude *~
 global-exclude *.pyc

README.md

@@ -7,6 +7,8 @@ A JupyterLab extension for version control using git
 
 ![](http://g.recordit.co/N9Ikzbyk8P.gif)
 
+To see the extension in action, open the example notebook included in the Binder [demo](https://mybinder.org/v2/gh/jupyterlab/jupyterlab-git/master?urlpath=lab).
+
 ## Prerequisites
 
 - JupyterLab  
@@ -24,6 +26,14 @@ pip install --upgrade jupyterlab-git
 jupyter lab build
 ```
 
+### Troubleshooting
+
+- When you run JupyterLab, if you can see the Git sidepanel UI but you cannot get it to work, you may need to explicitly enable the serverextension by running:
+
+```bash
+jupyter serverextension enable --py jupyterlab_git
+```
+
 ## Development
 
 ### Contributing
@@ -55,17 +65,19 @@ If you would like to be listed, please submit a pull request with your informati
 Requires node 4+ and npm 4+
 
 ```bash
+# Install new-ish JupyterLab
+pip install -U jupyterlab
+
 # Clone the repo to your local environment
 git clone https://github.com/jupyterlab/jupyterlab-git.git
 cd jupyterlab-git
-# Install JupyterLab
-pip install jupyterlab
-# Install Javascript dependencies
-jlpm install
-# Install the server extension in development mode
+
+# Install the server extension in development mode and enable it
 pip install -e .[test]
 jupyter serverextension enable --py jupyterlab_git
-# Link your development version of the extension with JupyterLab
+
+# Build the labextension and dev-mode link it to jlab
+jlpm build
 jupyter labextension link .
 ```
 
@@ -81,4 +93,4 @@ To execute the tests
 ```bash
 pytest jupyterlab_git
 jlpm run test
-```
+```

babel.config.js

@@ -1,4 +1,5 @@
 module.exports = {
+  "sourceMap": "inline",
   presets: [
     [
       '@babel/preset-env',