Skip to content

Commit 1df3a5e

Browse files
authored
Merge pull request #38 from consideRatio/jlab2
JupyterLab 2 support
2 parents 720747a + 331533f commit 1df3a5e

File tree

7 files changed

+2879
-3819
lines changed

7 files changed

+2879
-3819
lines changed

package-lock.json

Lines changed: 2848 additions & 3790 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jupyter-widgets/jupyterlab-sidecar",
3-
"version": "0.4.0",
3+
"version": "0.5.0",
44
"description": "A sidecar output widget for JupyterLab",
55
"keywords": [
66
"jupyter",
@@ -38,31 +38,32 @@
3838
"watch:lib": "tsc"
3939
},
4040
"dependencies": {
41-
"@jupyter-widgets/base": "^2.0.1",
42-
"@jupyter-widgets/jupyterlab-manager": "^1.0.0",
43-
"@jupyterlab/application": "^1.0.0"
41+
"@jupyter-widgets/base": "^3.0.0",
42+
"@jupyter-widgets/jupyterlab-manager": "^2.0.0",
43+
"@jupyterlab/application": "^2.0.0",
44+
"@lumino/coreutils": "^1.4.2"
4445
},
4546
"devDependencies": {
4647
"@types/expect.js": "^0.3.29",
47-
"@types/mocha": "^2.2.41",
48-
"@types/node": "^8.0.17",
48+
"@types/mocha": "^7.0.2",
49+
"@types/node": "^13.9.2",
4950
"expect.js": "^0.3.1",
50-
"fs-extra": "^4.0.2",
51+
"fs-extra": "^8.1.0",
5152
"json-loader": "^0.5.7",
52-
"karma": "^1.7.0",
53-
"karma-chrome-launcher": "^2.2.0",
54-
"karma-firefox-launcher": "^1.0.1",
53+
"karma": "^4.4.1",
54+
"karma-chrome-launcher": "^3.1.0",
55+
"karma-firefox-launcher": "^1.3.0",
5556
"karma-ie-launcher": "^1.0.0",
5657
"karma-mocha": "^1.3.0",
57-
"karma-mocha-reporter": "^2.2.3",
58-
"karma-typescript": "^3.0.5",
59-
"mkdirp": "^0.5.1",
60-
"mocha": "^3.5.0",
61-
"npm-run-all": "^4.1.1",
62-
"rimraf": "^2.6.2",
63-
"source-map-loader": "^0.2.1",
64-
"ts-loader": "^2.3.2",
65-
"typescript": "~3.5.2"
58+
"karma-mocha-reporter": "^2.2.5",
59+
"karma-typescript": "^5.0.0",
60+
"mkdirp": "^1.0.3",
61+
"mocha": "^7.1.1",
62+
"npm-run-all": "^4.1.5",
63+
"rimraf": "^3.0.2",
64+
"source-map-loader": "^0.2.4",
65+
"ts-loader": "^6.2.1",
66+
"typescript": "^3.8.3"
6667
},
6768
"jupyterlab": {
6869
"extension": "lib/plugin"

src/plugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77

88
import {
99
UUID
10-
} from '@phosphor/coreutils';
10+
} from '@lumino/coreutils';
1111

1212
import {
1313
IJupyterWidgetRegistry

src/widget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class SidecarModel extends OutputModel {
2929

3030
initialize(attributes: any, options: any) {
3131
super.initialize(attributes, options);
32-
this.widget_manager.display_model(undefined, this, {});
32+
this.widget_manager.display_model(undefined as any, this, {});
3333
}
3434

3535
static serializers : any = {

tests/src/index.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ import {
1212
} from './utils.spec';
1313

1414
import {
15-
ExampleModel, ExampleView
15+
SidecarModel
1616
} from '../../src/'
1717

1818

19-
describe('Example', () => {
19+
describe('Sidecar', () => {
2020

21-
describe('ExampleModel', () => {
21+
describe('SidecarModel', () => {
2222

2323
it('should be createable', () => {
24-
let model = createTestModel(ExampleModel);
25-
expect(model).to.be.an(ExampleModel);
24+
let model = createTestModel(SidecarModel);
25+
expect(model).to.be.an(SidecarModel);
2626
expect(model.get('value')).to.be('Hello World');
2727
});
2828

2929
it('should be createable with a value', () => {
3030
let state = { value: 'Foo Bar!' }
31-
let model = createTestModel(ExampleModel, state);
32-
expect(model).to.be.an(ExampleModel);
31+
let model = createTestModel(SidecarModel, state);
32+
expect(model).to.be.an(SidecarModel);
3333
expect(model.get('value')).to.be('Foo Bar!');
3434
});
3535

tests/src/utils.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class MockComm {
2121
on_msg(fn: Function | null) {
2222
this._on_msg = fn;
2323
}
24-
_process_msg(msg: services.KernelMessage.ICommMsg) {
24+
_process_msg(msg: services.KernelMessage.ICommMsgMsg) {
2525
if (this._on_msg) {
2626
return this._on_msg(msg);
2727
} else {

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"compilerOptions": {
33
"declaration": true,
4+
"esModuleInterop": true,
45
"noImplicitAny": true,
56
"noEmitOnError": true,
67
"noUnusedLocals": true,

0 commit comments

Comments
 (0)