From 488eeb600b07f55f92a1ced4c13ee322c00a9623 Mon Sep 17 00:00:00 2001
From: Matt Godbolt <matt@godbolt.org>
Date: Tue, 25 Jul 2023 22:35:47 -0500
Subject: [PATCH] Update to Monaco 0.40.0 (#5287)

Also hopefully fixes the issue where when we bump monaco versions we get
build errors.
---
 package-lock.json     | 16 ++++++++--------
 package.json          |  4 ++--
 webpack.config.esm.ts |  7 ++++++-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1293f6b25..2c4d8e372 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,8 +45,8 @@
         "lodash.clonedeep": "^4.5.0",
         "lru-cache": "^10.0.0",
         "lz-string": "^1.4.4",
-        "monaco-editor": "^0.36.1",
-        "monaco-vim": "^0.3.5",
+        "monaco-editor": "^0.40.0",
+        "monaco-vim": "^0.4.0",
         "morgan": "^1.10.0",
         "node-targz": "^0.2.0",
         "nopt": "^7.0.0",
@@ -14737,9 +14737,9 @@
       }
     },
     "node_modules/monaco-editor": {
-      "version": "0.36.1",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.36.1.tgz",
-      "integrity": "sha512-/CaclMHKQ3A6rnzBzOADfwdSJ25BFoFT0Emxsc4zYVyav5SkK9iA6lEtIeuN/oRYbwPgviJT+t3l+sjFa28jYg=="
+      "version": "0.40.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.40.0.tgz",
+      "integrity": "sha512-1wymccLEuFSMBvCk/jT1YDW/GuxMLYwnFwF9CDyYCxoTw2Pt379J3FUhwy9c43j51JdcxVPjwk0jm0EVDsBS2g=="
     },
     "node_modules/monaco-editor-webpack-plugin": {
       "version": "7.1.0",
@@ -14755,9 +14755,9 @@
       }
     },
     "node_modules/monaco-vim": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/monaco-vim/-/monaco-vim-0.3.5.tgz",
-      "integrity": "sha512-4L8iHlhpYImhqQwGIfcsD9caxlW/eANRCk/77xTAAlxV2LLSfMpubnSXCGdoOu+GPlHM0frKFn3aUQJpoe0gjQ==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/monaco-vim/-/monaco-vim-0.4.0.tgz",
+      "integrity": "sha512-+CsW0+Mvx2+eitkXS7OpUXIu57qXlqAL8oVkYhkPCEZ/c6+6gOp/IcG7w+Lb33YiZuTyvJ891+czkeJRPIEwVA==",
       "peerDependencies": {
         "monaco-editor": "*"
       }
diff --git a/package.json b/package.json
index 8c5b4f02d..39b4ef3a9 100644
--- a/package.json
+++ b/package.json
@@ -54,8 +54,8 @@
     "lodash.clonedeep": "^4.5.0",
     "lru-cache": "^10.0.0",
     "lz-string": "^1.4.4",
-    "monaco-editor": "^0.36.1",
-    "monaco-vim": "^0.3.5",
+    "monaco-editor": "^0.40.0",
+    "monaco-vim": "^0.4.0",
     "morgan": "^1.10.0",
     "node-targz": "^0.2.0",
     "nopt": "^7.0.0",
diff --git a/webpack.config.esm.ts b/webpack.config.esm.ts
index c2f0ea033..e70eae9d1 100644
--- a/webpack.config.esm.ts
+++ b/webpack.config.esm.ts
@@ -115,7 +115,12 @@ export default {
     cache: {
         type: 'filesystem',
         buildDependencies: {
-            config: [fileURLToPath(import.meta.url)],
+            config: [
+                fileURLToPath(import.meta.url),
+                // Depend on the package.json to force a recache if something changes:
+                // this is only because something in Monaco upsets the cache if its version changes
+                path.resolve(__dirname, 'package.json'),
+            ],
         },
     },
     resolve: {