Upgraded typescript to fix build errors

jupyter · Oct 5, 2021 · fd82468 · fd82468
1 parent 518950f
commit fd82468
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/labextension/package.json b/packages/labextension/package.json
@@ -55,7 +55,7 @@
     "@phosphor/commands": "^1.6.1",
     "mkdirp": "^0.5.1",
     "rimraf": "^2.6.3",
-    "typescript": "^3.5.2"
+    "typescript": "^3.7.2"
   },
   "jupyterlab": {
     "extension": true,

diff --git a/packages/nbdime/package.json b/packages/nbdime/package.json
@@ -34,6 +34,7 @@
     "@phosphor/dragdrop": "^1.3.0",
     "@phosphor/signaling": "^1.2.2",
     "@phosphor/widgets": "^1.6.0",
+    "@types/node": "^16.10.2",
     "json-stable-stringify": "^1.0.1"
   },
   "devDependencies": {
@@ -42,7 +43,6 @@
     "@types/expect.js": "^0.3.29",
     "@types/json-stable-stringify": "^1.0.32",
     "@types/mocha": "^5.2.6",
-    "@types/node": "^12.0.10",
     "@types/sanitizer": "^0.0.28",
     "expect.js": "^0.3.1",
     "fs-extra": "^8.1.0",
@@ -56,7 +56,7 @@
     "karma-typescript-es6-transform": "^4.0.0",
     "mocha": "^6.0.2",
     "rimraf": "^2.6.3",
-    "typescript": "^3.5.2"
+    "typescript": "^3.7.2"
   },
   "peerDependencies": {
     "codemirror": "^5.0.0"

diff --git a/packages/nbdime/src/upstreaming/flexlayout.ts b/packages/nbdime/src/upstreaming/flexlayout.ts
@@ -378,9 +378,9 @@ class FlexLayout extends PanelLayout {
     Private.toggleDirection(this.parent!, this._direction);
     let style = this.parent!.node.style;
     style.flexWrap = this._wrap ? 'wrap' : 'nowrap';
-    style.justifyContent = Private.translateFlexString(this._justifyContent);
-    style.alignContent = Private.translateFlexString(this._alignContent);
-    style.alignItems = Private.translateFlexString(this._alignItems);
+    style.justifyContent = Private.translateFlexString(this._justifyContent)!;
+    style.alignContent = Private.translateFlexString(this._alignContent)!;
+    style.alignItems = Private.translateFlexString(this._alignItems)!;
     this.parent!.fit();
   }
 
@@ -533,7 +533,7 @@ class FlexLayout extends PanelLayout {
     // Update display order
     for (let i = 0; i < widgets.length; ++i) {
       let widget = widgets[i];
-      widget.node.style.order = this.order ?  i.toString() : null;
+      widget.node.style.order = this.order ?  i.toString() : '';
     }
   }
 
@@ -717,7 +717,7 @@ namespace FlexLayout {
     if (value === 'auto') {
       widget.node.style.flexBasis = value as string;
     } else if (value === null) {
-      widget.node.style.flexBasis = value;
+      widget.node.style.flexBasis = '';
     } else {
       widget.node.style.flexBasis = value.toString() + 'px';
     }