From 33123c354b79f7951423dd75097b11e7eb075f99 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Fri, 2 Jul 2021 19:49:55 -0600 Subject: Upgrade various dependencies to latest part 2 (#1557) * Upgrade various dependencies to latest, remove unnecessary electron-hunspell - upgrade eslint and friends to latest - remove deprecated 'node-sass' in favor of 'sass' - disable new rules from 'eslint-config-airbnb' that are conflicting with current code style - add workspace config for 'vscode' that silences 'experimentalDecorator' warning and forces 'prettier' to single quote * Run yarn lint to autofix with new ruleset and worked down lint issues to zero --- src/features/workspaces/containers/EditWorkspaceScreen.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/features/workspaces/containers') diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js index 5eca71259..ba7606031 100644 --- a/src/features/workspaces/containers/EditWorkspaceScreen.js +++ b/src/features/workspaces/containers/EditWorkspaceScreen.js @@ -32,9 +32,7 @@ class EditWorkspaceScreen extends Component { const { workspaceBeingEdited } = workspaceStore; const { actions } = this.props; const workspace = new Workspace( - Object.assign({ - saving: true, - }, workspaceBeingEdited, values), + ({ saving: true, ...workspaceBeingEdited, ...values }), ); actions.workspaces.update({ workspace }); }; -- cgit v1.2.3-54-g00ecf