Merge pull request #2511 from BenHenning/master-with-conflict-resolution

chore: Merge branch `master` into `rc/v12.0.0`

Note that this includes a cherry-pick of #2508 to resolve conflicts found in #2503. Note that a separate branch is needed here to pull in the cherry-picked changes (in order to address the branch conflicts).

Author: BenHenning

.github/workflows/assign_reviewers.yml

@@ -15,9 +15,11 @@ on:
 jobs:
   requested-reviewer:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - name: Assign requested reviewer
-        uses: actions/github-script@v5
+        uses: actions/github-script@v7
         with:
           script: |
             try {

codelabs/custom_generator/custom_generator.md

@@ -203,7 +203,7 @@ A custom language generator is simply an instance of `Blockly.Generator`. Create
 ```js
 import * as Blockly from 'blockly';
 
-export const jsonGenerator = new Blockly.Generator('JSON');
+export const jsonGenerator = new Blockly.CodeGenerator('JSON');
 ```
 
 ### Generate code