From 69fe12b98ee52a57ebc35c4161fcf797b7e2ec5c Mon Sep 17 00:00:00 2001 From: elbywan Date: Tue, 9 Aug 2022 09:51:25 +0200 Subject: [PATCH 1/2] chore: upgrade pnpm to 7.9.0 --- .npmrc | 4 ---- package.json | 2 +- pnpm-lock.yaml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.npmrc b/.npmrc index 1b37c23b2837..b8087a46efcf 100644 --- a/.npmrc +++ b/.npmrc @@ -2,10 +2,6 @@ shared-workspace-lockfile=true enable-pre-post-scripts=true hoist=false strict-peer-dependencies=false -# See: https://github.com/actions/setup-node/issues/543#issuecomment-1182469390 -loglevel=warn -# Disabled because it does not seem to be working and it regenerates the lockfile abusively -side-effects-cache=false public-hoist-pattern[]=@babel/* public-hoist-pattern[]=*eslint* diff --git a/package.json b/package.json index 29557ea3dfc4..94aed0d53515 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "license": "MIT", "private": true, - "packageManager": "pnpm@7.3.0", + "packageManager": "pnpm@7.9.0", "repository": { "type": "git", "url": "https://github.com/LedgerHQ/ledger-live.git" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 099edad85081..d4bf27d59150 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22013,7 +22013,7 @@ packages: dev: true /concat-map/0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} /concat-stream/1.5.2: resolution: {integrity: sha1-cIl4Yk2FavQaWnQd790mHadSwmY=} From 400a51717e8713f6d95458b34a1aa67a6a590c73 Mon Sep 17 00:00:00 2001 From: elbywan Date: Tue, 9 Aug 2022 10:49:57 +0200 Subject: [PATCH 2/2] fix: force commonjs imports from react-native transport package --- apps/ledger-live-mobile/src/screens/PairDevices/Scanning.tsx | 3 +-- .../react-native-hw-transport-ble/src/BleTransport.ts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/ledger-live-mobile/src/screens/PairDevices/Scanning.tsx b/apps/ledger-live-mobile/src/screens/PairDevices/Scanning.tsx index d319a487260f..d92b4f085956 100644 --- a/apps/ledger-live-mobile/src/screens/PairDevices/Scanning.tsx +++ b/apps/ledger-live-mobile/src/screens/PairDevices/Scanning.tsx @@ -4,8 +4,7 @@ import { useSelector } from "react-redux"; import { useTranslation } from "react-i18next"; import { Observable } from "rxjs"; import { InfiniteLoader } from "@ledgerhq/native-ui"; -import { DeviceModelId } from "@ledgerhq/devices/src/index"; -import { getInfosForServiceUuid } from "@ledgerhq/devices"; +import { getInfosForServiceUuid, DeviceModelId } from "@ledgerhq/devices"; import logger from "../../logger"; import { BLE_SCANNING_NOTHING_TIMEOUT } from "../../constants"; import { knownDevicesSelector } from "../../reducers/ble"; diff --git a/libs/ledgerjs/packages/react-native-hw-transport-ble/src/BleTransport.ts b/libs/ledgerjs/packages/react-native-hw-transport-ble/src/BleTransport.ts index e4919b82f14e..2323f4a170b0 100644 --- a/libs/ledgerjs/packages/react-native-hw-transport-ble/src/BleTransport.ts +++ b/libs/ledgerjs/packages/react-native-hw-transport-ble/src/BleTransport.ts @@ -10,8 +10,8 @@ import { getInfosForServiceUuid, } from "@ledgerhq/devices"; import type { DeviceModel } from "@ledgerhq/devices"; -import { sendAPDU } from "@ledgerhq/devices/ble/sendAPDU"; -import { receiveAPDU } from "@ledgerhq/devices/ble/receiveAPDU"; +import { sendAPDU } from "@ledgerhq/devices/lib/ble/sendAPDU"; +import { receiveAPDU } from "@ledgerhq/devices/lib/ble/receiveAPDU"; import { log } from "@ledgerhq/logs"; import { Observable, defer, merge, from, of, throwError } from "rxjs"; import {