Skip to content

Commit ab6a212

Browse files
authored
Merge pull request jupyterlab#239 from blink1073/jlab-0.35
Upgrade to JLab 0.35 and Cleanup
2 parents 10bbe9a + 7cfb97d commit ab6a212

File tree

5 files changed

+1048
-15
lines changed

5 files changed

+1048
-15
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,3 @@ node_modules/
105105
.vscode/
106106

107107
package-lock.json
108-
yarn.lock

.travis.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
language: python
22
python:
33
- '3.6'
4-
install: pip install pytest notebook psutil
4+
cache:
5+
pip: true
6+
directories:
7+
- /home/travis/.yarn-cache/
8+
install: pip install pytest jupyterlab psutil
59
script:
6-
- pytest tests/unit
10+
- pytest tests/unit
11+
- yarn
12+
- yarn build
13+
- pip install .
14+
- jupyter labextension install .
15+
- python -m jupyterlab.browser_check

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@
2424
"extension": true
2525
},
2626
"dependencies": {
27-
"@jupyterlab/application": "^0.18.0",
28-
"@jupyterlab/apputils": "^0.18.0",
29-
"@jupyterlab/console": "^0.18.0",
27+
"@jupyterlab/application": "^0.19.1",
28+
"@jupyterlab/apputils": "^0.19.1",
29+
"@jupyterlab/console": "^0.19.1",
3030
"@jupyterlab/coreutils": "^2.0.2",
31-
"@jupyterlab/filebrowser": "^0.18.0",
32-
"@jupyterlab/mainmenu": "^0.7.0",
33-
"@jupyterlab/terminal": "^0.18.0",
34-
"@jupyterlab/theming": "^0.9.0",
31+
"@jupyterlab/filebrowser": "^0.19.1",
32+
"@jupyterlab/mainmenu": "^0.8.1",
3533
"@jupyterlab/services": "^3.1.0",
34+
"@jupyterlab/terminal": "^0.19.1",
35+
"@jupyterlab/theming": "^0.9.0",
3636
"@phosphor/widgets": "^1.6.0",
37-
"nbdime": "^2.0.0",
38-
"react": "^15.6.2",
39-
"react-dom": "^15.6.2",
37+
"nbdime": "^4.0.1",
38+
"react": "^16.5.2",
39+
"react-dom": "^16.5.2",
4040
"react-toggle-display": "^2.2.0",
4141
"typestyle": "^2.0.1"
4242
},
4343
"devDependencies": {
4444
"rimraf": "^2.6.1",
45-
"typescript": "~2.4.0"
45+
"typescript": "~3.1.2"
4646
},
4747
"directories": {
4848
"lib": "lib"

tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"module": "commonjs",
88
"moduleResolution": "node",
99
"target": "es2015",
10-
"outDir": "./lib",
10+
"rootDir": "src",
11+
"outDir": "lib",
1112
"lib": ["es5", "es2015.promise", "es2015.collection","dom"],
1213
"types": [],
1314
"jsx": "react"

0 commit comments

Comments
 (0)