Skip to content

Commit 21ee990

Browse files
ibdafnaibdafna
authored
Merge pull request jupyter-widgets#3328 from jasongrout/updates
Update dependencies
2 parents 045cb0e + 58455d1 commit 21ee990

File tree

19 files changed

+3596
-2703
lines changed

19 files changed

+3596
-2703
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ npm-debug.log
2323
.vscode/*
2424
!.vscode/extensions.json
2525

26+
# Generated files
2627
python/widgetsnbextension/widgetsnbextension/static
2728
python/jupyterlab_widgets/jupyterlab_widgets/labextension/
29+
packages/controls/css/nouislider.css
2830

2931
index.built.js
3032
index.built.js.map

‎examples/web1/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"devDependencies": {
2424
"chai": "^4.0.0",
25-
"css-loader": "^5.2.6",
25+
"css-loader": "^6.5.1",
2626
"file-loader": "^6.2.0",
2727
"karma": "^6.3.3",
2828
"karma-chai": "^0.1.0",
@@ -31,7 +31,7 @@
3131
"karma-mocha": "^2.0.1",
3232
"karma-mocha-reporter": "^2.2.5",
3333
"mocha": "^9.0.0",
34-
"style-loader": "^2.0.0",
35-
"webpack": "^5.38.1"
34+
"style-loader": "^3.3.1",
35+
"webpack": "^5.65.0"
3636
}
3737
}

‎examples/web2/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"font-awesome": "^4.7.0"
2121
},
2222
"devDependencies": {
23-
"css-loader": "^5.2.6",
23+
"css-loader": "^6.5.1",
2424
"file-loader": "^6.2.0",
2525
"raw-loader": "^4.0.2",
26-
"style-loader": "^2.0.0",
26+
"style-loader": "^3.3.1",
2727
"url-loader": "^4.1.1",
28-
"webpack": "^5.38.1"
28+
"webpack": "^5.65.0"
2929
}
3030
}

‎examples/web3/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@
2020
"@jupyterlab/services": "^6.0.0",
2121
"codemirror": "^5.48.0",
2222
"font-awesome": "^4.7.0",
23-
"http-server": "^0.12.3"
23+
"http-server": "^14.0.0"
2424
},
2525
"devDependencies": {
2626
"@types/codemirror": "^5.60.0",
27-
"@types/node": "^15.12.2",
28-
"css-loader": "^5.2.6",
27+
"@types/node": "^17.0.2",
28+
"css-loader": "^6.5.1",
2929
"file-loader": "^6.2.0",
3030
"fs-extra": "^10.0.0",
3131
"postcss": "^8.3.2",
3232
"postcss-cssnext": "^3.1.0",
3333
"postcss-import": "^14.0.2",
3434
"postcss-loader": "^6.1.0",
3535
"rimraf": "^3.0.2",
36-
"style-loader": "^2.0.0",
36+
"style-loader": "^3.3.1",
3737
"typescript": "~4.3.2",
3838
"url-loader": "^4.1.1",
39-
"webpack": "^5.38.1"
39+
"webpack": "^5.65.0"
4040
}
4141
}

‎examples/web4/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"font-awesome": "^4.7.0"
1818
},
1919
"devDependencies": {
20-
"css-loader": "^5.2.6",
20+
"css-loader": "^6.5.1",
2121
"file-loader": "^6.2.0",
22-
"style-loader": "^2.0.0",
22+
"style-loader": "^3.3.1",
2323
"url-loader": "^4.1.1",
24-
"webpack": "^5.38.1"
24+
"webpack": "^5.65.0"
2525
}
2626
}

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
}
3333
},
3434
"devDependencies": {
35-
"@jupyterlab/buildutils": "^3.0.0",
36-
"@typescript-eslint/eslint-plugin": "^4.28.2",
37-
"@typescript-eslint/parser": "^4.28.2",
38-
"eslint": "^7.30.0",
35+
"@jupyterlab/buildutils": "^3.2.5",
36+
"@typescript-eslint/eslint-plugin": "^5.8.0",
37+
"@typescript-eslint/parser": "^5.8.0",
38+
"eslint": "^8.5.0",
3939
"eslint-config-prettier": "^8.3.0",
40-
"eslint-plugin-prettier": "^3.4.0",
41-
"husky": "^6.0.0",
40+
"eslint-plugin-prettier": "^4.0.0",
41+
"husky": "^7.0.4",
4242
"lerna": "^4.0.0",
43-
"lint-staged": "^11.0.0",
43+
"lint-staged": "^12.1.3",
4444
"prettier": "^2.3.2",
45-
"sort-package-json": "~1.50.0"
45+
"sort-package-json": "~1.53.1"
4646
},
4747
"engines": {
4848
"node": ">=10.15.3",

‎packages/base-manager/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"dependencies": {
3535
"@jupyter-widgets/base": "^5.0.0-beta.0",
3636
"@jupyterlab/services": "^6.0.0",
37-
"@lumino/coreutils": "^1.4.2",
37+
"@lumino/coreutils": "^1.11.1",
3838
"base64-js": "^1.2.1",
3939
"sanitize-html": "^2.3"
4040
},
@@ -43,8 +43,8 @@
4343
"@types/chai": "^4.1.7",
4444
"@types/chai-as-promised": "^7.1.0",
4545
"@types/expect.js": "^0.3.29",
46-
"@types/mocha": "^8.2.2",
47-
"@types/sanitize-html": "^1.20",
46+
"@types/mocha": "^9.0.0",
47+
"@types/sanitize-html": "^2.6.0",
4848
"@types/sinon": "^10.0.2",
4949
"@types/sinon-chai": "^3.2.2",
5050
"chai": "^4.0.0",
@@ -62,10 +62,10 @@
6262
"mocha": "^9.0.0",
6363
"npm-run-all": "^4.1.5",
6464
"rimraf": "^3.0.2",
65-
"sinon": "^11.1.1",
65+
"sinon": "^12.0.1",
6666
"sinon-chai": "^3.3.0",
6767
"typescript": "~4.3.2",
68-
"webpack": "^5.38.1"
68+
"webpack": "^5.65.0"
6969
},
7070
"publishConfig": {
7171
"access": "public"

‎packages/base-manager/src/manager-base.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ export interface IManagerStateMap extends PartialJSONObject {
7474
[key: string]: IState;
7575
}
7676

77+
/**
78+
* Widget manager state.
79+
*
80+
* The JSON schema for this is in @jupyter-widgets/schema/v2/state.schema.json.
81+
*/
7782
export interface IManagerState extends PartialJSONObject {
7883
version_major: number;
7984
version_minor: number;
@@ -470,7 +475,7 @@ export abstract class ManagerBase implements IWidgetManager {
470475

471476
// If the model has already been created, set its state and then
472477
// return it.
473-
if (this._models[model_id]) {
478+
if (this._models[model_id] !== undefined) {
474479
return this._models[model_id].then((model) => {
475480
// deserialize state
476481
return (model.constructor as typeof WidgetModel)

‎packages/base/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
},
3434
"dependencies": {
3535
"@jupyterlab/services": "^6.0.0",
36-
"@lumino/coreutils": "^1.2.0",
37-
"@lumino/messaging": "^1.2.1",
38-
"@lumino/widgets": "^1.3.0",
39-
"@types/backbone": "1.4.10",
36+
"@lumino/coreutils": "^1.11.1",
37+
"@lumino/messaging": "^1.10.1",
38+
"@lumino/widgets": "^1.30.0",
39+
"@types/backbone": "1.4.14",
4040
"@types/lodash": "^4.14.134",
4141
"backbone": "1.4.0",
4242
"jquery": "^3.1.1",
@@ -47,7 +47,7 @@
4747
"@types/chai": "^4.1.7",
4848
"@types/chai-as-promised": "^7.1.0",
4949
"@types/expect.js": "^0.3.29",
50-
"@types/mocha": "^8.2.2",
50+
"@types/mocha": "^9.0.0",
5151
"@types/sinon": "^10.0.2",
5252
"@types/sinon-chai": "^3.2.2",
5353
"chai": "^4.0.0",
@@ -65,9 +65,9 @@
6565
"mocha": "^9.0.0",
6666
"npm-run-all": "^4.1.5",
6767
"rimraf": "^3.0.2",
68-
"sinon": "^11.1.1",
68+
"sinon": "^12.0.1",
6969
"sinon-chai": "^3.3.0",
7070
"typescript": "~4.3.2",
71-
"webpack": "^5.38.1"
71+
"webpack": "^5.65.0"
7272
}
7373
}

‎packages/controls/css/nouislider-custom.css‎

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,20 @@
44

55
/* Custom CSS for nouislider */
66

7-
/* <DEPRECATED> */
8-
.widget-slider .noUi-connect, /* <DEPRECATED> */
9-
.jupyter-widget-slider .noUi-connect {
7+
.noUi-connect {
108
background: rgb(33, 150, 243);
119
}
1210

13-
/* <DEPRECATED> */
14-
.widget-slider .noUi-horizontal, /* <DEPRECATED> */
15-
.jupyter-widget-slider .noUi-horizontal {
11+
.noUi-horizontal {
1612
height: var(--jp-widgets-slider-track-thickness);
1713
}
1814

19-
/* <DEPRECATED> */
20-
.widget-slider .noUi-vertical, /* <DEPRECATED> */
21-
.jupyter-widget-slider .noUi-vertical {
15+
.noUi-vertical {
2216
width: var(--jp-widgets-slider-track-thickness);
2317
height: 100%;
2418
}
2519

26-
/* <DEPRECATED> */
27-
.widget-slider .noUi-horizontal .noUi-handle, /* <DEPRECATED> */
28-
.jupyter-widget-slider .noUi-horizontal .noUi-handle {
20+
.noUi-horizontal .noUi-handle {
2921
width: var(--jp-widgets-slider-handle-size);
3022
height: var(--jp-widgets-slider-handle-size);
3123
border-radius: 50%;
@@ -38,9 +30,7 @@
3830
right: calc(var(--jp-widgets-slider-handle-size) / -2);
3931
}
4032

41-
/* <DEPRECATED> */
42-
.widget-slider .noUi-vertical .noUi-handle, /* <DEPRECATED> */
43-
.jupyter-widget-slider .noUi-vertical .noUi-handle {
33+
.noUi-vertical .noUi-handle {
4434
height: var(--jp-widgets-slider-handle-size);
4535
width: var(--jp-widgets-slider-handle-size);
4636
border-radius: 50%;
@@ -53,40 +43,30 @@
5343
top: calc(var(--jp-widgets-slider-handle-size) / -2);
5444
}
5545

56-
/* <DEPRECATED> */
57-
.widget-slider .noUi-handle:after, /* <DEPRECATED> */
58-
.jupyter-widget-slider .noUi-handle:after {
46+
.noUi-handle:after {
5947
content: none;
6048
}
6149

62-
/* <DEPRECATED> */
63-
.widget-slider .noUi-handle:before, /* <DEPRECATED> */
64-
.jupyter-widget-slider .noUi-handle:before {
50+
.noUi-handle:before {
6551
content: none;
6652
}
6753

68-
/* <DEPRECATED> */
69-
.widget-slider .noUi-target, /* <DEPRECATED> */
70-
.jupyter-widget-slider .noUi-target {
54+
.noUi-target {
7155
background: #fafafa;
7256
border-radius: 4px;
7357
border: 1px;
7458
/* box-shadow: inset 0 1px 1px #F0F0F0, 0 3px 6px -5px #BBB; */
7559
}
7660

77-
/* <DEPRECATED> */
78-
.widget-slider .ui-slider, /* <DEPRECATED> */
79-
.jupyter-widget-slider .ui-slider {
61+
.ui-slider {
8062
border: var(--jp-widgets-slider-border-width) solid var(--jp-layout-color3);
8163
background: var(--jp-layout-color3);
8264
box-sizing: border-box;
8365
position: relative;
8466
border-radius: 0px;
8567
}
8668

87-
/* <DEPRECATED> */
88-
.widget-slider .noUi-handle, /* <DEPRECATED> */
89-
.jupyter-widget-slider .noUi-handle {
69+
.noUi-handle {
9070
width: var(--jp-widgets-slider-handle-size);
9171
border: 1px solid #d9d9d9;
9272
border-radius: 3px;
@@ -96,40 +76,29 @@
9676
outline: none;
9777
}
9878

99-
/* <DEPRECATED> */
100-
.widget-slider .noUi-target:not([disabled]) .noUi-handle:hover, /* <DEPRECATED> */
101-
/* <DEPRECATED> */ .widget-slider .noUi-target:not([disabled]) .noUi-handle:focus, /* <DEPRECATED> */
102-
.jupyter-widget-slider .noUi-target:not([disabled]) .noUi-handle:hover,
103-
.jupyter-widget-slider .noUi-target:not([disabled]) .noUi-handle:focus {
79+
.noUi-target:not([disabled]) .noUi-handle:hover,
80+
.noUi-target:not([disabled]) .noUi-handle:focus {
10481
background-color: var(--jp-widgets-slider-active-handle-color);
10582
border: var(--jp-widgets-slider-border-width) solid
10683
var(--jp-widgets-slider-active-handle-color);
10784
}
10885

109-
/* <DEPRECATED> */
110-
.widget-slider [disabled].noUi-target, /* <DEPRECATED> */
111-
.jupyter-widget-slider [disabled].noUi-target {
86+
[disabled].noUi-target {
11287
opacity: 0.35;
11388
}
11489

115-
/* <DEPRECATED> */
116-
.widget-slider .noUi-connects, /* <DEPRECATED> */
117-
.jupyter-widget-slider .noUi-connects {
90+
.noUi-connects {
11891
overflow: visible;
11992
z-index: 0;
12093
background: var(--jp-layout-color3);
12194
}
12295

123-
/* <DEPRECATED> */
124-
.widget-slider .noUi-vertical .noUi-connect, /* <DEPRECATED> */
125-
.jupyter-widget-slider .noUi-vertical .noUi-connect {
96+
.noUi-vertical .noUi-connect {
12697
width: calc(100% + 2px);
12798
right: -1px;
12899
}
129100

130-
/* <DEPRECATED */
131-
.widget-slider .noUi-horizontal .noUi-connect, /* <DEPRECATED */
132-
.jupyter-widget-slider .noUi-horizontal .noUi-connect {
101+
.noUi-horizontal .noUi-connect {
133102
height: calc(100% + 2px);
134103
top: -1px;
135104
}

0 commit comments

Comments
 (0)