diff --git a/examples/console/package.json b/examples/console/package.json index 13dac6e1c56e..e4ed436abed3 100644 --- a/examples/console/package.json +++ b/examples/console/package.json @@ -18,7 +18,7 @@ "es6-promise": "~4.2.8" }, "devDependencies": { - "@types/codemirror": "^0.0.74", + "@types/codemirror": "0.0.75", "css-loader": "~3.3.0", "file-loader": "~5.0.2", "mini-css-extract-plugin": "~0.8.0", diff --git a/examples/filebrowser/package.json b/examples/filebrowser/package.json index 21cd68a5fa3c..ba48b0a2770f 100644 --- a/examples/filebrowser/package.json +++ b/examples/filebrowser/package.json @@ -23,7 +23,7 @@ "es6-promise": "~4.2.8" }, "devDependencies": { - "@types/codemirror": "^0.0.74", + "@types/codemirror": "0.0.75", "css-loader": "~3.3.0", "file-loader": "~5.0.2", "mini-css-extract-plugin": "~0.8.0", diff --git a/examples/notebook/package.json b/examples/notebook/package.json index ddc41277fcb3..79a1b8dcf6b2 100644 --- a/examples/notebook/package.json +++ b/examples/notebook/package.json @@ -23,7 +23,7 @@ "es6-promise": "~4.2.8" }, "devDependencies": { - "@types/codemirror": "^0.0.74", + "@types/codemirror": "0.0.75", "css-loader": "~3.3.0", "file-loader": "~5.0.2", "mini-css-extract-plugin": "~0.8.0", diff --git a/packages/codemirror-extension/package.json b/packages/codemirror-extension/package.json index 71b71205492c..bad81e97d23e 100644 --- a/packages/codemirror-extension/package.json +++ b/packages/codemirror-extension/package.json @@ -45,7 +45,7 @@ "@jupyterlab/mainmenu": "^2.0.0-alpha.4", "@jupyterlab/statusbar": "^2.0.0-alpha.4", "@lumino/widgets": "^1.9.4", - "codemirror": "~5.47.0" + "codemirror": "~5.49.2" }, "devDependencies": { "rimraf": "~3.0.0", diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json index b4836dd996fd..2647b96cb406 100644 --- a/packages/codemirror/package.json +++ b/packages/codemirror/package.json @@ -44,11 +44,11 @@ "@lumino/disposable": "^1.3.2", "@lumino/signaling": "^1.3.2", "@lumino/widgets": "^1.9.4", - "codemirror": "~5.47.0", + "codemirror": "~5.49.2", "react": "~16.12.0" }, "devDependencies": { - "@types/codemirror": "^0.0.74", + "@types/codemirror": "0.0.75", "rimraf": "~3.0.0", "typedoc": "^0.15.4", "typescript": "~3.7.3" diff --git a/packages/codemirror/src/editor.ts b/packages/codemirror/src/editor.ts index f6be986f3e20..d3bc84b837d3 100644 --- a/packages/codemirror/src/editor.ts +++ b/packages/codemirror/src/editor.ts @@ -681,6 +681,9 @@ export class CodeMirrorEditor implements CodeEditor.IEditor { editor.setOption('mode', spec.mime); }); let extraKeys = editor.getOption('extraKeys') || {}; + if (typeof extraKeys === 'string') { + return; + } const isCode = mime !== 'text/plain' && mime !== 'text/x-ipythongfm'; if (isCode) { extraKeys['Backspace'] = 'delSpaceToPrevTabStop'; diff --git a/packages/documentsearch/package.json b/packages/documentsearch/package.json index 36e75a2a2ecf..078117486bc7 100644 --- a/packages/documentsearch/package.json +++ b/packages/documentsearch/package.json @@ -43,7 +43,7 @@ "@lumino/disposable": "^1.3.2", "@lumino/signaling": "^1.3.2", "@lumino/widgets": "^1.9.4", - "codemirror": "~5.47.0", + "codemirror": "~5.49.2", "react": "~16.12.0" }, "devDependencies": { diff --git a/tests/test-codemirror/package.json b/tests/test-codemirror/package.json index 9746758a7980..af818b5cd50b 100644 --- a/tests/test-codemirror/package.json +++ b/tests/test-codemirror/package.json @@ -16,7 +16,7 @@ "@jupyterlab/codemirror": "^2.0.0-alpha.4", "@jupyterlab/testutils": "^2.0.0-alpha.4", "chai": "^4.2.0", - "codemirror": "~5.47.0", + "codemirror": "~5.49.2", "jest": "^24.9.0", "jest-junit": "^10.0.0", "simulate-event": "~1.4.0", diff --git a/yarn.lock b/yarn.lock index 2fa8b338e8a7..1be5071c4f02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1877,10 +1877,10 @@ resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= -"@types/codemirror@^0.0.74": - version "0.0.74" - resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.74.tgz#7ca146f7f3414166e7501000d691b2f18d978d10" - integrity sha512-pjc14HE6KCCk3SYoC49k/gJJHkredJy4GdSK+lGRMIBfG+Uq6vT8oZiKToFH2J7pZ5pUd69UGD6CgmFG1V17wA== +"@types/codemirror@0.0.75": + version "0.0.75" + resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.75.tgz#95010c3fd4e3e61665635048a25d7f9d4f8a0d6e" + integrity sha512-GhTfPMqrQiHdBoM002Lc6pcyBewsbginhYDhmmXUMxc980VTWm9UsmcnVdb5VmA2NWw492J3nMy9vG2s/IQQfA== dependencies: "@types/tern" "*" @@ -3740,10 +3740,10 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -codemirror@~5.47.0: - version "5.47.0" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.47.0.tgz#c13a521ae5660d3acc655af252f4955065293789" - integrity sha512-kV49Fr+NGFHFc/Imsx6g180hSlkGhuHxTSDDmDHOuyln0MQYFLixDY4+bFkBVeCEiepYfDimAF/e++9jPJk4QA== +codemirror@~5.49.2: + version "5.49.2" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.49.2.tgz#c84fdaf11b19803f828b0c67060c7bc6d154ccad" + integrity sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ== collection-visit@^1.0.0: version "1.0.0" @@ -12132,10 +12132,10 @@ terser-webpack-plugin@^1.4.1: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser-webpack-plugin@^2.2.2: - version "2.3.0" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.0.tgz#00fd8f792a330dc572e2e2b468fd7cb5ffd7ea51" - integrity sha512-yez0HdpDf/iQVYGf+e/o8ZYWLb1g9d1nRRi5FIOZ4KfXbfSPT259UoqxPiSLhCnr0mlDoh+bucpYQSFbU0cEsQ== +terser-webpack-plugin@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.3.tgz#7b070b40e39ef177ca062a4b6d70c3acdd85defc" + integrity sha512-R8cqQDld4BjVKaIR0D9Q0O/QzfgXzME3wXfSxxW23ZGv5xpMDUt1NEnCuG94y1+bKASLvc5TjIHLlNo0eK8GLA== dependencies: cacache "^13.0.1" find-cache-dir "^3.1.0" @@ -13838,10 +13838,10 @@ yarn-deduplicate@^1.1.1: commander "^2.10.0" semver "^5.3.0" -yarn@1.21.0: - version "1.21.0" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.21.0.tgz#e0827d97a24f6714f1540cf2e8328b2e8eed682c" - integrity sha512-g9cvrdKXPZlz1eJYpKanQm3eywEmecudeyDkwiVWeswBrpHK3nJFBholkphHF9eNc8y/FNEhSQ8Et5ZAx4XyLw== +yarn@1.21.1: + version "1.21.1" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.21.1.tgz#1d5da01a9a03492dc4a5957befc1fd12da83d89c" + integrity sha512-dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ== yauzl@2.4.1: version "2.4.1"