@nordicsemiconductor/pc-nrfconnect-shared 76.0.0 → 78.0.0

package/Changelog.md

@@ -7,6 +7,45 @@ This project does _not_ adhere to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
 every new version is a new major version.
 
+## 78 - 2023-08-02
+
+### Changed
+
+-   New name for the shared package, it is now under the `@nordicsemiconductor`
+    namespace on npm. The idea is that apps will now install shared from npm,
+    and use the new name `@nordicsemiconductor/pc-nrfconnect-shared` when
+    importing components from shared
+
+## 77 - 2023-08-01
+
+### Added
+
+-   Functions to invoke functionality in the main process via IPC:
+
+    -   `apps.getDownloadableApps()`
+    -   `apps.installDownloadableApp(app, version?)`
+    -   `openWindow.openApp(app, openAppOptions?)` (This was previously exported
+        as `openAppWindow``)
+    -   `openWindow.openLauncher()`
+    -   `preventSleep.start()`
+    -   `preventSleep.end(id)`
+
+### Removed
+
+-   Export of the serialport IPC channel names.
+
+### Changed
+
+-   On the build server the generated types are removed before regenerating
+    them, so we make sure that we do not have stale declaration files for source
+    files we already removed.
+
+### Steps to upgrade when using this package
+
+-   Replace all code that still uses `ipcRenderer` with invocations of the
+    appropriate functions.
+-   Replace invocations of `openAppWindow` with `openWindow.openApp`.
+
 ## 76 - 2023-07-28
 
 ### Changed

package/config/tailwind.config.js

@@ -12,7 +12,7 @@ module.exports = {
     prefix: 'tw-',
     content: [
         './src/**/*.{html,jsx,tsx}',
-        './node_modules/pc-nrfconnect-shared/src/**/*.tsx',
+        './node_modules/@nordicsemiconductor/pc-nrfconnect-shared/src/**/*.tsx',
     ],
     theme: {
         colors,

package/main/index.ts

@@ -4,29 +4,27 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-export const SERIALPORT_CHANNEL = {
-    OPEN: 'serialport:open',
-    CLOSE: 'serialport:close',
-    WRITE: 'serialport:write',
-    UPDATE: 'serialport:update',
-    SET: 'serialport:set',
+import { forRenderer as forRendererAppDetails } from '../ipc/appDetails';
+import { forRenderer as forRendererApps } from '../ipc/apps';
+import { forRenderer as forRendererOpenWindow } from '../ipc/openWindow';
+import { forRenderer as forRendererPreventSleep } from '../ipc/preventSleep';
+import {
+    forRenderer as forRendererSerialPort,
+    inRenderer as inRendererSerialPort,
+} from '../ipc/serialPort';
 
-    ON_CLOSED: 'serialport:on-close',
-    ON_DATA: 'serialport:on-data',
-    ON_UPDATE: 'serialport:on-update',
-    ON_SET: 'serialport:on-set',
-    ON_CHANGED: 'serialport:on-changed',
-    ON_WRITE: 'serialport:on-write',
+export { registerLauncherWindowFromMain } from '../ipc/infrastructure/mainToRenderer';
 
-    IS_OPEN: 'serialport:is-open',
-    GET_OPTIONS: 'serialport:get-options',
+export const appDetails = { forRenderer: forRendererAppDetails };
+export const apps = { forRenderer: forRendererApps };
+export const openWindow = { forRenderer: forRendererOpenWindow };
+export const preventSleep = { forRenderer: forRendererPreventSleep };
+export const serialPort = {
+    inRenderer: inRendererSerialPort,
+    forRenderer: forRendererSerialPort,
 };
 
-export type OverwriteOptions = {
-    overwrite?: boolean;
-    settingsLocked?: boolean;
-};
+export * from '../ipc/MetaFiles';
 
-export type OpenAppOptions = {
-    device?: { serialNumber: string; serialPortPath?: string };
-};
+export { type OverwriteOptions } from '../ipc/serialPort';
+export { type OpenAppOptions } from '../ipc/openWindow';

package/mocks/electronMock.ts

@@ -10,6 +10,8 @@ export const match = jest.fn();
 export const app = jest.fn();
 export const dialog = jest.fn();
 export const ipcRenderer = {
+    on: jest.fn(),
     once: jest.fn(),
+    invoke: jest.fn().mockResolvedValue(undefined),
     send: jest.fn(),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "76.0.0",
+    "version": "78.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",
@@ -37,6 +37,7 @@
         "check:lint": "eslint --color .",
         "check:types": "tsc --noEmit",
         "check:license": "ts-node scripts/nrfconnect-license.ts check",
+        "clean-generate-types": "rimraf ./typings/generated",
         "generate-types": "tsc --emitDeclarationOnly --declaration --declarationMap --outDir ./typings/generated --rootDir .",
         "prepare": "ts-node scripts/installHusky.ts",
         "release-shared": "ts-node scripts/release-shared.ts",

package/scripts/check-app-properties.ts

@@ -10,7 +10,7 @@ import { execSync } from 'child_process';
 import { existsSync, readdirSync, readFileSync } from 'fs';
 import property from 'lodash/property';
 
-import { PackageJson } from '../src/utils/AppTypes';
+import { PackageJson } from '../ipc/MetaFiles';
 
 const format = (strings: string[]) =>
     strings.map(string => `\`${string}\``).join(', ');

package/scripts/esbuild-renderer.js

@@ -22,7 +22,9 @@ const projectSpecificTailwindConfigPath = path.join(
 const tailwindConfig = () =>
     fs.existsSync(projectSpecificTailwindConfigPath)
         ? projectSpecificTailwindConfigPath
-        : require.resolve('pc-nrfconnect-shared/config/tailwind.config.js');
+        : require.resolve(
+              '@nordicsemiconductor/pc-nrfconnect-shared/config/tailwind.config.js'
+          );
 
 function options(additionalOptions) {
     const { dependencies } = JSON.parse(

package/scripts/esbuild.js

@@ -26,7 +26,7 @@ if (!fs.existsSync(distFolder)) {
 fs.copyFileSync(
     join(
         process.cwd(),
-        './node_modules/pc-nrfconnect-shared/scripts/nordic-publish.js'
+        './node_modules/@nordicsemiconductor/pc-nrfconnect-shared/scripts/nordic-publish.js'
     ),
     join(distFolder, 'nordic-publish.js')
 );
@@ -34,7 +34,7 @@ fs.copyFileSync(
 fs.copyFileSync(
     join(
         process.cwd(),
-        './node_modules/pc-nrfconnect-shared/dist/bootstrap.css'
+        './node_modules/@nordicsemiconductor/pc-nrfconnect-shared/dist/bootstrap.css'
     ),
     join(distFolder, 'bootstrap.css')
 );
@@ -47,7 +47,7 @@ if (process.argv.includes('--include-bootloader')) {
     fs.copyFileSync(
         join(
             process.cwd(),
-            './node_modules/pc-nrfconnect-shared/fw/bootloader/graviton_bootloader_v1.0.1-[nRF5_SDK_15.0.1-1.alpha_f76d012].zip'
+            './node_modules/@nordicsemiconductor/pc-nrfconnect-shared/fw/bootloader/graviton_bootloader_v1.0.1-[nRF5_SDK_15.0.1-1.alpha_f76d012].zip'
         ),
         join(
             process.cwd(),

package/scripts/nordic-publish.ts

@@ -13,7 +13,7 @@ import FtpClient from 'ftp';
 import semver from 'semver';
 import calculateShasum from 'shasum';
 
-import { AppInfo, PackageJson, SourceJson } from '../src/utils/AppTypes';
+import { AppInfo, PackageJson, SourceJson } from '../ipc/MetaFiles';
 import checkAppProperties from './check-app-properties';
 
 interface LegacyAppInfo {

package/scripts/release-shared.ts

@@ -25,7 +25,7 @@
 */
 import { execSync, spawnSync } from 'node:child_process';
 
-import { PackageJson } from '../src/utils/AppTypes';
+import { PackageJson } from '../ipc/MetaFiles';
 
 const logError = (message: string) => {
     console.error(message);

package/src/About/ApplicationCard.tsx

@@ -5,51 +5,22 @@
  */
 
 import React, { useEffect, useState } from 'react';
-import { ipcRenderer } from 'electron';
 
+import {
+    AppDetailsFromLauncher,
+    inMain as appDetails,
+} from '../../ipc/appDetails';
 import Card from '../Card/Card';
 import FactoryResetButton from '../FactoryReset/FactoryResetButton';
 import AboutButton from './AboutButton';
 import Section from './Section';
 import ShortcutButton from './ShortcutButton';
 
-interface AppDetails {
-    coreVersion: string;
-    corePath: string;
-    homeDir: string;
-    tmpDir: string;
-}
-
-interface LauncerApp {
-    name?: string;
-    displayName?: string;
-    description?: string;
-    homepage?: string;
-    currentVersion?: string;
-    latestVersion?: string;
-    engineVersion?: string;
-    path?: string;
-    iconPath?: string;
-    shortcutIconPath?: string;
-    isOfficial?: string;
-    sharedVersion?: string;
-    source?: string;
-    url?: string;
-    releaseNote?: string;
-    upgradeAvailable?: string;
-    repositoryUrl?: string;
-}
-
-type DetailsFromLauncher = AppDetails & LauncerApp;
-
 export default () => {
-    const [appInfo, setAppInfo] = useState<DetailsFromLauncher>();
+    const [appInfo, setAppInfo] = useState<AppDetailsFromLauncher>();
 
     useEffect(() => {
-        ipcRenderer.once('app-details', (_, details: DetailsFromLauncher) => {
-            setAppInfo(details);
-        });
-        ipcRenderer.send('get-app-details');
+        appDetails.getAppDetails().then(setAppInfo);
     }, [setAppInfo]);
 
     if (appInfo == null) return null;

package/src/App/App.tsx

@@ -9,9 +9,9 @@ import 'focus-visible';
 import React, { FC, ReactNode, useEffect, useMemo } from 'react';
 import Carousel from 'react-bootstrap/Carousel';
 import { useDispatch, useSelector } from 'react-redux';
-import { ipcRenderer } from 'electron';
 import { Reducer } from 'redux';
 
+import { inMain as openWindow } from '../../ipc/openWindow';
 import About from '../About/About';
 import BrokenDeviceDialog from '../Device/BrokenDeviceDialog/BrokenDeviceDialog';
 import { setAutoReselect } from '../Device/deviceAutoSelectSlice';
@@ -102,7 +102,7 @@ const ConnectedApp: FC<ConnectedAppProps> = ({
         hotKey: 'alt+l',
         title: 'Open launcher',
         isGlobal: true,
-        action: () => ipcRenderer.send('open-app-launcher'),
+        action: openWindow.openLauncher,
     });
 
     useEffect(() => {

package/src/SerialPort/SerialPort.test.ts

@@ -6,20 +6,16 @@
 
 import { ipcRenderer } from 'electron';
 
-import { OverwriteOptions, SERIALPORT_CHANNEL } from '../../main';
+import { OverwriteOptions } from '../../ipc/serialPort';
 import { createSerialPort } from './SerialPort';
 
-jest.mock('electron', () => ({
-    ipcRenderer: { invoke: jest.fn(), on: jest.fn(), send: jest.fn() },
-}));
-
 const defaultOptions = { path: '/dev/ROBOT', baudRate: 115200 };
 
 test('SerialPort is initialized with the correct setup', async () => {
     const port = await createSerialPort(defaultOptions);
 
     expect(ipcRenderer.invoke).toHaveBeenCalledWith(
-        SERIALPORT_CHANNEL.OPEN,
+        'serialport:open',
         defaultOptions,
         { overwrite: false, settingsLocked: false }
     );
@@ -31,7 +27,7 @@ test('SerialPort may be initialized with overwrite and settingsLocked', async ()
     let overwriteOptions: OverwriteOptions = { overwrite: true };
     await createSerialPort(defaultOptions, overwriteOptions);
     expect(ipcRenderer.invoke).toHaveBeenCalledWith(
-        SERIALPORT_CHANNEL.OPEN,
+        'serialport:open',
         defaultOptions,
         overwriteOptions
     );
@@ -39,7 +35,7 @@ test('SerialPort may be initialized with overwrite and settingsLocked', async ()
     overwriteOptions = { settingsLocked: true };
     await createSerialPort(defaultOptions, overwriteOptions);
     expect(ipcRenderer.invoke).toHaveBeenCalledWith(
-        SERIALPORT_CHANNEL.OPEN,
+        'serialport:open',
         defaultOptions,
         overwriteOptions
     );
@@ -47,7 +43,7 @@ test('SerialPort may be initialized with overwrite and settingsLocked', async ()
     overwriteOptions = { settingsLocked: true, overwrite: true };
     await createSerialPort(defaultOptions, overwriteOptions);
     expect(ipcRenderer.invoke).toHaveBeenCalledWith(
-        SERIALPORT_CHANNEL.OPEN,
+        'serialport:open',
         defaultOptions,
         overwriteOptions
     );

package/src/SerialPort/SerialPort.ts

@@ -9,11 +9,10 @@ import type {
     SetOptions,
     UpdateOptions,
 } from '@serialport/bindings-cpp';
-import { ipcRenderer } from 'electron';
 import EventEmitter from 'events';
 import type { SerialPortOpenOptions } from 'serialport';
 
-import { OverwriteOptions, SERIALPORT_CHANNEL } from '../../main';
+import { forMain, inMain, OverwriteOptions } from '../../ipc/serialPort';
 import logger from '../logging';
 
 export type SerialPort = Awaited<ReturnType<typeof createSerialPort>>;
@@ -29,77 +28,30 @@ export const createSerialPort = async (
     const eventEmitter = new EventEmitter();
     let closed = false;
 
-    ipcRenderer.on(`${SERIALPORT_CHANNEL.ON_DATA}_${path}`, (_event, data) =>
+    forMain.registerOnDataReceived(path)(data =>
         eventEmitter.emit('onData', data)
     );
-    ipcRenderer.on(`${SERIALPORT_CHANNEL.ON_CLOSED}_${path}`, () => {
+    forMain.registerOnDataWritten(path)(data =>
+        eventEmitter.emit('onDataWritten', data)
+    );
+
+    forMain.registerOnClosed(path)(() => {
         eventEmitter.emit('onClosed');
         closed = true;
     });
-    ipcRenderer.on(
-        `${SERIALPORT_CHANNEL.ON_UPDATE}_${path}`,
-        (_event, newOptions) => eventEmitter.emit('onUpdate', newOptions)
+    forMain.registerOnUpdated(path)(newOptions =>
+        eventEmitter.emit('onUpdate', newOptions)
     );
-    ipcRenderer.on(
-        `${SERIALPORT_CHANNEL.ON_SET}_${path}`,
-        (_event, newOptions) => eventEmitter.emit('onSet', newOptions)
+    forMain.registerOnSet(path)(newOptions =>
+        eventEmitter.emit('onSet', newOptions)
     );
-    ipcRenderer.on(
-        `${SERIALPORT_CHANNEL.ON_CHANGED}_${path}`,
-        (_event, newOptions) => eventEmitter.emit('onChange', newOptions)
-    );
-
-    // The origin of this event is emitted when a renderer writes to the port.
-    ipcRenderer.on(`${SERIALPORT_CHANNEL.ON_WRITE}_${path}`, (_event, data) =>
-        eventEmitter.emit('onDataWritten', data)
+    forMain.registerOnChanged(path)(newOptions =>
+        eventEmitter.emit('onChange', newOptions)
     );
 
-    const write = (data: string | number[] | Buffer): void => {
-        ipcRenderer.invoke(SERIALPORT_CHANNEL.WRITE, path, data);
-    };
-
-    const isOpen = (): Promise<boolean> =>
-        ipcRenderer.invoke(SERIALPORT_CHANNEL.IS_OPEN, path);
-
-    const close = async () => {
-        if (closed) return;
-        const error = await ipcRenderer.invoke(SERIALPORT_CHANNEL.CLOSE, path);
-        if (error) {
-            // IPC only carries the error message, that's why we throw new Error.
-            throw new Error(error);
-        }
-
-        try {
-            if (await isOpen()) {
-                logger.info(
-                    `Port ${options.path} still in use by other window(s)`
-                );
-            }
-        } catch {
-            logger.info(`Closed port: ${options.path}`);
-        }
-    };
-
-    // Only supports baudRate, same as serialport.io
-    const update = (newOptions: UpdateOptions) => {
-        ipcRenderer.invoke(SERIALPORT_CHANNEL.UPDATE, path, newOptions);
-    };
-
-    const set = (newOptions: SetOptions) => {
-        ipcRenderer.invoke(SERIALPORT_CHANNEL.SET, path, newOptions);
-    };
-
-    const getOptions = ():
-        | Promise<SerialPortOpenOptions<AutoDetectTypes>>
-        | undefined => ipcRenderer.invoke(SERIALPORT_CHANNEL.GET_OPTIONS, path);
-
     const openWithRetries = async (retryCount: number) => {
         try {
-            return (await ipcRenderer.invoke(
-                SERIALPORT_CHANNEL.OPEN,
-                options,
-                overwriteOptions
-            )) as string;
+            return await inMain.open(options, overwriteOptions);
         } catch (error) {
             if (
                 (error as Error).message.includes(
@@ -107,18 +59,37 @@ export const createSerialPort = async (
                 ) &&
                 retryCount > 0
             ) {
-                return new Promise<string>(resolve => {
+                return new Promise<void | string>(resolve => {
                     setTimeout(async () => {
-                        resolve(
-                            (await openWithRetries(retryCount - 1)) as string
-                        );
+                        resolve(await openWithRetries(retryCount - 1));
                     }, 50 + Math.random() * 100);
                 });
             }
-            return Promise.resolve<string>((error as Error).message);
+            return (error as Error).message;
+        }
+    };
+
+    const close = async () => {
+        if (closed) return;
+        await inMain.close(path);
+
+        try {
+            if (await inMain.isOpen(path)) {
+                logger.info(
+                    `Port ${options.path} still in use by other window(s)`
+                );
+            }
+        } catch {
+            logger.info(`Closed port: ${options.path}`);
         }
     };
 
+    const write = (data: string | number[] | Buffer) =>
+        inMain.write(path, data);
+    const update = (newOptions: UpdateOptions) =>
+        inMain.update(path, newOptions); // Only supports baudRate, same as serialport.io
+    const set = (newOptions: SetOptions) => inMain.set(path, newOptions);
+
     const error = await openWithRetries(3);
 
     if (error) {
@@ -138,12 +109,15 @@ export const createSerialPort = async (
 
     return {
         path,
-        write,
+
         close,
-        isOpen,
+        write,
         update,
         set,
-        getOptions,
+
+        isOpen: () => inMain.isOpen(path),
+        getOptions: () => inMain.getOptions(path),
+
         onData: (handler: (data: Uint8Array) => void) => {
             eventEmitter.on('onData', handler);
             return () => {
@@ -187,15 +161,11 @@ export const createSerialPort = async (
     };
 };
 
-export const getSerialPortOptions = async (
-    path: string
-): Promise<SerialPortOpenOptions<AutoDetectTypes> | undefined> => {
+export const getSerialPortOptions = async (path: string) => {
     try {
         console.log('will fetch options from path=', path);
-        return (await ipcRenderer.invoke(
-            SERIALPORT_CHANNEL.GET_OPTIONS,
-            path
-        )) as SerialPortOpenOptions<AutoDetectTypes> | undefined;
+
+        return await inMain.getOptions(path);
     } catch (error) {
         logger.error(`Failed to get options for port: ${path}`);
     }

package/src/index.ts

@@ -5,9 +5,7 @@
  */
 import { hideDialog, showDialog } from './ErrorDialog/errorDialogSlice';
 
-const ErrorDialogActions = { hideDialog, showDialog };
-
-export { ErrorDialogActions };
+export const ErrorDialogActions = { hideDialog, showDialog };
 
 export { default as App, type PaneProps } from './App/App';
 export { default as Logo } from './Logo/Logo';
@@ -130,8 +128,6 @@ export {
 } from './SerialPort/SerialPort';
 export { default as ConflictingSettingsDialog } from './SerialPort/ConflictingSettingsDialog';
 
-export { openAppWindow } from './OpenApp/openApp';
-
 export type { AppDispatch, AppThunk, NrfConnectState } from './store';
 
 export {
@@ -140,13 +136,6 @@ export {
     prepareDevice,
 } from './Device/deviceSetup';
 
-export type {
-    AppInfo,
-    AppVersions,
-    PackageJson,
-    SourceJson,
-} from './utils/AppTypes';
-
 export {
     addNewMessage,
     newCopiedFlashMessage,
@@ -155,3 +144,7 @@ export {
     newErrorFlashMessage,
     newSuccessFlashMessage,
 } from './FlashMessage/FlashMessageSlice';
+
+export { inMain as apps } from '../ipc/apps';
+export { inMain as openWindow } from '../ipc/openWindow';
+export { inMain as preventSleep } from '../ipc/preventSleep';

package/src/logging/sendInitialLogMessages.ts

@@ -5,8 +5,8 @@
  */
 
 import { getModuleVersions } from '@nordicsemiconductor/nrf-device-lib-js';
-import { ipcRenderer } from 'electron';
 
+import { inMain as appDetails } from '../../ipc/appDetails';
 import {
     getDeviceLibContext,
     getModuleVersion,
@@ -17,48 +17,45 @@ import logLibVersions from '../utils/logLibVersions';
 import logger from '.';
 
 let initialMessagesSent = false;
-export default () => {
+export default async () => {
     if (initialMessagesSent) return;
     initialMessagesSent = true;
 
     logLibVersions();
     logger.debug(`Application data folder: ${getAppDataDir()}`);
 
-    ipcRenderer.once('app-details', async (_event, details) => {
-        const {
-            name,
-            currentVersion,
-            engineVersion,
-            coreVersion,
-            corePath,
-            isOfficial,
-            installed,
-            homeDir,
-            tmpDir,
-            bundledJlink,
-        } = details;
-
-        const official = isOfficial ? 'official' : 'local';
-
-        logger.debug(`App ${name} v${currentVersion} ${official}`);
-        logger.debug(`App path: ${installed.path}`);
-        logger.debug(
-            `nRFConnect ${coreVersion}, required by the app is (${engineVersion})`
-        );
-        logger.debug(`nRFConnect path: ${corePath}`);
-        logger.debug(`HomeDir: ${homeDir}`);
-        logger.debug(`TmpDir: ${tmpDir}`);
-
-        if (bundledJlink) {
-            const versions = await getModuleVersions(getDeviceLibContext());
-            const jlinkVersion = getModuleVersion('JlinkARM', versions);
-
-            if (!describeVersion(jlinkVersion).includes(bundledJlink)) {
-                logger.info(
-                    `Installed JLink version does not match the provided version (${bundledJlink})`
-                );
-            }
+    const details = await appDetails.getAppDetails();
+
+    const {
+        name,
+        currentVersion,
+        engineVersion,
+        coreVersion,
+        corePath,
+        installed,
+        homeDir,
+        tmpDir,
+        bundledJlink,
+        source,
+    } = details;
+
+    logger.debug(`App ${name} v${currentVersion} (${source})`);
+    logger.debug(`App path: ${installed.path}`);
+    logger.debug(
+        `nRFConnect ${coreVersion}, required by the app is (${engineVersion})`
+    );
+    logger.debug(`nRFConnect path: ${corePath}`);
+    logger.debug(`HomeDir: ${homeDir}`);
+    logger.debug(`TmpDir: ${tmpDir}`);
+
+    if (bundledJlink) {
+        const versions = await getModuleVersions(getDeviceLibContext());
+        const jlinkVersion = getModuleVersion('JlinkARM', versions);
+
+        if (!describeVersion(jlinkVersion).includes(bundledJlink)) {
+            logger.info(
+                `Installed JLink version does not match the provided version (${bundledJlink})`
+            );
         }
-    });
-    ipcRenderer.send('get-app-details');
+    }
 };

package/src/utils/packageJson.ts

@@ -33,7 +33,7 @@ import { readFileSync } from 'fs';
 // @ts-ignore This will be available when the app uses it.
 // eslint-disable-next-line import/no-unresolved
 import packageJsons from '../../../../package.json';
-import type { PackageJson } from './AppTypes';
+import type { PackageJson } from '../../ipc/MetaFiles';
 
 let packageJson: PackageJson = packageJsons;
 

package/src/utils/usageData.ts

@@ -7,8 +7,8 @@
 import { ApplicationInsights } from '@microsoft/applicationinsights-web';
 import type Systeminformation from 'systeminformation';
 
+import type { PackageJson } from '../../ipc/MetaFiles';
 import logger from '../logging';
-import type { PackageJson } from './AppTypes';
 import { isDevelopment } from './environment';
 import {
     deleteIsSendingUsageData,