Desktop,CLI,Mobile: Update immer to v9.0.21 (#12182)

packages/app-desktop/app.reducer.ts

@@ -1,4 +1,4 @@
-import produce from 'immer';
+import { produce } from 'immer';
 import Setting from '@joplin/lib/models/Setting';
 import { defaultState, defaultWindowState, State, WindowState } from '@joplin/lib/reducer';
 import iterateItems from './gui/ResizableLayout/utils/iterateItems';

packages/app-desktop/app.ts

@@ -92,7 +92,7 @@ class Application extends BaseApplication {
 	public reducer(state: AppState = appDefaultState, action: any) {
 		let newState = appReducer(state, action);
 		newState = resourceEditWatcherReducer(newState, action);
-		newState = super.reducer(newState, action);
+		newState = super.reducer(newState, action) as AppState;
 		return newState;
 	}
 

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

@@ -7,7 +7,7 @@ import SearchPlugins from './SearchPlugins';
 import PluginBox, { UpdateState } from './PluginBox';
 import Button, { ButtonLevel, ButtonSize } from '../../../Button/Button';
 import bridge from '../../../../services/bridge';
-import produce from 'immer';
+import { produce } from 'immer';
 import { OnChangeEvent } from '../../../lib/SearchInput/SearchInput';
 import { PluginItem, ItemEvent, OnPluginSettingChangeEvent } from '@joplin/lib/components/shared/config/plugins/types';
 import RepositoryApi, { InstallMode } from '@joplin/lib/services/plugins/RepositoryApi';

packages/app-desktop/gui/MainScreen.tsx

@@ -17,7 +17,7 @@ import { AppState } from '../app.reducer';
 import { saveLayout, loadLayout } from './ResizableLayout/utils/persist';
 import Setting from '@joplin/lib/models/Setting';
 import shouldShowMissingPasswordWarning from '@joplin/lib/components/shared/config/shouldShowMissingPasswordWarning';
-import produce from 'immer';
+import { produce } from 'immer';
 import shim from '@joplin/lib/shim';
 import bridge from '../services/bridge';
 import styled from 'styled-components';

packages/app-desktop/gui/ResizableLayout/utils/movements.ts

@@ -1,6 +1,6 @@
 import iterateItems from './iterateItems';
 import { LayoutItem, LayoutItemDirection, tempContainerPrefix } from './types';
-import produce from 'immer';
+import { produce } from 'immer';
 import uuid from '@joplin/lib/uuid';
 import validateLayout from './validateLayout';
 

packages/app-desktop/gui/ResizableLayout/utils/persist.ts

@@ -1,5 +1,5 @@
 import { LayoutItem, Size } from './types';
-import produce from 'immer';
+import { produce } from 'immer';
 import iterateItems from './iterateItems';
 import validateLayout from './validateLayout';
 

packages/app-desktop/gui/ResizableLayout/utils/removeItem.ts

@@ -1,4 +1,4 @@
-import produce from 'immer';
+import { produce } from 'immer';
 import iterateItems from './iterateItems';
 import { LayoutItem } from './types';
 import validateLayout from './validateLayout';

packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.ts

@@ -1,4 +1,4 @@
-import produce from 'immer';
+import { produce } from 'immer';
 import iterateItems from './iterateItems';
 import { LayoutItem } from './types';
 import validateLayout from './validateLayout';

packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.ts

@@ -1,4 +1,4 @@
-import produce from 'immer';
+import { produce } from 'immer';
 import { LayoutItem } from './types';
 import validateLayout from './validateLayout';
 

packages/app-desktop/gui/ResizableLayout/utils/validateLayout.ts

@@ -1,4 +1,4 @@
-import produce from 'immer';
+import { produce } from 'immer';
 import iterateItems from './iterateItems';
 import { LayoutItem, LayoutItemDirection } from './types';
 

packages/app-desktop/package.json

@@ -179,7 +179,7 @@
     "formatcoords": "1.1.3",
     "fs-extra": "11.2.0",
     "highlight.js": "11.10.0",
-    "immer": "7.0.15",
+    "immer": "9.0.21",
     "keytar": "7.9.0",
     "mark.js": "8.11.1",
     "md5": "2.3.0",

packages/app-mobile/root.tsx

@@ -454,7 +454,7 @@ const appReducer = (state = appDefaultState, action: any) => {
 		throw error;
 	}
 
-	return reducer(newState, action);
+	return reducer(newState, action) as AppState;
 };
 
 const store = createStore(appReducer, applyMiddleware(generalMiddleware));

packages/app-mobile/utils/testing/createMockReduxStore.ts

@@ -4,12 +4,12 @@ import appDefaultState from '../appDefaultState';
 import Setting from '@joplin/lib/models/Setting';
 import { AppState } from '../types';
 
-const testReducer = (state: AppState|undefined, action: unknown) => {
+const testReducer = (state: AppState|undefined, action: unknown): AppState => {
 	state ??= {
 		...appDefaultState,
 		settings: Setting.toPlainObject(),
 	};
-	return reducer(state, action);
+	return { ...state, ...reducer(state, action) };
 };
 
 const createMockReduxStore = () => {

packages/lib/BaseApplication.ts

@@ -48,7 +48,7 @@ import MigrationService from './services/MigrationService';
 import ShareService from './services/share/ShareService';
 import handleSyncStartupOperation from './services/synchronizer/utils/handleSyncStartupOperation';
 import SyncTargetJoplinCloud from './SyncTargetJoplinCloud';
-const { setAutoFreeze } = require('immer');
+import { setAutoFreeze } from 'immer';
 import { getEncryptionEnabled } from './services/synchronizer/syncInfoUtils';
 import { loadMasterKeysFromSettings, migrateMasterPassword } from './services/e2ee/utils';
 import SyncTargetNone from './SyncTargetNone';

packages/lib/components/shared/config/plugins/useOnDeleteHandler.ts

@@ -2,7 +2,7 @@ import { _ } from '../../../../locale';
 import PluginService, { PluginSettings, defaultPluginSetting } from '../../../../services/plugins/PluginService';
 import type * as React from 'react';
 import shim from '../../../../shim';
-import produce from 'immer';
+import { produce } from 'immer';
 import { ItemEvent, OnPluginSettingChangeHandler } from './types';
 
 const useOnDeleteHandler = (

packages/lib/components/shared/config/plugins/useOnInstallHandler.ts

@@ -1,4 +1,4 @@
-import produce from 'immer';
+import { produce } from 'immer';
 import Logger from '@joplin/utils/Logger';
 import { ItemEvent, OnPluginSettingChangeHandler } from './types';
 import type * as React from 'react';

packages/lib/package.json

@@ -72,7 +72,7 @@
     "html-entities": "1.4.0",
     "html-minifier": "4.0.0",
     "image-data-uri": "2.0.1",
-    "immer": "7.0.15",
+    "immer": "9.0.21",
     "js-yaml": "4.1.0",
     "markdown-it": "13.0.2",
     "md5": "2.3.0",

packages/lib/reducer.ts

@@ -1,4 +1,4 @@
-import produce, { Draft, original } from 'immer';
+import { produce, Draft, original } from 'immer';
 import pluginServiceReducer, { stateRootKey as pluginServiceStateRootKey, defaultState as pluginServiceDefaultState, State as PluginServiceState } from './services/plugins/reducer';
 import shareServiceReducer, { stateRootKey as shareServiceStateRootKey, defaultState as shareServiceDefaultState, State as ShareServiceState } from './services/share/reducer';
 import Note from './models/Note';

packages/lib/services/ResourceEditWatcher/reducer.ts

@@ -1,4 +1,4 @@
-import produce, { Draft } from 'immer';
+import { produce, Draft } from 'immer';
 import { defaultWindowId, stateUtils } from '../../reducer';
 
 export const defaultState = {

packages/lib/services/plugins/PluginService.ts

@@ -8,7 +8,7 @@ import { filename, dirname, rtrimSlashes } from '../../path-utils';
 import Setting from '../../models/Setting';
 import Logger from '@joplin/utils/Logger';
 import RepositoryApi from './RepositoryApi';
-import produce from 'immer';
+import { produce } from 'immer';
 import { PluginManifest } from './utils/types';
 import isCompatible from './utils/isCompatible';
 import { AppType } from './api/types';

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

@@ -1,4 +1,4 @@
-import produce from 'immer';
+import { produce } from 'immer';
 import Setting from '../../../models/Setting';
 import shim from '../../../shim';
 import PluginService, { defaultPluginSetting, DefaultPluginsInfo, Plugins, PluginSettings } from '../PluginService';

yarn.lock

@@ -8306,7 +8306,7 @@ __metadata:
     glob: 10.4.5
     gulp: 4.0.2
     highlight.js: 11.10.0
-    immer: 7.0.15
+    immer: 9.0.21
     jest: 29.7.0
     jest-environment-jsdom: 29.7.0
     js-sha512: 0.9.0
@@ -8639,7 +8639,7 @@ __metadata:
     html-entities: 1.4.0
     html-minifier: 4.0.0
     image-data-uri: 2.0.1
-    immer: 7.0.15
+    immer: 9.0.21
     jest: 29.7.0
     js-yaml: 4.1.0
     jsdom: 23.2.0
@@ -28529,14 +28529,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immer@npm:7.0.15":
-  version: 7.0.15
-  resolution: "immer@npm:7.0.15"
-  checksum: d79deb76f8bce71fff95bfbfa6a614bf55dd1f500eea189d3dcc587d94ed911b048e875c810b4e1214b3a6a7c8db148628e0c62e6fd8a649e84002cba0053e34
-  languageName: node
-  linkType: hard
-
-"immer@npm:^9.0.7":
+"immer@npm:9.0.21, immer@npm:^9.0.7":
   version: 9.0.21
   resolution: "immer@npm:9.0.21"
   checksum: 70e3c274165995352f6936695f0ef4723c52c92c92dd0e9afdfe008175af39fa28e76aafb3a2ca9d57d1fb8f796efc4dd1e1cc36f18d33fa5b74f3dfb0375432