diff --git a/deno.json b/deno.json index 71604d00..c7a43366 100644 --- a/deno.json +++ b/deno.json @@ -1,12 +1,12 @@ { "workspace": [ - "./packages/web", - "./packages/core", - "./packages/transport-deno", - "./packages/transport-node", - "./packages/transport-http", - "./packages/transport-web-bluetooth", - "./packages/transport-web-serial" + "packages/web", + "packages/core", + "packages/transport-deno", + "packages/transport-node", + "packages/transport-http", + "packages/transport-web-bluetooth", + "packages/transport-web-serial" ], "tasks": { "build:npm": "deno run -A scripts/build_npm_package.ts" diff --git a/deno.lock b/deno.lock index d029f88a..bbe2d259 100644 --- a/deno.lock +++ b/deno.lock @@ -5,7 +5,12 @@ "jsr:@deno/cache-dir@0.20": "0.20.1", "jsr:@deno/dnt@~0.42.1": "0.42.1", "jsr:@deno/graph@0.86": "0.86.9", + "jsr:@meshtastic/core@^2.6.4": "2.6.4", + "jsr:@meshtastic/protobufs@^2.6.2": "2.7.0", "jsr:@meshtastic/protobufs@^2.7.0": "2.7.0", + "jsr:@meshtastic/transport-http@~0.2.1": "0.2.1", + "jsr:@meshtastic/transport-web-bluetooth@~0.1.2": "0.1.2", + "jsr:@meshtastic/transport-web-serial@~0.2.1": "0.2.1", "jsr:@std/bytes@^1.0.5": "1.0.6", "jsr:@std/fmt@1": "1.0.8", "jsr:@std/fmt@^1.0.3": "1.0.8", @@ -23,6 +28,10 @@ "npm:@bufbuild/protobuf@^2.2.3": "2.6.0", "npm:@bufbuild/protobuf@^2.6.0": "2.6.0", "npm:@hookform/resolvers@^5.1.1": "5.1.1_react-hook-form@7.60.0__react@19.1.0_react@19.1.0", + "npm:@jsr/meshtastic__core@2.6.4": "2.6.4", + "npm:@jsr/meshtastic__transport-http@*": "0.2.1", + "npm:@jsr/meshtastic__transport-web-bluetooth@*": "0.1.2", + "npm:@jsr/meshtastic__transport-web-serial@*": "0.2.1", "npm:@noble/curves@^1.9.2": "1.9.2", "npm:@radix-ui/react-accordion@^1.2.11": "1.2.11_@types+react@19.1.8_@types+react-dom@19.1.6__@types+react@19.1.8_react@19.1.0_react-dom@19.1.0__react@19.1.0", "npm:@radix-ui/react-checkbox@^1.3.2": "1.3.2_@types+react@19.1.8_@types+react-dom@19.1.6__@types+react@19.1.8_react@19.1.0_react-dom@19.1.0__react@19.1.0", @@ -101,6 +110,7 @@ "npm:typescript@^5.8.3": "5.8.3", "npm:vite@*": "7.0.2_@types+node@22.16.0_picomatch@4.0.2", "npm:vite@7": "7.0.2_@types+node@22.16.0_picomatch@4.0.2", + "npm:vite@7.0.2": "7.0.2_@types+node@22.16.0_picomatch@4.0.2", "npm:vitest@^3.2.4": "3.2.4_@types+node@22.16.0_happy-dom@18.0.1_vite@7.0.2__@types+node@22.16.0__picomatch@4.0.2", "npm:zod@^3.25.75": "3.25.75", "npm:zustand@5.0.6": "5.0.6_@types+react@19.1.8_immer@10.1.1_react@19.1.0" @@ -133,12 +143,31 @@ "@deno/graph@0.86.9": { "integrity": "c4f353a695bcc5246c099602977dabc6534eacea9999a35a8cb24e807192e6a1" }, + "@meshtastic/core@2.6.4": { + "integrity": "3b98855596fa4c2178a9b6569f4ddb53ff1ce1b4c2bba0f4b9f3de60a7b4c4a3", + "dependencies": [ + "jsr:@meshtastic/protobufs@^2.6.2", + "npm:@bufbuild/protobuf@^2.2.3", + "npm:crc", + "npm:ste-simple-events", + "npm:tslog" + ] + }, "@meshtastic/protobufs@2.7.0": { "integrity": "38357241bd8a7431c87366dbe12ce9e69f204ebb6ec23da12f7682765b6c8376", "dependencies": [ "npm:@bufbuild/protobuf@^2.2.3" ] }, + "@meshtastic/transport-http@0.2.1": { + "integrity": "4d086ee6d5665c3490736737c4354eb3049edf792b1d195b30a3254cb535a7d6" + }, + "@meshtastic/transport-web-bluetooth@0.1.2": { + "integrity": "5187a81143139460e75ddb2f3b82ef52c2f7e40901d22d90384fe91adfabb8e2" + }, + "@meshtastic/transport-web-serial@0.2.1": { + "integrity": "d09fa8ac278b105c8f2b3a72af9cf8a5676baac6f4e9111c6773ff6217e2d5be" + }, "@std/bytes@1.0.6": { "integrity": "f6ac6adbd8ccd99314045f5703e23af0a68d7f7e58364b47d2c7f408aeb5820a" }, @@ -658,6 +687,45 @@ "@jridgewell/sourcemap-codec" ] }, + "@jsr/meshtastic__core@2.6.4": { + "integrity": "sha512-1Kz5DK6peFxluHOJR38vFwfgeJzMXTz+3p6TvibjILVhSQC2U1nu8aJbn6w5zhRqS+j79OmtrRvdzL6VNsTkkQ==", + "dependencies": [ + "@bufbuild/protobuf", + "@jsr/meshtastic__protobufs", + "crc", + "ste-simple-events", + "tslog" + ], + "tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__core/2.6.4.tgz" + }, + "@jsr/meshtastic__protobufs@2.7.0": { + "integrity": "sha512-ndZhUyB/ADSyjJI+iSeSOoIKqNGZ2+ERVjfY0qnh4jgF740tFTwefC5mzZhOqDLbreGFYS79+429NtH5Ujdzdg==", + "dependencies": [ + "@bufbuild/protobuf" + ], + "tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__protobufs/2.7.0.tgz" + }, + "@jsr/meshtastic__transport-http@0.2.1": { + "integrity": "sha512-lmQKr3aIINKvtGROU4HchmSVqbZSbkIHqajowRRC8IAjsnR0zNTyxz210QyY4pFUF9hpcW3GRjwq5h/VO2JuGg==", + "dependencies": [ + "@jsr/meshtastic__core" + ], + "tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__transport-http/0.2.1.tgz" + }, + "@jsr/meshtastic__transport-web-bluetooth@0.1.2": { + "integrity": "sha512-Z+5pv9RXNgY0/crKExOH3pZ6LT0HIXFmnBL7NX5AO2knOFRn+4lmxQEhhmiTTlkUfqyEfAvbjuY5u4mq9TPTdQ==", + "dependencies": [ + "@jsr/meshtastic__core" + ], + "tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__transport-web-bluetooth/0.1.2.tgz" + }, + "@jsr/meshtastic__transport-web-serial@0.2.1": { + "integrity": "sha512-yumjEGLkAuJYOC3aWKvZzbQqi/LnqaKfNpVCY7Ki7oLtAshNiZrBLiwiFhN7+ZR9FfMdJThyBMqREBDRRWTO1Q==", + "dependencies": [ + "@jsr/meshtastic__core" + ], + "tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__transport-web-serial/0.2.1.tgz" + }, "@mapbox/geojson-rewind@0.5.2": { "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==", "dependencies": [ @@ -5151,6 +5219,10 @@ }, "packages/web": { "dependencies": [ + "jsr:@meshtastic/core@^2.6.4", + "jsr:@meshtastic/transport-http@~0.2.1", + "jsr:@meshtastic/transport-web-bluetooth@~0.1.2", + "jsr:@meshtastic/transport-web-serial@~0.2.1", "jsr:@std/path@^1.1.0", "npm:@types/w3c-web-serial@*", "npm:@types/web-bluetooth@*" @@ -5159,6 +5231,10 @@ "dependencies": [ "npm:@bufbuild/protobuf@^2.6.0", "npm:@hookform/resolvers@^5.1.1", + "npm:@jsr/meshtastic__core@2.6.4", + "npm:@jsr/meshtastic__transport-http@*", + "npm:@jsr/meshtastic__transport-web-bluetooth@*", + "npm:@jsr/meshtastic__transport-web-serial@*", "npm:@noble/curves@^1.9.2", "npm:@radix-ui/react-accordion@^1.2.11", "npm:@radix-ui/react-checkbox@^1.3.2", diff --git a/packages/web/deno.json b/packages/web/deno.json index 21f97a4a..ee020975 100644 --- a/packages/web/deno.json +++ b/packages/web/deno.json @@ -1,6 +1,10 @@ { "imports": { "@app/": "./src/", + "@meshtastic/core": "jsr:@meshtastic/core@^2.6.4", + "@meshtastic/transport-http": "jsr:@meshtastic/transport-http@^0.2.1", + "@meshtastic/transport-web-bluetooth": "jsr:@meshtastic/transport-web-bluetooth@^0.1.2", + "@meshtastic/transport-web-serial": "jsr:@meshtastic/transport-web-serial@^0.2.1", "@public/": "./public/", "@pages/": "./src/pages/", "@components/": "./src/components/", @@ -8,20 +12,6 @@ "@layouts/": "./src/layouts/", "@std/path": "jsr:@std/path@^1.1.0" }, - "tasks": { - "build": "vite build", - "build:analyze": "BUNDLE_ANALYZE=true deno task build", - "lint": "deno lint src/", - "lint:fix": "deno lint --fix src/", - "format": "deno fmt src/", - "dev": "deno task dev:ui", - "dev:ui": "VITE_APP_VERSION=development deno run -A npm:vite dev", - "test": "deno run -A npm:vitest", - "check": "deno check", - "preview": "deno run -A npm:vite preview", - "generate:routes": "deno run -A npm:@tanstack/router-cli generate --outDir src/ routes --rootRoutePath /", - "package": "gzipper c -i html,js,css,png,ico,svg,json,webmanifest,txt dist dist/output && tar -cvf dist/build.tar -C ./dist/output/ ." - }, "include": ["src", "./vite-env.d.ts"], "compilerOptions": { "lib": [ diff --git a/packages/web/package.json b/packages/web/package.json index 8584c844..086e1f19 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -15,13 +15,27 @@ "pre-commit": "deno task lint:fix && deno task format" }, "homepage": "https://meshtastic.org", + "scripts": { + "build": "deno run -A npm:vite build", + "build:analyze": "BUNDLE_ANALYZE=true deno task build", + "lint": "deno lint src/", + "lint:fix": "deno lint --fix src/", + "format": "deno fmt src/", + "dev": "deno task dev:ui", + "dev:ui": "VITE_APP_VERSION=development deno run -A npm:vite dev", + "test": "deno run -A npm:vitest", + "check": "deno check", + "preview": "deno run -A npm:vite preview", + "generate:routes": "deno run -A npm:@tanstack/router-cli generate --outDir src/ routes --rootRoutePath /", + "package": "gzipper c -i html,js,css,png,ico,svg,json,webmanifest,txt dist dist/output && tar -cvf dist/build.tar -C ./dist/output/ ." + }, "dependencies": { "@bufbuild/protobuf": "^2.6.0", + "@meshtastic/core": "npm:@jsr/meshtastic__core@2.6.4", + "@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", "@hookform/resolvers": "^5.1.1", - "@meshtastic/core": "workspace:*", - "@meshtastic/transport-http": "workspace:*", - "@meshtastic/transport-web-bluetooth": "workspace:*", - "@meshtastic/transport-web-serial": "workspace:*", "@noble/curves": "^1.9.2", "@radix-ui/react-accordion": "^1.2.11", "@radix-ui/react-checkbox": "^1.3.2", diff --git a/packages/web/postcss.config.cjs b/packages/web/postcss.config.cjs deleted file mode 100644 index 483f3785..00000000 --- a/packages/web/postcss.config.cjs +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - plugins: { - "@tailwindcss/postcss": {}, - }, -};