Skip to content

Commit

Permalink
Merge branch 'master' into dev-v4
Browse files Browse the repository at this point in the history
  • Loading branch information
jemu75 committed Apr 28, 2024
2 parents ae0a5a4 + 00d80da commit 3363389
Show file tree
Hide file tree
Showing 16 changed files with 1,266 additions and 199 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<<<<<<< HEAD
# Logs
logs
*.log
Expand Down Expand Up @@ -26,3 +27,6 @@ coverage
*.njsproj
*.sln
*.sw?
=======
node_modules
>>>>>>> master
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Verwendet IntelliSense zum Ermitteln möglicher Attribute.
// Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
// Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Chrome mit \"localhost\" starten",
"url": "http://localhost:3000/#/demo/?protocol=http&server=fhem&port=8083&path=fhem",
"webRoot": "${workspaceFolder}"
}
]
}
23 changes: 23 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "dev",
"problemMatcher": [
"$eslint-compact"
],
"label": "npm: dev",
"detail": "vite"
},
{
"type": "npm",
"script": "test:unit",
"problemMatcher": [
"$eslint-compact"
],
"label": "npm: test:unit",
"detail": "vitest"
}
]
}
Loading

0 comments on commit 3363389

Please sign in to comment.