Spork: unfork Blockly by cwillisf · Pull Request #214 · scratchfoundation/scratch-editor

cwillisf · 2025-03-05T19:26:06Z

Proposed Changes

Use the new version of scratch-blocks, which now depends on Blockly instead of being a fork of Blockly.

Reason for Changes

As stated in scratchfoundation/scratch-blocks#3338:

We can use new Blockly features!
We can more easily maintain scratch-blocks!
We can keep up to date with new Blockly releases!
We can hang with the cool kids at Blockly-related parties!

Test Coverage

Many existing tests at least partially cover these changes. We'll also be testing these changes through several manual testing sessions.

* fix: run stacks in response to stack click events * refactor: listen for regular click events to run block stacks

…extensions toolbox categories (#2)

* fix: handle modern workspace comment events * fix: correctly access coordinates on events

* chore: format runtime.js * fix: add the hat extension to extension hat blocks

… occupied by a shadow block (#8) * chore: format engine/blocks.js * fix: restore shadow blocks when removing a block from an input

…locks getting into a bad state (#9)

The playgrounds themselves are still broken, but it's a step...

…ty with patched scratch-blocks (#1)

…ected (#4)

* fix: add support for Scratch-style procedures * refactor: remove underscore procedure creation callback

…toolbox categories (#9)

…the stage (#10)

…space (#11)

zfangqijun · 2025-10-27T14:51:57Z

@cwillisf hello，is there a preview page for spork?
I am developing using the spork branch and encountering some bugs, I want to compare and see if it's a problem with my own code.

Samq64 · 2025-10-28T19:50:20Z

Will Google transferring Blocky to the Raspberry Pi Foundation impact this?

is there a preview page for spork?

Yes, https://scratchfoundation.github.io/scratch-editor/spork/scratch-gui/ although I am not sure if it's fully up-to-date.

zfangqijun · 2025-10-29T08:47:22Z

Will Google transferring Blocky to the Raspberry Pi Foundation impact this?

is there a preview page for spork?

Yes, https://scratchfoundation.github.io/scratch-editor/spork/scratch-gui/ although I am not sure if it's fully up-to-date.

thanks！🌹

cwillisf · 2025-10-29T14:03:41Z

Hey all, thanks for checking in!

Yes, https://scratchfoundation.github.io/scratch-editor/spork/scratch-gui/ although I am not sure if it's fully up-to-date.

That should always be up to date with what's in this branch, as it's automatically deployed as part of the CI/CD scripts in this repository. However, this branch is somewhat out of date right now: I need to merge the React 18 and Face Sensing changes from develop into this branch.

cwillisf · 2025-10-29T14:14:27Z

Will Google transferring Blocky to the Raspberry Pi Foundation impact this?

I'm excited for the Blockly team! The Scratch team is friends with the folks at the Raspberry Pi Foundation, and we've worked together in the past. We're all committed to seeing this through and continuing to work together in the future.

TL;DR: all good! 🎉

github-actions · 2026-02-19T19:51:05Z

Test report for scratch-vm

1 files ± 0 763 suites ±0 1m 33s ⏱️ -7s
1 666 tests ± 0 1 666 ✅ ± 0 0 💤 ±0 0 ❌ ±0
4 845 runs - 10 4 815 ✅ - 10 30 💤 ±0 0 ❌ ±0

Results for commit 37568e0. ± Comparison against base commit f581090.

♻️ This comment has been updated with latest results.

github-actions · 2026-02-19T19:51:07Z

Test report for scratch-svg-renderer

1 files ±0 60 suites ±0 0s ⏱️ ±0s
124 tests ±0 124 ✅ ±0 0 💤 ±0 0 ❌ ±0
276 runs ±0 275 ✅ ±0 1 💤 ±0 0 ❌ ±0

Results for commit 37568e0. ± Comparison against base commit f581090.

♻️ This comment has been updated with latest results.

github-actions · 2026-02-19T19:51:25Z

Test report for task-herder

28 tests ±0 28 ✅ ±0 0s ⏱️ ±0s
7 suites ±0 0 💤 ±0
1 files ±0 0 ❌ ±0

Results for commit 37568e0. ± Comparison against base commit f581090.

♻️ This comment has been updated with latest results.

github-actions · 2026-02-19T19:51:43Z

Test report for scratch-render

1 files ±0 55 suites ±0 2s ⏱️ ±0s
209 tests ±0 209 ✅ ±0 0 💤 ±0 0 ❌ ±0
279 runs ±0 279 ✅ ±0 0 💤 ±0 0 ❌ ±0

Results for commit 37568e0. ± Comparison against base commit f581090.

♻️ This comment has been updated with latest results.

github-actions · 2026-02-19T20:03:03Z

Test report for scratch-gui

2 files ±0 62 suites ±0 9m 37s ⏱️ +31s
397 tests - 1 389 ✅ - 1 8 💤 ±0 0 ❌ ±0
415 runs - 1 407 ✅ - 1 8 💤 ±0 0 ❌ ±0

Results for commit 37568e0. ± Comparison against base commit f581090.

This pull request removes 1 test.

color modes block helpers updates extension block colors based on color mode ‑ color modes block helpers updates extension block colors based on color mode

♻️ This comment has been updated with latest results.

gonfunko and others added 30 commits February 19, 2025 16:25

fix: run stacks in response to click events (#1)

8a8c633

* fix: run stacks in response to stack click events * refactor: listen for regular click events to run block stacks

fix: use toolboxitemid instead of id as the identifier attribute for …

28ea54a

…extensions toolbox categories (#2)

fix: handle modern workspace comment events (#3)

ac4280e

* fix: handle modern workspace comment events * fix: correctly access coordinates on events

fix: handle new custom block comment events (#4)

29bdbd1

fix: add the hat extension to extension hat blocks (#5)

8ba4f9e

* chore: format runtime.js * fix: add the hat extension to extension hat blocks

fix: add the monitor block extension to extension monitor blocks (#6)

42efd32

refactor: use block styles instead of colors (#7)

686996a

fix: update VM state when blocks are removed from an input previously…

ced972e

… occupied by a shadow block (#8) * chore: format engine/blocks.js * fix: restore shadow blocks when removing a block from an input

fix: fix bug that could result in the VM's representation of shadow b…

ae67b9b

…locks getting into a bad state (#9)

style: run "eslint --fix ."

a135fb5

style: copy style changes from gonfunko/modern-blockly

9136cd0

ci: enable alpha and beta releases

e8e9603

fix: use scratch-blocks@^2.0.0-beta

8263b70

ci: make temporary "spork" release channel

36652ad

chore(deps): update deps for spork test

603b852

fix: Fix test failures. (#10)

f633995

chore(deps): update deps for spork test

c07586b

build: fix webpack-dev-server configuration

baf68a2

The playgrounds themselves are still broken, but it's a step...

chore(deps): update deps for spork test

f0f1c14

Replace text-encoding polyfill

aedce8a

fix: temporarily disable functionality in scratch-gui for compatibili…

d67cb26

…ty with patched scratch-blocks (#1)

fix: show the correct toolbox based on sprites or the stage being sel…

eaaca29

…ected (#4)

fix: modify inject options to reflect Scratch behaviors (#5)

818227b

fix: add support for Scratch-style procedures (#6)

7c75828

* fix: add support for Scratch-style procedures * refactor: remove underscore procedure creation callback

fix: reenable the Scratch colour eyedropper

fde8293

fix: patch the getCheckboxState method in the new flyout (#7)

3baa9bb

fix: select extension categories when added (#8)

fbffc14

fix: Use toolboxitemid instead of id as the identifier attribute for …

5de68f1

…toolbox categories (#9)

fix: preserve toolbox scroll position when switching between sprites/…

c0b3d0e

…the stage (#10)

fix: call reportValue on the ScratchBlocks module instead of the work…

b7e7854

…space (#11)

cwillisf force-pushed the spork branch from 6bf544f to 10e6b7c Compare September 3, 2025 20:58

cwillisf added 4 commits September 4, 2025 09:02

Merge branch 'develop' into spork

5f6b6a4

style: use single quotes to fix lint

d0a73c5

test: update comment ID in engine adapter test

677f663

ci: de-matrix GH Pages deploy

ab60931

cwillisf force-pushed the spork branch 3 times, most recently from 594cf8f to d365a86 Compare September 4, 2025 17:11

cwillisf added 2 commits September 4, 2025 10:21

ci: output more info for debugging GHA

92427b6

ci: skip GH Pages publish from fork PRs

0f959e1

cwillisf force-pushed the spork branch from d365a86 to 0f959e1 Compare September 4, 2025 18:19

cwillisf mentioned this pull request Sep 4, 2025

Publish branches to GH Pages #305

Merged

cwillisf and others added 4 commits December 4, 2025 14:43

Merge remote-tracking branch 'origin/develop' into spork

504f261

chore(deps): update deps for spork test

c69bbc7

fix: Fix test failures. (#10)

0487565

Merge remote-tracking branch 'origin/develop' into spork

5216e12

style: fix scratch-vm lint

e084e0b

cwillisf added 2 commits February 19, 2026 13:58

style: match formatting in develop to reduce diff noise

b17d293

fix: resolve oops on dragging code to backpack

37568e0

cwillisf force-pushed the spork branch from 52b7a9d to 37568e0 Compare February 23, 2026 22:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Spork: unfork Blockly#214

Spork: unfork Blockly#214
cwillisf wants to merge 101 commits intodevelopfrom
spork

cwillisf commented Mar 5, 2025

Uh oh!

zfangqijun commented Oct 27, 2025

Uh oh!

Samq64 commented Oct 28, 2025 •

edited

Loading

Uh oh!

zfangqijun commented Oct 29, 2025

Uh oh!

cwillisf commented Oct 29, 2025

Uh oh!

cwillisf commented Oct 29, 2025

Uh oh!

github-actions bot commented Feb 19, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 19, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 19, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 19, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 19, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Comments

Conversation

cwillisf commented Mar 5, 2025

Proposed Changes

Reason for Changes

Test Coverage

Uh oh!

zfangqijun commented Oct 27, 2025

Uh oh!

Samq64 commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zfangqijun commented Oct 29, 2025

Uh oh!

cwillisf commented Oct 29, 2025

Uh oh!

cwillisf commented Oct 29, 2025

Uh oh!

github-actions bot commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test report for scratch-vm

Uh oh!

github-actions bot commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test report for scratch-svg-renderer

Uh oh!

github-actions bot commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test report for task-herder

Uh oh!

github-actions bot commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test report for scratch-render

Uh oh!

github-actions bot commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test report for scratch-gui

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Samq64 commented Oct 28, 2025 •

edited

Loading

github-actions bot commented Feb 19, 2026 •

edited

Loading

github-actions bot commented Feb 19, 2026 •

edited

Loading

github-actions bot commented Feb 19, 2026 •

edited

Loading

github-actions bot commented Feb 19, 2026 •

edited

Loading

github-actions bot commented Feb 19, 2026 •

edited

Loading