Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed encrypted configuration and jsonConfig layout #1179

Merged
merged 8 commits into from
Mar 18, 2024
+3,520 −1,587
Merged

Fixed encrypted configuration and jsonConfig layout #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
820c0bf
Fixed encrypted configuration - fixes #1170
klein0r Mar 13, 2024
385463e
Updated license information
klein0r Mar 13, 2024
42fe69d
vscode schema and changelog_old
klein0r Mar 13, 2024
faac1ab
Dropped admin 4 support
klein0r Mar 13, 2024
cd90d41
es2021
klein0r Mar 13, 2024
c5adb49
Translation helper
klein0r Mar 13, 2024
6fbccb5
jsonConfig layout fix
klein0r Mar 13, 2024
0465b5e
Changed default selection to HomeMatic IP
klein0r Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .eslintrc.js
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add the vs-code stuff to gitignore if it is nothing special for this project?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like vscode needs explicit mapping for the json schema so okay to keep it in for me.

"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
}
27 changes: 27 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Older changes
Loading
Loading