Merge pull request #340 from NordicSemiconductor/update/nrf-device-li…

…b-js_to_0.4.6 Update `nrf-device-lib-js` to 0.4.6
NordicSemiconductor · Apr 28, 2022 · 0a64c17 · 0a64c17
2 parents 11037bd + b602503
commit 0a64c17
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 53 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 6.0.2 - 2022-04-28
+
+### Changed
+
+-   Update `nrf-device-lib-js` to 0.4.6.
+
 ## 6.0.1 - 2022-04-11
 
 ### Changed

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pc-nrfconnect-shared",
-    "version": "6.0.1",
+    "version": "6.0.2",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",
@@ -36,7 +36,7 @@
         "@babel/preset-typescript": "7.16.7",
         "@electron/remote": "^2.0.4",
         "@mdi/font": "3.9.97",
-        "@nordicsemiconductor/nrf-device-lib-js": "0.4.4",
+        "@nordicsemiconductor/nrf-device-lib-js": "0.4.6",
         "@reduxjs/toolkit": "1.8.0",
         "@svgr/webpack": "5.5.0",
         "@swc/core": "1.2.148",

diff --git a/src/Device/DeviceSelector/DeviceSelector.test.tsx b/src/Device/DeviceSelector/DeviceSelector.test.tsx
@@ -19,6 +19,30 @@ import DeviceSelector from './DeviceSelector';
 jest.mock('../sdfuOperations', () => ({}));
 
 const testDevice: Device = {
+    id: 1,
+    hwInfo: {
+        romSize: 123,
+        ramSize: 456,
+        romPageSize: 789,
+        deviceFamily: 'PCATest',
+        deviceVersion: 'PCATest',
+    },
+    broken: null,
+    usb: {
+        serialNumber: '000000001',
+        manufacturer: 'testManufacturer',
+        product: 'testProduct',
+        device: {
+            busNumber: 2,
+            address: 3,
+            descriptor: {
+                bDescriptorType: 4,
+                idVendor: 5,
+                idProduct: 6,
+            },
+            configurations: [],
+        },
+    },
     serialNumber: '000000001',
     serialPorts: [
         {
@@ -56,7 +80,6 @@ const testDevice: Device = {
         comName: 'COM1',
     },
     favorite: false,
-    // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
     traits: {
         jlink: true,
     },
@@ -83,7 +106,6 @@ describe('DeviceSelector', () => {
     it('should have no device selected by default', () => {
         const { getByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -98,7 +120,6 @@ describe('DeviceSelector', () => {
     it('should show no connected devices', () => {
         const { getByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -114,7 +135,6 @@ describe('DeviceSelector', () => {
     it('should list connected devices', () => {
         const { getByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -130,7 +150,6 @@ describe('DeviceSelector', () => {
     it('should unlist disconnected devices', () => {
         const { queryByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -146,7 +165,6 @@ describe('DeviceSelector', () => {
     it('should show more device info when selecting the expand button', () => {
         const { getByText, getByTestId, getAllByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -164,7 +182,6 @@ describe('DeviceSelector', () => {
     it('can select connected devices', () => {
         const { getAllByText, getByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -183,7 +200,6 @@ describe('DeviceSelector', () => {
     it('can deselect selected devices', async () => {
         const { getAllByText, getByText, findByTestId, getByTestId } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -204,7 +220,6 @@ describe('DeviceSelector', () => {
     it('should allow device selection when custom devices are enabled and no valid firmware is defined', () => {
         const { queryByText, getAllByText, getByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -234,7 +249,6 @@ describe('DeviceSelector', () => {
     it('should deselect device when custom devices are disabled and no valid firmware is defined', async () => {
         const { getByText, getAllByText, queryByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -270,7 +284,6 @@ describe('DeviceSelector', () => {
     it('should show firmware prompt when a valid firmware is defined', async () => {
         const { getByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,
@@ -295,7 +308,6 @@ describe('DeviceSelector', () => {
     it('should select device when cancelling firmware prompt', async () => {
         const { getByText, getAllByText, findByText } = render(
             <DeviceSelector
-                // @ts-expect-error The DeviceTraits type was wrong, but will be fixed by https://github.com/NordicPlayground/nrf-device-lib-js/pull/104
                 deviceListing={{
                     nordicUsb: true,
                     serialPort: true,

diff --git a/src/Device/deviceLister.ts b/src/Device/deviceLister.ts
@@ -126,17 +126,8 @@ export const stopWatchingDevices = () => {
     }
 };
 
-// @ts-expect-error This is how the nrfdl-js api works at the moment.
 const DEFAULT_TRAITS: DeviceTraits = {
     serialPort: true,
-    // usb: false,
-    // nordicUsb: false,
-    // nordicDfu: false,
-    // seggerUsb: false,
-    // jlink: false,
-    // broken: false,
-    // mcuboot: false,
-    // modem: false,
 };
 
 /**

diff --git a/src/Device/sdfuOperations.ts b/src/Device/sdfuOperations.ts
@@ -427,17 +427,9 @@ const prepareInDFUBootloader = async (
         )
     );
 
-    // @ts-expect-error This is how the nrfdl-js api works at the moment.
     return waitForDevice(device.serialNumber, DEFAULT_DEVICE_WAIT_TIME, {
         serialPort: true,
         nordicUsb: true,
-        // broken: false,
-        // jlink: false,
-        // mcuboot: false,
-        // modem: false,
-        // nordicDfu: false,
-        // seggerUsb: false,
-        // usb: false,
     });
 };