feat: upstream merge 2026-03 (146 commits)

.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/workflows/ci-cd.yml

@@ -81,22 +81,8 @@ jobs:
         run: npm run build:dev
       - name: Lint
         run: npm run lint
-      - name: Create test-results directories
-        run: |
-          mkdir -p packages/scratch-vm/test-results
-          mkdir -p packages/scratch-gui/test-results
       - name: Run Unit Tests
-        env:
-          TAP_REPORTER: junit
-          TAP_REPORTER_FILE: test-results/unit-tests-results.xml
         run: npm run test:unit
-      - name: Store Test Results
-        if: always() # Even if tests fail
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
-        with:
-          name: test-output-unit
-          path: |
-            packages/*/test-results/*
 
   integration-test-vm:
     runs-on: ubuntu-latest

.nvmrc

@@ -1 +1 @@
-24.13.1
+24.14.0

.upstream-merge-history.json

@@ -1,10 +1,18 @@
 {
   "lastMerge": {
-    "date": "2026-02-14",
-    "upstreamCommit": "5f063605b67927f01647f56a8abf28b972a292bd",
-    "smalrubyCommit": "8220cde2ad0589dc5decfae18ae17ca66c57562b",
-    "mergeCommit": "58b3f1c7c",
-    "notes": "PR #431 green flag keyboard focus fix - 93 upstream commits merged"
+    "date": "2026-03-08",
+    "upstreamCommit": "42ea882750bd1c3b1544df33cfa794efa2a6d907",
+    "smalrubyCommit": "fe2bee4d37263f1d814235843d118b66406f5762",
+    "mergeCommit": "6ac14806a",
+    "notes": "146 upstream commits merged - scratch-blocks v2.0.0, release 13.0.0"
   },
-  "previousMerges": []
+  "previousMerges": [
+    {
+      "date": "2026-02-14",
+      "upstreamCommit": "5f063605b67927f01647f56a8abf28b972a292bd",
+      "smalrubyCommit": "8220cde2ad0589dc5decfae18ae17ca66c57562b",
+      "mergeCommit": "58b3f1c7c",
+      "notes": "PR #431 green flag keyboard focus fix - 93 upstream commits merged"
+    }
+  ]
 }

notes/upstream/merge-2026-03/conflict-resolutions.md

@@ -0,0 +1,34 @@
+# Conflict Resolutions - 2026-03 Upstream Merge
+
+## Files with Conflicts
+
+### Known Conflicts (Resolved)
+- [x] `package-lock.json` - Regenerated with `npm install --legacy-peer-deps`
+- [x] `packages/scratch-gui/package.json` - Kept @smalruby naming, merged deps
+- [x] `packages/scratch-render/package.json` - Kept @smalruby naming, bumped version
+- [x] `packages/scratch-svg-renderer/package.json` - Kept @smalruby naming, bumped version
+- [x] `packages/scratch-vm/package.json` - Kept @smalruby naming, bumped version
+- [x] `packages/task-herder/package.json` - Kept @smalruby naming, bumped version
+
+### Unexpected Conflicts (Manual Resolution)
+- [x] `.github/workflows/ci.yml` (DU) - Kept deletion (Smalruby uses own CI)
+- [x] `packages/scratch-gui/src/lib/settings/color-mode/dark/__mocks__/index.js` (DU) - Accepted upstream
+- [x] `packages/scratch-gui/src/lib/settings/color-mode/default/__mocks__/index.js` (DU) - Accepted upstream
+- [x] `packages/scratch-gui/eslint.config.mjs` - Kept Smalruby additions + upstream globalIgnores, updated import/core-modules to import-x/core-modules
+- [x] `packages/scratch-gui/src/containers/blocks.jsx` - Kept Smalruby logic (Ruby tab guard, fromRuby cleanup), updated ScratchBlocks API calls to v2.0.0
+- [x] `packages/scratch-gui/test/integration/blocks-standalone.test.js` - Imported both `until` and `scopeForFlyoutBlock`
+- [x] `packages/scratch-gui/test/integration/blocks.test.js` - Imported both `until` and `scopeForFlyoutBlock`
+- [x] `packages/scratch-gui/test/integration/localization.test.js` - Kept Smalruby version (Japanese locale test)
+
+## Post-Merge Fixes
+- Added `blockDisplayInitialState` export alias to `block-display.js` reducer
+- Added `redux` to `import-x/no-unresolved` ignore in eslint config
+- Fixed `colorMode` destructuring in blocks.jsx (needed by CustomProcedures)
+- Added `react`, `react-dom`, `redux` as direct dependencies (were peer deps only)
+
+## ScratchBlocks v2.0.0 API Changes Applied
+- `ScratchBlocks.prompt` → `ScratchBlocks.dialog.setPrompt()`
+- `ScratchBlocks.statusButtonCallback` → `ScratchBlocks.StatusIndicatorLabel.statusButtonCallback`
+- `ScratchBlocks.Xml.textToDom` → `ScratchBlocks.utils.xml.textToDom`
+- `ScratchBlocks.Xml.clearWorkspaceAndLoadFromXml` → `ScratchBlocks.clearWorkspaceAndLoadFromXml`
+- `this.workspace.reportValue()` → `this.ScratchBlocks.reportValue()`

notes/upstream/merge-2026-03/progress.md

@@ -0,0 +1,23 @@
+# Upstream Merge Progress - 2026-03
+
+## Info
+- **Date**: 2026-03-08
+- **Branch**: feat/upstream-merge-2026-03
+- **Upstream commits**: 146
+- **Previous merge commit**: 5f063605b67927f01647f56a8abf28b972a292bd
+
+## Steps
+
+| Step | Status | Time |
+|------|--------|------|
+| Prerequisites | ✅ | 2026-03-08 |
+| Branch creation | ✅ | 2026-03-08 |
+| Merge execution | ✅ | 2026-03-08 |
+| Conflict resolution | ✅ | 2026-03-08 |
+| Lint | ✅ | 2026-03-08 |
+| Build | ✅ | 2026-03-08 |
+| Unit tests | ✅ | 2026-03-08 |
+| Integration tests | ✅ | 2026-03-08 |
+| CI check | ⏳ Running | |
+| Documentation | ✅ | 2026-03-08 |
+| PR creation | ✅ | PR #238 |

notes/upstream/merge-2026-03/test-results.md

@@ -0,0 +1,40 @@
+# Test Results - 2026-03 Upstream Merge
+
+## Lint
+✅ Passed (3 pre-existing warnings)
+
+## Build
+✅ Passed (dev build, warnings only)
+
+## Unit Tests
+✅ Passed (183 suites, 1582/1583 passed, 1 skipped)
+
+## Integration Tests
+✅ Passed (local)
+
+- smalruby-tutorials.test.js: 3/3 ✅
+- block-display-modal.test.js: 7/7 ✅
+- gemini-modal.test.js: 1/1 ✅
+- ruby-tab-completion-and-indent.test.js: ✅ (skipped: 12)
+- tutorial-block-restriction.test.js: 3/3 ✅
+- palette-toggle.test.js: 4/4 ✅
+- backpack.test.js: ✅
+- ruby-tab.test.js: ✅
+- menu-bar.test.js: ✅
+- project-loading.test.js: ✅
+- sprites.test.js: ✅
+- blocks.test.js: ✅
+- localization.test.js: 4/4 ✅
+
+### Fixes Required for scratch-blocks v2
+- `clickText` → `clickBlocksCategory` for toolbox category clicks (DOM structure changed)
+- `.blocklyToolboxDiv` → `.blocklyToolbox` CSS selector (class name changed)
+- `import Blockly from 'scratch-blocks'` → `import * as Blockly from 'scratch-blocks'` (no default export)
+- `Blockly.utils.genUid()` → `Blockly.utils.idGenerator.genUid()` (API changed)
+- `Blockly.NAME_TYPE` → `Blockly.Names.NameType` (API changed)
+
+## CI Status
+⏳ Running - https://github.com/smalruby/smalruby3-editor/actions/runs/22818709584
+
+### Known CI Issue
+- "Lint commit messages" workflow fails due to upstream commits with headers >100 characters. This is expected for merge branches and not a blocking issue.