Skip to content

Conversation

@BenHenning
Copy link
Collaborator

@BenHenning BenHenning commented May 12, 2025

The basics

The details

Resolves

N/A

Proposed Changes

This brings the v12 branch up-to-date with the changes in master.

Reason for Changes

This is needed to prepare for testing samples against v12.

Test Coverage

N/A

Documentation

N/A

Additional Information

CLOSE THIS PR BY MERGE COMMIT

Note that this includes a cherry-pick of #2508 to resolve conflicts found in #2503. Note that a separate branch is needed here to pull in the cherry-picked changes (in order to address the branch conflicts).

gonfunko and others added 30 commits December 3, 2024 14:56
 - @blockly/block-dynamic-connection@0.7.12
 - @blockly/block-plus-minus@8.0.12
 - @blockly/block-shareable-procedures@5.0.12
 - @blockly/block-test@6.0.11
 - @blockly/workspace-content-highlight@5.0.12
 - @blockly/continuous-toolbox@6.0.12
 - @blockly/plugin-cross-tab-copy-paste@6.0.12
 - @blockly/dev-scripts@4.0.7
 - @blockly/dev-tools@8.0.12
 - @blockly/disable-top-blocks@0.5.12
 - @blockly/field-angle@5.0.12
 - @blockly/field-bitmap@5.0.12
 - @blockly/field-colour@5.0.12
 - @blockly/field-colour-hsv-sliders@5.0.12
 - @blockly/field-date@9.0.12
 - @blockly/field-dependent-dropdown@4.0.12
 - @blockly/field-grid-dropdown@5.0.12
 - @blockly/field-multilineinput@5.0.13
 - @blockly/field-slider@7.0.12
 - @blockly/fixed-edges@5.0.12
 - @blockly/keyboard-navigation@0.6.12
 - @blockly/plugin-modal@7.0.12
 - @blockly/plugin-scroll-options@6.0.12
 - @blockly/shadow-block-converter@6.0.13
 - @blockly/plugin-strict-connection-checker@5.0.12
 - @blockly/suggested-blocks@5.0.12
 - @blockly/theme-dark@7.0.10
 - @blockly/theme-deuteranopia@6.0.10
 - @blockly/theme-highcontrast@6.0.10
 - @blockly/theme-modern@6.0.10
 - @blockly/theme-tritanopia@6.0.10
 - @blockly/toolbox-search@2.0.12
 - @blockly/plugin-typed-variable-modal@8.0.12
 - @blockly/workspace-backpack@6.0.12
 - @blockly/workspace-minimap@0.2.12
 - @blockly/plugin-workspace-search@9.1.6
 - @blockly/zoom-to-fit@6.0.12
 - @blockly/block-dynamic-connection@0.7.13
 - @blockly/block-plus-minus@8.0.13
 - @blockly/block-shareable-procedures@5.0.13
 - @blockly/workspace-content-highlight@5.0.13
 - @blockly/continuous-toolbox@6.0.13
 - @blockly/plugin-cross-tab-copy-paste@6.0.13
 - @blockly/dev-tools@8.0.13
 - @blockly/disable-top-blocks@0.5.13
 - @blockly/field-angle@5.0.13
 - @blockly/field-bitmap@5.0.13
 - @blockly/field-colour@5.0.13
 - @blockly/field-colour-hsv-sliders@5.0.13
 - @blockly/field-date@9.0.13
 - @blockly/field-dependent-dropdown@4.0.13
 - @blockly/field-grid-dropdown@5.0.13
 - @blockly/field-multilineinput@5.0.14
 - @blockly/field-slider@7.0.13
 - @blockly/fixed-edges@5.0.13
 - @blockly/keyboard-navigation@0.6.13
 - @blockly/plugin-modal@7.0.13
 - @blockly/plugin-scroll-options@6.0.13
 - @blockly/shadow-block-converter@6.0.14
 - @blockly/plugin-strict-connection-checker@5.0.13
 - @blockly/suggested-blocks@5.0.13
 - @blockly/toolbox-search@2.0.13
 - @blockly/plugin-typed-variable-modal@8.0.13
 - @blockly/workspace-backpack@6.0.13
 - @blockly/workspace-minimap@0.2.13
 - @blockly/plugin-workspace-search@9.1.7
 - @blockly/zoom-to-fit@6.0.13
 - @blockly/field-colour@5.0.14
 - @blockly/field-colour-hsv-sliders@5.0.14
 - @blockly/block-dynamic-connection@0.7.14
 - @blockly/block-plus-minus@8.0.14
 - @blockly/block-shareable-procedures@5.0.14
 - @blockly/workspace-content-highlight@5.0.14
 - @blockly/continuous-toolbox@6.0.14
 - @blockly/plugin-cross-tab-copy-paste@6.0.14
 - @blockly/dev-tools@8.1.0
 - @blockly/disable-top-blocks@0.5.14
 - @blockly/field-angle@5.0.14
 - @blockly/field-bitmap@5.0.14
 - @blockly/field-colour@5.0.15
 - @blockly/field-colour-hsv-sliders@5.0.15
 - @blockly/field-date@9.0.14
 - @blockly/field-dependent-dropdown@4.0.14
 - @blockly/field-grid-dropdown@5.0.14
 - @blockly/field-multilineinput@5.0.15
 - @blockly/field-slider@7.0.14
 - @blockly/fixed-edges@5.0.14
 - @blockly/keyboard-navigation@0.6.14
 - @blockly/plugin-modal@7.0.14
 - @blockly/plugin-scroll-options@6.0.14
 - @blockly/shadow-block-converter@6.0.15
 - @blockly/plugin-strict-connection-checker@5.0.14
 - @blockly/suggested-blocks@5.0.14
 - @blockly/toolbox-search@2.0.14
 - @blockly/plugin-typed-variable-modal@8.0.14
 - @blockly/workspace-backpack@6.0.14
 - @blockly/workspace-minimap@0.2.14
 - @blockly/plugin-workspace-search@9.1.8
 - @blockly/zoom-to-fit@6.0.14
The custom generator codelab was using the deprecated Blockly.Generator class.
This updates it to use Blockly.CodeGenerator instead, which is the new
recommended way to create custom generators.

Mentioned in #6584
 - @blockly/workspace-content-highlight@5.0.15
…p to support touch

This includes debug logging. A followup commit will remove the debugging.
fix(codelabs): Update custom generator codelab to use CodeGenerator
…areable_procedure

fix: Mitigate shareable procedure flyout bug.
…ouch

fix: RaspberryPiFoundation#2463 update event handling for field-bitmap to support touch
 - @blockly/block-shareable-procedures@5.0.15
 - @blockly/field-bitmap@5.0.15
Adds a 'blockly' import migration and renames manual test files to .js
 - @blockly/migrate@3.0.3
gonfunko and others added 7 commits March 25, 2025 14:21
 - @blockly/field-colour@5.0.16
 - @blockly/field-colour-hsv-sliders@5.0.16
 - @blockly/field-colour@5.0.17
 - @blockly/field-colour-hsv-sliders@5.0.17
This depends on things that no longer exist in
blockly@v12.0.0-beta.4, like BasicCursor and Cursor, and also
on other things that will cease to exist before 12.0.0, like
ASTNode.

We need to update the samples repository to be able to test
plugins with v12, and this plugin is soon to be replaced by
the new plugin being developed in
google/blockly-keyboard-experimentation, so the most expedient
course of action is just to delete this one to allow upgrading
this repo's blockly devDependency.

BREAKING CHANGE:

Removes the keyboard-experimentation plugin, obviously.

Conflicts:
	plugins/keyboard-navigation/CHANGELOG.md
	plugins/keyboard-navigation/package-lock.json
	plugins/keyboard-navigation/package.json
	plugins/keyboard-navigation/src/navigation.js
	plugins/keyboard-navigation/src/navigation_controller.js
	plugins/keyboard-navigation/test/navigation_test.mocha.js
@BenHenning BenHenning requested a review from a team as a code owner May 12, 2025 18:42
@BenHenning BenHenning requested review from rachel-fenichel and removed request for a team May 12, 2025 18:42
@google-cla
Copy link

google-cla bot commented May 12, 2025

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@BenHenning
Copy link
Collaborator Author

PTAL @maribethb.

@BenHenning BenHenning closed this May 12, 2025
@BenHenning BenHenning reopened this May 12, 2025
@BenHenning BenHenning merged commit d5eb18f into RaspberryPiFoundation:rc/v12.0.0 May 12, 2025
13 of 17 checks passed
@BenHenning BenHenning deleted the master-with-conflict-resolution branch May 12, 2025 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants