diff --git a/plugins/block-dynamic-connection/package-lock.json b/plugins/block-dynamic-connection/package-lock.json index a57cf1f44d..455ad7f252 100644 --- a/plugins/block-dynamic-connection/package-lock.json +++ b/plugins/block-dynamic-connection/package-lock.json @@ -1689,4 +1689,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/block-plus-minus/package-lock.json b/plugins/block-plus-minus/package-lock.json index 22f85f3342..fb680b6a3b 100644 --- a/plugins/block-plus-minus/package-lock.json +++ b/plugins/block-plus-minus/package-lock.json @@ -1818,4 +1818,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/block-shareable-procedures/package-lock.json b/plugins/block-shareable-procedures/package-lock.json index 80371a2ef2..096ad01597 100644 --- a/plugins/block-shareable-procedures/package-lock.json +++ b/plugins/block-shareable-procedures/package-lock.json @@ -926,4 +926,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/block-test/package-lock.json b/plugins/block-test/package-lock.json index 9dc779f028..58f98140d6 100644 --- a/plugins/block-test/package-lock.json +++ b/plugins/block-test/package-lock.json @@ -11790,4 +11790,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/content-highlight/package-lock.json b/plugins/content-highlight/package-lock.json index 04a994525a..9cb8b4979f 100644 --- a/plugins/content-highlight/package-lock.json +++ b/plugins/content-highlight/package-lock.json @@ -40,4 +40,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/continuous-toolbox/package-lock.json b/plugins/continuous-toolbox/package-lock.json index 168170f1fa..980d735f7c 100644 --- a/plugins/continuous-toolbox/package-lock.json +++ b/plugins/continuous-toolbox/package-lock.json @@ -12337,4 +12337,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/cross-tab-copy-paste/package-lock.json b/plugins/cross-tab-copy-paste/package-lock.json index ec37dd3fa0..d3afaa0524 100644 --- a/plugins/cross-tab-copy-paste/package-lock.json +++ b/plugins/cross-tab-copy-paste/package-lock.json @@ -12337,4 +12337,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/dev-tools/package-lock.json b/plugins/dev-tools/package-lock.json index 7b6309d469..8d0acce919 100644 --- a/plugins/dev-tools/package-lock.json +++ b/plugins/dev-tools/package-lock.json @@ -243,4 +243,4 @@ } } } -} \ No newline at end of file +} diff --git a/plugins/disable-top-blocks/package-lock.json b/plugins/disable-top-blocks/package-lock.json index 5eb9790974..b5f924ffc6 100644 --- a/plugins/disable-top-blocks/package-lock.json +++ b/plugins/disable-top-blocks/package-lock.json @@ -12337,4 +12337,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/field-angle/package-lock.json b/plugins/field-angle/package-lock.json index b3a72eff84..d3f1965c20 100644 --- a/plugins/field-angle/package-lock.json +++ b/plugins/field-angle/package-lock.json @@ -425,4 +425,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/field-angle/src/field_angle.ts b/plugins/field-angle/src/field_angle.ts index 4fd712bcc4..088bbf35cc 100644 --- a/plugins/field-angle/src/field_angle.ts +++ b/plugins/field-angle/src/field_angle.ts @@ -668,11 +668,6 @@ export class FieldAngle extends Blockly.FieldNumber { /** Register the field and any dependencies. */ export function registerFieldAngle() { - // Unregister legacy field_angle that was in core. - // TODO(#2194): Delete this once core Blockly no longer defines field_angle. - // If field_angle is not defined in core, this generates a console warning. - Blockly.fieldRegistry.unregister('field_angle'); - Blockly.fieldRegistry.register('field_angle', FieldAngle); } diff --git a/plugins/field-bitmap/package-lock.json b/plugins/field-bitmap/package-lock.json index 02ac855f0e..b483ba86f8 100644 --- a/plugins/field-bitmap/package-lock.json +++ b/plugins/field-bitmap/package-lock.json @@ -1676,4 +1676,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/field-colour-hsv-sliders/package-lock.json b/plugins/field-colour-hsv-sliders/package-lock.json index 705ecfad1d..1b8d9c6bf9 100644 --- a/plugins/field-colour-hsv-sliders/package-lock.json +++ b/plugins/field-colour-hsv-sliders/package-lock.json @@ -40,4 +40,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/field-colour/package-lock.json b/plugins/field-colour/package-lock.json index 73c37dd3b9..79912afe7d 100644 --- a/plugins/field-colour/package-lock.json +++ b/plugins/field-colour/package-lock.json @@ -1218,4 +1218,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/field-colour/src/field_colour.ts b/plugins/field-colour/src/field_colour.ts index 2d791202d5..dc5c88dfe4 100644 --- a/plugins/field-colour/src/field_colour.ts +++ b/plugins/field-colour/src/field_colour.ts @@ -741,11 +741,6 @@ FieldColour.prototype.DEFAULT_VALUE = '#ffffff'; * Register the field and any dependencies. */ export function registerFieldColour() { - // Unregister legacy field_colour that was in core. - // TODO(#2194): Delete this once core Blockly no longer defines field_colour. - // If field_colour is not defined in core, this generates a console warning. - Blockly.fieldRegistry.unregister('field_colour'); - Blockly.fieldRegistry.register('field_colour', FieldColour); } diff --git a/plugins/field-colour/test/blocks_test.mocha.js b/plugins/field-colour/test/blocks_test.mocha.js index 3d0f4f4999..710a50f573 100644 --- a/plugins/field-colour/test/blocks_test.mocha.js +++ b/plugins/field-colour/test/blocks_test.mocha.js @@ -169,32 +169,6 @@ const blockJson = { }, }; -/** - * Uninstall old blocks and generators, since they come pre-installed - * with Blockly. - * TODO(#2194): Delete this function and calls to it. - */ -function uninstallBlocks() { - delete Blockly.Blocks['colour_blend']; - delete Blockly.Blocks['colour_rgb']; - delete Blockly.Blocks['colour_random']; - delete Blockly.Blocks['colour_picker']; - - const blockNames = [ - 'colour_blend', - 'colour_rgb', - 'colour_random', - 'colour_picker', - ]; - blockNames.forEach((name) => { - delete javascriptGenerator.forBlock[name]; - delete dartGenerator.forBlock[name]; - delete luaGenerator.forBlock[name]; - delete pythonGenerator.forBlock[name]; - delete phpGenerator.forBlock[name]; - }); -} - /** * Assert that the generated code matches the golden code for the specified * language. @@ -212,7 +186,6 @@ function checkResult(suffix, generated) { suite('Colour Block Generators', function () { suiteSetup(function () { - uninstallBlocks(); installAllBlocks({ javascript: javascriptGenerator, dart: dartGenerator, @@ -248,7 +221,4 @@ suite('Colour Block Generators', function () { teardown(function () { this.workspace.dispose(); }); - suiteTeardown(function () { - uninstallBlocks(); - }); }); diff --git a/plugins/field-colour/test/index.ts b/plugins/field-colour/test/index.ts index c72be864fb..722d0629ea 100644 --- a/plugins/field-colour/test/index.ts +++ b/plugins/field-colour/test/index.ts @@ -240,31 +240,6 @@ const jsonToolbox = { ], }; -/** - * Uninstall the base colour blocks and their associated generators. - * TODO(#2194): remove this when those blocks are removed from the core library. - */ -function uninstallBlocks() { - delete Blockly.Blocks['colour_blend']; - delete Blockly.Blocks['colour_rgb']; - delete Blockly.Blocks['colour_random']; - delete Blockly.Blocks['colour_picker']; - - const blockNames = [ - 'colour_blend', - 'colour_rgb', - 'colour_random', - 'colour_picker', - ]; - blockNames.forEach((name) => { - delete javascriptGenerator.forBlock[name]; - delete dartGenerator.forBlock[name]; - delete luaGenerator.forBlock[name]; - delete pythonGenerator.forBlock[name]; - delete phpGenerator.forBlock[name]; - }); -} - /** * Create a workspace. * @@ -281,7 +256,6 @@ function createWorkspace( } document.addEventListener('DOMContentLoaded', function () { - uninstallBlocks(); installColourBlocks({ javascript: javascriptGenerator, dart: dartGenerator, diff --git a/plugins/field-date/package-lock.json b/plugins/field-date/package-lock.json index 4235cab686..251725d381 100644 --- a/plugins/field-date/package-lock.json +++ b/plugins/field-date/package-lock.json @@ -423,4 +423,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/field-dependent-dropdown/package-lock.json b/plugins/field-dependent-dropdown/package-lock.json index fcee97e8b6..7b89813ce2 100644 --- a/plugins/field-dependent-dropdown/package-lock.json +++ b/plugins/field-dependent-dropdown/package-lock.json @@ -242,4 +242,4 @@ } } } -} \ No newline at end of file +} diff --git a/plugins/field-grid-dropdown/package-lock.json b/plugins/field-grid-dropdown/package-lock.json index 45995cf5e5..30685ed99a 100644 --- a/plugins/field-grid-dropdown/package-lock.json +++ b/plugins/field-grid-dropdown/package-lock.json @@ -40,4 +40,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/field-multilineinput/package-lock.json b/plugins/field-multilineinput/package-lock.json index e6ca8444b2..efbc6620ce 100644 --- a/plugins/field-multilineinput/package-lock.json +++ b/plugins/field-multilineinput/package-lock.json @@ -425,4 +425,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/field-multilineinput/src/field_multilineinput.ts b/plugins/field-multilineinput/src/field_multilineinput.ts index c8d7d405da..ee518fba1c 100644 --- a/plugins/field-multilineinput/src/field_multilineinput.ts +++ b/plugins/field-multilineinput/src/field_multilineinput.ts @@ -498,13 +498,6 @@ export class FieldMultilineInput extends Blockly.FieldTextInput { * Register the field and any dependencies. */ export function registerFieldMultilineInput() { - // Unregister legacy field_multilinetext that was in core. - // TODO(2194): Delete this once core Blockly no longer defines - // field_multilinetext. - // If field_multilinetext is not defined in core, - // this generates a console warning. - Blockly.fieldRegistry.unregister('field_multilinetext'); - Blockly.fieldRegistry.register('field_multilinetext', FieldMultilineInput); } diff --git a/plugins/field-multilineinput/test/block_test.mocha.js b/plugins/field-multilineinput/test/block_test.mocha.js index 368b4cccb7..d60fd2cf15 100644 --- a/plugins/field-multilineinput/test/block_test.mocha.js +++ b/plugins/field-multilineinput/test/block_test.mocha.js @@ -15,7 +15,6 @@ import {phpGenerator} from 'blockly/php'; import {pythonGenerator} from 'blockly/python'; import {luaGenerator} from 'blockly/lua'; import {installAllBlocks} from '../src/index'; -import {BLOCK_NAME} from '../src/blocks/textMultiline'; import {assert} from 'chai'; const blockJson = { @@ -39,21 +38,6 @@ const blockJson = { }, }; -/** - * Uninstall old blocks and generators, since they come pre-installed - * with Blockly. - * TODO(#2194): Delete this function and calls to it. - */ -function uninstallBlocks() { - delete Blockly.Blocks[BLOCK_NAME]; - - delete javascriptGenerator.forBlock[BLOCK_NAME]; - delete dartGenerator.forBlock[BLOCK_NAME]; - delete luaGenerator.forBlock[BLOCK_NAME]; - delete pythonGenerator.forBlock[BLOCK_NAME]; - delete phpGenerator.forBlock[BLOCK_NAME]; -} - /** * Assert that the generated code matches the golden code for the specified * language. @@ -72,7 +56,6 @@ function checkResult(suffix, generated) { suite('Multiline Text Block Generators', function () { suiteSetup(function () { Blockly.setLocale(en); - uninstallBlocks(); installAllBlocks({ javascript: javascriptGenerator, dart: dartGenerator, @@ -108,7 +91,4 @@ suite('Multiline Text Block Generators', function () { teardown(function () { this.workspace.dispose(); }); - suiteTeardown(function () { - uninstallBlocks(); - }); }); diff --git a/plugins/field-multilineinput/test/index.ts b/plugins/field-multilineinput/test/index.ts index 135ac63f39..521ca502d4 100644 --- a/plugins/field-multilineinput/test/index.ts +++ b/plugins/field-multilineinput/test/index.ts @@ -191,19 +191,6 @@ const jsonToolbox = { ], }; -/** - * Uninstall the base multiline text block and its associated generators. - * TODO(#2194): remove this when those blocks are removed from the core library. - */ -function uninstallBlock() { - delete Blockly.Blocks['text_multiline']; - delete javascriptGenerator.forBlock['text_multiline']; - delete dartGenerator.forBlock['text_multiline']; - delete luaGenerator.forBlock['text_multiline']; - delete pythonGenerator.forBlock['text_multiline']; - delete phpGenerator.forBlock['text_multiline']; -} - /** * Create a workspace. * @@ -215,7 +202,6 @@ function createWorkspace( blocklyDiv: HTMLElement, options: Blockly.BlocklyOptions, ): Blockly.WorkspaceSvg { - uninstallBlock(); textMultiline.installBlock({ javascript: javascriptGenerator, dart: dartGenerator, diff --git a/plugins/field-slider/package-lock.json b/plugins/field-slider/package-lock.json index 327056b17f..012ee513fc 100644 --- a/plugins/field-slider/package-lock.json +++ b/plugins/field-slider/package-lock.json @@ -423,4 +423,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/fixed-edges/package-lock.json b/plugins/fixed-edges/package-lock.json index 430fc7587c..317201f780 100644 --- a/plugins/fixed-edges/package-lock.json +++ b/plugins/fixed-edges/package-lock.json @@ -12337,4 +12337,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/keyboard-navigation/package-lock.json b/plugins/keyboard-navigation/package-lock.json index 4497be2978..4b0da70f2c 100644 --- a/plugins/keyboard-navigation/package-lock.json +++ b/plugins/keyboard-navigation/package-lock.json @@ -3067,4 +3067,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/modal/package-lock.json b/plugins/modal/package-lock.json index 5aa0ca5190..ce34417400 100644 --- a/plugins/modal/package-lock.json +++ b/plugins/modal/package-lock.json @@ -3007,4 +3007,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/scroll-options/package-lock.json b/plugins/scroll-options/package-lock.json index 51e1216e61..f18a2ae7d1 100644 --- a/plugins/scroll-options/package-lock.json +++ b/plugins/scroll-options/package-lock.json @@ -40,4 +40,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/shadow-block-converter/package-lock.json b/plugins/shadow-block-converter/package-lock.json index 9fb6c9b1f1..cdbb70c752 100644 --- a/plugins/shadow-block-converter/package-lock.json +++ b/plugins/shadow-block-converter/package-lock.json @@ -13185,4 +13185,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/strict-connection-checker/package-lock.json b/plugins/strict-connection-checker/package-lock.json index 56affcf608..7e52cb3c22 100644 --- a/plugins/strict-connection-checker/package-lock.json +++ b/plugins/strict-connection-checker/package-lock.json @@ -169,4 +169,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/suggested-blocks/package-lock.json b/plugins/suggested-blocks/package-lock.json index f51571ff56..6e2d735f6f 100644 --- a/plugins/suggested-blocks/package-lock.json +++ b/plugins/suggested-blocks/package-lock.json @@ -354,4 +354,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/theme-dark/package-lock.json b/plugins/theme-dark/package-lock.json index 77ce0401a9..06a9ae8c3a 100644 --- a/plugins/theme-dark/package-lock.json +++ b/plugins/theme-dark/package-lock.json @@ -11790,4 +11790,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/theme-deuteranopia/package-lock.json b/plugins/theme-deuteranopia/package-lock.json index 337d573220..ade5a8d78b 100644 --- a/plugins/theme-deuteranopia/package-lock.json +++ b/plugins/theme-deuteranopia/package-lock.json @@ -11790,4 +11790,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/theme-highcontrast/package-lock.json b/plugins/theme-highcontrast/package-lock.json index 01bab46f7f..6f28c2431e 100644 --- a/plugins/theme-highcontrast/package-lock.json +++ b/plugins/theme-highcontrast/package-lock.json @@ -11790,4 +11790,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/theme-modern/package-lock.json b/plugins/theme-modern/package-lock.json index df0f76e693..3292556c46 100644 --- a/plugins/theme-modern/package-lock.json +++ b/plugins/theme-modern/package-lock.json @@ -11790,4 +11790,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/theme-tritanopia/package-lock.json b/plugins/theme-tritanopia/package-lock.json index 213eb0825a..b58c5e1237 100644 --- a/plugins/theme-tritanopia/package-lock.json +++ b/plugins/theme-tritanopia/package-lock.json @@ -11790,4 +11790,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/toolbox-search/package-lock.json b/plugins/toolbox-search/package-lock.json index 8b6224a3cf..b9293b31c5 100644 --- a/plugins/toolbox-search/package-lock.json +++ b/plugins/toolbox-search/package-lock.json @@ -186,4 +186,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/typed-variable-modal/package-lock.json b/plugins/typed-variable-modal/package-lock.json index 450b64be71..736055b55d 100644 --- a/plugins/typed-variable-modal/package-lock.json +++ b/plugins/typed-variable-modal/package-lock.json @@ -3007,4 +3007,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/workspace-backpack/package-lock.json b/plugins/workspace-backpack/package-lock.json index 76a6ee9f1c..d22fa34b74 100644 --- a/plugins/workspace-backpack/package-lock.json +++ b/plugins/workspace-backpack/package-lock.json @@ -40,4 +40,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/workspace-minimap/package-lock.json b/plugins/workspace-minimap/package-lock.json index 002f480088..bbc2b944ab 100644 --- a/plugins/workspace-minimap/package-lock.json +++ b/plugins/workspace-minimap/package-lock.json @@ -115,4 +115,4 @@ } } } -} \ No newline at end of file +} diff --git a/plugins/workspace-search/package-lock.json b/plugins/workspace-search/package-lock.json index fcc2b0ca4f..d574738619 100644 --- a/plugins/workspace-search/package-lock.json +++ b/plugins/workspace-search/package-lock.json @@ -1475,4 +1475,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/plugins/zoom-to-fit/package-lock.json b/plugins/zoom-to-fit/package-lock.json index 720669373d..b87cfcce1c 100644 --- a/plugins/zoom-to-fit/package-lock.json +++ b/plugins/zoom-to-fit/package-lock.json @@ -40,4 +40,4 @@ "dev": true } } -} \ No newline at end of file +}