update deps, fix build

This commit is contained in:
Sacha Weatherstone
2024-01-24 22:01:28 +10:00
parent 72bfd44b1f
commit f997faa072
7 changed files with 546 additions and 529 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "meshtastic-web",
"version": "2.2.18-0",
"version": "2.2.19-0",
"type": "module",
"description": "Meshtastic web client",
"license": "GPL-3.0-only",
@@ -22,7 +22,7 @@
"dependencies": {
"@bufbuild/protobuf": "^1.6.0",
"@emeraldpay/hashicon-react": "^0.5.2",
"@meshtastic/js": "2.2.18-0",
"@meshtastic/js": "2.2.19-0",
"@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.5",
@@ -40,36 +40,36 @@
"@turf/turf": "^6.5.0",
"base64-js": "^1.5.1",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"class-validator": "^0.14.1",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"cmdk": "^0.2.0",
"immer": "^10.0.3",
"lucide-react": "^0.307.0",
"lucide-react": "^0.314.0",
"mapbox-gl": "npm:empty-npm-package@^1.0.0",
"maplibre-gl": "3.6.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.49.2",
"react-hook-form": "^7.49.3",
"react-map-gl": "7.1.7",
"react-qrcode-logo": "^2.9.0",
"rfc4648": "^1.5.3",
"tailwind-merge": "^2.2.0",
"tailwind-merge": "^2.2.1",
"tailwindcss-animate": "^1.0.7",
"timeago-react": "^3.0.6",
"zustand": "4.4.7"
"zustand": "4.5.0"
},
"devDependencies": {
"@biomejs/biome": "^1.5.0",
"@buf/meshtastic_protobufs.bufbuild_es": "1.6.0-20240106203407-94f78518ac45.1",
"@types/chrome": "^0.0.256",
"@types/node": "^20.10.7",
"@types/react": "^18.2.47",
"@biomejs/biome": "^1.5.3",
"@buf/meshtastic_protobufs.bufbuild_es": "1.6.0-20240120102703-ad0e0726ffe6.1",
"@types/chrome": "^0.0.258",
"@types/node": "^20.11.6",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/w3c-web-serial": "^1.0.6",
"@types/web-bluetooth": "^0.0.20",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.4.16",
"autoprefixer": "^10.4.17",
"gzipper": "^7.2.0",
"postcss": "^8.4.33",
"rollup-plugin-visualizer": "^5.12.0",
@@ -77,7 +77,7 @@
"tar": "^6.2.0",
"tslib": "^2.6.2",
"typescript": "^5.3.3",
"vite": "^5.0.11",
"vite": "^5.0.12",
"vite-plugin-environment": "^1.1.3"
}
}

1027
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

View File

@@ -47,6 +47,12 @@ export const LoRa = (): JSX.Element => {
label: "Channel Number",
description: "LoRa channel number",
},
{
type: "toggle",
name: "ignoreMqtt",
label: "Ignore MQTT",
description: "Don't forward MQTT messages over the mesh",
},
],
},
{

View File

@@ -106,7 +106,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
produce<DeviceState>((draft) => {
draft.devices.set(id, {
id,
status: Types.DeviceStatusEnum.DEVICE_DISCONNECTED,
status: Types.DeviceStatusEnum.DeviceDisconnected,
channels: new Map(),
config: new Protobuf.LocalOnly.LocalConfig(),
moduleConfig: new Protobuf.LocalOnly.LocalModuleConfig(),

View File

@@ -8,7 +8,8 @@ import { Channel } from "@components/PageComponents/Channel.js";
import { PageLayout } from "@components/PageLayout.js";
import { Sidebar } from "@components/Sidebar.js";
import { useDevice } from "@core/stores/deviceStore.js";
import { Protobuf, Types } from "@meshtastic/js";
import { Types } from "@meshtastic/js";
import type { Protobuf } from "@meshtastic/js";
import { ImportIcon, QrCodeIcon } from "lucide-react";
import { useState } from "react";
@@ -22,7 +23,7 @@ export const getChannelName = (channel: Protobuf.Channel.Channel) =>
export const ChannelsPage = (): JSX.Element => {
const { channels, setDialogOpen } = useDevice();
const [activeChannel, setActiveChannel] = useState<Types.ChannelNumber>(
Types.ChannelNumber.PRIMARY,
Types.ChannelNumber.Primary,
);
const currentChannel = channels.get(activeChannel);

View File

@@ -15,7 +15,7 @@ export const MessagesPage = (): JSX.Element => {
const [chatType, setChatType] =
useState<Types.PacketDestination>("broadcast");
const [activeChat, setActiveChat] = useState<number>(
Types.ChannelNumber.PRIMARY,
Types.ChannelNumber.Primary,
);
const filteredNodes = Array.from(nodes.values()).filter(
(n) => n.num !== hardware.myNodeNum,
@@ -91,7 +91,7 @@ export const MessagesPage = (): JSX.Element => {
key={node.num}
to={activeChat}
messages={messages.direct.get(node.num)}
channel={Types.ChannelNumber.PRIMARY}
channel={Types.ChannelNumber.Primary}
/>
),
)}

View File

@@ -56,4 +56,7 @@ export class LoRaValidation
@IsArray()
ignoreIncoming: number[];
@IsBoolean()
ignoreMqtt: boolean;
}