Merge pull request #91 from jetstreamapp/upgrade-monaco

Upgrade monaco and headlessui
jetstreamapp · Jan 31, 2023 · 682d920 · 682d920
2 parents 9055bae + 85ce43d
commit 682d920
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/apps/jetstream/src/app/components/query/QueryOptions/ManualSoql.tsx b/apps/jetstream/src/app/components/query/QueryOptions/ManualSoql.tsx
@@ -119,7 +119,7 @@ export const ManualSoql: FunctionComponent<ManualSoqlProps> = ({ className, isTo
     editorRef.current.addAction({
       id: 'format',
       label: 'Format',
-      keybindings: [monaco?.KeyMod.Shift | monaco?.KeyMod.Alt | monaco?.KeyCode.KEY_F],
+      keybindings: [monaco?.KeyMod.Shift | monaco?.KeyMod.Alt | monaco?.KeyCode.KeyF],
       contextMenuGroupId: '9_cutcopypaste',
       run: (currEditor) => {
         setSoql(formatQuery(currEditor.getValue(), { fieldMaxLineLength: 80 }));

diff --git a/apps/jetstream/src/app/components/query/QueryResults/QueryResultsSoqlPanel.tsx b/apps/jetstream/src/app/components/query/QueryResults/QueryResultsSoqlPanel.tsx
@@ -135,7 +135,7 @@ export const QueryResultsSoqlPanel: FunctionComponent<QueryResultsSoqlPanelProps
     editorRef.current.addAction({
       id: 'format',
       label: 'Format',
-      keybindings: [monaco?.KeyMod.Shift | monaco?.KeyMod.Alt | monaco?.KeyCode.KEY_F],
+      keybindings: [monaco?.KeyMod.Shift | monaco?.KeyMod.Alt | monaco?.KeyCode.KeyF],
       contextMenuGroupId: '9_cutcopypaste',
       run: (currEditor) => {
         setUserSoql(formatQuery(currEditor.getValue(), { fieldMaxLineLength: 80 }));

diff --git a/package.json b/package.json
@@ -246,10 +246,10 @@
     "@emotion/styled": "11.10.5",
     "@fullhuman/postcss-purgecss": "^2.2.0",
     "@grpc/grpc-js": "^1.5.8",
-    "@headlessui/react": "^1.7.7",
+    "@headlessui/react": "^1.7.8",
     "@heroicons/react": "^1.0.4",
     "@mdx-js/react": "^1.6.21",
-    "@monaco-editor/react": "^4.2.2",
+    "@monaco-editor/react": "^4.4.6",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/auto-instrumentations-node": "^0.28.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.27.0",
@@ -303,7 +303,7 @@
     "localforage": "^1.9.0",
     "lodash": "^4.17.21",
     "mailgun.js": "^3.6.0",
-    "monaco-editor": "^0.25.0",
+    "monaco-editor": "^0.34.1",
     "nanoid": "^3.1.20",
     "next": "13.0.0",
     "next-images": "^1.4.0",

diff --git a/yarn.lock b/yarn.lock
@@ -2606,10 +2606,10 @@
     "@hapi/hoek" "^9.0.0"
     "@hapi/topo" "^5.0.0"
 
-"@headlessui/react@^1.7.7":
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.7.tgz#d6f8708d8943ae8ebb1a6929108234e4515ac7e8"
-  integrity sha512-BqDOd/tB9u2tA0T3Z0fn18ktw+KbVwMnkxxsGPIH2hzssrQhKB5n/6StZOyvLYP/FsYtvuXfi9I0YowKPv2c1w==
+"@headlessui/react@^1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.8.tgz#d7b4a95d50f9a386f7d1259d5ff8a6d7eb552ef0"
+  integrity sha512-zcwb0kd7L05hxmoAMIioEaOn235Dg0fUO+iGbLPgLVSjzl/l39V6DTpC2Df49PE5aG5/f5q0PZ9ZHZ78ENNV+A==
   dependencies:
     client-only "^0.0.1"
 
@@ -3292,10 +3292,10 @@
   dependencies:
     state-local "^1.0.6"
 
-"@monaco-editor/react@^4.2.2":
-  version "4.4.5"
-  resolved "https://registry.npmjs.org/@monaco-editor/react/-/react-4.4.5.tgz"
-  integrity sha512-IImtzU7sRc66OOaQVCG+5PFHkSWnnhrUWGBuH6zNmH2h0YgmAhcjHZQc/6MY9JWEbUtVF1WPBMJ9u1XuFbRrVA==
+"@monaco-editor/react@^4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.6.tgz#8ae500b0edf85276d860ed702e7056c316548218"
+  integrity sha512-Gr3uz3LYf33wlFE3eRnta4RxP5FSNxiIV9ENn2D2/rN8KgGAD8ecvcITRtsbbyuOuNkwbuHYxfeaz2Vr+CtyFA==
   dependencies:
     "@monaco-editor/loader" "^1.3.2"
     prop-types "^15.7.2"
@@ -18903,10 +18903,10 @@ moment-timezone@^0.5.x:
   resolved "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz"
   integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
 
-monaco-editor@^0.25.0:
-  version "0.25.2"
-  resolved "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.25.2.tgz"
-  integrity sha512-5iylzSJevCnzJn9UVsW8yOZ3yHjmAs4TfvH3zsbftKiFKmHG0xirGN6DK9Kk04VSWxYCZZAIafYJoNJJMAU1KA==
+monaco-editor@^0.34.1:
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.34.1.tgz#1b75c4ad6bc4c1f9da656d740d98e0b850a22f87"
+  integrity sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==
 
 move-concurrently@^1.0.1:
   version "1.0.1"