Skip to content

Commit d6ee845

Browse files
IDisposableIDisposable
authored
Merge branch 'dev' into feat/hostname
2 parents ffca856 + 9a4d061 commit d6ee845

File tree

138 files changed

+12639
-3085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+12639
-3085
lines changed

‎.devcontainer/docker/devcontainer.json‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
11
{
2-
"name": "JetKVM docker devcontainer",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
4-
"features": {
5-
"ghcr.io/devcontainers/features/node:1": {
6-
// Should match what is defined in ui/package.json
7-
"version": "22.19.0"
8-
}
9-
},
10-
"mounts": [
11-
"source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
12-
],
13-
"onCreateCommand": ".devcontainer/install-deps.sh",
14-
"customizations": {
15-
"vscode": {
16-
"extensions": [
17-
// coding styles
18-
"chrislajoie.vscode-modelines",
19-
"editorconfig.editorconfig",
20-
// GitHub
21-
"GitHub.vscode-pull-request-github",
22-
"github.vscode-github-actions",
23-
// Golang
24-
"golang.go",
25-
// C / C++
26-
"ms-vscode.cpptools",
27-
"ms-vscode.cpptools-extension-pack",
28-
// CMake / Makefile
29-
"ms-vscode.makefile-tools",
30-
"ms-vscode.cmake-tools",
31-
// Frontend
32-
"esbenp.prettier-vscode",
33-
"dbaeumer.vscode-eslint",
34-
"bradlc.vscode-tailwindcss"
35-
]
36-
}
37-
}
2+
"name": "JetKVM docker devcontainer",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
4+
"features": {
5+
"ghcr.io/devcontainers/features/node:1": {
6+
// Should match what is defined in ui/package.json
7+
"version": "22.20.0"
8+
}
9+
},
10+
"mounts": [
11+
"source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
12+
],
13+
"onCreateCommand": ".devcontainer/install-deps.sh",
14+
"customizations": {
15+
"vscode": {
16+
"extensions": [
17+
// coding styles
18+
"chrislajoie.vscode-modelines",
19+
"editorconfig.editorconfig",
20+
// GitHub
21+
"GitHub.vscode-pull-request-github",
22+
"github.vscode-github-actions",
23+
// Golang
24+
"golang.go",
25+
// C / C++
26+
"ms-vscode.cpptools",
27+
"ms-vscode.cpptools-extension-pack",
28+
// CMake / Makefile
29+
"ms-vscode.makefile-tools",
30+
"ms-vscode.cmake-tools",
31+
// Frontend
32+
"esbenp.prettier-vscode",
33+
"dbaeumer.vscode-eslint",
34+
"bradlc.vscode-tailwindcss",
35+
"codeandstuff.package-json-upgrade",
36+
// Localization
37+
"inlang.vs-code-extension"
38+
]
39+
}
40+
}
3841
}

‎.devcontainer/podman/devcontainer.json‎

Lines changed: 49 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,50 @@
11
{
2-
"name": "JetKVM podman devcontainer",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
4-
"features": {
5-
"ghcr.io/devcontainers/features/node:1": {
6-
// Should match what is defined in ui/package.json
7-
"version": "22.19.0"
8-
}
9-
},
10-
"runArgs": [
11-
"--userns=keep-id",
12-
"--security-opt=label=disable",
13-
"--security-opt=label=nested"
14-
],
15-
"containerUser": "vscode",
16-
"containerEnv": {
17-
"HOME": "/home/vscode"
18-
}
19-
}
2+
"name": "JetKVM podman devcontainer",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
4+
"features": {
5+
"ghcr.io/devcontainers/features/node:1": {
6+
// Should match what is defined in ui/package.json
7+
"version": "22.20.0"
8+
}
9+
},
10+
"runArgs": [
11+
"--userns=keep-id",
12+
"--security-opt=label=disable",
13+
"--security-opt=label=nested"
14+
],
15+
"containerUser": "vscode",
16+
"containerEnv": {
17+
"HOME": "/home/vscode"
18+
},
19+
"mounts": [
20+
"source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
21+
],
22+
"onCreateCommand": ".devcontainer/install-deps.sh",
23+
"customizations": {
24+
"vscode": {
25+
"extensions": [
26+
// coding styles
27+
"chrislajoie.vscode-modelines",
28+
"editorconfig.editorconfig",
29+
// GitHub
30+
"GitHub.vscode-pull-request-github",
31+
"github.vscode-github-actions",
32+
// Golang
33+
"golang.go",
34+
// C / C++
35+
"ms-vscode.cpptools",
36+
"ms-vscode.cpptools-extension-pack",
37+
// CMake / Makefile
38+
"ms-vscode.makefile-tools",
39+
"ms-vscode.cmake-tools",
40+
// Frontend
41+
"esbenp.prettier-vscode",
42+
"dbaeumer.vscode-eslint",
43+
"bradlc.vscode-tailwindcss",
44+
"codeandstuff.package-json-upgrade",
45+
// Localization
46+
"inlang.vs-code-extension"
47+
]
48+
}
49+
}
50+
}

‎.gitignore‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
bin/*
2-
static/*
3-
.idea
4-
.DS_Store
5-
6-
.cache
7-
.vite
8-
.pnpm-store
9-
10-
device-tests.tar.gz
11-
node_modules
12-
13-
# generated during the build process
14-
#internal/native/include
1+
bin/*
2+
static/*
3+
.idea
4+
.DS_Store
5+
6+
.cache
7+
.vite
8+
.pnpm-store
9+
10+
device-tests.tar.gz
11+
node_modules
12+
13+
# generated during the build process
14+
#internal/native/include
1515
#internal/native/lib
16+
1617
*.eez-project-ui-state
18+
19+
ui/reports

‎.vscode/extensions.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"recommendations": [
3+
// coding styles
4+
"chrislajoie.vscode-modelines",
5+
"editorconfig.editorconfig",
6+
// GitHub
7+
"GitHub.vscode-pull-request-github",
8+
"github.vscode-github-actions",
9+
// Golang
10+
"golang.go",
11+
// C / C++
12+
"ms-vscode.cpptools",
13+
"ms-vscode.cpptools-extension-pack",
14+
// CMake / Makefile
15+
"ms-vscode.makefile-tools",
16+
"ms-vscode.cmake-tools",
17+
// Frontend
18+
"esbenp.prettier-vscode",
19+
"dbaeumer.vscode-eslint",
20+
"bradlc.vscode-tailwindcss",
21+
"codeandstuff.package-json-upgrade",
22+
// Localization
23+
"inlang.vs-code-extension"
24+
]
25+
}

0 commit comments

Comments
 (0)