Skip to content

Commit f9618b8

Browse files
committed
Moved to blockly v11 and respective plugin versions in order to get
'@mit-app-inventor/blockly-plugin-workspace-multiselect' working. Required updating of imports and making sure 'workspace' was not reactive (https://groups.google.com/g/blockly/c/myo3FXL3r_Y/m/NLgPZNc0CgAJVue3).
1 parent 20795a4 commit f9618b8

33 files changed

+5083
-1437
lines changed

bundles/org.openhab.ui/web/package-lock.json

Lines changed: 4973 additions & 1328 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundles/org.openhab.ui/web/package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,13 @@
5454
"Samsung >= 5"
5555
],
5656
"dependencies": {
57-
"@blockly/field-slider": "^6.1.4",
58-
"@blockly/plugin-typed-variable-modal": "^7.0.15",
59-
"@blockly/plugin-workspace-search": "^8.1.2",
60-
"@blockly/shadow-block-converter": "^5.0.0",
61-
"@blockly/theme-dark": "^6.0.5",
62-
"@blockly/zoom-to-fit": "^5.0.11",
57+
"@blockly/field-multilineinput": "^5.0.17",
58+
"@blockly/field-slider": "^7.0.16",
59+
"@blockly/plugin-typed-variable-modal": "^8.0.16",
60+
"@blockly/plugin-workspace-search": "^9.1.10",
61+
"@blockly/shadow-block-converter": "^6.0.17",
62+
"@blockly/theme-dark": "^7.0.12",
63+
"@blockly/zoom-to-fit": "^6.0.16",
6364
"@codemirror/autocomplete": "^6.18.6",
6465
"@codemirror/commands": "^6.8.1",
6566
"@codemirror/lang-css": "^6.3.1",
@@ -78,11 +79,11 @@
7879
"@jsep-plugin/object": "^1.2.1",
7980
"@jsep-plugin/regex": "^1.0.3",
8081
"@jsep-plugin/template": "^1.0.4",
81-
"@mit-app-inventor/blockly-plugin-workspace-multiselect": "^0.1.12",
82+
"@mit-app-inventor/blockly-plugin-workspace-multiselect": "^1.0.2",
8283
"@replit/codemirror-indentation-markers": "^6.5.3",
8384
"@uiw/codemirror-theme-gruvbox-dark": "^4.24.2",
8485
"@vue-leaflet/vue-leaflet": "^0.10.1",
85-
"blockly": "^10.4.2",
86+
"blockly": "^11.2.2",
8687
"codemirror": "^6.0.2",
8788
"cronstrue": "^2.50.0",
8889
"crypto-browserify": "^3.12.0",

bundles/org.openhab.ui/web/src/assets/definitions/blockly/_tmp/blocks-exec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Blockly from 'blockly'
2-
import { javascriptGenerator } from 'blockly/javascript.js'
1+
import * as Blockly from 'blockly'
2+
import { javascriptGenerator } from 'blockly/javascript'
33

44
export default function defineOHBlocks_Exec (f7) {
55
Blockly.Blocks['oh_exec'] = {

bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-audio.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
* supports jsscripting
1111
*/
1212

13-
import Blockly from 'blockly'
14-
import { javascriptGenerator } from 'blockly/javascript.js'
13+
import * as Blockly from 'blockly'
14+
import { javascriptGenerator } from 'blockly/javascript'
1515
import { FieldSlider } from '@blockly/field-slider'
1616

1717
export default function (f7, sinks, voices) {

bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-color.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* supports jsscripting
44
*/
55

6-
import Blockly from 'blockly'
7-
import { javascriptGenerator } from 'blockly/javascript.js'
6+
import * as Blockly from 'blockly'
7+
import { javascriptGenerator } from 'blockly/javascript'
88
import { blockGetCheckedInputType } from '@/assets/definitions/blockly/utils.js'
99

1010
export default function (f7) {

bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dateoffsets.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* supports jsscripting
33
*/
4-
import Blockly from 'blockly'
5-
import { javascriptGenerator } from 'blockly/javascript.js'
4+
import * as Blockly from 'blockly'
5+
import { javascriptGenerator } from 'blockly/javascript'
66
import { FieldDatePicker } from './fields/date-field.js'
77
import { addDateComparisonSupport } from './utils.js'
88

@@ -496,7 +496,7 @@ export default function (f7) {
496496
for (i = 0; i < this.itemCount_; i++) {
497497
if (!this.getInput('ADD' + i)) {
498498
let input = this.appendValueInput('ADD' + i)
499-
.setAlign(Blockly.ALIGN_RIGHT)
499+
.setAlign(Blockly.inputs.Align.RIGHT)
500500
.setCheck('zdtTemporalUnit')
501501
if (i === 0) {
502502
input.appendField(new Blockly.FieldDropdown([['set', 'with'], ['add', 'plus'], ['subtract', 'minus']]), 'operation')

bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dicts.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* supports jsscripting
33
*/
44

5-
import Blockly from 'blockly'
6-
import { javascriptGenerator } from 'blockly/javascript.js'
5+
import * as Blockly from 'blockly'
6+
import { javascriptGenerator } from 'blockly/javascript'
77
import { blockGetCheckedInputType } from '@/assets/definitions/blockly/utils.js'
88

99
export default function (f7) {
@@ -121,7 +121,7 @@ export default function (f7) {
121121
for (i = 0; i < this.itemCount_; i++) {
122122
if (!this.getInput('ADD' + i)) {
123123
let input = this.appendValueInput('ADD' + i)
124-
.setAlign(Blockly.ALIGN_RIGHT)
124+
.setAlign(Blockly.inputs.Align.RIGHT)
125125
if (i === 0) {
126126
input.appendField('dictionary of')
127127
}

bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-ephemeris.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* See usage discussion here: https://community.openhab.org/t/wip-ephemeris-documentation/84536
77
* supports jsscripting
88
*/
9-
import Blockly from 'blockly'
10-
import { javascriptGenerator } from 'blockly/javascript.js'
9+
import * as Blockly from 'blockly'
10+
import { javascriptGenerator } from 'blockly/javascript'
1111

1212
export default function (f7) {
1313
/*

bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-eventbus.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* supports jsscripting
44
*/
55

6-
import Blockly from 'blockly'
7-
import { javascriptGenerator } from 'blockly/javascript.js'
6+
import * as Blockly from 'blockly'
7+
import { javascriptGenerator } from 'blockly/javascript'
88
import { blockGetCheckedInputType } from './utils.js'
99

1010
export default function (f7) {
@@ -19,7 +19,7 @@ export default function (f7) {
1919
.appendField(new Blockly.FieldDropdown([['send command', 'sendCommand'], ['post update', 'postUpdate']]), 'eventType')
2020
this.appendValueInput('itemName')
2121
.appendField('to')
22-
.setAlign(Blockly.ALIGN_RIGHT)
22+
.setAlign(Blockly.inputs.Align.RIGHT)
2323
.setCheck(['String', 'oh_item', 'oh_itemtype'])
2424
this.setInputsInline(true)
2525
this.setPreviousStatement(true, null)

bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-http.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Adds HTTP blocks
33
*/
44

5-
import Blockly from 'blockly'
6-
import { javascriptGenerator } from 'blockly/javascript.js'
5+
import * as Blockly from 'blockly'
6+
import { javascriptGenerator } from 'blockly/javascript'
77

88
export default function (f7) {
99
const timeoutImage = 'data:image/png;base64,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'

0 commit comments

Comments
 (0)