From 70edffeeae0ff97fe2615e6d00e269d7d14dd04f Mon Sep 17 00:00:00 2001 From: Austin Date: Fri, 12 Jun 2026 12:51:48 -0400 Subject: [PATCH] JSR migrations for pnpm 11 (#1090) JSR is now integrated into pnpm since version 10.9 Should fix issues resolving JSR dependencies during "pnpm test" --- .npmrc | 1 - package.json | 1 + packages/web/.npmrc | 1 - pnpm-lock.yaml | 16 ++++++++++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) delete mode 100644 .npmrc delete mode 100644 packages/web/.npmrc diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 41583e36..00000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -@jsr:registry=https://npm.jsr.io diff --git a/package.json b/package.json index 84004077..2fbc5dda 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "tslog": "^4.9.3" }, "devDependencies": { + "@meshtastic/core": "jsr:^2.6.6", "@types/node": "^24.3.1", "husky": "^9.1.0", "lint-staged": "^16.0.0", diff --git a/packages/web/.npmrc b/packages/web/.npmrc deleted file mode 100644 index 41583e36..00000000 --- a/packages/web/.npmrc +++ /dev/null @@ -1 +0,0 @@ -@jsr:registry=https://npm.jsr.io diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bc1322d6..1b3767f3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,6 +21,9 @@ importers: specifier: ^4.9.3 version: 4.10.2 devDependencies: + '@meshtastic/core': + specifier: jsr:^2.6.6 + version: '@jsr/meshtastic__core@2.6.6' '@types/node': specifier: ^24.3.1 version: 24.12.0 @@ -1295,6 +1298,9 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} + '@jsr/meshtastic__core@2.6.6': + resolution: {integrity: sha512-f9c/HV6d7fGg+FtsnnC6DSomdGQ7Hr96JiT3epTUduwClYFdi/ftKEadfV55cMhCrp1QK9y6lkPG2S+X1AwN5Q==, tarball: https://npm.jsr.io/~/11/@jsr/meshtastic__core/2.6.6.tgz} + '@jsr/meshtastic__protobufs@2.7.20': resolution: {integrity: sha512-GrHWfOzi9i7xk2Br3MkKWLxbzreZuwgjZKNooednYpa1V/abnSj9e4twNTtKyqXYaAOzthY3Cdk4IXouBN9dbA==, tarball: https://npm.jsr.io/~/11/@jsr/meshtastic__protobufs/2.7.20.tgz} @@ -6867,6 +6873,16 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.5 + '@jsr/meshtastic__core@2.6.6': + dependencies: + '@bufbuild/protobuf': 2.11.0 + '@jsr/meshtastic__protobufs': 2.7.20 + crc: 4.3.2 + ste-simple-events: 3.0.11 + tslog: 4.10.2 + transitivePeerDependencies: + - buffer + '@jsr/meshtastic__protobufs@2.7.20': dependencies: '@bufbuild/protobuf': 2.11.0