@nordicsemiconductor/pc-nrfconnect-shared 92.0.0 → 94.0.0

package/dist/bootstrap.css

@@ -3299,6 +3299,7 @@ input[type=button].btn-block {
   display: block;
   min-height: 1.2500000004rem;
   padding-left: 1.5rem;
+  -webkit-print-color-adjust: exact;
   print-color-adjust: exact;
 }
 .custom-control-inline {

package/nrfutil/sandbox.ts

@@ -18,6 +18,7 @@ import {
     LogMessage,
     ModuleVersion,
     NrfutilJson,
+    NrfutilProgress,
     Progress,
     Task,
     TaskBegin,
@@ -79,7 +80,10 @@ const commonParser = <Result>(
     const processItem = (item: NrfutilJson<Result>) => {
         switch (item.type) {
             case 'task_progress':
-                callbacks.onProgress?.(item.data.progress, item.data.task);
+                callbacks.onProgress?.(
+                    convertNrfutilProgress(item.data.progress),
+                    item.data.task
+                );
                 break;
             case 'task_begin':
                 callbacks.onTaskBegin?.(item.data);
@@ -492,13 +496,32 @@ export default async (
         version ?? (moduleVersions?.[0] as string)
     );
 
-    onProgress?.({ progressPercentage: 0 });
+    onProgress?.(convertNrfutilProgress({ progressPercentage: 0 }));
     const result = await sandbox.isSandboxInstalled();
 
     if (!result) {
         await sandbox.prepareSandbox(onProgress);
     }
 
-    onProgress?.({ progressPercentage: 100 });
+    onProgress?.(convertNrfutilProgress({ progressPercentage: 100 }));
     return sandbox;
 };
+
+const convertNrfutilProgress = (progress: NrfutilProgress): Progress => {
+    const amountOfSteps = progress.amountOfSteps ?? 1;
+    const step = progress.step ?? 1;
+
+    const singleStepWeight = (1 / amountOfSteps) * 100;
+
+    const totalProgressPercentage =
+        singleStepWeight * (step - 1) +
+        progress.progressPercentage / amountOfSteps;
+
+    return {
+        ...progress,
+        stepProgressPercentage: progress.progressPercentage,
+        totalProgressPercentage,
+        amountOfSteps,
+        step,
+    };
+};

package/nrfutil/sandboxTypes.ts

@@ -44,9 +44,22 @@ export type TaskEnd<T = void> = {
     data?: T;
 };
 
+export type NrfutilProgress = {
+    progressPercentage: number;
+    message?: string;
+    description?: string;
+    amountOfSteps?: number;
+    duration?: number;
+    name?: string;
+    operation?: string;
+    result?: string;
+    state?: string;
+    step?: number;
+};
+
 export type TaskProgress = {
     task: Task;
-    progress: Progress;
+    progress: NrfutilProgress;
 };
 
 type NrfutilJsonProgress = {
@@ -96,16 +109,17 @@ export type NrfutilJson<T = unknown> =
     | NrfutilJsonBatchUpdate<T>;
 
 export type Progress = {
-    progressPercentage: number;
+    totalProgressPercentage: number;
+    stepProgressPercentage: number;
     message?: string;
     description?: string;
-    amountOfSteps?: number;
+    amountOfSteps: number;
     duration?: number;
     name?: string;
     operation?: string;
     result?: string;
     state?: string;
-    step?: number;
+    step: number;
 };
 
 export type LogMessage = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "92.0.0",
+    "version": "94.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",
@@ -40,17 +40,15 @@
         "@swc/core": "1.3.56",
         "@swc/jest": "0.2.24",
         "@testing-library/jest-dom": "5.16.5",
-        "@testing-library/react": "10.4.9",
+        "@testing-library/react": "^14.0.0",
         "@types/adm-zip": "^0.5.0",
         "@types/date-fns": "^2.6.0",
-        "@types/enzyme": "3.10.12",
-        "@types/enzyme-adapter-react-16": "1.0.6",
         "@types/ftp": "0.3.33",
         "@types/klaw": "3.0.3",
         "@types/lodash.range": "3.2.7",
         "@types/mousetrap": "1.6.11",
         "@types/react": "17.0.55",
-        "@types/react-dom": "17.0.19",
+        "@types/react-dom": "18.2.6",
         "@types/react-redux": "7.1.25",
         "@types/semver": "7.3.13",
         "@types/shasum": "1.0.0",
@@ -65,11 +63,8 @@
         "date-fns": "2.29.3",
         "electron": "22.3.5",
         "electron-store": "8.1.0",
-        "enzyme": "3.11.0",
-        "enzyme-adapter-react-16": "1.15.7",
-        "enzyme-to-json": "3.6.2",
-        "esbuild": "0.17.18",
-        "esbuild-sass-plugin": "2.9.0",
+        "esbuild": "0.19.2",
+        "esbuild-sass-plugin": "2.13.0",
         "esbuild-style-plugin": "1.6.2",
         "eslint": "8.37.0",
         "eslint-config-airbnb": "19.0.4",
@@ -101,14 +96,14 @@
         "prettier-plugin-tailwindcss": "^0.3.0",
         "prettysize": "2.0.0",
         "protobufjs": "^7.0.0",
-        "react": "16.14.0",
+        "react": "18.2.0",
         "react-bootstrap": "1.6.6",
-        "react-dom": "16.14.0",
+        "react-dom": "18.2.0",
         "react-flip-toolkit": "7.0.17",
-        "react-markdown": "4.3.1",
+        "react-markdown": "8.0.7",
         "react-redux": "7.2.9",
-        "react-resize-detector": "6.7.8",
-        "react-test-renderer": "16.14.0",
+        "react-resize-detector": "9.1.0",
+        "react-test-renderer": "18.2.0",
         "redux": "4.2.1",
         "redux-devtools-extension": "2.13.9",
         "redux-thunk": "2.4.2",