Update immer to ^9.0.1 (#1027)

(cherry picked from commit 21cdd50) # Conflicts: # common/config/rush/pnpm-lock.yaml # full-stack-tests/presentation/package.json # presentation/components/package.json # ui/components/package.json # ui/framework/package.json # ui/ninezone/package.json
iTwin · Mar 25, 2021 · 90b7a74 · 90b7a74
1 parent cea0e71
commit 90b7a74
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 20 deletions.
diff --git a/common/api/summary/ui-framework.exports.csv b/common/api/summary/ui-framework.exports.csv
@@ -186,7 +186,7 @@ public;ElementTooltipChangedEventArgs
 alpha;EmphasizeElementsChangedArgs
 beta;ExpandableSection 
 beta;ExpandableSectionProps 
-internal;expandWidget: 
+internal;expandWidget: (base:
 beta;ExtensibleToolbarProps
 beta;featureOverridesActiveStateFunc(state: Readonly
 alpha;FocusToolSettings 
@@ -457,19 +457,19 @@ beta;SessionStateActionsProps
 beta;SessionStateActionsUnion = ActionsUnion
 beta;sessionStateMapDispatchToProps:
 beta;SessionStateReducer(state: SessionState | undefined, action: SessionStateActionsUnion): DeepReadonly
-internal;setPanelSize: 
+internal;setPanelSize: (base:
 beta;SettingsModalFrontstage 
 internal;settingsStatusToUiSettingsStatus(status: SettingsStatus): UiSettingsStatus
-internal;setWidgetLabel: 
-internal;setWidgetState: 
+internal;setWidgetLabel: (base:
+internal;setWidgetState: (base:
 alpha;SheetCard 
 alpha;SheetCardProps
 alpha;SheetData
 alpha;SheetNavigationAid 
 alpha;SheetNavigationAidControl 
 alpha;SheetNavigationProps 
 alpha;SheetsModalFrontstage 
-internal;showWidget: 
+internal;showWidget: (base:
 public;SignIn 
 public;SignInProps 
 public;SignOutModalFrontstage 

diff --git a/common/api/ui-framework.api.md b/common/api/ui-framework.api.md
@@ -1869,7 +1869,7 @@ export interface ExpandableSectionProps extends CommonProps {
 }
 
 // @internal (undocumented)
-export const expandWidget: <Base extends {
+export const expandWidget: (base: {
     readonly draggedTab: {
         readonly tabId: string;
         readonly position: {
@@ -1982,7 +1982,7 @@ export const expandWidget: <Base extends {
         readonly width: number;
         readonly height: number;
     };
-}>(base: Base, id: string) => Base;
+}, id: string) => import("immer/dist/internal").WritableDraft<NineZoneState>;
 
 // @beta
 export interface ExtensibleToolbarProps {
@@ -4656,7 +4656,7 @@ export const sessionStateMapDispatchToProps: {
 export function SessionStateReducer(state: SessionState | undefined, action: SessionStateActionsUnion): DeepReadonly<SessionState>;
 
 // @internal (undocumented)
-export const setPanelSize: <Base extends {
+export const setPanelSize: (base: {
     readonly draggedTab: {
         readonly tabId: string;
         readonly position: {
@@ -4769,7 +4769,7 @@ export const setPanelSize: <Base extends {
         readonly width: number;
         readonly height: number;
     };
-}>(base: Base, side: PanelSide, size: number | undefined) => Base;
+}, side: PanelSide, size: number | undefined) => import("immer/dist/internal").WritableDraft<NineZoneState>;
 
 // @beta
 export class SettingsModalFrontstage implements ModalFrontstageInfo {
@@ -4794,7 +4794,7 @@ export class SettingsModalFrontstage implements ModalFrontstageInfo {
 export function settingsStatusToUiSettingsStatus(status: SettingsStatus): UiSettingsStatus;
 
 // @internal (undocumented)
-export const setWidgetLabel: <Base extends {
+export const setWidgetLabel: (base: {
     readonly draggedTab: {
         readonly tabId: string;
         readonly position: {
@@ -4907,10 +4907,10 @@ export const setWidgetLabel: <Base extends {
         readonly width: number;
         readonly height: number;
     };
-}>(base: Base, id: string, label: string) => Base;
+}, id: string, label: string) => import("immer/dist/internal").WritableDraft<NineZoneState>;
 
 // @internal (undocumented)
-export const setWidgetState: <Base extends {
+export const setWidgetState: (base: {
     readonly draggedTab: {
         readonly tabId: string;
         readonly position: {
@@ -5023,7 +5023,7 @@ export const setWidgetState: <Base extends {
         readonly width: number;
         readonly height: number;
     };
-}>(base: Base, widgetDef: WidgetDef, state: WidgetState_2) => Base;
+}, widgetDef: WidgetDef, state: WidgetState_2) => import("immer/dist/internal").WritableDraft<NineZoneState>;
 
 // @alpha
 export class SheetCard extends React.Component<SheetCardProps, SheetCardState> {
@@ -5090,7 +5090,7 @@ export class SheetsModalFrontstage implements ModalFrontstageInfo {
 }
 
 // @internal (undocumented)
-export const showWidget: <Base extends {
+export const showWidget: (base: {
     readonly draggedTab: {
         readonly tabId: string;
         readonly position: {
@@ -5203,7 +5203,7 @@ export const showWidget: <Base extends {
         readonly width: number;
         readonly height: number;
     };
-}>(base: Base, id: string) => Base;
+}, id: string) => import("immer/dist/internal").WritableDraft<NineZoneState>;
 
 // @public
 export class SignIn extends React.PureComponent<SignInProps> {

diff --git a/common/changes/@bentley/presentation-components/update-immer_2021-03-24-15-39.json b/common/changes/@bentley/presentation-components/update-immer_2021-03-24-15-39.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@bentley/presentation-components",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/presentation-components",
+  "email": "70327485+roluk@users.noreply.github.com"
+}
diff --git a/common/changes/@bentley/ui-components/update-immer_2021-03-24-15-39.json b/common/changes/@bentley/ui-components/update-immer_2021-03-24-15-39.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@bentley/ui-components",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/ui-components",
+  "email": "70327485+roluk@users.noreply.github.com"
+}
diff --git a/common/changes/@bentley/ui-framework/update-immer_2021-03-24-15-39.json b/common/changes/@bentley/ui-framework/update-immer_2021-03-24-15-39.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@bentley/ui-framework",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/ui-framework",
+  "email": "70327485+roluk@users.noreply.github.com"
+}
diff --git a/common/changes/@bentley/ui-ninezone/update-immer_2021-03-24-15-39.json b/common/changes/@bentley/ui-ninezone/update-immer_2021-03-24-15-39.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@bentley/ui-ninezone",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/ui-ninezone",
+  "email": "70327485+roluk@users.noreply.github.com"
+}
diff --git a/full-stack-tests/presentation/package.json b/full-stack-tests/presentation/package.json
@@ -59,7 +59,11 @@
     "cpx": "^1.5.0",
     "deep-equal": "^1",
     "faker": "^4.1.0",
+<<<<<<< HEAD
     "immer": "^8.0.1",
+=======
+    "immer": "^9.0.1",
+>>>>>>> 21cdd50377... Update immer to ^9.0.1 (#1027)
     "mocha": "^5.2.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
@@ -92,4 +96,4 @@
     ],
     "extends": "plugin:@bentley/imodeljs-recommended"
   }
-}
+}
diff --git a/presentation/components/package.json b/presentation/components/package.json
@@ -98,7 +98,11 @@
     "eslint": "^6.8.0",
     "faker": "^4.1.0",
     "ignore-styles": "^5.0.1",
+<<<<<<< HEAD
     "immer": "^8.0.1",
+=======
+    "immer": "^9.0.1",
+>>>>>>> 21cdd50377... Update immer to ^9.0.1 (#1027)
     "jsdom-global": "3.0.2",
     "mocha": "^5.2.0",
     "nyc": "^14.0.0",
@@ -135,4 +139,4 @@
     ],
     "extends": "plugin:@bentley/ui"
   }
-}
+}
diff --git a/ui/components/package.json b/ui/components/package.json
@@ -124,7 +124,11 @@
     "callable-instance2": "1.0.0",
     "classnames": "^2.2.5",
     "eventemitter2": "^5.0.1",
+<<<<<<< HEAD
     "immer": "^8.0.1",
+=======
+    "immer": "^9.0.1",
+>>>>>>> 21cdd50377... Update immer to ^9.0.1 (#1027)
     "immutable": "^3.8.2",
     "inspire-tree": "^5.0.1",
     "linkify-it": "~2.2.0",
@@ -166,4 +170,4 @@
       "plugin:@bentley/jsdoc"
     ]
   }
-}
+}
diff --git a/ui/framework/package.json b/ui/framework/package.json
@@ -142,7 +142,11 @@
     "@bentley/icons-generic-webfont": "^1.0.15",
     "@bentley/presentation-components": "2.14.0-dev.25",
     "classnames": "^2.2.5",
+<<<<<<< HEAD
     "immer": "^8.0.1",
+=======
+    "immer": "^9.0.1",
+>>>>>>> 21cdd50377... Update immer to ^9.0.1 (#1027)
     "lodash": "^4.17.10",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
@@ -174,4 +178,4 @@
       "plugin:@bentley/jsdoc"
     ]
   }
-}
+}
diff --git a/ui/ninezone/package.json b/ui/ninezone/package.json
@@ -91,7 +91,11 @@
   ],
   "dependencies": {
     "classnames": "^2.2.5",
+<<<<<<< HEAD
     "immer": "^8.0.1",
+=======
+    "immer": "^9.0.1",
+>>>>>>> 21cdd50377... Update immer to ^9.0.1 (#1027)
     "uuid": "^7.0.3"
   },
   "nyc": {
@@ -118,4 +122,4 @@
       "plugin:@bentley/jsdoc"
     ]
   }
-}
+}