diff --git a/package-lock.json b/package-lock.json
index c93dbef27ab..4f83263da57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "packages/plugins/theme-highcontrast",
         "packages/plugins/theme-modern",
         "packages/plugins/theme-tritanopia",
-        "packages/dev-tools",
+        "packages/plugins/dev-tools",
         "packages/docs"
       ],
       "devDependencies": {
@@ -323,9 +323,9 @@
       }
     },
     "node_modules/@asamuzakjp/css-color/node_modules/@csstools/css-calc": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.2.1.tgz",
-      "integrity": "sha512-DtdHlgXh5ZkA43cwBcAm+huzgJiwx3ZTWVjBs94kwz2xKqSimDA3lBgCjphYgwgVUMWatSM0pDd8TILB1yrVVg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.3.0.tgz",
+      "integrity": "sha512-c5ihYsPkdG6JCkU2zTMm4+k6r7RXuGxtWYhu5DHMIiF1FHzrfmHL5so11AoFpUv/tu61xfcmT4AmKoFfMPoqdQ==",
       "dev": true,
       "funding": [
         {
@@ -347,9 +347,9 @@
       }
     },
     "node_modules/@asamuzakjp/css-color/node_modules/@csstools/css-color-parser": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.9.tgz",
-      "integrity": "sha512-paQcIaOO53Rk5+YrBaBjm/SgrV4INImjo2BT1DtQRYr+XeTRbeAYlS+jxXp9drqvKmtFnWRJKIalDLhZZDu42A==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.10.tgz",
+      "integrity": "sha512-UZhQLIUyJaaMepqehrCODwCg2KW25vFvLWBmqYFaPclYvvxzj/sG8LBOhBFCp11i9uE7t1EyS+RAoV9tztPFyw==",
       "dev": true,
       "funding": [
         {
@@ -364,7 +364,7 @@
       "license": "MIT",
       "dependencies": {
         "@csstools/color-helpers": "^6.1.0",
-        "@csstools/css-calc": "^3.2.1"
+        "@csstools/css-calc": "^3.3.0"
       },
       "engines": {
         "node": ">=20.19.0"
@@ -2194,7 +2194,6 @@
       "version": "13.1.0",
       "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-13.1.0.tgz",
       "integrity": "sha512-u59AFquSTta2yRQrp/W/dUk4wbaemKEMzKG+CMoBqwwToagxnSAsb+wLn4AuSt/wABmiAq0q9356rO9VwOuu+g==",
-      "dev": true,
       "license": "Apache 2.0",
       "peerDependencies": {
         "blockly": "^13.1.0"
@@ -2263,27 +2262,8 @@
       "license": "MIT"
     },
     "node_modules/@blockly/dev-tools": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-13.1.0.tgz",
-      "integrity": "sha512-jtQ1tIJGYgAXGA46mgCha+3UWCiL+lHHjpfyr09rce40hTedSSIeWlI4J58IeAnDkGBSQhkBRBpFV1b/37CA+A==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@blockly/block-test": "^13.1.0",
-        "@blockly/theme-dark": "^13.1.0",
-        "@blockly/theme-deuteranopia": "^13.1.0",
-        "@blockly/theme-highcontrast": "^13.1.0",
-        "@blockly/theme-tritanopia": "^13.1.0",
-        "chai": "^6.2.2",
-        "dat.gui": "^0.7.9",
-        "lodash.assign": "^4.2.0",
-        "lodash.merge": "^4.6.2",
-        "monaco-editor": "^0.55.1",
-        "sinon": "^22.0.0"
-      },
-      "peerDependencies": {
-        "blockly": "^13.1.0"
-      }
+      "resolved": "packages/plugins/dev-tools",
+      "link": true
     },
     "node_modules/@blockly/theme-dark": {
       "resolved": "packages/plugins/theme-dark",
@@ -2756,9 +2736,9 @@
       }
     },
     "node_modules/@csstools/css-syntax-patches-for-csstree": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.6.tgz",
-      "integrity": "sha512-TcJCWFbXLPpJYq6z7bfOyjWYJDiDg2/I4gyUC9pqPNqHFRIey0EB0q0L5cSnQDfWJg8Jd6VadakxdIez/3zkqQ==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.7.tgz",
+      "integrity": "sha512-fQ+05118eQS1cofO3aJpB5efgpBZMvIzwr/sbC8kDLVA5XLG8q1kJV5yzrUAI1f7lvhPnm8fgIjzFB8/O/5Dig==",
       "dev": true,
       "funding": [
         {
@@ -4981,9 +4961,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
-      "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz",
+      "integrity": "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8486,6 +8466,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/dat.gui": {
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@types/dat.gui/-/dat.gui-0.7.13.tgz",
+      "integrity": "sha512-LmG4Pr0mbsB/1WVttf8xaHx45BvSBDGY5D9+0/9AZCbI4vvOguwBHZdKyJMxt5Yst8+icRSHKmr7ClV2u5ZtDA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/debug": {
       "version": "4.1.13",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz",
@@ -8803,7 +8790,6 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "dev": true,
       "license": "MIT",
       "optional": true
     },
@@ -9142,15 +9128,15 @@
       "license": "ISC"
     },
     "node_modules/@wdio/config": {
-      "version": "9.29.1",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.29.1.tgz",
-      "integrity": "sha512-8IXDiRG9wUUnpU6M/uzsVqIHJD/7o4y9RaOU2Jh/OdRJP/7rxwfGsa24Bv486rnMGdghztkwLCBJWG0jbeEtfw==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-9.30.0.tgz",
+      "integrity": "sha512-pH/Y1F4QVIsx33xyli8+9HCr4HRuOeUk8j/lqNBuuUzbvduYRCLmNkZqxRsLnRth8wrlPdzA8Hq+PPLwJWrceA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@wdio/logger": "9.29.1",
         "@wdio/types": "9.29.1",
-        "@wdio/utils": "9.29.1",
+        "@wdio/utils": "9.30.0",
         "deepmerge-ts": "^7.0.3",
         "glob": "^10.2.2",
         "import-meta-resolve": "^4.0.0",
@@ -9230,9 +9216,9 @@
       }
     },
     "node_modules/@wdio/protocols": {
-      "version": "9.29.1",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.29.1.tgz",
-      "integrity": "sha512-NFlBQOA4zDb4D/ETpVMqDgbJyEqdhGRsJWybLOXG7PGlPwfcrfmTMHC1+Boq4KODgpwbhCmI9zIk2JQmGYIttQ==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.30.0.tgz",
+      "integrity": "sha512-VDKCTw3GVdqUw1+fXAY4FUOSt+a3/r7T2O34d5HAaZLfI6QHacsU7/N0Sv3w/QgWU6yj3WkXElXq1oSWF1XcBw==",
       "dev": true,
       "license": "MIT"
     },
@@ -9297,9 +9283,9 @@
       "license": "MIT"
     },
     "node_modules/@wdio/utils": {
-      "version": "9.29.1",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.29.1.tgz",
-      "integrity": "sha512-jyt6b6FfdYwVbMISVhuyGC1xQGZj6xM03KhTHozH7a9/zu9b++94KRdT9HRbwX8zefjW0YeIC5+qWSIf7WWHZg==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-9.30.0.tgz",
+      "integrity": "sha512-MhTx8jKOtspogeMUmASFsmL6vRetwCpvfcAFHauYZ62UzPjFwHThIXorzoG90mrcS9Yl+c8Sj9BfX+bdxwXfsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9309,7 +9295,7 @@
         "decamelize": "^6.0.0",
         "deepmerge-ts": "^7.0.3",
         "edgedriver": "^6.1.2",
-        "geckodriver": "^6.1.0",
+        "geckodriver": "^6.1.1",
         "get-port": "^7.0.0",
         "import-meta-resolve": "^4.0.0",
         "locate-app": "^2.2.24",
@@ -10517,9 +10503,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.0.tgz",
-      "integrity": "sha512-oCu2wfipvX3AePSgmOuKkIywOu+8n9psz7hXYmk56ghpu3+7KzNIBopaOs4c9BrtdnTtW30unG9GTfHo7EwERQ==",
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.1.tgz",
+      "integrity": "sha512-HYXq73DDpCtNzOmrFsm9eSwCvWCql0RzqjpDzXN9EadiLJ4DNat0nsZ/Bzmy+Ud12mb4/zKDY0cQ805ZzN+i0A==",
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.cjs"
@@ -10756,9 +10742,9 @@
       "license": "ISC"
     },
     "node_modules/browserslist": {
-      "version": "4.28.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.6.tgz",
-      "integrity": "sha512-FQBYNK15VMslhLHpA7+n+n1GOlF1kId2xcCg7/j95f24AOF6VDYMNH4mFxF7KuaTdv627faazpOAjFzMrfJOUw==",
+      "version": "4.28.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz",
+      "integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==",
       "funding": [
         {
           "type": "opencollective",
@@ -10775,9 +10761,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.10.42",
-        "caniuse-lite": "^1.0.30001803",
-        "electron-to-chromium": "^1.5.389",
+        "baseline-browser-mapping": "^2.10.44",
+        "caniuse-lite": "^1.0.30001806",
+        "electron-to-chromium": "^1.5.393",
         "node-releases": "^2.0.51",
         "update-browserslist-db": "^1.2.3"
       },
@@ -11013,7 +10999,6 @@
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
       "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -12659,7 +12644,6 @@
       "version": "0.7.9",
       "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.9.tgz",
       "integrity": "sha512-sCNc1OHobc+Erc1HqiswYgHdVNpSJUlk/Hz8vzOCsER7rl+oF/4+v8GXFUyCgtXpoCX6+bnmg07DedLvBLwYKQ==",
-      "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/data-uri-to-buffer": {
@@ -13119,7 +13103,6 @@
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.7.tgz",
       "integrity": "sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==",
-      "dev": true,
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -13287,9 +13270,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.394",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.394.tgz",
-      "integrity": "sha512-Wmt2Gm0o8JWBuGgmc4XZ0u9s1RaCRqhxP47phplmfg04+qypTUurpeJGP45A7Fhv7jdrrVH44PLlR9qXo37cVQ==",
+      "version": "1.5.395",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.395.tgz",
+      "integrity": "sha512-7zt9Aw+SrmxLWLN0zhaTWZQiCdryLVrYTq5R7iZakLvi2UQPYMMsROYV/2qVCzMeCiSXHwKOU+sZ4zOVVlrtKA==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -14916,9 +14899,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
-      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.3.tgz",
+      "integrity": "sha512-/zipXxyO6rGvuNGDiULY9MvEGSkb2gaG4GGH4ygMi0ZZzyMHdUZBmntJmx5x1G2VuPytCwGN4xsJP6cw+sK+vQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -18680,7 +18663,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
       "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.clonedeep": {
@@ -18706,7 +18688,6 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.template": {
@@ -18897,7 +18878,6 @@
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-14.0.0.tgz",
       "integrity": "sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "marked": "bin/marked.js"
@@ -21635,7 +21615,6 @@
       "version": "0.55.1",
       "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.55.1.tgz",
       "integrity": "sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "dompurify": "3.2.7",
@@ -22947,9 +22926,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.21.tgz",
-      "integrity": "sha512-v4sDNP3fdNiWMfabO7OwOQdOX8TiQSztKyT1Wj0w+j7LDallJThJRBBBmzVGyYj0crMh7jlV4zepPkiNu9UwDQ==",
+      "version": "8.5.22",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.22.tgz",
+      "integrity": "sha512-KBDEIpLrvpv16pp3K0Fw+UCoZfopFjjgeB+0tA/aaThfEE74kKDLrgg603YvOWJyg3+WYtyq3xYsQWsIyZlPqQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -29106,23 +29085,23 @@
       }
     },
     "node_modules/webdriver": {
-      "version": "9.29.1",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.29.1.tgz",
-      "integrity": "sha512-uhxYap3qQXC9H2V8SDr7vcy0blZETeri4goLwbw1TFq4EZHF1Dv503Zc0PAjfkNQJCD4/rzAyr07+EX72kx1pg==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-9.30.0.tgz",
+      "integrity": "sha512-DisY5E8p5zAZyl8pee08p4Vlc91c94Am9oswZaNCgZH5Ewm//FoCZ+tHNppENqooCYjfa/upATbFqGOLuXQkrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "^20.1.0",
         "@types/ws": "^8.5.3",
-        "@wdio/config": "9.29.1",
+        "@wdio/config": "9.30.0",
         "@wdio/logger": "9.29.1",
-        "@wdio/protocols": "9.29.1",
+        "@wdio/protocols": "9.30.0",
         "@wdio/types": "9.29.1",
-        "@wdio/utils": "9.29.1",
+        "@wdio/utils": "9.30.0",
         "deepmerge-ts": "^7.0.3",
         "https-proxy-agent": "^7.0.6",
-        "undici": "^6.21.3",
-        "ws": "^8.8.0"
+        "undici": "^6.27.0",
+        "ws": "^8.21.0"
       },
       "engines": {
         "node": ">=18.20.0"
@@ -29163,20 +29142,20 @@
       "license": "MIT"
     },
     "node_modules/webdriverio": {
-      "version": "9.29.1",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.29.1.tgz",
-      "integrity": "sha512-UIplAnvbjdE0tucHVR/8Uk0Y7rz72VaEx/s0Tq91fMdXm+m+Za16e+b5tObh4xEEfyCITODPfzgBva9rA+xApQ==",
+      "version": "9.30.0",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.30.0.tgz",
+      "integrity": "sha512-cmV/uSbCvnJ99QejGPVGlzb9MjiSYUts8VjdESnDKvA7JvRMIJK0l807Js7HDK/g6KG7j+D2apsFHGlT7W5UeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "^20.11.30",
         "@types/sinonjs__fake-timers": "^8.1.5",
-        "@wdio/config": "9.29.1",
+        "@wdio/config": "9.30.0",
         "@wdio/logger": "9.29.1",
-        "@wdio/protocols": "9.29.1",
+        "@wdio/protocols": "9.30.0",
         "@wdio/repl": "9.16.2",
         "@wdio/types": "9.29.1",
-        "@wdio/utils": "9.29.1",
+        "@wdio/utils": "9.30.0",
         "archiver": "^7.0.1",
         "aria-query": "^5.3.0",
         "cheerio": "^1.0.0-rc.12",
@@ -29193,7 +29172,7 @@
         "rgb2hex": "0.2.5",
         "serialize-error": "^12.0.0",
         "urlpattern-polyfill": "^10.0.0",
-        "webdriver": "9.29.1"
+        "webdriver": "9.30.0"
       },
       "engines": {
         "node": ">=18.20.0"
@@ -30267,6 +30246,7 @@
         "puppeteer-core": "^25.3.0",
         "readline-sync": "^1.4.10",
         "rimraf": "^6.1.3",
+        "sinon": "22.1.0",
         "typescript": "^6.0.3",
         "typescript-eslint": "^8.62.1",
         "webdriverio": "^9.29.1",
@@ -30411,6 +30391,31 @@
         "js-yaml": "bin/js-yaml.mjs"
       }
     },
+    "packages/plugins/dev-tools": {
+      "name": "@blockly/dev-tools",
+      "version": "13.1.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@blockly/block-test": "^13.1.0",
+        "@blockly/theme-dark": "^13.1.0",
+        "@blockly/theme-deuteranopia": "^13.1.0",
+        "@blockly/theme-highcontrast": "^13.1.0",
+        "@blockly/theme-tritanopia": "^13.1.0",
+        "chai": "^6.2.2",
+        "dat.gui": "^0.7.9",
+        "lodash.assign": "^4.2.0",
+        "lodash.merge": "^4.6.2",
+        "monaco-editor": "^0.55.1"
+      },
+      "devDependencies": {
+        "@blockly/dev-scripts": "^13.1.0",
+        "@types/dat.gui": "^0.7.13",
+        "sinon": "^22.0.0"
+      },
+      "peerDependencies": {
+        "blockly": "^13.1.1"
+      }
+    },
     "packages/plugins/theme-dark": {
       "name": "@blockly/theme-dark",
       "version": "13.1.0",
diff --git a/package.json b/package.json
index e38201d9cb1..0fb7e00efa9 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "packages/plugins/theme-highcontrast",
     "packages/plugins/theme-modern",
     "packages/plugins/theme-tritanopia",
-    "packages/dev-tools",
+    "packages/plugins/dev-tools",
     "packages/docs"
   ],
   "devDependencies": {
diff --git a/packages/blockly/package.json b/packages/blockly/package.json
index 69cabf2dcea..ccfa04efb4f 100644
--- a/packages/blockly/package.json
+++ b/packages/blockly/package.json
@@ -132,6 +132,7 @@
     "puppeteer-core": "^25.3.0",
     "readline-sync": "^1.4.10",
     "rimraf": "^6.1.3",
+    "sinon": "22.1.0",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.62.1",
     "webdriverio": "^9.29.1",
diff --git a/packages/blockly/tests/mocha/block_test.js b/packages/blockly/tests/mocha/block_test.js
index 9762f466ce5..6db80f6da49 100644
--- a/packages/blockly/tests/mocha/block_test.js
+++ b/packages/blockly/tests/mocha/block_test.js
@@ -1289,7 +1289,7 @@ suite('Blocks', function () {
       });
     });
     suite('Add Connections Programmatically', function () {
-      test('Output', async function () {
+      test('Output', function () {
         const block = createRenderedBlock(this.workspace, 'empty_block');
 
         block.setOutput(true);
@@ -1908,7 +1908,7 @@ suite('Blocks', function () {
         function getFocusableAriaLabel(iFocusable) {
           return iFocusable.getFocusableElement().getAttribute('aria-label');
         }
-        test('Bubble has ARIA label', async function () {
+        test('Bubble has ARIA label', function () {
           assert.isTrue(
             this.bubble.focusableElement.hasAttribute('aria-label'),
           );
@@ -1918,7 +1918,7 @@ suite('Blocks', function () {
           assert.include(label, 'Warning');
           assert.include(label, 'Something went wrong');
         });
-        test('Bubble has ARIA role of group', async function () {
+        test('Bubble has ARIA role of group', function () {
           assert.equal(
             this.bubble.focusableElement.getAttribute('role'),
             'group',
diff --git a/packages/blockly/tests/mocha/shortcut_items_test.js b/packages/blockly/tests/mocha/shortcut_items_test.js
index f59476e0245..b3b1960d423 100644
--- a/packages/blockly/tests/mocha/shortcut_items_test.js
+++ b/packages/blockly/tests/mocha/shortcut_items_test.js
@@ -1441,7 +1441,7 @@ suite('Keyboard Shortcut Items', function () {
       assert.strictEqual(Blockly.getFocusManager().getFocusedNode(), stack1);
     });
 
-    test('Next stack from nested element', async function () {
+    test('Next stack from nested element', function () {
       const icon = this.block1.getIcon(Blockly.icons.MutatorIcon.TYPE);
       Blockly.getFocusManager().focusNode(icon);
       this.injectionDiv.dispatchEvent(keyNextStack());
diff --git a/packages/plugins/dev-tools/package.json b/packages/plugins/dev-tools/package.json
index bf6cc6ac0f0..7a6d9c3789c 100644
--- a/packages/plugins/dev-tools/package.json
+++ b/packages/plugins/dev-tools/package.json
@@ -47,12 +47,12 @@
     "dat.gui": "^0.7.9",
     "lodash.assign": "^4.2.0",
     "lodash.merge": "^4.6.2",
-    "monaco-editor": "^0.55.1",
-    "sinon": "^22.0.0"
+    "monaco-editor": "^0.55.1"
   },
   "devDependencies": {
     "@blockly/dev-scripts": "^13.1.0",
-    "@types/dat.gui": "^0.7.13"
+    "@types/dat.gui": "^0.7.13",
+    "sinon": "^22.0.0"
   },
   "peerDependencies": {
     "blockly": "^13.1.1"