Merge tag 'v11.6.0' into uepr56-react18

Author: KManolov3

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-editor",
-  "version": "11.6.0-gui-standalone",
+  "version": "11.6.0",
   "private": "true",
   "description": "Scratch editor mono-repository",
   "author": "Scratch Foundation",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scratch/scratch-gui",
-  "version": "11.6.0-gui-standalone",
+  "version": "11.6.0",
   "description": "Graphical User Interface for creating and running Scratch 3.0 projects",
   "author": "Massachusetts Institute of Technology",
   "license": "AGPL-3.0-only",
@@ -60,9 +60,9 @@
     "@microbit/microbit-universal-hex": "0.2.2",
     "@radix-ui/react-context-menu": "^2.2.5",
     "@testing-library/user-event": "^14.6.1",
-    "@scratch/scratch-render": "11.6.0-gui-standalone",
-    "@scratch/scratch-svg-renderer": "11.6.0-gui-standalone",
-    "@scratch/scratch-vm": "11.6.0-gui-standalone",
+    "@scratch/scratch-render": "11.6.0",
+    "@scratch/scratch-svg-renderer": "11.6.0",
+    "@scratch/scratch-vm": "11.6.0",
     "arraybuffer-loader": "1.0.8",
     "autoprefixer": "9.8.8",
     "balance-text": "3.3.1",
@@ -71,7 +71,7 @@
     "cat-blocks": "npm:[email protected]",
     "classnames": "2.5.1",
     "computed-style-to-inline-style": "3.0.0",
-    "cookie": "^0.6.0",
+    "cookie": "0.6.0",
     "copy-webpack-plugin": "6.4.1",
     "core-js": "2.6.12",
     "css-loader": "5.2.7",
@@ -111,12 +111,12 @@
     "react-virtualized": "9.22.6",
     "react-visibility-sensor": "5.1.1",
     "redux-throttle": "0.1.1",
-    "scratch-audio": "2.0.210",
-    "scratch-blocks": "1.1.211",
-    "scratch-l10n": "6.0.25",
+    "scratch-audio": "2.0.215",
+    "scratch-blocks": "1.1.213",
+    "scratch-l10n": "6.0.30",
     "scratch-paint": "4.0.3",
-    "scratch-render-fonts": "1.0.220",
-    "scratch-storage": "4.0.210",
+    "scratch-render-fonts": "1.0.223",
+    "scratch-storage": "4.0.214",
     "startaudiocontext": "1.2.1",
     "style-loader": "4.0.0",
     "to-style": "1.3.3",
@@ -131,10 +131,10 @@
     "redux": "^4.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.28.0",
-    "@babel/core": "7.28.0",
+    "@babel/cli": "7.28.3",
+    "@babel/core": "7.28.3",
     "@babel/eslint-parser": "7.28.0",
-    "@babel/preset-env": "7.28.0",
+    "@babel/preset-env": "7.28.3",
     "@babel/preset-react": "7.27.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
@@ -154,7 +154,7 @@
     "eslint-plugin-react": "7.37.5",
     "file-loader": "6.2.0",
     "gh-pages": "3.2.3",
-    "html-webpack-plugin": "5.6.3",
+    "html-webpack-plugin": "5.6.4",
     "jest": "21.2.1",
     "jest-junit": "7.0.0",
     "mkdirp": "1.0.4",
@@ -171,7 +171,7 @@
     "ts-loader": "9.5.2",
     "url-loader": "4.1.1",
     "web-audio-test-api": "0.5.2",
-    "webpack": "5.101.0",
+    "webpack": "5.101.2",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.2.2",
     "yauzl": "3.2.0"

packages/scratch-gui/package.json

@@ -32,14 +32,15 @@ const TitledHOC = function (WrappedComponent) {
                 this.handleReceivedProjectTitle(this.props.projectTitle);
             }
             // if project is a new default project, and has loaded,
-            if (this.props.isShowingWithoutId && prevProps.isAnyCreatingNewState) {
+            if (this.props.isShowingWithoutId && !this.props.isAnyCreatingNewState && prevProps.isAnyCreatingNewState) {
                 // reset title to default
-                const defaultProjectTitle = this.handleReceivedProjectTitle();
-                this.props.onUpdateProjectTitle(defaultProjectTitle);
+                this.handleReceivedProjectTitle();
             }
             // if the projectTitle hasn't changed, but the reduxProjectTitle
             // HAS changed, we need to report that change to the projectTitle's owner
-            if (this.props.reduxProjectTitle !== prevProps.reduxProjectTitle &&
+            if (!this.props.isShowingWithoutId &&
+                !this.props.isAnyCreatingNewState &&
+                this.props.reduxProjectTitle !== prevProps.reduxProjectTitle &&
                 this.props.reduxProjectTitle !== this.props.projectTitle) {
                 this.props.onUpdateProjectTitle(this.props.reduxProjectTitle);
             }

packages/scratch-gui/src/lib/titled-hoc.jsx

@@ -1,6 +1,6 @@
 {
   "name": "@scratch/scratch-render",
-  "version": "11.6.0-gui-standalone",
+  "version": "11.6.0",
   "description": "WebGL Renderer for Scratch 3.0",
   "author": "Massachusetts Institute of Technology",
   "license": "AGPL-3.0-only",
@@ -47,7 +47,7 @@
     "iOS >= 8"
   ],
   "dependencies": {
-    "@scratch/scratch-svg-renderer": "11.6.0-gui-standalone",
+    "@scratch/scratch-svg-renderer": "11.6.0",
     "grapheme-breaker": "0.3.2",
     "hull.js": "0.2.10",
     "ify-loader": "1.1.0",
@@ -60,29 +60,29 @@
     "scratch-render-fonts": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.28.0",
+    "@babel/core": "7.28.3",
     "@babel/eslint-parser": "7.28.0",
     "@babel/polyfill": "7.12.1",
-    "@babel/preset-env": "7.28.0",
-    "@scratch/scratch-vm": "11.6.0-gui-standalone",
+    "@babel/preset-env": "7.28.3",
+    "@scratch/scratch-vm": "11.6.0",
     "babel-loader": "9.2.1",
     "copy-webpack-plugin": "6.4.1",
     "docdash": "0.4.0",
     "eslint": "8.57.1",
     "eslint-config-scratch": "9.0.9",
     "gh-pages": "1.2.0",
-    "html-webpack-plugin": "5.6.3",
+    "html-webpack-plugin": "5.6.4",
     "jsdoc": "3.6.11",
     "json": "9.0.6",
     "playwright-chromium": "1.54.2",
-    "scratch-render-fonts": "1.0.220",
+    "scratch-render-fonts": "1.0.223",
     "scratch-semantic-release-config": "3.0.0",
-    "scratch-storage": "4.0.210",
+    "scratch-storage": "4.0.214",
     "scratch-webpack-configuration": "3.0.0",
     "semantic-release": "19.0.5",
     "tap": "16.3.10",
     "terser-webpack-plugin": "5.3.14",
-    "webpack": "5.101.0",
+    "webpack": "5.101.2",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.2.2"
   }

packages/scratch-render/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scratch/scratch-svg-renderer",
-  "version": "11.6.0-gui-standalone",
+  "version": "11.6.0",
   "description": "SVG renderer for Scratch",
   "main": "./dist/node/scratch-svg-renderer.js",
   "browser": "./dist/web/scratch-svg-renderer.js",
@@ -49,9 +49,9 @@
     "transformation-matrix": "1.15.3"
   },
   "devDependencies": {
-    "@babel/core": "7.28.0",
+    "@babel/core": "7.28.3",
     "@babel/eslint-parser": "7.28.0",
-    "@babel/preset-env": "7.28.0",
+    "@babel/preset-env": "7.28.3",
     "babel-loader": "9.2.1",
     "copy-webpack-plugin": "6.4.1",
     "eslint": "8.57.1",
@@ -61,12 +61,12 @@
     "json": "9.0.6",
     "mkdirp": "2.1.6",
     "rimraf": "3.0.2",
-    "scratch-render-fonts": "1.0.220",
+    "scratch-render-fonts": "1.0.223",
     "scratch-semantic-release-config": "3.0.0",
     "scratch-webpack-configuration": "3.0.0",
     "semantic-release": "19.0.5",
     "tap": "16.3.10",
-    "webpack": "5.101.0",
+    "webpack": "5.101.2",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.2.2",
     "xmldom": "0.1.31"

packages/scratch-svg-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scratch/scratch-vm",
-  "version": "11.6.0-gui-standalone",
+  "version": "11.6.0",
   "description": "Virtual Machine for Scratch 3.0",
   "author": "Massachusetts Institute of Technology",
   "license": "AGPL-3.0-only",
@@ -50,8 +50,8 @@
     "statements": 70
   },
   "dependencies": {
-    "@scratch/scratch-render": "11.6.0-gui-standalone",
-    "@scratch/scratch-svg-renderer": "11.6.0-gui-standalone",
+    "@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",
@@ -64,19 +64,19 @@
     "immutable": "3.8.2",
     "jszip": "3.10.1",
     "minilog": "3.1.0",
-    "scratch-audio": "2.0.210",
+    "scratch-audio": "2.0.215",
     "scratch-parser": "6.0.0",
-    "scratch-sb1-converter": "2.0.211",
-    "scratch-storage": "4.0.210",
+    "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"
   },
   "devDependencies": {
-    "@babel/core": "7.28.0",
+    "@babel/core": "7.28.3",
     "@babel/eslint-parser": "7.28.0",
-    "@babel/preset-env": "7.28.0",
+    "@babel/preset-env": "7.28.3",
     "adm-zip": "0.4.11",
     "babel-loader": "9.2.1",
     "callsite": "1.0.0",
@@ -92,16 +92,16 @@
     "jsdoc": "3.6.11",
     "json": "^9.0.4",
     "pngjs": "3.4.0",
-    "scratch-blocks": "1.1.211",
-    "scratch-l10n": "6.0.25",
-    "scratch-render-fonts": "1.0.220",
+    "scratch-blocks": "1.1.213",
+    "scratch-l10n": "6.0.30",
+    "scratch-render-fonts": "1.0.223",
     "scratch-semantic-release-config": "3.0.0",
     "scratch-webpack-configuration": "3.0.0",
     "script-loader": "0.7.2",
     "semantic-release": "19.0.5",
     "stats.js": "0.17.0",
     "tap": "16.3.10",
-    "webpack": "5.101.0",
+    "webpack": "5.101.2",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "5.2.2"
   }