Merge pull request #3328 from jasongrout/updates

Update dependencies

Author: ibdafna

.gitignore

@@ -23,8 +23,10 @@ npm-debug.log
 .vscode/*
 !.vscode/extensions.json
 
+# Generated files
 python/widgetsnbextension/widgetsnbextension/static
 python/jupyterlab_widgets/jupyterlab_widgets/labextension/
+packages/controls/css/nouislider.css
 
 index.built.js
 index.built.js.map

examples/web1/package.json

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "chai": "^4.0.0",
-    "css-loader": "^5.2.6",
+    "css-loader": "^6.5.1",
     "file-loader": "^6.2.0",
     "karma": "^6.3.3",
     "karma-chai": "^0.1.0",
@@ -31,7 +31,7 @@
     "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
     "mocha": "^9.0.0",
-    "style-loader": "^2.0.0",
-    "webpack": "^5.38.1"
+    "style-loader": "^3.3.1",
+    "webpack": "^5.65.0"
   }
 }

examples/web2/package.json

@@ -20,11 +20,11 @@
     "font-awesome": "^4.7.0"
   },
   "devDependencies": {
-    "css-loader": "^5.2.6",
+    "css-loader": "^6.5.1",
     "file-loader": "^6.2.0",
     "raw-loader": "^4.0.2",
-    "style-loader": "^2.0.0",
+    "style-loader": "^3.3.1",
     "url-loader": "^4.1.1",
-    "webpack": "^5.38.1"
+    "webpack": "^5.65.0"
   }
 }

examples/web3/package.json

@@ -20,22 +20,22 @@
     "@jupyterlab/services": "^6.0.0",
     "codemirror": "^5.48.0",
     "font-awesome": "^4.7.0",
-    "http-server": "^0.12.3"
+    "http-server": "^14.0.0"
   },
   "devDependencies": {
     "@types/codemirror": "^5.60.0",
-    "@types/node": "^15.12.2",
-    "css-loader": "^5.2.6",
+    "@types/node": "^17.0.2",
+    "css-loader": "^6.5.1",
     "file-loader": "^6.2.0",
     "fs-extra": "^10.0.0",
     "postcss": "^8.3.2",
     "postcss-cssnext": "^3.1.0",
     "postcss-import": "^14.0.2",
     "postcss-loader": "^6.1.0",
     "rimraf": "^3.0.2",
-    "style-loader": "^2.0.0",
+    "style-loader": "^3.3.1",
     "typescript": "~4.3.2",
     "url-loader": "^4.1.1",
-    "webpack": "^5.38.1"
+    "webpack": "^5.65.0"
   }
 }

examples/web4/package.json

@@ -17,10 +17,10 @@
     "font-awesome": "^4.7.0"
   },
   "devDependencies": {
-    "css-loader": "^5.2.6",
+    "css-loader": "^6.5.1",
     "file-loader": "^6.2.0",
-    "style-loader": "^2.0.0",
+    "style-loader": "^3.3.1",
     "url-loader": "^4.1.1",
-    "webpack": "^5.38.1"
+    "webpack": "^5.65.0"
   }
 }

package.json

@@ -32,17 +32,17 @@
     }
   },
   "devDependencies": {
-    "@jupyterlab/buildutils": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.28.2",
-    "@typescript-eslint/parser": "^4.28.2",
-    "eslint": "^7.30.0",
+    "@jupyterlab/buildutils": "^3.2.5",
+    "@typescript-eslint/eslint-plugin": "^5.8.0",
+    "@typescript-eslint/parser": "^5.8.0",
+    "eslint": "^8.5.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "husky": "^6.0.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "husky": "^7.0.4",
     "lerna": "^4.0.0",
-    "lint-staged": "^11.0.0",
+    "lint-staged": "^12.1.3",
     "prettier": "^2.3.2",
-    "sort-package-json": "~1.50.0"
+    "sort-package-json": "~1.53.1"
   },
   "engines": {
     "node": ">=10.15.3",

packages/base-manager/package.json

@@ -34,7 +34,7 @@
   "dependencies": {
     "@jupyter-widgets/base": "^5.0.0-beta.0",
     "@jupyterlab/services": "^6.0.0",
-    "@lumino/coreutils": "^1.4.2",
+    "@lumino/coreutils": "^1.11.1",
     "base64-js": "^1.2.1",
     "sanitize-html": "^2.3"
   },
@@ -43,8 +43,8 @@
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "^7.1.0",
     "@types/expect.js": "^0.3.29",
-    "@types/mocha": "^8.2.2",
-    "@types/sanitize-html": "^1.20",
+    "@types/mocha": "^9.0.0",
+    "@types/sanitize-html": "^2.6.0",
     "@types/sinon": "^10.0.2",
     "@types/sinon-chai": "^3.2.2",
     "chai": "^4.0.0",
@@ -62,10 +62,10 @@
     "mocha": "^9.0.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "sinon": "^11.1.1",
+    "sinon": "^12.0.1",
     "sinon-chai": "^3.3.0",
     "typescript": "~4.3.2",
-    "webpack": "^5.38.1"
+    "webpack": "^5.65.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -74,6 +74,11 @@ export interface IManagerStateMap extends PartialJSONObject {
   [key: string]: IState;
 }
 
+/**
+ * Widget manager state.
+ *
+ * The JSON schema for this is in @jupyter-widgets/schema/v2/state.schema.json.
+ */
 export interface IManagerState extends PartialJSONObject {
   version_major: number;
   version_minor: number;
@@ -470,7 +475,7 @@ export abstract class ManagerBase implements IWidgetManager {
 
           // If the model has already been created, set its state and then
           // return it.
-          if (this._models[model_id]) {
+          if (this._models[model_id] !== undefined) {
             return this._models[model_id].then((model) => {
               // deserialize state
               return (model.constructor as typeof WidgetModel)

packages/base/package.json

@@ -33,10 +33,10 @@
   },
   "dependencies": {
     "@jupyterlab/services": "^6.0.0",
-    "@lumino/coreutils": "^1.2.0",
-    "@lumino/messaging": "^1.2.1",
-    "@lumino/widgets": "^1.3.0",
-    "@types/backbone": "1.4.10",
+    "@lumino/coreutils": "^1.11.1",
+    "@lumino/messaging": "^1.10.1",
+    "@lumino/widgets": "^1.30.0",
+    "@types/backbone": "1.4.14",
     "@types/lodash": "^4.14.134",
     "backbone": "1.4.0",
     "jquery": "^3.1.1",
@@ -47,7 +47,7 @@
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "^7.1.0",
     "@types/expect.js": "^0.3.29",
-    "@types/mocha": "^8.2.2",
+    "@types/mocha": "^9.0.0",
     "@types/sinon": "^10.0.2",
     "@types/sinon-chai": "^3.2.2",
     "chai": "^4.0.0",
@@ -65,9 +65,9 @@
     "mocha": "^9.0.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "sinon": "^11.1.1",
+    "sinon": "^12.0.1",
     "sinon-chai": "^3.3.0",
     "typescript": "~4.3.2",
-    "webpack": "^5.38.1"
+    "webpack": "^5.65.0"
   }
 }

packages/controls/css/nouislider-custom.css

@@ -4,28 +4,20 @@
 
 /* Custom CSS for nouislider */
 
-/* <DEPRECATED> */
-.widget-slider .noUi-connect, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-connect {
+.noUi-connect {
   background: rgb(33, 150, 243);
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-horizontal, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-horizontal {
+.noUi-horizontal {
   height: var(--jp-widgets-slider-track-thickness);
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-vertical, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-vertical {
+.noUi-vertical {
   width: var(--jp-widgets-slider-track-thickness);
   height: 100%;
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-horizontal .noUi-handle, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-horizontal .noUi-handle {
+.noUi-horizontal .noUi-handle {
   width: var(--jp-widgets-slider-handle-size);
   height: var(--jp-widgets-slider-handle-size);
   border-radius: 50%;
@@ -38,9 +30,7 @@
   right: calc(var(--jp-widgets-slider-handle-size) / -2);
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-vertical .noUi-handle, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-vertical .noUi-handle {
+.noUi-vertical .noUi-handle {
   height: var(--jp-widgets-slider-handle-size);
   width: var(--jp-widgets-slider-handle-size);
   border-radius: 50%;
@@ -53,40 +43,30 @@
   top: calc(var(--jp-widgets-slider-handle-size) / -2);
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-handle:after, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-handle:after {
+.noUi-handle:after {
   content: none;
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-handle:before, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-handle:before {
+.noUi-handle:before {
   content: none;
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-target, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-target {
+.noUi-target {
   background: #fafafa;
   border-radius: 4px;
   border: 1px;
   /* box-shadow: inset 0 1px 1px #F0F0F0, 0 3px 6px -5px #BBB; */
 }
 
-/* <DEPRECATED> */
-.widget-slider .ui-slider, /* <DEPRECATED> */
-.jupyter-widget-slider .ui-slider {
+.ui-slider {
   border: var(--jp-widgets-slider-border-width) solid var(--jp-layout-color3);
   background: var(--jp-layout-color3);
   box-sizing: border-box;
   position: relative;
   border-radius: 0px;
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-handle, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-handle {
+.noUi-handle {
   width: var(--jp-widgets-slider-handle-size);
   border: 1px solid #d9d9d9;
   border-radius: 3px;
@@ -96,40 +76,29 @@
   outline: none;
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-target:not([disabled]) .noUi-handle:hover, /* <DEPRECATED> */
-/* <DEPRECATED> */ .widget-slider .noUi-target:not([disabled]) .noUi-handle:focus, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-target:not([disabled]) .noUi-handle:hover,
-.jupyter-widget-slider .noUi-target:not([disabled]) .noUi-handle:focus {
+.noUi-target:not([disabled]) .noUi-handle:hover,
+.noUi-target:not([disabled]) .noUi-handle:focus {
   background-color: var(--jp-widgets-slider-active-handle-color);
   border: var(--jp-widgets-slider-border-width) solid
     var(--jp-widgets-slider-active-handle-color);
 }
 
-/* <DEPRECATED> */
-.widget-slider [disabled].noUi-target, /* <DEPRECATED> */
-.jupyter-widget-slider [disabled].noUi-target {
+[disabled].noUi-target {
   opacity: 0.35;
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-connects, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-connects {
+.noUi-connects {
   overflow: visible;
   z-index: 0;
   background: var(--jp-layout-color3);
 }
 
-/* <DEPRECATED> */
-.widget-slider .noUi-vertical .noUi-connect, /* <DEPRECATED> */
-.jupyter-widget-slider .noUi-vertical .noUi-connect {
+.noUi-vertical .noUi-connect {
   width: calc(100% + 2px);
   right: -1px;
 }
 
-/* <DEPRECATED */
-.widget-slider .noUi-horizontal .noUi-connect, /* <DEPRECATED */
-.jupyter-widget-slider .noUi-horizontal .noUi-connect {
+.noUi-horizontal .noUi-connect {
   height: calc(100% + 2px);
   top: -1px;
 }