From 88f3e5fb5c08db6142929327c58cb716f84bdb42 Mon Sep 17 00:00:00 2001 From: Dan Ditomaso Date: Mon, 13 Oct 2025 22:01:30 -0400 Subject: [PATCH] fixed publishing issue --- .github/workflows/release-protobufs.yml | 6 +--- packages/protobufs/package.json | 8 +++--- packages/protobufs/packages/ts/deno.json | 4 +-- packages/protobufs/packages/ts/package.json | 32 --------------------- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100755 packages/protobufs/packages/ts/package.json diff --git a/.github/workflows/release-protobufs.yml b/.github/workflows/release-protobufs.yml index 57d02317..0857e735 100644 --- a/.github/workflows/release-protobufs.yml +++ b/.github/workflows/release-protobufs.yml @@ -29,7 +29,6 @@ jobs: set -euxo pipefail ls -la packages/ts || true cat packages/ts/deno.json - cat packages/ts/package.json - name: Determine VERSION run: | @@ -48,7 +47,7 @@ jobs: working-directory: packages/ts run: | set -euxo pipefail - for f in deno.json package.json; do + for f in deno.json; do test -f "$f" jq --arg version "${VERSION//\//-}" ' walk( @@ -123,9 +122,6 @@ jobs: with: name: ts_code - - name: Remove package.json (JSR doesn’t need it) - run: rm -f package.json - - name: Set up Deno uses: denoland/setup-deno@main with: diff --git a/packages/protobufs/package.json b/packages/protobufs/package.json index 3a6b3561..ee31ed5e 100644 --- a/packages/protobufs/package.json +++ b/packages/protobufs/package.json @@ -1,8 +1,9 @@ { - "name": "@meshtastic/protobufs", - "version": "__PACKAGE_VERSION__", - "private": false, + "name": "@meshtastic/protobufs-ws", + "private": true, + "version": "0.0.0", "type": "module", + "description": "Workspace package for Meshtastic protobuf stubs (local dev only). This package is published to the JSR registry separately.", "license": "GPL-3.0-only", "files": [ "./packages/ts/dist/" @@ -24,7 +25,6 @@ "dependencies": {}, "devDependencies": { "@bufbuild/protoc-gen-es": "^1.9.0", - "fast-glob": "^3.3.2", "rimraf": "^6.0.0" } } diff --git a/packages/protobufs/packages/ts/deno.json b/packages/protobufs/packages/ts/deno.json index 212a0575..b5f91df0 100644 --- a/packages/protobufs/packages/ts/deno.json +++ b/packages/protobufs/packages/ts/deno.json @@ -1,6 +1,6 @@ { "name": "@meshtastic/protobufs", - "version": "2.7.12", + "version": "__PACKAGE_VERSION__", "exports": { ".": "./mod.ts" }, @@ -8,6 +8,6 @@ "@bufbuild/protobuf": "npm:@bufbuild/protobuf@^2.9.0" }, "publish": { - "exclude": ["!lib"] + "exclude": ["!dist"] } } diff --git a/packages/protobufs/packages/ts/package.json b/packages/protobufs/packages/ts/package.json deleted file mode 100755 index 756ebea0..00000000 --- a/packages/protobufs/packages/ts/package.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "@meshtastic/protobufs", - "description": "Protobuf definitions for the Meshtastic project", - "version": "2.7.12", - "homepage": "https://github.com/meshtastic/protobufs", - "license": "GPLV3", - "publishConfig": { - "access": "public" - }, - "type": "module", - "main": "./dist/mod.js", - "module": "./dist/mod.js", - "types": "./dist/mod.d.ts", - "dependencies": { - "@bufbuild/protobuf": "^2.9.0" - }, - "devDependencies": { - "tsdown": "^0.15.6", - "typescript": "^5.9.3" - }, - "scripts": { - "build": "tsdown" - }, - "tsdown": { - "entry": "mod.ts", - "dts": true, - "format": [ - "esm" - ], - "splitting": false - } -}