scratch-vm 5.0.163 → 5.0.165-spork.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-vm",
-  "version": "5.0.163",
+  "version": "5.0.165-spork.1",
   "description": "Virtual Machine for Scratch 3.0",
   "author": "Massachusetts Institute of Technology",
   "license": "AGPL-3.0-only",
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/scratchfoundation/scratch-vm.git",
-    "sha": "fb791aa761397c4ec5ee63e695069cb71f275860"
+    "sha": "6ec8b4011cf106e14a8ccd442b83971f289c5748"
   },
   "main": "./dist/node/scratch-vm.js",
   "browser": "./dist/web/scratch-vm.js",
@@ -78,9 +78,9 @@
     "web-worker": "^1.3.0"
   },
   "devDependencies": {
-    "@babel/core": "7.26.7",
-    "@babel/eslint-parser": "7.26.5",
-    "@babel/preset-env": "7.26.7",
+    "@babel/core": "7.26.8",
+    "@babel/eslint-parser": "7.26.8",
+    "@babel/preset-env": "7.26.8",
     "@commitlint/cli": "17.8.1",
     "@commitlint/config-conventional": "17.8.1",
     "adm-zip": "0.4.11",
@@ -99,8 +99,8 @@
     "jsdoc": "3.6.11",
     "json": "^9.0.4",
     "pngjs": "3.4.0",
-    "scratch-blocks": "1.1.206",
-    "scratch-l10n": "5.0.120",
+    "scratch-blocks": "2.0.0-spork.4",
+    "scratch-l10n": "5.0.121",
     "scratch-render-fonts": "1.0.161",
     "scratch-semantic-release-config": "3.0.0",
     "scratch-webpack-configuration": "3.0.0",

package/release.config.js

@@ -5,6 +5,18 @@ module.exports = {
             name: 'develop'
             // default channel
         },
+        {
+            name: 'alpha',
+            prerelease: true
+        },
+        {
+            name: 'beta',
+            prerelease: true
+        },
+        {
+            name: 'spork',
+            prerelease: true
+        },
         {
             name: 'hotfix/*',
             channel: 'hotfix'

package/src/engine/blocks.js

@@ -322,12 +322,6 @@ class Blocks {
         const stage = this.runtime.getTargetForStage();
         const editingTarget = this.runtime.getEditingTarget();
 
-        // UI event: clicked scripts toggle in the runtime.
-        if (e.element === 'stackclick') {
-            this.runtime.toggleScript(e.blockId, {stackClick: true});
-            return;
-        }
-
         // Block create/update/destroy
         switch (e.type) {
         case 'create': {
@@ -481,18 +475,19 @@ class Blocks {
             this.emitProjectChanged();
             break;
         }
+        case 'block_comment_create':
         case 'comment_create':
             if (this.runtime.getEditingTarget()) {
                 const currTarget = this.runtime.getEditingTarget();
                 currTarget.createComment(
                     e.commentId,
                     e.blockId,
-                    e.text,
-                    e.xy.x,
-                    e.xy.y,
-                    e.width,
-                    e.height,
-                    e.minimized
+                    '',
+                    e.json.x,
+                    e.json.y,
+                    e.json.width,
+                    e.json.height,
+                    false
                 );
 
                 if (
@@ -505,12 +500,13 @@ class Blocks {
                     // comments, then the auto positioning should have taken place.
                     // Update the x and y position of these comments to match the
                     // one from the event.
-                    currTarget.comments[e.commentId].x = e.xy.x;
-                    currTarget.comments[e.commentId].y = e.xy.y;
+                    currTarget.comments[e.commentId].x = e.json.x;
+                    currTarget.comments[e.commentId].y = e.json.y;
                 }
             }
             this.emitProjectChanged();
             break;
+        case 'block_comment_change':
         case 'comment_change':
             if (this.runtime.getEditingTarget()) {
                 const currTarget = this.runtime.getEditingTarget();
@@ -526,21 +522,11 @@ class Blocks {
                     return;
                 }
                 const comment = currTarget.comments[e.commentId];
-                const change = e.newContents_;
-                if (Object.prototype.hasOwnProperty.call(change, 'minimized')) {
-                    comment.minimized = change.minimized;
-                }
-                if (Object.prototype.hasOwnProperty.call(change, 'width') &&
-                    Object.prototype.hasOwnProperty.call(change, 'height')) {
-                    comment.width = change.width;
-                    comment.height = change.height;
-                }
-                if (Object.prototype.hasOwnProperty.call(change, 'text')) {
-                    comment.text = change.text;
-                }
+                comment.text = e.newContents_;
                 this.emitProjectChanged();
             }
             break;
+        case 'block_comment_move':
         case 'comment_move':
             if (this.runtime.getEditingTarget()) {
                 const currTarget = this.runtime.getEditingTarget();
@@ -564,6 +550,50 @@ class Blocks {
                 this.emitProjectChanged();
             }
             break;
+        case 'block_comment_collapse':
+        case 'comment_collapse':
+            if (this.runtime.getEditingTarget()) {
+                const currTarget = this.runtime.getEditingTarget();
+                if (
+                    currTarget &&
+                        !Object.prototype.hasOwnProperty.call(
+                            currTarget.comments,
+                            e.commentId
+                        )
+                ) {
+                    log.warn(
+                        `Cannot collapse comment with id ${e.commentId} because it does not exist.`
+                    );
+                    return;
+                }
+                const comment = currTarget.comments[e.commentId];
+                comment.minimized = e.newCollapsed;
+                this.emitProjectChanged();
+            }
+            break;
+        case 'block_comment_resize':
+        case 'comment_resize':
+            if (this.runtime.getEditingTarget()) {
+                const currTarget = this.runtime.getEditingTarget();
+                if (
+                    currTarget &&
+                        !Object.prototype.hasOwnProperty.call(
+                            currTarget.comments,
+                            e.commentId
+                        )
+                ) {
+                    log.warn(
+                        `Cannot resize comment with id ${e.commentId} because it does not exist.`
+                    );
+                    return;
+                }
+                const comment = currTarget.comments[e.commentId];
+                comment.width = e.newSize.width;
+                comment.height = e.newSize.height;
+                this.emitProjectChanged();
+            }
+            break;
+        case 'block_comment_delete':
         case 'comment_delete':
             if (this.runtime.getEditingTarget()) {
                 const currTarget = this.runtime.getEditingTarget();
@@ -594,6 +624,15 @@ class Blocks {
                 this.emitProjectChanged();
             }
             break;
+        case 'click':
+            // UI event: clicked scripts toggle in the runtime.
+            if (e.targetType === 'block') {
+                this.runtime.toggleScript(
+                    this.getTopLevelScript(e.blockId),
+                    {stackClick: true}
+                );
+            }
+            break;
         }
     }
 
@@ -850,19 +889,32 @@ class Blocks {
                 typeof e.oldInput !== 'undefined' &&
                 oldParent.inputs[e.oldInput].block === e.id
             ) {
-                // This block was connected to the old parent's input.
-                oldParent.inputs[e.oldInput].block = null;
+                // This block was connected to an input. We either want to
+                // restore the shadow block that previously occupied
+                // this input, or null out the input's block.
+                const shadow = oldParent.inputs[e.oldInput].shadow;
+                if (shadow && e.id !== shadow) {
+                    oldParent.inputs[e.oldInput].block = shadow;
+                    this._blocks[shadow].parent = oldParent.id;
+                } else {
+                    oldParent.inputs[e.oldInput].block = null;
+                    if (e.id !== shadow) {
+                        this._blocks[e.id].parent = null;
+                    }
+                }
             } else if (oldParent.next === e.id) {
                 // This block was connected to the old parent's next connection.
                 oldParent.next = null;
+                this._blocks[e.id].parent = null;
             }
-            this._blocks[e.id].parent = null;
             didChange = true;
         }
 
         // Is this block a top-level block?
         if (typeof e.newParent === 'undefined') {
-            this._addScript(e.id);
+            if (!this._blocks[e.id].shadow) {
+                this._addScript(e.id);
+            }
         } else {
             // Remove script, if one exists.
             this._deleteScript(e.id);

package/src/engine/comment.js

@@ -31,7 +31,7 @@ class Comment {
     toXML () {
         return `<comment id="${this.id}" x="${this.x}" y="${
             this.y}" w="${this.width}" h="${this.height}" pinned="${
-            this.blockId !== null}" minimized="${this.minimized}">${xmlEscape(this.text)}</comment>`;
+            !this.minimized}" collapsed="${this.minimized}">${xmlEscape(this.text)}</comment>`;
     }
 
     // TODO choose min and defaults for width and height

package/src/engine/runtime.js

@@ -1049,9 +1049,7 @@ class Runtime extends EventEmitter {
                 type: menuId,
                 inputsInline: true,
                 output: 'String',
-                colour: categoryInfo.color1,
-                colourSecondary: categoryInfo.color2,
-                colourTertiary: categoryInfo.color3,
+                style: categoryInfo.id,
                 outputShape: menuInfo.acceptReporters ?
                     ScratchBlocksConstants.OUTPUT_SHAPE_ROUND :
                     ScratchBlocksConstants.OUTPUT_SHAPE_SQUARE,
@@ -1108,9 +1106,7 @@ class Runtime extends EventEmitter {
                 message0: '%1',
                 inputsInline: true,
                 output: output,
-                colour: categoryInfo.color1,
-                colourSecondary: categoryInfo.color2,
-                colourTertiary: categoryInfo.color3,
+                style: categoryInfo.id,
                 outputShape: outputShape,
                 args0: [
                     {
@@ -1155,9 +1151,8 @@ class Runtime extends EventEmitter {
             type: extendedOpcode,
             inputsInline: true,
             category: categoryInfo.name,
-            colour: categoryInfo.color1,
-            colourSecondary: categoryInfo.color2,
-            colourTertiary: categoryInfo.color3
+            style: categoryInfo.id,
+            extensions: []
         };
         const context = {
             // TODO: store this somewhere so that we can map args appropriately after translation.
@@ -1177,7 +1172,7 @@ class Runtime extends EventEmitter {
         const iconURI = blockInfo.blockIconURI || categoryInfo.blockIconURI;
 
         if (iconURI) {
-            blockJSON.extensions = ['scratch_extension'];
+            blockJSON.extensions.push('scratch_extension');
             blockJSON.message0 = '%1 %2';
             const iconJSON = {
                 type: 'field_image',
@@ -1224,6 +1219,7 @@ class Runtime extends EventEmitter {
             blockJSON.outputShape =
                     ScratchBlocksConstants.OUTPUT_SHAPE_SQUARE;
             blockJSON.nextStatement = null; // null = available connection; undefined = terminal
+            blockJSON.extensions.push('shape_hat');
             break;
         case BlockType.CONDITIONAL:
         case BlockType.LOOP:
@@ -1289,7 +1285,7 @@ class Runtime extends EventEmitter {
 
         if (blockInfo.blockType === BlockType.REPORTER) {
             if (!blockInfo.disableMonitor && context.inputList.length === 0) {
-                blockJSON.checkboxInFlyout = true;
+                blockJSON.extensions.push('monitor_block');
             }
         } else if (blockInfo.blockType === BlockType.LOOP) {
             // Add icon to the bottom right of a loop block
@@ -1562,7 +1558,7 @@ class Runtime extends EventEmitter {
 
             return {
                 id: categoryInfo.id,
-                xml: `<category name="${name}" id="${
+                xml: `<category name="${name}" toolboxitemid="${
                     categoryInfo.id
                 }" ${statusButtonXML} ${colorXML} ${menuIconXML}>${paletteBlocks
                     .map(block => block.xml)

package/webpack.config.js

@@ -81,7 +81,7 @@ const playgroundBuilder = webBuilder.clone()
         }
     })
     .addModuleRule({
-        test: require.resolve('scratch-blocks/dist/vertical.js'),
+        test: require.resolve('scratch-blocks/dist/main.js'),
         loader: 'expose-loader',
         options: {
             exposes: 'Blockly'