Sync 13.7.3 experience cs

.editorconfig

@@ -4,12 +4,13 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
+indent_size = 4
 trim_trailing_whitespace = true
 
-[*.{cjs,js,jsx,mjs,ts,tsx}]
+[*.{cjs,html,js,jsx,mjs,ts,tsx}]
 indent_style = space
 
-[*,{json,json5,jsonc}]
+[*.{json,json5,jsonc}]
 indent_size = 2
 indent_style = space
 

.gitattributes

@@ -46,6 +46,7 @@
 *.sublime-project text eol=lf
 *.test.*.snap text eol=lf
 *.ts text eol=lf
+*.tsx text eol=lf
 *.txt text eol=lf
 *.vert text eol=lf
 *.xml text eol=lf

.github/actions/deploy-pages-with-retry/action.yml

@@ -0,0 +1,64 @@
+name: Deploy GitHub Pages with retry
+
+description: Deploy to GitHub Pages and retry failed deploy attempts with a delay.
+
+inputs:
+  github_token:
+    description: GitHub token used by peaceiris/actions-gh-pages
+    required: true
+  publish_dir:
+    description: Directory to publish
+    required: true
+  destination_dir:
+    description: Destination subdirectory in gh-pages branch
+    required: true
+  full_commit_message:
+    description: Full commit message for the deploy commit
+    required: true
+  retry_delay_seconds:
+    description: Delay in seconds between retries
+    required: false
+    default: "5"
+
+runs:
+  using: composite
+  steps:
+    - name: Deploy (attempt 1)
+      id: deploy_pages_attempt_1
+      continue-on-error: true
+      uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
+      with:
+        github_token: ${{ inputs.github_token }}
+        publish_dir: ${{ inputs.publish_dir }}
+        destination_dir: ${{ inputs.destination_dir }}
+        full_commit_message: ${{ inputs.full_commit_message }}
+
+    - name: Wait before retry (attempt 2)
+      if: ${{ steps.deploy_pages_attempt_1.outcome == 'failure' }}
+      shell: bash
+      run: sleep "${{ inputs.retry_delay_seconds }}"
+
+    - name: Deploy (attempt 2)
+      id: deploy_pages_attempt_2
+      if: ${{ steps.deploy_pages_attempt_1.outcome == 'failure' }}
+      continue-on-error: true
+      uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
+      with:
+        github_token: ${{ inputs.github_token }}
+        publish_dir: ${{ inputs.publish_dir }}
+        destination_dir: ${{ inputs.destination_dir }}
+        full_commit_message: ${{ inputs.full_commit_message }}
+
+    - name: Wait before retry (attempt 3)
+      if: ${{ steps.deploy_pages_attempt_2.outcome == 'failure' }}
+      shell: bash
+      run: sleep "${{ inputs.retry_delay_seconds }}"
+
+    - name: Deploy (attempt 3)
+      if: ${{ steps.deploy_pages_attempt_2.outcome == 'failure' }}
+      uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
+      with:
+        github_token: ${{ inputs.github_token }}
+        publish_dir: ${{ inputs.publish_dir }}
+        destination_dir: ${{ inputs.destination_dir }}
+        full_commit_message: ${{ inputs.full_commit_message }}

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

@@ -36,7 +36,6 @@ runs:
         key: ${{ runner.os }}-npm-${{ hashFiles('.nvmrc', 'package-lock.json') }}
     - if: steps.restore-node-modules-cache.outputs.cache-hit != 'true'
       name: Install NPM dependencies
-      working-directory: .
       shell: bash
       run: NODE_ENV=development npm ci
     - uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4

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

@@ -11,24 +11,28 @@ runs:
   using: composite
   steps:
     - name: Install Playwright
+      if: ${{ inputs.package_name == 'scratch-render' || inputs.package_name == 'scratch-gui' }}
       shell: bash
-      run: |
-        if [[ ${{ inputs.package_name }} == "scratch-render" ]]; then
-          npx playwright install --with-deps chromium
-        fi    
-    - name: Explicitly install Rolldown linux binaries
-      shell: bash
-      run: npm install @rolldown/binding-linux-x64-gnu --no-save --ignore-scripts
-
+      # Install both browsers for any package that needs Playwright,
+      # even if a particular package only uses one of them — keeping
+      # the install step uniform is much simpler than maintaining a
+      # per-package browser list, and Firefox in scratch-render is
+      # cheap unused weight rather than a correctness problem.
+      run: npx playwright install --with-deps chromium firefox
     - name: Test
       working-directory: ./packages/${{ inputs.package_name }}
       shell: bash
       env:
         TAP_REPORTER: "junit"
         TAP_REPORTER_FILE: "test-results/junit.xml"
+      # xvfb-run provides a virtual display for browsers that need one.
+      # Firefox's non-headless mode (used because headless Firefox lacks
+      # WebGL support) requires an X server, and xvfb fills that role
+      # on the headless CI runner. Chromium doesn't need it but works
+      # fine under xvfb too.
       run: |
         mkdir -p test-results
-        npm run test
+        xvfb-run --auto-servernum npm run test
     - name: Store Test Results
       if: ${{ !cancelled() }}
       uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5

.github/path-filters.yml

@@ -14,6 +14,9 @@ any-workspace:
 task-herder:
   - *global
   - "packages/task-herder/**"
+scratch-media-lib-scripts:
+  - *global
+  - "packages/scratch-media-lib-scripts/**"
 scratch-svg-renderer:
   - *global
   - "packages/scratch-svg-renderer/**"

.github/workflows/ci.yml

@@ -1,16 +1,25 @@
 name: CI
 
 on:
-  workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
-  push: # Runs whenever a commit is pushed to the repository
-    branches: [experience-cs]
+  merge_group:
+  pull_request:
+  push: # WARNING: Renovate sometimes automerges without PR, so we MUST build and test renovate/** branches
+  workflow_call:
+    inputs:
+      force-full-build:
+        description: 'Build all packages regardless of path filters'
+        type: boolean
+        default: false
+  workflow_dispatch:
+    inputs:
+      force-full-build:
+        description: 'Build all packages regardless of path filters'
+        type: boolean
+        default: false
 
 permissions:
-  packages: write # deploy to GitHub Packages
-  contents: read # The following 4 permissions are needed to publish test results
-  issues: read
-  checks: write
-  pull-requests: write
+  contents: read
+  packages: write
 
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.event.compare || github.head_ref || github.ref }}"
@@ -27,104 +36,106 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
         with:
-          cache: "npm"
-          node-version-file: ".nvmrc"
-          registry-url: "https://npm.pkg.github.com"
-      - uses: wagoid/commitlint-github-action@9763196e10f27aef304c9b8b660d31d97fce0f99 # v5
-      - name: Debug info
+          cache: 'npm'
+          node-version-file: '.nvmrc'
+          registry-url: https://npm.pkg.github.com
+      - name: Debug Info
         # https://docs.github.com/en/actions/reference/security/secure-use#use-an-intermediate-environment-variable
         env:
           # `env:` values are printed to the log even without using them in `run:`
           GH_CONTEXT: ${{ toJson(github) }}
+          SCRATCH_ENV: ${{ vars.SCRATCH_ENV || '<none>' }}
         run: |
           cat <<EOF
           Working directory: $(pwd)
           Node version: $(node --version)
           NPM version: $(npm --version)
-          Scratch environment: ${{ vars.SCRATCH_ENV || '<none>' }}
+          Scratch environment: $SCRATCH_ENV
           EOF
 
-      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3
-        id: filter
+      - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4
+        id: paths-filter
+        if: ${{ !inputs.force-full-build }}
         with:
           filters: ./.github/path-filters.yml
 
+      - name: Resolve Changed Packages
+        id: filter
+        run: |
+          if [ "${{ inputs.force-full-build }}" = "true" ]; then
+            echo "any-workspace=true" >> "$GITHUB_OUTPUT"
+            PACKAGES=$(ls -1d packages/*/ | xargs -n1 basename | jq -Rcn '[inputs]')
+            echo "changes=$PACKAGES" >> "$GITHUB_OUTPUT"
+          else
+            echo "any-workspace=${{ steps.paths-filter.outputs.any-workspace }}" >> "$GITHUB_OUTPUT"
+            PACKAGES=$(echo '${{ steps.paths-filter.outputs.changes }}' | jq -c '[.[] | select(. != "global" and . != "any-workspace")]')
+            echo "changes=$PACKAGES" >> "$GITHUB_OUTPUT"
+          fi
+
       - if: ${{ steps.filter.outputs.any-workspace == 'true' }}
         env:
           NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         uses: ./.github/actions/install-dependencies
 
-      - name: Explicitly install Rolldown linux binaries
+      - name: Install Rolldown linux binaries
         if: ${{ steps.filter.outputs.any-workspace == 'true' }}
         run: npm install @rolldown/binding-linux-x64-gnu --no-save --ignore-scripts
 
-      - name: Build packages
+      # TODO: Packages currently depend on each other's compiled dist at build time. Fix that and matrix the builds.
+      - name: Build Packages
         if: ${{ steps.filter.outputs.any-workspace == 'true' }}
         run: npm run build
 
-      - name: Store build artifacts
+      - name: Store Build Artifacts
         if: ${{ steps.filter.outputs.any-workspace == 'true' }}
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
         with:
           name: build
+          retention-days: 90
           path: |
             packages/**/build
             packages/**/dist
             packages/**/playground
+
       - name: Publish scratch-gui to GitHub Packages
+        if: ${{ github.ref == 'refs/heads/experience-cs' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }}
         working-directory: ./packages/scratch-gui
         env:
           NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          RELEASE_VERSION="0.1.0-experience-cs.$(date +'%Y%m%d%H%M%S')"
-          npm version --no-git-tag-version $RELEASE_VERSION
+          RELEASE_VERSION="13.7.3-experience-cs.$(date +'%Y%m%d%H%M%S')"
+          npm version --no-git-tag-version "$RELEASE_VERSION"
           npm publish --access public --tag latest
 
   test:
-    runs-on: ubuntu-latest
+    name: Test
     needs: build
-    if: ${{ needs.build.outputs.any-workspace == 'true' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        package: ${{ fromJSON(needs.build.outputs.packages) }}
-        exclude:
-          - package: global
-          - package: any-workspace
-    name: Test ${{ matrix.package }}
-    steps:
-      - 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@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
-        with:
-          name: build
-          path: packages
-      - uses: ./.github/actions/test-package
-        with:
-          package_name: ${{ matrix.package }}
-  results:
-    name: Test Results
-    runs-on: ubuntu-latest
-    needs: test
-    if: ${{ !cancelled() }}
-    steps:
-      - run: |
-          case "${{ needs.test.result }}" in
-            success)
-              echo "Tests passed successfully."
-              exit 0
-              ;;
-            skipped)
-              echo "Tests were unnecessary for these changes, so they were skipped."
-              echo "If this is unexpected, check the path filters."
-              exit 0
-              ;;
-            *)
-              echo "Tests failed."
-              exit 1
-              ;;
-          esac
+    if: ${{ needs.build.outputs.any-workspace == 'true' && needs.build.outputs.packages != '[]' }}
+    uses: ./.github/workflows/test-packages.yml
+    with:
+      packages: ${{ needs.build.outputs.packages }}
+
+  preview:
+    name: Preview
+    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/'))
+      }}
+    uses: ./.github/workflows/deploy-playground-preview.yml
+    with:
+      # even `develop` should be published to a subdirectory
+      # that way each branch can be updated or cleaned up independently
+      destination_dir: ${{ github.head_ref || github.ref_name }}
+      full_commit_message: "Build for ${{ github.sha }} ${{ github.event.head_commit.message }}"

.github/workflows/commitlint.yml

@@ -1,8 +1,9 @@
-name: Lint commit messages
+name: Lint Commit Messages
 on: [pull_request]
 
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.sha }}"
+  cancel-in-progress: true
 
 jobs:
   commitlint: