From 612748e04112b98399449b89d249762c76dd7658 Mon Sep 17 00:00:00 2001 From: Pascal Pickel Date: Tue, 13 Feb 2024 14:51:33 +0100 Subject: [PATCH] feat: update shared --- package-lock.json | 67 ++++++++++++++++++++++++------------------ package.json | 2 +- src/DeviceSelector.tsx | 2 +- src/index.tsx | 9 ++++-- 4 files changed, 46 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4552d4d..35879c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "pc-nrfconnect-dtm", - "version": "2.2.0", + "version": "2.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pc-nrfconnect-dtm", - "version": "2.2.0", + "version": "2.2.2", "license": "SEE LICENSE IN LICENSE", "devDependencies": { - "@nordicsemiconductor/pc-nrfconnect-shared": "^142.0.0", + "@nordicsemiconductor/pc-nrfconnect-shared": "^157.0.0", "@testing-library/user-event": "^13.1.9", "chart.js": "^4.0.1", "chartjs-plugin-datalabels": "2.2.0", @@ -17,7 +17,7 @@ "react-chartjs-2": "^5.0.1" }, "engines": { - "nrfconnect": ">=4.3.0" + "nrfconnect": ">=4.4.1" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -744,9 +744,9 @@ } }, "node_modules/@electron/remote": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.11.tgz", - "integrity": "sha512-PYEs7W3GrQNuhgiMHjFEvL5MbAL6C7m1AwSAHGqC+xc33IdP7rcGtJSdTP2eg1ssyB3oI00KwTsiSlsQbAoXpA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", + "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", "dev": true, "peerDependencies": { "electron": ">= 13.0.0" @@ -2873,13 +2873,13 @@ } }, "node_modules/@nordicsemiconductor/pc-nrfconnect-shared": { - "version": "142.0.0", - "resolved": "https://registry.npmjs.org/@nordicsemiconductor/pc-nrfconnect-shared/-/pc-nrfconnect-shared-142.0.0.tgz", - "integrity": "sha512-dz0sWMUje+VYzvPPaX4gEhswAHEt+MCNTRkzP1SEQ7SYVV5/hAQIlBKeLIuUzLYXmRldTjZ7j91j+G8GSps1aw==", + "version": "157.0.0", + "resolved": "https://registry.npmjs.org/@nordicsemiconductor/pc-nrfconnect-shared/-/pc-nrfconnect-shared-157.0.0.tgz", + "integrity": "sha512-+/xiejw5JAx9IAMupMKRoZ2hr8vgOfG7J6Dsz/145o9+y54wNbOcfWA2vEvZA7YebCYaskYS9FRFadcAzn1umA==", "dev": true, "hasInstallScript": true, "dependencies": { - "@electron/remote": "^2.0.4", + "@electron/remote": "^2.1.1", "@mdi/font": "7.2.96", "@mdi/js": "^7.2.96", "@mdi/react": "^1.6.1", @@ -2912,7 +2912,7 @@ "bootstrap": "4.6.2", "commander": "10.0.0", "date-fns": "2.29.3", - "electron": "22.3.5", + "electron": "^28.1.4", "electron-store": "8.1.0", "esbuild": "0.19.2", "esbuild-sass-plugin": "2.13.0", @@ -4292,9 +4292,9 @@ } }, "node_modules/@types/http-cache-semantics": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz", - "integrity": "sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", + "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", "dev": true }, "node_modules/@types/invariant": { @@ -4512,9 +4512,9 @@ } }, "node_modules/@types/responselike": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz", - "integrity": "sha512-TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", + "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", "dev": true, "dependencies": { "@types/node": "*" @@ -4624,9 +4624,9 @@ "dev": true }, "node_modules/@types/yauzl": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz", - "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==", + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", "dev": true, "optional": true, "dependencies": { @@ -6982,14 +6982,14 @@ "dev": true }, "node_modules/electron": { - "version": "22.3.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.5.tgz", - "integrity": "sha512-CTdnoTbO3sDiMv47TX3ZO640Ca57v1qpiqGChFF8oZbtfHuQjTPPaE4hsoynf22wwnBiyJNL41DpB/pfp9USnA==", + "version": "28.2.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.2.tgz", + "integrity": "sha512-8UcvIGFcjplHdjPFNAHVFg5bS0atDyT3Zx21WwuE4iLfxcAMsyMEOgrQX3im5LibA8srwsUZs7Cx0JAUfcQRpw==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", - "@types/node": "^16.11.26", + "@types/node": "^18.11.18", "extract-zip": "^2.0.1" }, "bin": { @@ -7019,10 +7019,13 @@ "dev": true }, "node_modules/electron/node_modules/@types/node": { - "version": "16.18.57", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.57.tgz", - "integrity": "sha512-piPoDozdPaX1hNWFJQzzgWqE40gh986VvVx/QO9RU4qYRE55ld7iepDVgZ3ccGUw0R4wge0Oy1dd+3xOQNkkUQ==", - "dev": true + "version": "18.19.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.15.tgz", + "integrity": "sha512-AMZ2UWx+woHNfM11PyAEQmfSxi05jm9OlkxczuHeEqmvwPkYj6MWv44gbzDPefYOLysTOFyI3ziiy2ONmUZfpA==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/emitter-listener": { "version": "1.1.2", @@ -20140,6 +20143,12 @@ "react": ">=15.0.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/unherit": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz", diff --git a/package.json b/package.json index 85262a7..0e81231 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "prepare": "husky install" }, "devDependencies": { - "@nordicsemiconductor/pc-nrfconnect-shared": "^142.0.0", + "@nordicsemiconductor/pc-nrfconnect-shared": "^157.0.0", "@testing-library/user-event": "^13.1.9", "chart.js": "^4.0.1", "chartjs-plugin-datalabels": "2.2.0", diff --git a/src/DeviceSelector.tsx b/src/DeviceSelector.tsx index d8d7e5f..b3ca6a1 100644 --- a/src/DeviceSelector.tsx +++ b/src/DeviceSelector.tsx @@ -14,7 +14,7 @@ import { jprogDeviceSetup, logger, } from '@nordicsemiconductor/pc-nrfconnect-shared'; -import { DeviceTraits } from '@nordicsemiconductor/pc-nrfconnect-shared/nrfutil'; +import { DeviceTraits } from '@nordicsemiconductor/pc-nrfconnect-shared/nrfutil/device'; import path from 'path'; import { deselectDevice, selectDevice } from './actions/testActions'; diff --git a/src/index.tsx b/src/index.tsx index b9e0b27..783d3b0 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,8 +5,11 @@ */ import React from 'react'; -import { App, render } from '@nordicsemiconductor/pc-nrfconnect-shared'; -import usageData from '@nordicsemiconductor/pc-nrfconnect-shared/src/utils/usageData'; +import { + App, + render, + telemetry, +} from '@nordicsemiconductor/pc-nrfconnect-shared'; import DeviceSelector from './DeviceSelector'; import Receiver from './Receiver'; @@ -16,7 +19,7 @@ import Transmitter from './Transmitter'; import './index.scss'; -usageData.enableTelemetry(); +telemetry.enableTelemetry(); render(