Chore: Move Logger from lib to utils package

.eslintignore

@@ -493,7 +493,6 @@ packages/lib/InMemoryCache.js
 packages/lib/JoplinDatabase.js
 packages/lib/JoplinError.js
 packages/lib/JoplinServerApi.js
-packages/lib/Logger.js
 packages/lib/ObjectUtils.js
 packages/lib/PoorManIntervals.js
 packages/lib/RotatingLogs.test.js

.gitignore

@@ -478,7 +478,6 @@ packages/lib/InMemoryCache.js
 packages/lib/JoplinDatabase.js
 packages/lib/JoplinError.js
 packages/lib/JoplinServerApi.js
-packages/lib/Logger.js
 packages/lib/ObjectUtils.js
 packages/lib/PoorManIntervals.js
 packages/lib/RotatingLogs.test.js

packages/app-cli/app/ResourceServer.js

@@ -1,4 +1,4 @@
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const { findAvailablePort } = require('@joplin/lib/net-utils');
 
 const http = require('http');

packages/app-cli/app/app-gui.js

@@ -1,4 +1,4 @@
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const Folder = require('@joplin/lib/models/Folder').default;
 const BaseItem = require('@joplin/lib/models/BaseItem').default;
 const Tag = require('@joplin/lib/models/Tag').default;

packages/app-cli/app/cli-integration-tests.js

@@ -3,7 +3,7 @@
 /* eslint-disable no-console */
 
 const fs = require('fs-extra');
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const { dirname } = require('@joplin/lib/path-utils');
 const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js');
 const JoplinDatabase = require('@joplin/lib/JoplinDatabase').default;

packages/app-cli/app/cli-utils.js

@@ -2,7 +2,7 @@ const yargParser = require('yargs-parser');
 const { _ } = require('@joplin/lib/locale');
 const time = require('@joplin/lib/time').default;
 const stringPadding = require('string-padding');
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 
 const cliUtils = {};
 

packages/app-cli/app/command-server.js

@@ -1,7 +1,7 @@
 const BaseCommand = require('./base-command').default;
 const { _ } = require('@joplin/lib/locale');
 const Setting = require('@joplin/lib/models/Setting').default;
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const shim = require('@joplin/lib/shim').default;
 
 class Command extends BaseCommand {

packages/app-cli/app/fuzzing.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const time = require('@joplin/lib/time').default;
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const Resource = require('@joplin/lib/models/Resource').default;
 const { dirname } = require('@joplin/lib/path-utils');
 const FsDriverNode = require('@joplin/lib/fs-driver-node').default;

packages/app-cli/app/main.js

@@ -20,7 +20,7 @@ const NoteTag = require('@joplin/lib/models/NoteTag').default;
 const MasterKey = require('@joplin/lib/models/MasterKey').default;
 const Setting = require('@joplin/lib/models/Setting').default;
 const Revision = require('@joplin/lib/models/Revision').default;
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const FsDriverNode = require('@joplin/lib/fs-driver-node').default;
 const sharp = require('sharp');
 const { shimInit } = require('@joplin/lib/shim-init-node.js');

packages/app-desktop/ElectronAppWrapper.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { PluginMessage } from './services/plugins/PluginRunner';
 import shim from '@joplin/lib/shim';
 import { isCallbackUrl } from '@joplin/lib/callbackUrlUtils';

packages/app-desktop/app.reducer.ts

@@ -4,7 +4,7 @@ import { defaultState, State } from '@joplin/lib/reducer';
 import iterateItems from './gui/ResizableLayout/utils/iterateItems';
 import { LayoutItem } from './gui/ResizableLayout/utils/types';
 import validateLayout from './gui/ResizableLayout/utils/validateLayout';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 
 const logger = Logger.create('app.reducer');
 

packages/app-desktop/app.ts

@@ -8,7 +8,7 @@ import PlatformImplementation from './services/plugins/PlatformImplementation';
 import shim from '@joplin/lib/shim';
 import AlarmService from '@joplin/lib/services/AlarmService';
 import AlarmServiceDriverNode from '@joplin/lib/services/AlarmServiceDriverNode';
-import Logger, { TargetType } from '@joplin/lib/Logger';
+import Logger, { TargetType } from '@joplin/utils/Logger';
 import Setting from '@joplin/lib/models/Setting';
 import actionApi from '@joplin/lib/services/rest/actionApi.desktop';
 import BaseApplication from '@joplin/lib/BaseApplication';

packages/app-desktop/checkForUpdates.ts

@@ -1,5 +1,5 @@
 import shim from '@joplin/lib/shim';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { _ } from '@joplin/lib/locale';
 import bridge from './services/bridge';
 import KvStore from '@joplin/lib/services/KvStore';

packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.tsx

@@ -13,7 +13,7 @@ import { PluginItem } from './PluginBox';
 import RepositoryApi from '@joplin/lib/services/plugins/RepositoryApi';
 import Setting from '@joplin/lib/models/Setting';
 import useOnInstallHandler, { OnPluginSettingChangeEvent } from './useOnInstallHandler';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import StyledMessage from '../../../style/StyledMessage';
 import StyledLink from '../../../style/StyledLink';
 const { space } = require('styled-system');

packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.ts

@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 import PluginService, { defaultPluginSetting, PluginSettings } from '@joplin/lib/services/plugins/PluginService';
 import produce from 'immer';
 import { _ } from '@joplin/lib/locale';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { ItemEvent } from './PluginBox';
 
 const logger = Logger.create('useOnInstallHandler');

packages/app-desktop/gui/MainScreen/commands/leaveSharedFolder.ts

@@ -1,7 +1,7 @@
 import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService';
 import { _ } from '@joplin/lib/locale';
 import ShareService from '@joplin/lib/services/share/ShareService';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 
 const logger = Logger.create('leaveSharedFolder');
 

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.ts

@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 import shim from '@joplin/lib/shim';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 
 const logger = Logger.create('useEditorSearch');
 

packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.ts

@@ -1,5 +1,5 @@
 import Resource from '@joplin/lib/models/Resource';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 const logger = Logger.create('contextMenuUtils');
 export enum ContextMenuItemType {
 	None = '',

packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts

@@ -7,7 +7,7 @@ const bridge = require('@electron/remote').require('./bridge').default;
 import ResourceFetcher from '@joplin/lib/services/ResourceFetcher';
 import htmlUtils from '@joplin/lib/htmlUtils';
 import rendererHtmlUtils from '@joplin/renderer/htmlUtils';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 const { fileUriToPath } = require('@joplin/lib/urlUtils');
 const joplinRendererUtils = require('@joplin/renderer').utils;
 const { clipboard } = require('electron');

packages/app-desktop/gui/NoteEditor/utils/useNoteSearchBar.ts

@@ -1,5 +1,5 @@
 import { useState, useCallback, MutableRefObject, useEffect } from 'react';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { SearchMarkers } from './useSearchMarkers';
 const CommandService = require('@joplin/lib/services/CommandService').default;
 

packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx

@@ -10,7 +10,7 @@ import styled from 'styled-components';
 import StyledFormLabel from '../style/StyledFormLabel';
 import StyledInput from '../style/StyledInput';
 import Button, { ButtonSize } from '../Button/Button';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import StyledMessage from '../style/StyledMessage';
 import { SharePermissions, ShareUserStatus, StateShare, StateShareUser } from '@joplin/lib/services/share/reducer';
 import { State } from '@joplin/lib/reducer';

packages/app-desktop/gui/Sidebar/Sidebar.tsx

@@ -19,7 +19,7 @@ import BaseModel from '@joplin/lib/BaseModel';
 import Folder from '@joplin/lib/models/Folder';
 import Note from '@joplin/lib/models/Note';
 import Tag from '@joplin/lib/models/Tag';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { FolderEntity, FolderIcon, FolderIconType } from '@joplin/lib/services/database/types';
 import stateToWhenClauseContext from '../../services/commands/stateToWhenClauseContext';
 import { store } from '@joplin/lib/reducer';

packages/app-desktop/gui/dialogs.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 
 // Can't upgrade beyond 2.x because it doesn't work with Electron. If trying to
 // upgrade again, check that adding a link from the CodeMirror editor works/

packages/app-desktop/gui/utils/loadScript.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 
 const logger = Logger.create('loadScript');
 

packages/app-desktop/main-html.js

@@ -20,7 +20,7 @@ const NoteTag = require('@joplin/lib/models/NoteTag').default;
 const MasterKey = require('@joplin/lib/models/MasterKey').default;
 const Setting = require('@joplin/lib/models/Setting').default;
 const Revision = require('@joplin/lib/models/Revision').default;
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const FsDriverNode = require('@joplin/lib/fs-driver-node').default;
 const shim = require('@joplin/lib/shim').default;
 const { shimInit } = require('@joplin/lib/shim-init-node.js');

packages/app-desktop/main.js

@@ -4,7 +4,7 @@ const electronApp = require('electron').app;
 require('@electron/remote/main').initialize();
 const ElectronAppWrapper = require('./ElectronAppWrapper').default;
 const { initBridge } = require('./bridge');
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const FsDriverNode = require('@joplin/lib/fs-driver-node').default;
 const envFromArgs = require('@joplin/lib/envFromArgs');
 const packageInfo = require('./packageInfo.js');

packages/app-desktop/package.json

@@ -138,6 +138,7 @@
     "@joeattardi/emoji-button": "4.6.4",
     "@joplin/lib": "~2.12",
     "@joplin/renderer": "~2.12",
+    "@joplin/utils": "~2.12",
     "async-mutex": "0.4.0",
     "codemirror": "5.65.9",
     "color": "3.2.1",

packages/app-desktop/plugins/GotoAnything.tsx

@@ -18,7 +18,7 @@ const { surroundKeywords, nextWhitespaceIndex, removeDiacritics } = require('@jo
 import { mergeOverlappingIntervals } from '@joplin/lib/ArrayUtils';
 import markupLanguageUtils from '../utils/markupLanguageUtils';
 import focusEditorIfEditorCommand from '@joplin/lib/services/commands/focusEditorIfEditorCommand';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { MarkupToHtml } from '@joplin/renderer';
 
 const logger = Logger.create('GotoAnything');

packages/app-desktop/services/plugins/BackOffHandler.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import time from '@joplin/lib/time';
 
 const logger = Logger.create('BackOffHandler');

packages/app-desktop/services/plugins/PluginRunner.ts

@@ -6,7 +6,7 @@ import bridge from '../bridge';
 import Setting from '@joplin/lib/models/Setting';
 import { EventHandlers } from '@joplin/lib/services/plugins/utils/mapEventHandlersToIds';
 import shim from '@joplin/lib/shim';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 // import BackOffHandler from './BackOffHandler';
 const ipcRenderer = require('electron').ipcRenderer;
 

packages/app-desktop/services/plugins/UserWebview.tsx

@@ -7,7 +7,7 @@ import useSubmitHandler from './hooks/useSubmitHandler';
 import useHtmlLoader from './hooks/useHtmlLoader';
 import useWebviewToPluginMessages from './hooks/useWebviewToPluginMessages';
 import useScriptLoader from './hooks/useScriptLoader';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import styled from 'styled-components';
 
 const logger = Logger.create('UserWebview');

packages/app-desktop/services/share/invitationRespond.ts

@@ -1,5 +1,5 @@
 import ShareService from '@joplin/lib/services/share/ShareService';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import Folder from '@joplin/lib/models/Folder';
 import { reg } from '@joplin/lib/registry';
 import { _ } from '@joplin/lib/locale';

packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.ts

@@ -2,7 +2,7 @@
 
 import SpellCheckerServiceDriverBase from '@joplin/lib/services/spellChecker/SpellCheckerServiceDriverBase';
 import bridge from '../bridge';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { languageCodeOnly, localesFromLanguageCode } from '@joplin/lib/locale';
 
 const logger = Logger.create('SpellCheckerServiceDriverNative');

packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts

@@ -3,7 +3,7 @@ import shim from '@joplin/lib/shim';
 import Setting from '@joplin/lib/models/Setting';
 const { themeStyle } = require('../../global-style.js');
 import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 const { assetsToHeaders } = require('@joplin/renderer');
 
 const logger = Logger.create('NoteBodyViewer/useSource');

packages/app-mobile/components/biometrics/BiometricPopup.tsx

@@ -4,7 +4,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { View, Dimensions, Alert, Button } from 'react-native';
 import { SensorInfo } from './sensorInfo';
 import { _ } from '@joplin/lib/locale';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import biometricAuthenticate from './biometricAuthenticate';
 
 const logger = Logger.create('BiometricPopup');

packages/app-mobile/components/biometrics/biometricAuthenticate.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import FingerprintScanner, { Errors } from 'react-native-fingerprint-scanner';
 import { _ } from '@joplin/lib/locale';
 

packages/app-mobile/components/biometrics/sensorInfo.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import Setting from '@joplin/lib/models/Setting';
 import FingerprintScanner from 'react-native-fingerprint-scanner';
 const logger = Logger.create('sensorInfo');

packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/NoteExportButton.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Text, Alert, View } from 'react-native';
 import { _ } from '@joplin/lib/locale';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { ProgressBar } from 'react-native-paper';
 import { FunctionComponent, useCallback, useState } from 'react';
 import shim from '@joplin/lib/shim';

packages/app-mobile/components/screens/Note.tsx

@@ -43,7 +43,7 @@ import SelectDateTimeDialog from '../SelectDateTimeDialog';
 import ShareExtension from '../../utils/ShareExtension.js';
 import CameraView from '../CameraView';
 import { NoteEntity } from '@joplin/lib/services/database/types';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import VoiceTypingDialog from '../voiceTyping/VoiceTypingDialog';
 import { voskEnabled } from '../../services/voiceTyping/vosk';
 import { isSupportedLanguage } from '../../services/voiceTyping/vosk.android';

packages/app-mobile/components/screens/log.js

@@ -6,7 +6,7 @@ const { reg } = require('@joplin/lib/registry.js');
 const { ScreenHeader } = require('../ScreenHeader');
 const time = require('@joplin/lib/time').default;
 const { themeStyle } = require('../global-style.js');
-const Logger = require('@joplin/lib/Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const { BaseScreenComponent } = require('../base-screen.js');
 const { _ } = require('@joplin/lib/locale');
 

packages/app-mobile/ios/Podfile.lock

@@ -475,9 +475,9 @@ PODS:
     - React-Core
   - RNFS (2.20.0):
     - React-Core
-  - RNGestureHandler (2.11.0):
+  - RNGestureHandler (2.12.0):
     - React-Core
-  - RNLocalize (3.0.1):
+  - RNLocalize (3.0.2):
     - React-Core
   - RNQuickAction (0.3.13):
     - React
@@ -854,8 +854,8 @@ SPEC CHECKSUMS:
   RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3
   RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
-  RNGestureHandler: 026038a97d4c8649ce397a22e162ca58b4e6c230
-  RNLocalize: 6dd9226886fa61bf0cefc7644e3f9620770b1a31
+  RNGestureHandler: dec4645026e7401a0899f2846d864403478ff6a5
+  RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
   RNReanimated: 9976fbaaeb8a188c36026154c844bf374b3b7eeb
   RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef

packages/app-mobile/package.json

@@ -22,6 +22,7 @@
     "@joplin/react-native-alarm-notification": "~2.12",
     "@joplin/react-native-saf-x": "~2.12",
     "@joplin/renderer": "~2.12",
+    "@joplin/utils": "~2.12",
     "@react-native-community/clipboard": "1.5.1",
     "@react-native-community/datetimepicker": "7.1.0",
     "@react-native-community/geolocation": "3.0.6",

packages/app-mobile/root.tsx

@@ -7,7 +7,7 @@ import PluginAssetsLoader from './PluginAssetsLoader';
 import AlarmService from '@joplin/lib/services/AlarmService';
 import Alarm from '@joplin/lib/models/Alarm';
 import time from '@joplin/lib/time';
-import Logger, { TargetType } from '@joplin/lib/Logger';
+import Logger, { TargetType } from '@joplin/utils/Logger';
 import BaseModel from '@joplin/lib/BaseModel';
 import BaseService from '@joplin/lib/services/BaseService';
 import ResourceService from '@joplin/lib/services/ResourceService';

packages/app-mobile/services/AlarmServiceDriver.android.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import { Notification } from '@joplin/lib/models/Alarm';
 
 const ReactNativeAN = require('@joplin/react-native-alarm-notification').default;

packages/app-mobile/services/AlarmServiceDriver.ios.ts

@@ -1,5 +1,5 @@
 import { Notification } from '@joplin/lib/models/Alarm';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 const PushNotificationIOS = require('@react-native-community/push-notification-ios').default;
 
 export default class AlarmServiceDriver {

packages/app-mobile/services/voiceTyping/vosk.android.ts

@@ -1,5 +1,5 @@
 import { languageCodeOnly } from '@joplin/lib/locale';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import Setting from '@joplin/lib/models/Setting';
 import { rtrimSlashes } from '@joplin/lib/path-utils';
 import shim from '@joplin/lib/shim';

packages/app-mobile/utils/autodetectTheme.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 import Setting from '@joplin/lib/models/Setting';
 import { Appearance, ColorSchemeName } from 'react-native';
 

packages/app-mobile/utils/checkPermissions.ts

@@ -1,4 +1,4 @@
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 
 const { Platform, PermissionsAndroid } = require('react-native');
 const logger = Logger.create('checkPermissions');

packages/app-mobile/utils/fs-driver-rn.ts

@@ -8,7 +8,7 @@ import { Platform } from 'react-native';
 import * as tar from 'tar-stream';
 import { resolve } from 'path';
 import { Buffer } from 'buffer';
-import Logger from '@joplin/lib/Logger';
+import Logger from '@joplin/utils/Logger';
 
 const logger = Logger.create('fs-driver-rn');
 

packages/lib/BaseApplication.ts

@@ -1,5 +1,5 @@
 import Setting, { Env } from './models/Setting';
-import Logger, { TargetType, LoggerWrapper } from './Logger';
+import Logger, { TargetType, LoggerWrapper } from '@joplin/utils/Logger';
 import shim from './shim';
 const { setupProxySettings } = require('./shim-init-node');
 import BaseService from './services/BaseService';

packages/lib/BaseSyncTarget.ts

@@ -1,4 +1,4 @@
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import Synchronizer from './Synchronizer';
 import EncryptionService from './services/e2ee/EncryptionService';
 import shim from './shim';

packages/lib/ClipperServer.ts

@@ -1,5 +1,5 @@
 import Setting from './models/Setting';
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import Api, { RequestFile } from './services/rest/Api';
 import ApiResponse from './services/rest/ApiResponse';
 const urlParser = require('url');

packages/lib/DropboxApi.js

@@ -1,4 +1,4 @@
-const Logger = require('./Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const shim = require('./shim').default;
 const JoplinError = require('./JoplinError').default;
 const time = require('./time').default;

packages/lib/JoplinServerApi.ts

@@ -3,7 +3,7 @@ import { _ } from './locale';
 const { rtrimSlashes } = require('./path-utils.js');
 import JoplinError from './JoplinError';
 import { Env } from './models/Setting';
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import personalizedUserContentBaseUrl from './services/joplinServer/personalizedUserContentBaseUrl';
 import { getHttpStatusMessage } from './net-utils';
 const { stringify } = require('query-string');

packages/lib/SyncTargetJoplinServer.ts

@@ -5,7 +5,7 @@ import { _ } from './locale.js';
 import JoplinServerApi from './JoplinServerApi';
 import BaseSyncTarget from './BaseSyncTarget';
 import { FileApi } from './file-api';
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 
 const staticLogger = Logger.create('SyncTargetJoplinServer');
 

packages/lib/Synchronizer.ts

@@ -1,4 +1,4 @@
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import LockHandler, { appTypeToLockType, hasActiveLock, LockClientType, LockType } from './services/synchronizer/LockHandler';
 import Setting, { AppType } from './models/Setting';
 import shim from './shim';

packages/lib/TaskQueue.ts

@@ -1,6 +1,6 @@
 import time from './time';
 import Setting from './models/Setting';
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 
 interface Task {
 	id: string;

packages/lib/WebDavApi.js

@@ -1,4 +1,4 @@
-const Logger = require('./Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 const shim = require('./shim').default;
 const parseXmlString = require('xml2js').parseString;
 const JoplinError = require('./JoplinError').default;

packages/lib/components/shared/config-shared.js

@@ -3,7 +3,7 @@ const SyncTargetRegistry = require('../../SyncTargetRegistry').default;
 const ObjectUtils = require('../../ObjectUtils');
 const { _ } = require('../../locale');
 const { createSelector } = require('reselect');
-const Logger = require('../../Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 
 const logger = Logger.create('config-shared');
 

packages/lib/database.ts

@@ -1,4 +1,4 @@
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import time from './time';
 import shim from './shim';
 

packages/lib/file-api.ts

@@ -1,4 +1,4 @@
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import shim from './shim';
 import BaseItem from './models/BaseItem';
 import time from './time';

packages/lib/geolocation-node.ts

@@ -1,4 +1,4 @@
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import shim from './shim';
 
 const logger = Logger.create('geolocation-node');

packages/lib/models/Folder.ts

@@ -7,7 +7,7 @@ import Database from '../database';
 import BaseItem from './BaseItem';
 import Resource from './Resource';
 import { isRootSharedFolder } from '../services/share/reducer';
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import syncDebugLog from '../services/synchronizer/syncDebugLog';
 import ResourceService from '../services/ResourceService';
 import { LoadOptions } from './utils/types';

packages/lib/models/Setting.test.ts

@@ -1,7 +1,7 @@
 import Setting, { SettingItemType, SettingSectionSource, SettingStorage } from '../models/Setting';
 import { setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow, msleep } from '../testing/test-utils';
 import { readFile, stat, mkdirp, writeFile, pathExists, readdir } from 'fs-extra';
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import { defaultProfileConfig } from '../services/profileConfig/types';
 import { createNewProfile, saveProfileConfig } from '../services/profileConfig';
 import initProfile from '../services/profileConfig/initProfile';

packages/lib/models/Setting.ts

@@ -6,7 +6,7 @@ import Database from '../database';
 import SyncTargetRegistry from '../SyncTargetRegistry';
 import time from '../time';
 import FileHandler, { SettingValues } from './settings/FileHandler';
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import mergeGlobalAndLocalSettings from '../services/profileConfig/mergeGlobalAndLocalSettings';
 import splitGlobalAndLocalSettings from '../services/profileConfig/splitGlobalAndLocalSettings';
 import JoplinError from '../JoplinError';

packages/lib/models/settings/FileHandler.ts

@@ -1,4 +1,4 @@
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import shim from '../../shim';
 import Setting from '../Setting';
 

packages/lib/onedrive-api.ts

@@ -1,6 +1,6 @@
 import shim from './shim';
 import time from './time';
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import { _ } from './locale';
 
 const { stringify } = require('query-string');

packages/lib/react-logger.js

@@ -1,4 +1,4 @@
-const Logger = require('./Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 
 class ReactLogger extends Logger {}
 

packages/lib/registry.ts

@@ -1,4 +1,4 @@
-import Logger from './Logger';
+import Logger from '@joplin/utils/Logger';
 import Setting from './models/Setting';
 import shim from './shim';
 import SyncTargetRegistry from './SyncTargetRegistry';

packages/lib/services/AlarmService.ts

@@ -1,4 +1,4 @@
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import Alarm from '../models/Alarm';
 
 import Note from '../models/Note';

packages/lib/services/BaseService.ts

@@ -1,4 +1,4 @@
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 
 export default class BaseService {
 

packages/lib/services/DecryptionWorker.ts

@@ -3,7 +3,7 @@ import BaseModel from '../BaseModel';
 import MasterKey from '../models/MasterKey';
 import Resource from '../models/Resource';
 import ResourceService from './ResourceService';
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import shim from '../shim';
 import KvStore from './KvStore';
 import EncryptionService from './e2ee/EncryptionService';

packages/lib/services/ExternalEditWatcher.ts

@@ -1,4 +1,4 @@
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import Setting from '../models/Setting';
 import shim from '../shim';
 import { basename, toSystemSlashes } from '../path-utils';

packages/lib/services/ExternalEditWatcher/utils.ts

@@ -2,7 +2,7 @@
 
 import { splitCommandString } from '@joplin/utils';
 import { spawn } from 'child_process';
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import Setting from '../../models/Setting';
 import { fileExtension } from '../../path-utils';
 import shim from '../../shim';

packages/lib/services/PluginManager.js

@@ -1,4 +1,4 @@
-const Logger = require('../Logger').default;
+const Logger = require('@joplin/utils/Logger').default;
 
 class PluginManager {
 	constructor() {

packages/lib/services/PostMessageService.ts

@@ -22,7 +22,7 @@
 // another location, when the response is received, it resolves that promise.
 // See UserWebviewIndex.js to see how it's done.
 
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import PluginService from './plugins/PluginService';
 
 const logger = Logger.create('PostMessageService');

packages/lib/services/ResourceEditWatcher/index.ts

@@ -2,7 +2,7 @@ import AsyncActionQueue from '../../AsyncActionQueue';
 import shim from '../../shim';
 import { _ } from '../../locale';
 import { toSystemSlashes } from '../../path-utils';
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import Setting from '../../models/Setting';
 import Resource from '../../models/Resource';
 import { ResourceEntity } from '../database/types';

packages/lib/services/ResourceFetcher.ts

@@ -2,7 +2,7 @@ import Resource from '../models/Resource';
 import Setting from '../models/Setting';
 import BaseService from './BaseService';
 import ResourceService from './ResourceService';
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import shim from '../shim';
 const { Dirnames } = require('./synchronizer/utils/types');
 const EventEmitter = require('events');

packages/lib/services/RevisionService.ts

@@ -9,7 +9,7 @@ import shim from '../shim';
 import BaseService from './BaseService';
 import { _ } from '../locale';
 import { ItemChangeEntity, NoteEntity, RevisionEntity } from './database/types';
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 import { MarkupLanguage } from '../../renderer';
 const { substrWithEllipsis } = require('../string-utils');
 const { sprintf } = require('sprintf-js');

packages/lib/services/e2ee/EncryptionService.ts

@@ -1,5 +1,5 @@
 import { MasterKeyEntity } from './types';
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import shim from '../../shim';
 import Setting from '../../models/Setting';
 import MasterKey from '../../models/MasterKey';

packages/lib/services/e2ee/utils.ts

@@ -1,4 +1,4 @@
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import BaseItem from '../../models/BaseItem';
 import MasterKey from '../../models/MasterKey';
 import Setting from '../../models/Setting';

packages/lib/services/plugins/Plugin.ts

@@ -3,7 +3,7 @@ import ViewController from './ViewController';
 import shim from '../../shim';
 import { ViewHandle } from './utils/createViewHandle';
 import { ContentScriptType } from './api/types';
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 const EventEmitter = require('events');
 
 const logger = Logger.create('Plugin');

packages/lib/services/plugins/PluginService.ts

@@ -6,7 +6,7 @@ import BaseService from '../BaseService';
 import shim from '../../shim';
 import { filename, dirname, rtrimSlashes } from '../../path-utils';
 import Setting from '../../models/Setting';
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import RepositoryApi from './RepositoryApi';
 import produce from 'immer';
 const compareVersions = require('compare-versions');

packages/lib/services/plugins/RepositoryApi.ts

@@ -1,4 +1,4 @@
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import shim from '../../shim';
 import { PluginManifest } from './utils/types';
 const md5 = require('md5');

packages/lib/services/plugins/api/JoplinPlugins.ts

@@ -1,7 +1,7 @@
 /* eslint-disable multiline-comment-style */
 
 import Plugin from '../Plugin';
-import Logger from '../../../Logger';
+import Logger from '@joplin/utils/Logger';
 import { ContentScriptType, Script } from './types';
 
 const logger = Logger.create('joplin.plugins');

packages/lib/services/plugins/defaultPlugins/defaultPluginsUtils.ts

@@ -3,7 +3,7 @@ import path = require('path');
 import Setting from '../../../models/Setting';
 import shim from '../../../shim';
 import PluginService, { defaultPluginSetting, DefaultPluginsInfo, PluginSettings } from '../PluginService';
-import Logger from '../../../Logger';
+import Logger from '@joplin/utils/Logger';
 import * as React from 'react';
 const shared = require('../../../components/shared/config-shared.js');
 

packages/lib/services/plugins/utils/loadContentScripts.ts

@@ -2,7 +2,7 @@ import { PluginStates } from '../reducer';
 import { ContentScriptType, ContentScriptContext, PostMessageHandler } from '../api/types';
 import { dirname } from '@joplin/renderer/pathUtils';
 import shim from '../../../shim';
-import Logger from '../../../Logger';
+import Logger from '@joplin/utils/Logger';
 import PluginService from '../PluginService';
 
 const logger = Logger.create('loadContentScripts');

packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.ts

@@ -1,4 +1,4 @@
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import Setting from '../../models/Setting';
 
 const logger = Logger.create('mergeGlobalAndLocalSettings');

packages/lib/services/rest/routes/notes.ts

@@ -21,7 +21,7 @@ const md5 = require('md5');
 import HtmlToMd from '../../../HtmlToMd';
 const urlUtils = require('../../../urlUtils.js');
 import * as ArrayUtils from '../../../ArrayUtils';
-import Logger from '../../../Logger';
+import Logger from '@joplin/utils/Logger';
 const { mimeTypeFromHeaders } = require('../../../net-utils');
 const { fileExtension, safeFileExtension, safeFilename, filename } = require('../../../path-utils');
 const { fileUriToPath } = require('../../../urlUtils');

packages/lib/services/searchengine/SearchEngine.ts

@@ -1,4 +1,4 @@
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import ItemChange from '../../models/ItemChange';
 import Setting from '../../models/Setting';
 import Note from '../../models/Note';

packages/lib/services/share/ShareService.test.ts

@@ -10,7 +10,7 @@ import { generateKeyPair } from '../e2ee/ppk';
 import MasterKey from '../../models/MasterKey';
 import { MasterKeyEntity } from '../e2ee/types';
 import { loadMasterKeysFromSettings, setupAndEnableEncryption, updateMasterPassword } from '../e2ee/utils';
-import Logger, { LogLevel } from '../../Logger';
+import Logger, { LogLevel } from '@joplin/utils/Logger';
 import shim from '../../shim';
 import Resource from '../../models/Resource';
 import { readFile } from 'fs-extra';

packages/lib/services/share/ShareService.ts

@@ -1,7 +1,7 @@
 import { Store } from 'redux';
 import JoplinServerApi from '../../JoplinServerApi';
 import { _ } from '../../locale';
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import Folder from '../../models/Folder';
 import MasterKey from '../../models/MasterKey';
 import Note from '../../models/Note';

packages/lib/services/share/reducer.ts

@@ -2,7 +2,7 @@ import { State as RootState } from '../../reducer';
 import { Draft } from 'immer';
 import { FolderEntity } from '../database/types';
 import { MasterKeyEntity } from '../e2ee/types';
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 
 const logger = Logger.create('share/reducer');
 

packages/lib/services/synchronizer/ItemUploader.ts

@@ -1,7 +1,7 @@
 import { ModelType } from '../../BaseModel';
 import { FileApi, MultiPutItem } from '../../file-api';
 import JoplinError from '../../JoplinError';
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 import BaseItem from '../../models/BaseItem';
 import { BaseItemEntity } from '../database/types';
 import { ApiCallFunction } from './utils/types';

packages/lib/services/synchronizer/syncDebugLog.ts

@@ -2,7 +2,7 @@
 // related events. In particular, it logs notes and folders being saved, and the
 // relevant sync operations. Enable it in app.ts
 
-import Logger from '../../Logger';
+import Logger from '@joplin/utils/Logger';
 
 const syncDebugLog = new Logger();
 

packages/lib/services/synchronizer/utils/handleConflictAction.ts

@@ -1,5 +1,5 @@
 import { Dispatch } from 'redux';
-import Logger from '../../../Logger';
+import Logger from '@joplin/utils/Logger';
 import BaseItem from '../../../models/BaseItem';
 import ItemChange from '../../../models/ItemChange';
 import Note from '../../../models/Note';

packages/lib/services/synchronizer/utils/handleSyncStartupOperation.ts

@@ -1,7 +1,7 @@
 import Setting, { SyncStartupOperation } from '../../../models/Setting';
 import { clearLocalDataForRedownload, clearLocalSyncStateForReupload } from '../tools';
 import { reg } from '../../../registry';
-import Logger from '../../../Logger';
+import Logger from '@joplin/utils/Logger';
 
 const logger = Logger.create('handleSyncStartupOperation');
 

packages/lib/testing/test-utils.ts

@@ -1,7 +1,7 @@
 /* eslint-disable require-atomic-updates */
 import BaseApplication from '../BaseApplication';
 import BaseModel from '../BaseModel';
-import Logger, { TargetType, LoggerWrapper, LogLevel } from '../Logger';
+import Logger, { TargetType, LoggerWrapper, LogLevel } from '@joplin/utils/Logger';
 import Setting from '../models/Setting';
 import BaseService from '../services/BaseService';
 import FsDriverNode from '../fs-driver-node';

packages/lib/utils/userFetcher.ts

@@ -2,7 +2,7 @@ import SyncTargetRegistry from '../SyncTargetRegistry';
 import eventManager from '../eventManager';
 import Setting from '../models/Setting';
 import { reg } from '../registry';
-import Logger from '../Logger';
+import Logger from '@joplin/utils/Logger';
 
 const logger = Logger.create('userFetcher');
 

packages/server/package.json

@@ -25,6 +25,7 @@
     "@fortawesome/fontawesome-free": "5.15.4",
     "@joplin/lib": "~2.12",
     "@joplin/renderer": "~2.12",
+    "@joplin/utils": "~2.12",
     "@koa/cors": "3.4.3",
     "@types/uuid": "9.0.1",
     "bcryptjs": "2.4.3",