-
Notifications
You must be signed in to change notification settings - Fork 662
chore: Merge branch master into rc/v12.0.0
#2511
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
BenHenning
merged 37 commits into
RaspberryPiFoundation:rc/v12.0.0
from
BenHenning:master-with-conflict-resolution
May 12, 2025
Merged
chore: Merge branch master into rc/v12.0.0
#2511
BenHenning
merged 37 commits into
RaspberryPiFoundation:rc/v12.0.0
from
BenHenning:master-with-conflict-resolution
May 12, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- @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/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
…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
Adds a 'blockly' import migration and renames manual test files to .js
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
|
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. |
1 task
Collaborator
Author
|
PTAL @maribethb. |
maribethb
approved these changes
May 12, 2025
d5eb18f
into
RaspberryPiFoundation:rc/v12.0.0
13 of 17 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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).