Skip to content

Conversation

@BenHenning
Copy link
Collaborator

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

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
This includes debug logging. A followup commit will remove the debugging.
fix(codelabs): Update custom generator codelab to use CodeGenerator
fix: Mitigate shareable procedure flyout bug.
fix: #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
@BenHenning BenHenning requested a review from a team as a code owner May 3, 2025 00:48
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@BenHenning BenHenning requested review from cpcallen and removed request for a team May 3, 2025 00:48
@google-cla
Copy link

google-cla bot commented May 3, 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 BenHenning changed the title chore: Merge branch master into rc/v12.0.0 chore: Merge branch master into rc/v12.0.0 May 3, 2025
@BenHenning BenHenning requested review from gonfunko and removed request for cpcallen May 3, 2025 00:48
 - @blockly/field-colour@5.0.17
 - @blockly/field-colour-hsv-sliders@5.0.17
@BenHenning
Copy link
Collaborator Author

Due to the conflicts introduced by #2508 this needs to be replaced by #2511.

@BenHenning BenHenning closed this May 12, 2025
BenHenning added a commit that referenced this pull request May 12, 2025
chore: Merge branch `master` into `rc/v12.0.0`

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).
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.

6 participants