Merge remote-tracking branch 'origin/develop' into backmerge/develop-into-membership

Author: KManolov3

.nvmrc

@@ -1 +1 @@
-20.19.5
+20.19.6

TRADEMARK

@@ -0,0 +1 @@
+The Scratch trademarks, including the Scratch name, logo, the Scratch Cat, Gobo, Pico, Nano, Tera and Giga graphics (the "Marks"), are property of the Scratch Foundation. Marks may not be used to endorse or promote products derived from this software without specific prior written permission.

package-lock.json

@@ -17,6 +17,7 @@
     "prepare": "husky install",
     "test": "npm test --workspaces",
     "refresh-gh-workflow": "ts-node scripts/build-gha-workflows.ts",
+    "update-legal": "npm --workspaces exec -c 'rm -f ./{LICENSE,TRADEMARK} && cp -f ../../{LICENSE,TRADEMARK} .'",
     "version": "cross-env-shell ./scripts/npm-version.sh"
   },
   "config": {

package.json

@@ -1 +1 @@
-20.19.5
+20.19.6

packages/scratch-gui/.nvmrc

@@ -1 +1 @@
-The Scratch trademarks, including the Scratch name, logo, the Scratch Cat, Gobo, Pico, Nano, Tera and Giga graphics (the "Marks"), are property of the Massachusetts Institute of Technology (MIT). Marks may not be used to endorse or promote products derived from this software without specific prior written permission.
+The Scratch trademarks, including the Scratch name, logo, the Scratch Cat, Gobo, Pico, Nano, Tera and Giga graphics (the "Marks"), are property of the Scratch Foundation. Marks may not be used to endorse or promote products derived from this software without specific prior written permission.

packages/scratch-gui/LICENSE

@@ -35,7 +35,9 @@
   },
   "files": [
     "dist",
-    "src"
+    "src",
+    "LICENSE",
+    "TRADEMARK"
   ],
   "scripts": {
     "build": "npm run clean && npm run build:dev && npm run build:dist && npm run build:dist-standalone",
@@ -78,7 +80,7 @@
     "core-js": "2.6.12",
     "css-loader": "5.2.7",
     "dapjs": "2.3.0",
-    "driver.js": "1.3.6",
+    "driver.js": "1.4.0",
     "es6-object-assign": "1.1.0",
     "fastestsmallesttextencoderdecoder": "1.0.22",
     "get-float-time-domain-data": "0.1.0",
@@ -116,8 +118,8 @@
     "redux-throttle": "0.1.1",
     "scratch-audio": "2.0.268",
     "scratch-blocks": "1.3.0",
-    "scratch-l10n": "6.1.25",
-    "scratch-paint": "4.1.19",
+    "scratch-l10n": "6.1.30",
+    "scratch-paint": "4.1.24",
     "scratch-render-fonts": "1.0.252",
     "scratch-storage": "5.0.10",
     "startaudiocontext": "1.2.1",
@@ -150,13 +152,13 @@
     "cheerio": "1.1.2",
     "cross-env": "7.0.3",
     "eslint": "9.39.1",
-    "eslint-config-scratch": "12.0.31",
+    "eslint-config-scratch": "12.0.38",
     "eslint-import-resolver-webpack": "0.13.10",
     "eslint-plugin-import": "2.32.0",
     "eslint-plugin-react": "7.37.5",
     "file-loader": "6.2.0",
     "gh-pages": "3.2.3",
-    "html-webpack-plugin": "5.6.4",
+    "html-webpack-plugin": "5.6.5",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "jest-junit": "7.0.0",
@@ -174,7 +176,7 @@
     "ts-loader": "9.5.4",
     "url-loader": "4.1.1",
     "web-audio-test-api": "0.5.2",
-    "webpack": "5.102.1",
+    "webpack": "5.103.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.2.2",
     "yauzl": "3.2.0"

packages/scratch-gui/LICENSE

@@ -140,10 +140,6 @@ button::-moz-focus-inner {
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
 }
 
-.tooltip:after {
-    background-color: $extensions-primary;
-}
-
 .coming-soon-tooltip {
     background-color: $data-primary !important;
 }
@@ -158,6 +154,7 @@ button::-moz-focus-inner {
     box-shadow: 0 0 .5rem hsla(0, 0%, 0%, .25) !important;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
     z-index: $z-index-tooltip !important;
+    --tooltip-arrow-color: $extensions-primary;
 }
 
 $arrow-size: 0.5rem;
@@ -197,4 +194,4 @@ $arrow-rounding: 0.125rem;
     margin-left: $arrow-inset !important;
     top: $arrow-inset !important;
     transform: rotate(-45deg) !important;
-}
+}