Skip to content

Commit

Permalink
Fixed encrypted configuration and jsonConfig layout (#1179)
Browse files Browse the repository at this point in the history
* Fixed encrypted configuration - fixes #1170

* Updated license information

* vscode schema and changelog_old

* Dropped admin 4 support

* es2021

* Translation helper

* jsonConfig layout fix

* Changed default selection to HomeMatic IP
  • Loading branch information
klein0r authored Mar 18, 2024
1 parent 3bd6e4c commit 4ff9d78
Show file tree
Hide file tree
Showing 35 changed files with 3,531 additions and 1,437 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ module.exports = {
'no-unneeded-ternary': 'error'
},
parserOptions: {
ecmaVersion: 2019
ecmaVersion: 2021
},
overrides: [
// we need ts parser for ts files
{
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 2019,
ecmaVersion: 2021,
sourceType: 'module',
project: './tsconfig.json'
},
Expand Down
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
}
27 changes: 27 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"eslint.enable": true,
"editor.formatOnSave": false,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[typescript]": {
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
}
},
"json.schemas": [
{
"fileMatch": [
"io-package.json"
],
"url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json"
},
{
"fileMatch": [
"admin/jsonConfig.json",
"admin/jsonCustom.json",
"admin/jsonTab.json"
],
"url": "https://raw.githubusercontent.com/ioBroker/adapter-react-v5/main/schemas/jsonConfig.json"
}
]
}
1 change: 1 addition & 0 deletions CHANGELOG_OLD.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Older changes
Loading

0 comments on commit 4ff9d78

Please sign in to comment.