From 12619065a4436043ba352e9ea209396a6ef3295f Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Mon, 13 Dec 2021 13:21:50 +0100
Subject: [PATCH] Dependencies: Bump monaco to 0.31.0 (#43022)

---
 package.json                                         |  2 +-
 packages/grafana-ui/package.json                     |  2 +-
 .../grafana-ui/src/components/Monaco/CodeEditor.tsx  |  2 +-
 yarn.lock                                            | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 128e99778e7..12ee14feb79 100644
--- a/package.json
+++ b/package.json
@@ -300,7 +300,7 @@
     "memoize-one": "6.0.0",
     "moment": "2.29.1",
     "moment-timezone": "0.5.33",
-    "monaco-editor": "0.27.0",
+    "monaco-editor": "^0.31.0",
     "monaco-promql": "^1.7.2",
     "mousetrap": "1.6.5",
     "mousetrap-global-bind": "1.1.0",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index cb48cd781ac..7ccff449b24 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -59,7 +59,7 @@
     "lodash": "4.17.21",
     "memoize-one": "6.0.0",
     "moment": "2.29.1",
-    "monaco-editor": "0.27.0",
+    "monaco-editor": "^0.31.0",
     "prismjs": "1.25.0",
     "rc-cascader": "1.5.0",
     "rc-drawer": "4.4.0",
diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
index f69084e05b9..b2eef4196e2 100644
--- a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
+++ b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
@@ -97,7 +97,7 @@ class UnthemedCodeEditor extends React.PureComponent<Props> {
     const { onEditorDidMount } = this.props;
     this.getEditorValue = () => editor.getValue();
 
-    editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_S, this.onSave);
+    editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS, this.onSave);
     const languagePromise = this.loadCustomLanguage();
 
     if (onEditorDidMount) {
diff --git a/yarn.lock b/yarn.lock
index 8f8cdf9a163..258d89ae9f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3755,7 +3755,7 @@ __metadata:
     memoize-one: 6.0.0
     mock-raf: 1.0.1
     moment: 2.29.1
-    monaco-editor: 0.27.0
+    monaco-editor: ^0.31.0
     postcss: 8.3.11
     postcss-loader: 6.1.1
     prismjs: 1.25.0
@@ -19215,7 +19215,7 @@ __metadata:
     mini-css-extract-plugin: 2.4.4
     moment: 2.29.1
     moment-timezone: 0.5.33
-    monaco-editor: 0.27.0
+    monaco-editor: ^0.31.0
     monaco-promql: ^1.7.2
     mousetrap: 1.6.5
     mousetrap-global-bind: 1.1.0
@@ -24672,10 +24672,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"monaco-editor@npm:0.27.0":
-  version: 0.27.0
-  resolution: "monaco-editor@npm:0.27.0"
-  checksum: 766ce20ea6f5b5861ce3a05fa437d0755622520ce3e7d6af84a103ea5daa52fe7053cfa4ab470fa84eb42a27810c336b39764c984b9cd30bc32fd69b2eba233b
+"monaco-editor@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "monaco-editor@npm:0.31.0"
+  checksum: 6a610e8720d22ec65e55b7d746d058dbd20ff91afca19bcdd9f3a9f4bf58843229d4a3784868b9fdb3129d7bbfc2f905c530b72576090fdcc8ffe07ef8531159
   languageName: node
   linkType: hard