Merge pull request #6388 from jasongrout/yarn-refresh

Refresh yarn.lock.
jupyterlab · May 23, 2019 · ce4c47a · ce4c47a
2 parents 7391a88 + 33d87c1
commit ce4c47a
Show file tree

Hide file tree

Showing 11 changed files with 3,471 additions and 1,916 deletions.
diff --git a/dev_mode/package.json b/dev_mode/package.json
@@ -78,7 +78,6 @@
     "codemirror": "~5.46.0",
     "es6-promise": "~4.1.1",
     "json5": "^2.1.0",
-    "marked": "0.5.1",
     "moment": "~2.21.0",
     "path-posix": "~1.0.0",
     "react": "~16.8.4",

diff --git a/examples/console/package.json b/examples/console/package.json
@@ -18,7 +18,7 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "@types/codemirror": "~0.0.70",
+    "@types/codemirror": "~0.0.74",
     "css-loader": "~2.1.1",
     "file-loader": "~3.0.1",
     "mini-css-extract-plugin": "~0.6.0",

diff --git a/examples/filebrowser/package.json b/examples/filebrowser/package.json
@@ -22,7 +22,7 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "@types/codemirror": "~0.0.70",
+    "@types/codemirror": "~0.0.74",
     "css-loader": "~2.1.1",
     "file-loader": "~3.0.1",
     "mini-css-extract-plugin": "~0.6.0",

diff --git a/examples/notebook/package.json b/examples/notebook/package.json
@@ -23,7 +23,7 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "@types/codemirror": "~0.0.70",
+    "@types/codemirror": "~0.0.74",
     "css-loader": "~2.1.1",
     "file-loader": "~3.0.1",
     "mini-css-extract-plugin": "~0.6.0",

diff --git a/packages/codemirror-extension/src/index.ts b/packages/codemirror-extension/src/index.ts
@@ -154,8 +154,9 @@ function activateEditorCommands(
     theme = (settings.get('theme').composite as string | null) || theme;
     scrollPastEnd = settings.get('scrollPastEnd').composite as boolean | null;
     styleActiveLine =
-      (settings.get('styleActiveLine').composite as boolean | object) ||
-      styleActiveLine;
+      (settings.get('styleActiveLine').composite as
+        | boolean
+        | CodeMirror.StyleActiveLine) || styleActiveLine;
     styleSelectedText =
       (settings.get('styleSelectedText').composite as boolean) ||
       styleSelectedText;

diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json
@@ -46,7 +46,7 @@
     "react": "~16.8.4"
   },
   "devDependencies": {
-    "@types/codemirror": "~0.0.70",
+    "@types/codemirror": "~0.0.74",
     "rimraf": "~2.6.2",
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"

diff --git a/packages/codemirror/src/editor.ts b/packages/codemirror/src/editor.ts
@@ -1209,7 +1209,7 @@ export namespace CodeMirrorEditor {
      * CodeMirror-activeline-background, and adds the class
      * CodeMirror-activeline-gutter to the line's gutter space is enabled.
      */
-    styleActiveLine: boolean | object;
+    styleActiveLine: boolean | CodeMirror.StyleActiveLine;
 
     /**
      * Whether to causes the selected text to be marked with the CSS class
@@ -1264,7 +1264,7 @@ export namespace CodeMirrorEditor {
     name: string,
     command: (cm: CodeMirror.Editor) => void
   ) {
-    CodeMirror.commands[name] = command;
+    (CodeMirror.commands as any)[name] = command;
   }
 }
 
@@ -1289,7 +1289,7 @@ namespace Private {
       ...otherOptions
     } = config;
     let bareConfig = {
-      autoCloseBrackets: autoClosingBrackets,
+      autoCloseBrackets: autoClosingBrackets ? {} : false,
       indentUnit: tabSize,
       indentWithTabs: !insertSpaces,
       lineWrapping: lineWrap === 'off' ? false : true,

diff --git a/packages/codemirror/typings/codemirror/codemirror.d.ts b/packages/codemirror/typings/codemirror/codemirror.d.ts
@@ -76,10 +76,6 @@ declare module 'codemirror' {
     head: Position;
   }
 
-  var commands: {
-    [key: string]: any;
-  };
-
   // findMode* functions are from loading the codemirror/mode/meta module
   interface modespec {
     ext?: string[];
@@ -99,14 +95,6 @@ declare module 'codemirror' {
   function findModeByFileName(name: string): modespec;
   function findModeByMIME(mime: string): modespec;
 
-  var modes: {
-    [key: string]: any;
-  };
-
-  var mimeModes: {
-    [key: string]: any;
-  };
-
   // come back to this later
   interface Context {
     state: any;

diff --git a/packages/ui-components/src/index.tsx b/packages/ui-components/src/index.tsx
@@ -35,6 +35,7 @@ export { Intent } from '@blueprintjs/core/lib/cjs/common/intent';
 
 interface IButtonProps extends IBPButtonProps {
   title?: string;
+  type?: 'button' | 'submit' | 'reset';
 }
 
 interface IInputGroupProps extends IBPInputGroupProps {

diff --git a/testutils/src/jest-shim.ts b/testutils/src/jest-shim.ts
@@ -44,8 +44,9 @@ process.on('unhandledRejection', (error, promise) => {
   console.error('Unhandled promise rejection somewhere in tests');
   if (error) {
     console.error(error);
-    if (error.stack) {
-      console.error(error.stack);
+    const stack = (error as any).stack;
+    if (stack) {
+      console.error(stack);
     }
   }
   promise.catch(err => console.error('promise rejected', err));