From 39202b4bcc0b744fe1143a012bf469205e69653a Mon Sep 17 00:00:00 2001 From: sverben <59171289+sverben@users.noreply.github.com> Date: Sat, 30 Mar 2024 16:28:11 +0100 Subject: [PATCH 1/2] chore: restore if block --- src/app/effects/blockly-editor.effects.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app/effects/blockly-editor.effects.ts b/src/app/effects/blockly-editor.effects.ts index 38946fb3..1e104df7 100644 --- a/src/app/effects/blockly-editor.effects.ts +++ b/src/app/effects/blockly-editor.effects.ts @@ -42,6 +42,13 @@ export class BlocklyEditorEffects { Blockly.Extensions.register('appendStatementInputStack', EXTENSIONS.APPEND_STATEMENT_INPUT_STACK) Blockly.Extensions.register('list_select_extension', EXTENSIONS.LIST_SELECT_EXTENSION); + Blockly.Extensions.registerMutator( + 'l_controls_if_mutator', + EXTENSIONS.CONTROLS_IF_MUTATOR_MIXIN, + null as unknown as undefined, // TODO(#6920) + ['controls_if_elseif', 'controls_if_else'], + ); + // When the current language is set: Find and set the blockly translations this.appState.currentLanguage$ .pipe(filter(language => !!language)) From 555274f87994394501d0cf2234957d86aa660c50 Mon Sep 17 00:00:00 2001 From: sverben <59171289+sverben@users.noreply.github.com> Date: Sat, 30 Mar 2024 16:34:29 +0100 Subject: [PATCH 2/2] chore: update blocks --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f839f46e..a270cb6c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@fortawesome/fontawesome-free": "^6.1.1", "@leaphy-robotics/avrdude-webassembly": "^1.3.0", "@leaphy-robotics/dfu-util-wasm": "1.0.2", - "@leaphy-robotics/leaphy-blocks": "2.0.1", + "@leaphy-robotics/leaphy-blocks": "2.0.2", "@leaphy-robotics/picotool-wasm": "1.0.2", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index 057826c2..c36ad389 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1862,10 +1862,10 @@ resolved "https://registry.yarnpkg.com/@leaphy-robotics/dfu-util-wasm/-/dfu-util-wasm-1.0.2.tgz#29afcc01266655e1c7b5da0eeceb0ead48c86fd7" integrity sha512-lvS+tJFO049b4ERYKX0HcoUtnQv76A1z9sZrAvbs7s3bvdMW0BObKmktZeJ7emcp3lU/+OJWsD2h0EY5rnkiNg== -"@leaphy-robotics/leaphy-blocks@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-2.0.1.tgz#649684abfd1fa3e1790d127189308a2e267b8c41" - integrity sha512-Ul/AE+TEZVuK9HJXHNhCrUYe5YWSNtmI84+xvRmYOg48FvR+/stYfrXoyBpYKP6toH9QiiCTawk/4bbYAnr1Yw== +"@leaphy-robotics/leaphy-blocks@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-2.0.2.tgz#691529b77a0d37110f145ad146d11f50bde440cb" + integrity sha512-qn0pyHpL5fFOd+frcK+gWlRFa3N44XNOGV3KOUH4/tSujTQGNPkG8DVzLS+F3daL4QaKE+AKz3LvR+IJbqk6Ug== dependencies: blockly "^10.1.3"