Merge branch 'develop' of https://github.com/TurboWarp/scratch-vm into TurboWarp-develop

Author: Titanium2099

.github/workflows/deploy.yml

@@ -13,14 +13,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Install Node.js
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
-          cache: npm
+          node-version: 22
       - name: Install dependencies
         run: npm ci
       - name: Build playground
@@ -31,7 +30,7 @@ jobs:
         # It will still generate what it can, so it's safe to ignore the error
         continue-on-error: true
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./playground/
 
@@ -47,4 +46,4 @@ jobs:
     steps:
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e
+      uses: actions/deploy-pages@v4

.github/workflows/node.js.yml

@@ -8,15 +8,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Install Node.js
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: npm
       - run: npm ci
       - run: npm run lint
       - run: npm run build
-      - run: npm run test
+      - run: npm run tap

package-lock.json

@@ -49,7 +49,7 @@
     "immutable": "3.8.2",
     "scratch-parser": "github:TurboWarp/scratch-parser#master",
     "scratch-sb1-converter": "0.2.7",
-    "scratch-translate-extension-languages": "0.0.20191118205314",
+    "scratch-translate-extension-languages": "^1.0.7",
     "text-encoding": "0.7.0",
     "uuid": "8.3.2",
     "worker-loader": "^1.1.1"

package.json

@@ -1,13 +1,16 @@
+// @ts-check
+
 const BlockUtility = require('../engine/block-utility');
 
 class CompatibilityLayerBlockUtility extends BlockUtility {
     constructor () {
         super();
+        this._stackFrame = {};
         this._startedBranch = null;
     }
 
     get stackFrame () {
-        return this.thread.compatibilityStackFrame;
+        return this.thread?.compatibilityStackFrame;
     }
 
     startBranch (branchNumber, isLoop) {

src/compiler/compat-block-utility.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * @fileoverview List of blocks to be supported in the compiler compatibility layer.
  * This is only for native blocks. Extensions should not be listed here.

src/compiler/compat-blocks.js

@@ -1,14 +1,20 @@
+// @ts-check
+
 const {IRGenerator} = require('./irgen');
+const {IROptimizer} = require('./iroptimizer');
 const JSGenerator = require('./jsgen');
 
-const compile = thread => {
+const compile = (/** @type {import("../engine/thread")} */ thread) => {
     const irGenerator = new IRGenerator(thread);
     const ir = irGenerator.generate();
 
+    const irOptimizer = new IROptimizer(ir);
+    irOptimizer.optimize();
+
     const procedures = {};
     const target = thread.target;
 
-    const compileScript = script => {
+    const compileScript = (/** @type {import("./intermediate").IntermediateScript} */ script) => {
         if (script.cachedCompileResult) {
             return script.cachedCompileResult;
         }