Skip to content

Commit

Permalink
chore: release v8.1.1
Browse files Browse the repository at this point in the history
* (klein0r) Updated Blockly/JS and Rules/JS image (as svg)
  • Loading branch information
klein0r committed May 3, 2024
1 parent 5f4d159 commit 97fc4fc
Show file tree
Hide file tree
Showing 20 changed files with 120 additions and 73 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG_OLD.md
@@ -1,4 +1,18 @@
The newest change log is in README.md
## 8.0.0 (2024-04-05)

NodeJS >= 18.x and js-controller >= 5 is required

* (klein0r) Breaking change: Removed support for binary states (deprecated since v6.2.0)
* (klein0r) Breaking change: Protected filesystem (iobroker-data/files) to prevent direct file writes
* (klein0r) Breaking change: request property has been removed of the sandbox (require the module if still needed)
* (klein0r) Added blockly block for global variables (e.g. script name)
* (klein0r) Added missing functions to protectFS
* (klein0r) Fixed httpPost (missing data)
* (klein0r) Fixed hasAttribute blockly block
* (klein0r) Fixed parenthesis insertion in blockly for multi and/or
* (PeterVoronov) Added setStateChanged / setStateChangedAsync

## 7.11.1 (2024-03-28)

* (klein0r) Added exec result blockly block
Expand Down
16 changes: 1 addition & 15 deletions README.md
Expand Up @@ -42,7 +42,7 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
<!--
### **WORK IN PROGRESS**
-->
### **WORK IN PROGRESS**
### 8.1.1 (2024-05-03)

* (klein0r) Updated Blockly/JS and Rules/JS image (as svg)

Expand All @@ -63,20 +63,6 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
* (klein0r) Fixed some missing translations (uk)
* (klein0r) Raised supported ecmaVersion from es2021 to es2022 (node18)

### 8.0.0 (2024-04-05)

NodeJS >= 18.x and js-controller >= 5 is required

* (klein0r) Breaking change: Removed support for binary states (deprecated since v6.2.0)
* (klein0r) Breaking change: Protected filesystem (iobroker-data/files) to prevent direct file writes
* (klein0r) Breaking change: request property has been removed of the sandbox (require the module if still needed)
* (klein0r) Added blockly block for global variables (e.g. script name)
* (klein0r) Added missing functions to protectFS
* (klein0r) Fixed httpPost (missing data)
* (klein0r) Fixed hasAttribute blockly block
* (klein0r) Fixed parenthesis insertion in blockly for multi and/or
* (PeterVoronov) Added setStateChanged / setStateChangedAsync

## License
The MIT License (MIT)

Expand Down
16 changes: 9 additions & 7 deletions admin/asset-manifest.json
@@ -1,8 +1,8 @@
{
"files": {
"main.js": "/static/js/main.c1ff39cf.js",
"static/css/184.7463f8b6.chunk.css": "/static/css/184.7463f8b6.chunk.css",
"static/js/184.8afcb7e1.chunk.js": "/static/js/184.8afcb7e1.chunk.js",
"main.js": "/static/js/main.14858ad5.js",
"static/css/373.d5afd7f9.chunk.css": "/static/css/373.d5afd7f9.chunk.css",
"static/js/373.b2a9ea25.chunk.js": "/static/js/373.b2a9ea25.chunk.js",
"static/js/966.088c1225.chunk.js": "/static/js/966.088c1225.chunk.js",
"static/js/30.8bf17a3b.chunk.js": "/static/js/30.8bf17a3b.chunk.js",
"static/js/704.4ede9892.chunk.js": "/static/js/704.4ede9892.chunk.js",
Expand Down Expand Up @@ -46,8 +46,10 @@
"static/media/Cellar.svg": "/static/media/Cellar.7ec1b1803a2437c8b78c.svg",
"static/media/Anteroom.svg": "/static/media/Anteroom.93a742135f2c060ad619.svg",
"static/media/Corridor.svg": "/static/media/Corridor.93a742135f2c060ad619.svg",
"static/media/blockly2js.svg": "/static/media/blockly2js.8fb8f9319a060341c081277b7b760c74.svg",
"static/media/names.txt": "/static/media/names.3a7dae0bd6b8b03b280f.txt",
"static/media/Home Theater.svg": "/static/media/Home Theater.1e5f19a0b2a013f153f5.svg",
"static/media/rules2js.svg": "/static/media/rules2js.a3f8ea14eb2673da17e7611b2299af6f.svg",
"static/media/Driveway.svg": "/static/media/Driveway.fbd31101c5a80a8bb37a.svg",
"static/media/Equipment Room.svg": "/static/media/Equipment Room.db92bdca64f653c844f8.svg",
"static/media/Front Yard.svg": "/static/media/Front Yard.af9ce2d89aa4d7a9363e.svg",
Expand Down Expand Up @@ -160,9 +162,9 @@
"static/media/Garage Doors.svg": "/static/media/Garage Doors.0c2a1cfca7ad1ea59625.svg",
"static/media/Outdoor Blinds.svg": "/static/media/Outdoor Blinds.37b85a9c060a4af48da9.svg",
"static/media/Upstairs.svg": "/static/media/Upstairs.441813e54e0daca0882d.svg",
"main.c1ff39cf.js.map": "/static/js/main.c1ff39cf.js.map",
"184.7463f8b6.chunk.css.map": "/static/css/184.7463f8b6.chunk.css.map",
"184.8afcb7e1.chunk.js.map": "/static/js/184.8afcb7e1.chunk.js.map",
"main.14858ad5.js.map": "/static/js/main.14858ad5.js.map",
"373.d5afd7f9.chunk.css.map": "/static/css/373.d5afd7f9.chunk.css.map",
"373.b2a9ea25.chunk.js.map": "/static/js/373.b2a9ea25.chunk.js.map",
"966.088c1225.chunk.js.map": "/static/js/966.088c1225.chunk.js.map",
"30.8bf17a3b.chunk.js.map": "/static/js/30.8bf17a3b.chunk.js.map",
"704.4ede9892.chunk.js.map": "/static/js/704.4ede9892.chunk.js.map",
Expand Down Expand Up @@ -195,6 +197,6 @@
"516.837647f3.chunk.js.map": "/static/js/516.837647f3.chunk.js.map"
},
"entrypoints": [
"static/js/main.c1ff39cf.js"
"static/js/main.14858ad5.js"
]
}
20 changes: 10 additions & 10 deletions admin/google-blockly/own/blocks_action.js
Expand Up @@ -23,7 +23,7 @@ Blockly.Action.blocks['exec'] =
+ ' <field name="TEXT">pwd</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="LOG_LEVEL">'
+ ' <value name="LOG">'
+ ' </value>'
+ ' <value name="WITH_STATEMENT">'
+ ' </value>'
Expand All @@ -44,15 +44,15 @@ Blockly.Blocks['exec'] = {
this.sourceBlock_.updateShape_(option === true || option === 'true' || option === 'TRUE');
}), 'WITH_STATEMENT');

this.appendDummyInput('LOG_LEVEL')
this.appendDummyInput('LOG')
.appendField(Blockly.Translate('loglevel'))
.appendField(new Blockly.FieldDropdown([
[Blockly.Translate('loglevel_none'), ''],
[Blockly.Translate('loglevel_debug'), 'debug'],
[Blockly.Translate('loglevel_info'), 'info'],
[Blockly.Translate('loglevel_warn'), 'warn'],
[Blockly.Translate('loglevel_error'), 'error'],
]), 'LOG_LEVEL');
]), 'LOG');

this.setInputsInline(false);
this.setPreviousStatement(true, null);
Expand Down Expand Up @@ -91,7 +91,7 @@ Blockly.Blocks['exec'] = {

Blockly.JavaScript['exec'] = function(block) {
const value_command = Blockly.JavaScript.valueToCode(block, 'COMMAND', Blockly.JavaScript.ORDER_ATOMIC);
const logLevel = block.getFieldValue('LOG_LEVEL');
const logLevel = block.getFieldValue('LOG');
const withStatement = block.getFieldValue('WITH_STATEMENT');

let logText;
Expand Down Expand Up @@ -630,13 +630,13 @@ Blockly.Blocks['request'] = {
}), 'WITH_STATEMENT');

this.appendDummyInput('LOG')
.appendField(Blockly.Translate('request_log'))
.appendField(Blockly.Translate('loglevel'))
.appendField(new Blockly.FieldDropdown([
[Blockly.Translate('request_log_none'), ''],
[Blockly.Translate('request_log_info'), 'log'],
[Blockly.Translate('request_log_debug'), 'debug'],
[Blockly.Translate('request_log_warn'), 'warn'],
[Blockly.Translate('request_log_error'), 'error']
[Blockly.Translate('loglevel_none'), ''],
[Blockly.Translate('loglevel_debug'), 'debug'],
[Blockly.Translate('loglevel_info'), 'info'],
[Blockly.Translate('loglevel_warn'), 'warn'],
[Blockly.Translate('loglevel_error'), 'error'],
]), 'LOG');

this.setInputsInline(false);
Expand Down
12 changes: 6 additions & 6 deletions admin/google-blockly/own/blocks_sendto.js
Expand Up @@ -99,13 +99,13 @@ Blockly.Blocks['sendto_custom'] = {
this.setColour(Blockly.Sendto.HUE);

this.appendDummyInput('LOG')
.appendField(Blockly.Translate('sendto_log'))
.appendField(Blockly.Translate('loglevel'))
.appendField(new Blockly.FieldDropdown([
[Blockly.Translate('sendto_log_none'), ''],
[Blockly.Translate('sendto_log_info'), 'log'],
[Blockly.Translate('sendto_log_debug'), 'debug'],
[Blockly.Translate('sendto_log_warn'), 'warn'],
[Blockly.Translate('sendto_log_error'), 'error']
[Blockly.Translate('loglevel_none'), ''],
[Blockly.Translate('loglevel_debug'), 'debug'],
[Blockly.Translate('loglevel_info'), 'info'],
[Blockly.Translate('loglevel_warn'), 'warn'],
[Blockly.Translate('loglevel_error'), 'error'],
]), 'LOG');

this.appendDummyInput('WITH_STATEMENT')
Expand Down
10 changes: 5 additions & 5 deletions admin/google-blockly/own/blocks_system.js
Expand Up @@ -58,7 +58,7 @@ Blockly.System.blocks['debug'] =
+ ' <field name="TEXT">test</field>'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="LOG_LEVEL">'
+ ' <value name="Severity">'
+ ' </value>'
+ '</block>';

Expand All @@ -68,13 +68,13 @@ Blockly.Blocks['debug'] = {
.setCheck(null)
.appendField(Blockly.Translate('debug'));

this.appendDummyInput('LOG_LEVEL')
this.appendDummyInput('Severity')
.appendField(new Blockly.FieldDropdown([
[Blockly.Translate('loglevel_debug'), 'debug'],
[Blockly.Translate('loglevel_info'), 'info'],
[Blockly.Translate('loglevel_warn'), 'warn'],
[Blockly.Translate('loglevel_error'), 'error'],
]), 'LOG_LEVEL');
[Blockly.Translate('loglevel_debug'), 'debug'],
]), 'Severity');

this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
Expand All @@ -87,7 +87,7 @@ Blockly.Blocks['debug'] = {

Blockly.JavaScript['debug'] = function(block) {
const value_text = Blockly.JavaScript.valueToCode(block, 'TEXT', Blockly.JavaScript.ORDER_ATOMIC);
const logLevel = block.getFieldValue('LOG_LEVEL');
const logLevel = block.getFieldValue('Severity');

return `console.${logLevel}(${value_text});\n`;
};
Expand Down

0 comments on commit 97fc4fc

Please sign in to comment.