From 64284f7968428fed1cf0d20863ece17daf0f8b2b Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com>
Date: Wed, 29 Oct 2025 12:41:10 -0700
Subject: [PATCH] fix(deps): fix merge error with internal dep versions

---
 package-lock.json                 | 73 ++-----------------------------
 packages/scratch-gui/package.json |  6 +--
 2 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 297ab6f792..fb7ac87c7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40226,9 +40226,9 @@
         "@mediapipe/face_detection": "0.4.1646425229",
         "@microbit/microbit-universal-hex": "0.2.2",
         "@radix-ui/react-context-menu": "^2.2.5",
-        "@scratch/scratch-render": "11.6.0",
-        "@scratch/scratch-svg-renderer": "11.6.0",
-        "@scratch/scratch-vm": "11.6.0",
+        "@scratch/scratch-render": "12.0.2-hotfix",
+        "@scratch/scratch-svg-renderer": "12.0.2-hotfix",
+        "@scratch/scratch-vm": "12.0.2-hotfix",
         "@tensorflow-models/face-detection": "^1.0.3",
         "@tensorflow/tfjs": "^4.22.0",
         "@testing-library/user-event": "^14.6.1",
@@ -40346,78 +40346,11 @@
         "redux": "^4.0.0"
       }
     },
-    "packages/scratch-gui/node_modules/@scratch/scratch-render": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@scratch/scratch-render/-/scratch-render-11.6.0.tgz",
-      "integrity": "sha512-fnz+GJY0vdG239t6rruTCIRTB2Vs1i2rojAuZhafQz00QnzLiWVtXJglS6xtrK+Jpt5S9lCLJko/0u1eIwDSug==",
-      "license": "AGPL-3.0-only",
-      "dependencies": {
-        "@scratch/scratch-svg-renderer": "11.6.0",
-        "grapheme-breaker": "0.3.2",
-        "hull.js": "0.2.10",
-        "ify-loader": "1.1.0",
-        "linebreak": "0.3.0",
-        "minilog": "3.1.0",
-        "raw-loader": "0.5.1",
-        "twgl.js": "4.24.0"
-      },
-      "peerDependencies": {
-        "scratch-render-fonts": "^1.0.0"
-      }
-    },
     "packages/scratch-gui/node_modules/@scratch/scratch-render/node_modules/raw-loader": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
       "integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
     },
-    "packages/scratch-gui/node_modules/@scratch/scratch-svg-renderer": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@scratch/scratch-svg-renderer/-/scratch-svg-renderer-11.6.0.tgz",
-      "integrity": "sha512-3w8h1fZb/2+9WHy/yl/whMrjx/mGj6MxnyI0EjDHl3xDZrU6QMEVTx+TEvK9vTfPJbDgVjm5vv8U0GyuXXTang==",
-      "license": "AGPL-3.0-only",
-      "dependencies": {
-        "base64-js": "1.5.1",
-        "base64-loader": "1.0.0",
-        "css-tree": "1.1.3",
-        "fastestsmallesttextencoderdecoder": "1.0.22",
-        "isomorphic-dompurify": "2.26.0",
-        "minilog": "3.1.0",
-        "transformation-matrix": "1.15.3"
-      },
-      "peerDependencies": {
-        "scratch-render-fonts": "^1.0.0"
-      }
-    },
-    "packages/scratch-gui/node_modules/@scratch/scratch-vm": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@scratch/scratch-vm/-/scratch-vm-11.6.0.tgz",
-      "integrity": "sha512-1p8NDDSxGmQAyizJ1W92dcMWlPQbBvgZ+x6eH59Y2wtzSTmoioFu/XpHMvoLrUGw4xsslnwslcgdYaJIlaScnw==",
-      "license": "AGPL-3.0-only",
-      "dependencies": {
-        "@scratch/scratch-render": "11.6.0",
-        "@scratch/scratch-svg-renderer": "11.6.0",
-        "@vernier/godirect": "1.8.3",
-        "arraybuffer-loader": "1.0.8",
-        "atob": "2.1.2",
-        "btoa": "1.2.1",
-        "canvas-toBlob": "1.0.0",
-        "decode-html": "2.0.0",
-        "diff-match-patch": "1.0.5",
-        "format-message": "6.2.4",
-        "htmlparser2": "3.10.1",
-        "immutable": "3.8.2",
-        "jszip": "3.10.1",
-        "minilog": "3.1.0",
-        "scratch-audio": "2.0.215",
-        "scratch-parser": "6.0.0",
-        "scratch-sb1-converter": "2.0.217",
-        "scratch-storage": "4.0.214",
-        "scratch-translate-extension-languages": "1.0.7",
-        "text-encoding": "0.7.0",
-        "uuid": "8.3.2",
-        "web-worker": "1.3.0"
-      }
-    },
     "packages/scratch-gui/node_modules/@scratch/scratch-vm/node_modules/scratch-audio": {
       "version": "2.0.215",
       "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-2.0.215.tgz",
diff --git a/packages/scratch-gui/package.json b/packages/scratch-gui/package.json
index b2d178ee01..02e7749794 100644
--- a/packages/scratch-gui/package.json
+++ b/packages/scratch-gui/package.json
@@ -60,9 +60,9 @@
     "@mediapipe/face_detection": "0.4.1646425229",
     "@microbit/microbit-universal-hex": "0.2.2",
     "@radix-ui/react-context-menu": "^2.2.5",
-    "@scratch/scratch-render": "11.6.0",
-    "@scratch/scratch-svg-renderer": "11.6.0",
-    "@scratch/scratch-vm": "11.6.0",
+    "@scratch/scratch-render": "12.0.2-hotfix",
+    "@scratch/scratch-svg-renderer": "12.0.2-hotfix",
+    "@scratch/scratch-vm": "12.0.2-hotfix",
     "@tensorflow-models/face-detection": "^1.0.3",
     "@tensorflow/tfjs": "^4.22.0",
     "@testing-library/user-event": "^14.6.1",