Update shared to v89

Author: Jonas Fritzke Emdal

jest.config.js

@@ -4,4 +4,5 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-module.exports = require('pc-nrfconnect-shared/config/jest.config')();
+module.exports =
+    require('@nordicsemiconductor/pc-nrfconnect-shared/config/jest.config')();

package-lock.json

@@ -38,11 +38,11 @@
         "prepare": "husky install"
     },
     "devDependencies": {
-        "nrf-intel-hex": "^1.2.0",
-        "pc-nrfconnect-shared": "github:NordicSemiconductor/pc-nrfconnect-shared#v77"
+        "@nordicsemiconductor/pc-nrfconnect-shared": "^89.0.0",
+        "nrf-intel-hex": "^1.2.0"
     },
     "eslintConfig": {
-        "extends": "./node_modules/pc-nrfconnect-shared/config/eslintrc"
+        "extends": "./node_modules/@nordicsemiconductor/pc-nrfconnect-shared/config/eslintrc"
     },
-    "prettier": "./node_modules/pc-nrfconnect-shared/config/prettier.config.js"
+    "prettier": "@nordicsemiconductor/pc-nrfconnect-shared/config/prettier.config.js"
 }

package.json

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-@import '~pc-nrfconnect-shared/styles';
+@import '@nordicsemiconductor/pc-nrfconnect-shared/styles';
 $labelHeight: 12px;
 
 .control-panel {

resources/css/controlPanel.scss

@@ -5,15 +5,15 @@
  */
 
 import { dialog, getCurrentWindow } from '@electron/remote';
-import { readFile, stat, Stats, statSync } from 'fs';
-import MemoryMap, { MemoryMapTuple, Overlap } from 'nrf-intel-hex';
-import { basename } from 'path';
 import {
     AppThunk,
     describeError,
     ErrorDialogActions,
     logger,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
+import { readFile, stat, Stats, statSync } from 'fs';
+import MemoryMap, { MemoryMapTuple, Overlap } from 'nrf-intel-hex';
+import { basename } from 'path';
 
 import {
     fileParse,

src/actions/fileActions.ts

@@ -9,16 +9,16 @@ import nrfdl, {
     Device,
     FirmwareReadResult,
 } from '@nordicsemiconductor/nrf-device-lib-js';
-import fs from 'fs';
-import MemoryMap, { MemoryMaps } from 'nrf-intel-hex';
 import {
     AppThunk,
     describeError,
     getDeviceLibContext,
     logger,
     selectedDevice,
     usageData,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
+import fs from 'fs';
+import MemoryMap, { MemoryMaps } from 'nrf-intel-hex';
 
 import { getAutoReset } from '../reducers/settingsReducer';
 import {

src/actions/jlinkTargetActions.ts

@@ -13,7 +13,7 @@ import {
     logger,
     selectedDevice,
     usageData,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { loadingEnd, targetWritableKnown } from '../reducers/targetReducer';
 import { RootState } from '../reducers/types';

src/actions/mcubootTargetActions.ts

@@ -10,7 +10,7 @@ import {
     getDeviceLibContext,
     logger,
     usageData,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 export const performUpdate = (
     device: Device,

src/actions/modemTargetActions.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-import { AppThunk, logger } from 'pc-nrfconnect-shared';
+import { AppThunk, logger } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import {
     fileRegionNamesKnown,

src/actions/regionsActions.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-import { AppThunk } from 'pc-nrfconnect-shared';
+import { AppThunk } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import {
     settingsLoad,

src/actions/settingsActions.ts

@@ -10,7 +10,7 @@ import {
     logger,
     selectedDevice,
     usageData,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { setShowMcuBootProgrammingDialog } from '../reducers/mcubootReducer';
 import { setShowModemProgrammingDialog } from '../reducers/modemReducer';

src/actions/targetActions.ts

@@ -12,8 +12,6 @@ import {
     Progress,
     readFwInfo,
 } from '@nordicsemiconductor/nrf-device-lib-js';
-import Crypto from 'crypto';
-import MemoryMap from 'nrf-intel-hex';
 import {
     AppThunk,
     defaultInitPacket,
@@ -29,7 +27,9 @@ import {
     setWaitForDevice,
     switchToBootloaderMode,
     usageData,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
+import Crypto from 'crypto';
+import MemoryMap from 'nrf-intel-hex';
 
 import { FileState } from '../reducers/fileReducer';
 import {

src/actions/usbsdfuTargetActions.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-import { AppThunk, logger } from 'pc-nrfconnect-shared';
+import { AppThunk, logger } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { RootState } from '../reducers/types';
 import {

src/actions/userInputActions.ts

@@ -6,7 +6,10 @@
 
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { Alert, selectedDevice } from 'pc-nrfconnect-shared';
+import {
+    Alert,
+    selectedDevice,
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { getLoaded, getZipFilePath } from '../reducers/fileReducer';
 import { getForceMcuBoot } from '../reducers/settingsReducer';

src/components/AppMainView.tsx

@@ -18,7 +18,7 @@ import {
     SidePanel,
     Toggle,
     truncateMiddle,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import * as fileActions from '../actions/fileActions';
 import * as jlinkTargetActions from '../actions/jlinkTargetActions';

src/components/ControlPanel.tsx

@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { selectedDevice } from 'pc-nrfconnect-shared';
+import { selectedDevice } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { getDeviceInfo, getIsMemLoaded } from '../reducers/targetReducer';
 

src/components/DeviceInfoView.tsx

@@ -11,7 +11,7 @@ import {
     DeviceSelector,
     logger,
     usageData,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { openDevice } from '../actions/targetActions';
 import EventAction from '../actions/usageDataActions';

src/components/DeviceSelector.tsx

@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { DocumentationSection } from 'pc-nrfconnect-shared';
+import { DocumentationSection } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 const DocumentationSections = [
     <DocumentationSection

src/components/DocumentationSections.tsx

@@ -26,7 +26,7 @@ import {
     Slider,
     Toggle,
     useStopwatch,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { canWrite, performUpdate } from '../actions/mcubootTargetActions';
 import { getMcubootFilePath, getZipFilePath } from '../reducers/fileReducer';

src/components/McuUpdateDialogView.tsx

@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { selectedDevice } from 'pc-nrfconnect-shared';
+import { selectedDevice } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { getZipFilePath } from '../reducers/fileReducer';
 import { getForceMcuBoot } from '../reducers/settingsReducer';

src/components/MemoryView.tsx

@@ -16,7 +16,7 @@ import {
     logger,
     selectedDevice,
     useStopwatch,
-} from 'pc-nrfconnect-shared';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { performUpdate } from '../actions/modemTargetActions';
 import { getZipFilePath } from '../reducers/fileReducer';

src/components/ModemUpdateDialogView.tsx

@@ -9,7 +9,7 @@ import Button from 'react-bootstrap/Button';
 import Overlay from 'react-bootstrap/Overlay';
 import Popover from 'react-bootstrap/Popover';
 import { useDispatch } from 'react-redux';
-import { colors } from 'pc-nrfconnect-shared';
+import { colors } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import * as fileActions from '../actions/fileActions';
 import { CoreDefinition } from '../util/devices';

src/components/RegionView.tsx

@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { Alert } from 'pc-nrfconnect-shared';
+import { Alert } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { getFileWarnings } from '../reducers/warningReducer';
 

src/components/WarningView.tsx

@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { App } from 'pc-nrfconnect-shared';
+import { App } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import AppMainView from './components/AppMainView';
 import ControlPanel from './components/ControlPanel';

src/index.tsx

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-import { NrfConnectState } from 'pc-nrfconnect-shared';
+import { NrfConnectState } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import rootReducer from './index';
 

src/reducers/types.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-import { getPersistentStore } from 'pc-nrfconnect-shared';
+import { getPersistentStore } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 interface StoreSchema {
     settings: Settings;

src/store.ts

@@ -6,8 +6,8 @@
 
 import { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
+import { AppThunk, logger } from '@nordicsemiconductor/pc-nrfconnect-shared';
 import * as fs from 'fs';
-import { AppThunk, logger } from 'pc-nrfconnect-shared';
 
 import * as fileActions from './actions/fileActions';
 

src/useOpenFileFromArgs.ts

@@ -7,8 +7,8 @@
 /* eslint-disable no-bitwise */
 
 import { FWInfo } from '@nordicsemiconductor/nrf-device-lib-js';
+import { logger } from '@nordicsemiconductor/pc-nrfconnect-shared';
 import MemoryMap, { MemoryMaps, Overlaps } from 'nrf-intel-hex';
-import { logger } from 'pc-nrfconnect-shared';
 
 import { CoreDefinition, coreFriendlyName, DeviceDefinition } from './devices';
 import { hexpad2 } from './hexpad';

src/util/regions.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-const baseConfig = require('pc-nrfconnect-shared/config/tailwind.config.js');
+const baseConfig = require('@nordicsemiconductor/pc-nrfconnect-shared/config/tailwind.config.js');
 
 module.exports = {
     ...baseConfig,

tailwind.config.js

@@ -1,5 +1,5 @@
 {
-    "extends": "./node_modules/pc-nrfconnect-shared/config/tsconfig.json",
+    "extends": "@nordicsemiconductor/pc-nrfconnect-shared/config/tsconfig.json",
     "compilerOptions": {
         "typeRoots": ["./types", "./node_modules/@types"]
     }