Spork: unfork Blockly #214

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)

Reverts one line of 9703bc6

github-actions · 2025-03-05T19:26:18Z

Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.

I have read the CLA Document and I hereby sign the CLA

1 out of 4 committers have signed the CLA.
✅ (cwillisf)[https://github.com/cwillisf]
❌ @gonfunko
❌ @adroitwhiz
❌ @BeksOmega
_{You can retrigger this bot by commenting recheck in this Pull Request.}_{Posted by the CLA Assistant Lite bot.}

This way it doesn't prevent other tests from running

cwillisf · 2025-04-01T21:33:18Z

Status update for anyone who might be watching this PR:

I know it looks like not much is happening here, but gears are turning behind the scenes. We're working on testing, and I'm sure there will be things to fix before we merge this, but I believe we're getting close. If anyone in the community wants to try this branch, please comment here if you find problems! Other than the zoom icons -- we know about that one 😆

Thank you!

If all goes as planned, I'd like to merge this sometime this summer, specifically before North American schools get going again for fall terms. If we get lucky and it's even earlier, that's cool too!

Some of our friends at Google haven't signed the CLA, but that's OK for now. We're working through some paperwork, but we're all friends, and I'm not worried about it. It's just slow; I apologize for that.

Samq64 · 2025-04-01T22:58:59Z

On scratch-gui's spork-test branch custom block inputs get cleared when editing the definition (gonfunko/scratch-blocks#228).

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 added 10 commits February 19, 2025 17:41

test: update XPath expressions for Blockly v12 beta

5127c73

Merge branch 'develop' into spork

9f1f9c3

Merge branch 'develop' into spork

ff757e4

test: update more XPath expressions for Blockly v12

f2e9e2b

fix: variables got shy when flipping between code and project view

d985234

Reverts one line of 9703bc6

Merge branch 'develop' into spork

35244af

Merge branch 'build-script-improvements' into spork

3958758

test: avoid false positives in xpath @Class tests

c5054ba

Merge branch 'develop' into spork

aaba89a

Merge branch 'develop' into spork

0f13ad8

cwillisf added 4 commits March 5, 2025 13:18

Merge branch 'develop' into spork

4651f48

ci: fix(?) pushing from the publish workflow

08891ce

ci: move commitlint into its own separate workflow

cd8f57a

This way it doesn't prevent other tests from running

ci: try again to get the push to work

6e4f7bb

cwillisf force-pushed the spork branch from 00895aa to 6e4f7bb Compare March 6, 2025 00:02

ci: temporarily disable publishing to NPM

9030d5c

cwillisf force-pushed the spork branch 2 times, most recently from ed3ba88 to 97bf00d Compare March 6, 2025 16:12

cwillisf added 2 commits March 6, 2025 08:26

ci: temporarily disable pre-build/test in publish workflow

a233860

ci: determine tag for "npm publish" from branch name

c34518b

cwillisf force-pushed the spork branch from 97bf00d to c34518b Compare March 6, 2025 16:26

cwillisf added 4 commits March 6, 2025 08:32

ci: make release commit message pass commitlint

8408a2a

ci: re-enable publish steps that were disabled for testing purposes

5aa2727

ci: publish to NPM under a tag determined by branch

8942bdd

Merge branch 'develop' into spork

0a4788a

Wowfunhappy mentioned this pull request Mar 13, 2025

Tracking modern-blockly scratch-blocks rewrite ScratchAddons/ScratchAddons#7768

Open

51 tasks

Bogomil-Stoyanov mentioned this pull request Mar 24, 2025

Extract GitHub Actions changes for branch-based publishing #222

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spork: unfork Blockly #214

Spork: unfork Blockly #214

cwillisf commented Mar 5, 2025

github-actions bot commented Mar 5, 2025

cwillisf commented Apr 1, 2025

Samq64 commented Apr 1, 2025 •

edited

Loading

Spork: unfork Blockly #214

Are you sure you want to change the base?

Spork: unfork Blockly #214

Conversation

cwillisf commented Mar 5, 2025

Proposed Changes

Reason for Changes

Test Coverage

github-actions bot commented Mar 5, 2025

cwillisf commented Apr 1, 2025

Samq64 commented Apr 1, 2025 • edited Loading

Samq64 commented Apr 1, 2025 •

edited

Loading