From 90b7a7441e4bbc770b1f9f8b803695ea328081c4 Mon Sep 17 00:00:00 2001
From: Robert Lukasonok <70327485+roluk@users.noreply.github.com>
Date: Thu, 25 Mar 2021 17:47:08 +0200
Subject: [PATCH] Update immer to ^9.0.1 (#1027)
(cherry picked from commit 21cdd50377bbb3157d3c6869aaa7ce965a76a4cc)
# 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
---
common/api/summary/ui-framework.exports.csv | 10 +++++-----
common/api/ui-framework.api.md | 20 +++++++++----------
.../update-immer_2021-03-24-15-39.json | 11 ++++++++++
.../update-immer_2021-03-24-15-39.json | 11 ++++++++++
.../update-immer_2021-03-24-15-39.json | 11 ++++++++++
.../update-immer_2021-03-24-15-39.json | 11 ++++++++++
full-stack-tests/presentation/package.json | 6 +++++-
presentation/components/package.json | 6 +++++-
ui/components/package.json | 6 +++++-
ui/framework/package.json | 6 +++++-
ui/ninezone/package.json | 6 +++++-
11 files changed, 84 insertions(+), 20 deletions(-)
create mode 100644 common/changes/@bentley/presentation-components/update-immer_2021-03-24-15-39.json
create mode 100644 common/changes/@bentley/ui-components/update-immer_2021-03-24-15-39.json
create mode 100644 common/changes/@bentley/ui-framework/update-immer_2021-03-24-15-39.json
create mode 100644 common/changes/@bentley/ui-ninezone/update-immer_2021-03-24-15-39.json
diff --git a/common/api/summary/ui-framework.exports.csv b/common/api/summary/ui-framework.exports.csv
index 284a74947af..bf61000a9da 100644
--- 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,11 +457,11 @@ 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
@@ -469,7 +469,7 @@ 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
index 419c01b0c2c..3918af48a2a 100644
--- 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: Base, id: string) => Base;
+}, id: string) => import("immer/dist/internal").WritableDraft;
// @beta
export interface ExtensibleToolbarProps {
@@ -4656,7 +4656,7 @@ export const sessionStateMapDispatchToProps: {
export function SessionStateReducer(state: SessionState | undefined, action: SessionStateActionsUnion): DeepReadonly;
// @internal (undocumented)
-export const setPanelSize: (base: Base, side: PanelSide, size: number | undefined) => Base;
+}, side: PanelSide, size: number | undefined) => import("immer/dist/internal").WritableDraft;
// @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: Base, id: string, label: string) => Base;
+}, id: string, label: string) => import("immer/dist/internal").WritableDraft;
// @internal (undocumented)
-export const setWidgetState: (base: Base, widgetDef: WidgetDef, state: WidgetState_2) => Base;
+}, widgetDef: WidgetDef, state: WidgetState_2) => import("immer/dist/internal").WritableDraft;
// @alpha
export class SheetCard extends React.Component {
@@ -5090,7 +5090,7 @@ export class SheetsModalFrontstage implements ModalFrontstageInfo {
}
// @internal (undocumented)
-export const showWidget: (base: Base, id: string) => Base;
+}, id: string) => import("immer/dist/internal").WritableDraft;
// @public
export class SignIn extends React.PureComponent {
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
new file mode 100644
index 00000000000..d603aa33bd4
--- /dev/null
+++ 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"
+}
\ No newline at end of file
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
new file mode 100644
index 00000000000..8b0919d3a2b
--- /dev/null
+++ 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"
+}
\ No newline at end of file
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
new file mode 100644
index 00000000000..61faabf7bcc
--- /dev/null
+++ 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"
+}
\ No newline at end of file
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
new file mode 100644
index 00000000000..84a2c18a816
--- /dev/null
+++ 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"
+}
\ No newline at end of file
diff --git a/full-stack-tests/presentation/package.json b/full-stack-tests/presentation/package.json
index 70e461d5b47..b9daef353f6 100644
--- 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"
}
-}
+}
\ No newline at end of file
diff --git a/presentation/components/package.json b/presentation/components/package.json
index cc9a0c9946f..af3c12b1ba8 100644
--- 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"
}
-}
+}
\ No newline at end of file
diff --git a/ui/components/package.json b/ui/components/package.json
index f1f3579b139..a520be26c86 100644
--- 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"
]
}
-}
+}
\ No newline at end of file
diff --git a/ui/framework/package.json b/ui/framework/package.json
index f58db455669..11420e41f7b 100644
--- 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"
]
}
-}
+}
\ No newline at end of file
diff --git a/ui/ninezone/package.json b/ui/ninezone/package.json
index 4bcac855f21..5fbe1c80791 100644
--- 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"
]
}
-}
+}
\ No newline at end of file