Merge upstream/develop and resolve conflicts

Author: pishi-ai

.github/actions/install-dependencies/action.yml

@@ -25,7 +25,7 @@ runs:
         fi
     # When the main workflow calls many workspace workflows, we can reuse this cache for all of them.
     # Since this is caching the node_modules directory, DO NOT add partial-match restore keys!
-    - uses: actions/cache/restore@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4
+    - uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
       id: restore-node-modules-cache
       with:
         path: |
@@ -39,7 +39,7 @@ runs:
       working-directory: .
       shell: bash
       run: NODE_ENV=development npm ci
-    - uses: actions/cache/save@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4
+    - uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
       if: steps.restore-node-modules-cache.outputs.cache-hit != 'true'
       with:
         path: |

.github/actions/test-package/action.yml

@@ -19,12 +19,22 @@ runs:
     - name: Test
       working-directory: ./packages/${{ inputs.package_name }}
       shell: bash
+      env:
+        TAP_REPORTER: "junit"
+        TAP_REPORTER_FILE: "test-results/junit.xml"
       run: |
         mkdir -p test-results
-        npm run test | tee -a ./test-results/${{ inputs.package_name }}-test-results.txt
+        npm run test
+    - name: Publish test reports
+      if: ${{ !cancelled() }}
+      uses: EnricoMi/publish-unit-test-result-action@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2
+      with:
+        files: "./packages/${{ inputs.package_name }}/test-results/**/*"
+        check_name: "Test report for ${{ inputs.package_name }}"
+        test_file_prefix: "+packages/${{ inputs.package_name }}/"
     - name: Store Test Results
       if: ${{ !cancelled() }}
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
       with:
         name: ${{ inputs.package_name }}-test-output
         path: ./packages/${{ inputs.package_name }}/test-results/*

.github/workflows/ci.yml

@@ -19,23 +19,22 @@ jobs:
       any-workspace: ${{ steps.filter.outputs.any-workspace }}
       packages: ${{ steps.filter.outputs.changes }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
         with:
           cache: 'npm'
           node-version-file: '.nvmrc'
       - name: Debug info
         # https://docs.github.com/en/actions/reference/security/secure-use#use-an-intermediate-environment-variable
         env:
-          GH_HEAD_REF: ${{ github.head_ref }}
+          # `env:` values are printed to the log even without using them in `run:`
+          GH_CONTEXT: ${{ toJson(github) }}
         run: |
           cat <<EOF
-          Scratch environment: ${{ vars.SCRATCH_ENV || '<none>' }}
+          Working directory: $(pwd)
           Node version: $(node --version)
           NPM version: $(npm --version)
-          GitHub ref: ${{ github.ref }}
-          GitHub head ref: ${GH_HEAD_REF}
-          Working directory: $(pwd)
+          Scratch environment: ${{ vars.SCRATCH_ENV || '<none>' }}
           EOF
 
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3
@@ -52,7 +51,7 @@ jobs:
 
       - name: Store build artifacts
         if: ${{ steps.filter.outputs.any-workspace == 'true' }}
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
         with:
           name: build
           path: |
@@ -73,25 +72,79 @@ jobs:
           - package: any-workspace
     name: Test ${{ matrix.package }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
         with:
           cache: 'npm'
           node-version-file: '.nvmrc'
       - uses: ./.github/actions/install-dependencies
-      - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
+      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
         with:
           name: build
           path: packages
       - uses: ./.github/actions/test-package
         with:
           package_name: ${{ matrix.package }}
 
+  preview:
+    runs-on: ubuntu-latest
+    needs: build
+    # We don't want to give forks free reign to publish to our GitHub Pages, so run this job only if both:
+    # - any workspace changed (otherwise there's no work to do)
+    # - and either
+    #   - this is not a PR (so it's some other event that happened in our fork, like a push or merge group)
+    #   - or it's a PR from our fork (not some other fork)
+    # - and
+    #   - it's not a Renovate branch (just to reduce noise)
+    if: ${{
+        (needs.build.outputs.any-workspace == 'true') &&
+        (
+          (!github.event.pull_request) ||
+          (github.event.pull_request.head.repo.full_name == github.repository)
+        ) &&
+        (!startsWith((github.head_ref || github.ref_name), 'renovate/'))
+      }}
+    name: Publish preview playgrounds to GitHub Pages
+    steps:
+      - name: Determine GitHub Pages directory name
+        id: branch_dir_name
+        # even `develop` should be published to a subdirectory
+        # that way each branch can be updated or cleaned up independently
+        run: |
+          echo "result=${GITHUB_REF_NAME//[^A-Za-z0-9._-]/_}" | tee --append "$GITHUB_OUTPUT"
+      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
+        with:
+          name: build
+          path: packages
+      - name: Prepare playgrounds for GitHub Pages
+        working-directory: ./packages
+        run: |
+          mkdir -p ../pages/
+          for pkg in *; do
+            if [ -d "${pkg}/playground" ]; then
+              # using symlinks is quick and artifact generation will dereference them
+              # if the GitHub Pages action stops dereferencing these links, we'll need to copy the files instead
+              ln -s "../packages/${pkg}/playground" "../pages/${pkg}"
+            fi
+          done
+
+          # scratch-gui doesn't follow the pattern above
+          ln -s "../packages/scratch-gui/build" "../pages/scratch-gui"
+
+          ls -l ../pages/
+      - name: Deploy playgrounds to GitHub Pages
+        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./pages
+          destination_dir: "${{steps.branch_dir_name.outputs.result}}"
+          full_commit_message: "Build for ${{ github.sha }} ${{ github.event.head_commit.message }}"
+
   results:
-    name: Results
+    name: Test Results
     runs-on: ubuntu-latest
     needs: test
-    if: ${{ always() }}
+    if: ${{ !cancelled() }}
     steps:
       - run: |
           case "${{ needs.test.result }}" in

.github/workflows/commitlint.yml

@@ -8,5 +8,5 @@ jobs:
   commitlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: wagoid/commitlint-github-action@9763196e10f27aef304c9b8b660d31d97fce0f99 # v5
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: wagoid/commitlint-github-action@b948419dd99f3fd78a6548d48f94e3df7f6bf3ed # v6

.github/workflows/ghpages-cleanup.yml

@@ -0,0 +1,44 @@
+name: GitHub Pages Cleanup
+
+on:
+  schedule:
+    - cron: 0 0 * * 6 # midnight on Saturdays
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out GitHub Pages branch
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        with:
+          # replace `fetch-depth` with `shallow-since` if and when actions/checkout#619 (or an equivalent) gets merged
+          # then remove the "Fetch a bit more history" step below
+          fetch-depth: 1
+          ref: gh-pages
+      - name: Fetch a bit more history
+        run: git fetch --update-shallow --shallow-since="32 days ago" origin gh-pages
+      - name: Mark stale directories for removal
+        run: |
+          for dir in */; do
+            [ -L "${dir%/}" ] && continue  # skip symlinks (trim trailing slash for test)
+            if [ -z "$(git log -n 1 --since "1 month ago" -- "$dir")" ]; then
+              echo "Removing stale directory: $dir"
+              git rm --quiet -r "$dir"
+            fi
+          done
+      - name: Configure git user
+        run: |
+          git config user.name 'github-actions[bot]'
+          git config user.email 'github-actions[bot]@users.noreply.github.com'
+      - name: Commit
+        run: |
+          if git diff --staged --quiet; then
+            echo 'No stale directories were found. Nothing to commit.'
+          else
+            git commit -m 'chore: remove stale GitHub Pages branches'
+          fi
+      - name: Push
+        run: "git push"

.github/workflows/publish.yml

@@ -51,11 +51,11 @@ jobs:
           git config --global user.name 'GitHub Actions'
           git config --global user.email 'github-actions@localhost'
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           token: ${{ secrets.PAT_RELEASE_PUSH }} # persists the token for pushing to the repo later
 
-      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
         with:
           cache: 'npm'
           node-version-file: '.nvmrc'
@@ -112,12 +112,7 @@ jobs:
 
       - name: Publish scratch-gui-standalone
         run: |
-          jq '
-            .name = "@scratch/scratch-gui-standalone" |
-            del(.peerDependencies) |
-            .exports."." = .exports."./standalone" |
-            del(.exports."./standalone")
-          ' ./packages/scratch-gui/package.json | npx sponge ./packages/scratch-gui/package.json
+          bash ./scripts/prepare-standalone-gui.sh
 
           npm --workspace=@scratch/scratch-gui-standalone run clean && npm --workspace=@scratch/scratch-gui-standalone run build:dist-standalone
           npm publish --access=public --tag="${{steps.npm_tag.outputs.npm_tag}}" --workspace=@scratch/scratch-gui-standalone
@@ -145,35 +140,3 @@ jobs:
         run: |
           git tag -f "${{github.event.release.tag_name}}" HEAD
           git push -f origin "refs/tags/${{github.event.release.tag_name}}"
-
-      - name: Deploy scratch-svg-renderer to GitHub Pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./packages/scratch-svg-renderer/playground
-          destination_dir: scratch-svg-renderer
-          full_commit_message: "Build for ${{ github.sha }} ${{ github.event.head_commit.message }}"
-
-      - name: Deploy scratch-render to GitHub Pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./packages/scratch-render/playground
-          destination_dir: scratch-render
-          full_commit_message: "Build for ${{ github.sha }} ${{ github.event.head_commit.message }}"
-
-      - name: Deploy scratch-vm to GitHub Pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./packages/scratch-vm/playground
-          destination_dir: scratch-vm
-          full_commit_message: "Build for ${{ github.sha }} ${{ github.event.head_commit.message }}"
-
-      - name: Deploy scratch-gui to GitHub Pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./packages/scratch-gui/build
-          destination_dir: scratch-gui
-          full_commit_message: "Build for ${{ github.sha }} ${{ github.event.head_commit.message }}"

.github/workflows/update-i18n.yml

@@ -16,8 +16,8 @@ jobs:
   update-i18n:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
         with:
           cache: 'npm'
           node-version-file: '.nvmrc'