Merge branch 'main' of github.com:grega/blockly

.github/workflows/build.yml

@@ -27,6 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
         with:
+          ref: ${{ github.ref }}
           persist-credentials: false
 
       - name: Reconfigure git to use HTTP authentication
@@ -58,6 +59,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+        with:
+          ref: ${{ github.ref }}
 
       - name: Use Node.js 20.x
         uses: actions/setup-node@v5
@@ -75,6 +78,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+        with:
+          ref: ${{ github.ref }}
 
       - name: Use Node.js 20.x
         uses: actions/setup-node@v5

.github/workflows/publish.yml

@@ -4,17 +4,27 @@ on:
   workflow_dispatch:
     inputs:
       dry_run:
-        description: 'Dry run - print the version that would be published, but do not commit or publish anything.'
+        description: >
+          Dry run — print the version and npm dist-tag that would be used; no commit or publish.
+          Pick the branch to publish from with the "Use workflow from" dropdown.
+          Non-default branches publish to the npm dist-tag `beta` (not `latest`).
         required: false
         default: false
         type: boolean
       skip_versioning:
         description: >
-          Skip version bump - use the version already in the repo
+          Skip version bump — use the version already in the repo
           (e.g. retry after npm publish failed but the release commit is already pushed).
         required: false
         default: false
         type: boolean
+      version_override:
+        description: >
+          Optional. Full semver to publish (e.g. 12.6.0-beta.2). Skips conventional bump when set.
+          Leave empty for automatic versioning.
+        required: false
+        default: ''
+        type: string
 
 permissions:
   contents: write
@@ -34,6 +44,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
         with:
+          ref: ${{ github.ref }}
           fetch-depth: 0
 
       - name: Setup Node.js
@@ -48,7 +59,7 @@ jobs:
 
       - name: Determine version bump
         id: bump
-        if: ${{ !inputs.skip_versioning }}
+        if: ${{ !inputs.skip_versioning && inputs.version_override == '' }}
         working-directory: packages/blockly
         run: |
           RELEASE_TYPE=$(npx conventional-recommended-bump --preset conventionalcommits -t blockly-)
@@ -58,7 +69,35 @@ jobs:
       - name: Apply version bump
         if: ${{ !inputs.skip_versioning }}
         working-directory: packages/blockly
-        run: npm version ${{ steps.bump.outputs.release_type }} --no-git-tag-version
+        env:
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+          REF_NAME: ${{ github.ref_name }}
+          RELEASE_TYPE: ${{ steps.bump.outputs.release_type }}
+          VERSION_OVERRIDE: ${{ inputs.version_override }}
+        run: |
+          set -euo pipefail
+          if [ -n "${VERSION_OVERRIDE}" ]; then
+            npm version "${VERSION_OVERRIDE}" --no-git-tag-version
+            exit 0
+          fi
+          if [ "${REF_NAME}" = "${DEFAULT_BRANCH}" ]; then
+            npm version "${RELEASE_TYPE}" --no-git-tag-version
+            exit 0
+          fi
+          VERSION=$(node -p "require('./package.json').version")
+          if [[ "${VERSION}" == *"-beta."* ]]; then
+            npm version prerelease --preid=beta --no-git-tag-version
+          else
+            case "${RELEASE_TYPE}" in
+              major) npm version premajor --preid=beta --no-git-tag-version ;;
+              minor) npm version preminor --preid=beta --no-git-tag-version ;;
+              patch) npm version prepatch --preid=beta --no-git-tag-version ;;
+              *)
+                echo "::error title=Invalid release bump::conventional-recommended-bump returned '${RELEASE_TYPE}' (expected major, minor, or patch). Fix commits/tags or set version_override." >&2
+                exit 1
+                ;;
+            esac
+          fi
 
       - name: Read package version
         id: version
@@ -68,6 +107,15 @@ jobs:
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "Version: $VERSION"
 
+      - name: Dry run summary
+        if: ${{ inputs.dry_run }}
+        run: |
+          DIST_TAG="${{ github.ref_name == github.event.repository.default_branch && 'latest' || 'beta' }}"
+          echo "Dry run: would publish version ${{ steps.version.outputs.version }} to npm dist-tag: ${DIST_TAG}"
+          if [ "${{ github.ref_name }}" != "${{ github.event.repository.default_branch }}" ]; then
+            echo "GitHub release would be created as prerelease."
+          fi
+
       - name: Upload versioned files
         if: ${{ !inputs.skip_versioning }}
         uses: actions/upload-artifact@v4
@@ -82,10 +130,13 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !inputs.dry_run }}
     environment: release
+    env:
+      NPM_DIST_TAG: ${{ github.ref_name == github.event.repository.default_branch && 'latest' || 'beta' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v5
         with:
+          ref: ${{ github.ref }}
           fetch-depth: 0
           ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }}
 
@@ -119,7 +170,7 @@ jobs:
 
       - name: Publish to npm
         working-directory: packages/blockly/dist
-        run: npm publish --verbose
+        run: npm publish --tag "${NPM_DIST_TAG}" --verbose
 
       - name: Create tarball
         working-directory: packages/blockly
@@ -131,7 +182,15 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           TARBALL="blockly-${{ needs.version.outputs.version }}.tgz"
-          gh release create "blockly-v${{ needs.version.outputs.version }}" "$TARBALL" \
-            --repo "$GITHUB_REPOSITORY" \
-            --title "blockly-v${{ needs.version.outputs.version }}" \
-            --generate-notes
+          if [ "${{ github.ref_name }}" != "${{ github.event.repository.default_branch }}" ]; then
+            gh release create "blockly-v${{ needs.version.outputs.version }}" "$TARBALL" \
+              --repo "$GITHUB_REPOSITORY" \
+              --title "blockly-v${{ needs.version.outputs.version }}" \
+              --generate-notes \
+              --prerelease
+          else
+            gh release create "blockly-v${{ needs.version.outputs.version }}" "$TARBALL" \
+              --repo "$GITHUB_REPOSITORY" \
+              --title "blockly-v${{ needs.version.outputs.version }}" \
+              --generate-notes
+          fi

packages/blockly/core/shortcut_items.ts

@@ -217,7 +217,9 @@ export function registerCut() {
       if (focused instanceof BlockSvg) {
         focused.checkAndDelete();
       } else if (isIDeletable(focused)) {
+        eventUtils.setGroup(true);
         focused.dispose();
+        eventUtils.setGroup(false);
       }
       return !!copyData;
     },

packages/blockly/tests/mocha/shortcut_items_test.js

@@ -295,6 +295,11 @@ suite('Keyboard Shortcut Items', function () {
       this.disposeSpy = sinon.spy(this.comment, 'dispose');
 
       this.injectionDiv.dispatchEvent(keyEvent);
+
+      const deleteEvents = this.workspace
+        .getUndoStack()
+        .filter((e) => e.type === 'comment_delete');
+      assert(deleteEvents[0].group !== ''); // Group string is not empty
       sinon.assert.calledOnce(this.copySpy);
       sinon.assert.calledOnce(this.disposeSpy);
     });