mirror/web
1
0
Fork 0
mirror of https://github.com/meshtastic/web.git synced 2026-04-20 13:58:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meshtastic:master' into tls-warning

Browse Source
This commit is contained in:
James Thomas
2025-04-02 08:32:23 -04:00
committed by GitHub
parent 443a9ea101 633b99d6b2
commit d2c33b4caf
4 changed files with 576 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
deno.json
View File

@@ -1,10 +1,5 @@
{
"imports": {
"@meshtastic/core": "jsr:@meshtastic/core@^2.6.2",
"@meshtastic/js": "jsr:@meshtastic/js@^2.3.4",
"@meshtastic/transport-http": "jsr:@meshtastic/transport-http@^0.2.1",
"@meshtastic/transport-web-bluetooth": "jsr:@meshtastic/transport-web-bluetooth@^0.1.1",
"@meshtastic/transport-web-serial": "jsr:@meshtastic/transport-web-serial@^0.2.1",
"@app/": "./src/",
"@pages/": "./src/pages/",
"@components/": "./src/components/",

1528
deno.lock generated
View File

File diff suppressed because it is too large Load Diff

51
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "meshtastic-web",
"version": "2.3.3-0",
"version": "2.6.0-0",
"type": "module",
"description": "Meshtastic web client",
"license": "GPL-3.0-only",
@@ -34,7 +34,12 @@
},
"homepage": "https://meshtastic.org",
"dependencies": {
"@bufbuild/protobuf": "^2.2.3",
"@meshtastic/core": "npm:@jsr/meshtastic__core@2.6.2",
"@meshtastic/js": "npm:@jsr/meshtastic__js@2.6.0-0",
"@meshtastic/transport-http": "npm:@jsr/meshtastic__transport-http",
"@meshtastic/transport-web-bluetooth": "npm:@jsr/meshtastic__transport-web-bluetooth",
"@meshtastic/transport-web-serial": "npm:@jsr/meshtastic__transport-web-serial",
"@bufbuild/protobuf": "^2.2.5",
"@noble/curves": "^1.8.1",
"@radix-ui/react-accordion": "^1.2.3",
"@radix-ui/react-checkbox": "^1.1.4",
@@ -55,17 +60,17 @@
"class-validator": "^0.14.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.0.4",
"cmdk": "^1.1.1",
"crypto-random-string": "^5.0.0",
"immer": "^10.1.1",
"js-cookie": "^3.0.5",
"lucide-react": "^0.477.0",
"maplibre-gl": "5.1.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"lucide-react": "^0.486.0",
"maplibre-gl": "5.3.0",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-error-boundary": "^5.0.0",
"react-hook-form": "^7.54.2",
"react-map-gl": "8.0.1",
"react-hook-form": "^7.55.0",
"react-map-gl": "8.0.2",
"react-qrcode-logo": "^3.0.0",
"rfc4648": "^1.5.4",
"vite-plugin-node-polyfills": "^0.23.0",
@@ -73,32 +78,32 @@
"zustand": "5.0.3"
},
"devDependencies": {
"@tailwindcss/postcss": "^4.0.9",
"@tailwindcss/postcss": "^4.1.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
"@testing-library/user-event": "^14.6.1",
"@types/chrome": "^0.0.307",
"@types/chrome": "^0.0.313",
"@types/js-cookie": "^3.0.6",
"@types/node": "^22.13.7",
"@types/react": "^19.0.10",
"@types/node": "^22.13.17",
"@types/react": "^19.0.12",
"@types/react-dom": "^19.0.4",
"@types/serviceworker": "^0.0.123",
"@types/serviceworker": "^0.0.127",
"@types/w3c-web-serial": "^1.0.8",
"@types/web-bluetooth": "^0.0.21",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"gzipper": "^8.2.0",
"happy-dom": "^17.2.2",
"autoprefixer": "^10.4.21",
"gzipper": "^8.2.1",
"happy-dom": "^17.4.4",
"postcss": "^8.5.3",
"simple-git-hooks": "^2.11.1",
"tailwind-merge": "^3.0.2",
"tailwindcss": "^4.0.9",
"simple-git-hooks": "^2.12.1",
"tailwind-merge": "^3.1.0",
"tailwindcss": "^4.1.0",
"tailwindcss-animate": "^1.0.7",
"tar": "^7.4.3",
"testing-library": "^0.0.2",
"typescript": "^5.8.2",
"vite": "^6.2.0",
"vitest": "^3.0.7",
"vite-plugin-pwa": "^0.21.1"
"vite": "^6.2.4",
"vitest": "^3.1.1",
"vite-plugin-pwa": "^1.0.0"
}
}

5
src/components/PageComponents/Channel.tsx
View File

@@ -34,9 +34,10 @@ export const Channel = ({ channel }: SettingsPanelProps) => {
settings: {
...data.settings,
psk: toByteArray(pass),
moduleSettings: {...data.settings.moduleSettings,
moduleSettings: create(Protobuf.Channel.ModuleSettingsSchema, {
...data.settings.moduleSettings,
positionPrecision: data.settings.moduleSettings.positionPrecision,
},
}),
},
});
connection?.setChannel(channel).then(() => {