object assign

src/components/desktop_nav/desktop_nav.js

@@ -73,17 +73,15 @@ export default {
           }
     },
     logoBgStyle() {
-      return Object.assign(
+      const mask = this.enableMask
-        {
+        ? {}
+        : {'background-color': this.enableMask ? '' : 'transparent'}
+
+      return {
         margin: `${this.logoMargin} 0`,
         opacity: this.searchBarHidden ? 1 : 0,
-        },
+        ...mask,
-        this.enableMask
+      }
-          ? {}
-          : {
-              'background-color': this.enableMask ? '' : 'transparent',
-            },
-      )
     },
     ...mapState(useInstanceStore, ['privateMode']),
     ...mapState(useInstanceStore, {

test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js

@@ -7,8 +7,7 @@ import {
 } from 'src/services/entity_normalizer/entity_normalizer.service.js'
 
 const makeMockUserMasto = (overrides = {}) => {
-  return Object.assign(
+  return {
-    {
     acct: 'hj',
     avatar:
     'https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png',
@@ -33,14 +32,12 @@ const makeMockUserMasto = (overrides = {}) => {
     statuses_count: 41775,
     url: 'https://shigusegubu.club/users/hj',
     username: 'hj',
-    },
+    ...overrides,
-    overrides,
+  }
-  )
 }
 
 const makeMockStatusMasto = (overrides = {}) => {
-  return Object.assign(
+  return {
-    {
     account: makeMockUserMasto(),
     application: { name: 'Web', website: null },
     content:
@@ -76,31 +73,26 @@ const makeMockStatusMasto = (overrides = {}) => {
     pleroma: {
       local: true,
     },
-    },
+    ...overrides,
-    overrides,
+  }
-  )
 }
 
 const makeMockEmojiMasto = (overrides = [{}]) => {
   return [
-    Object.assign(
     {
       shortcode: 'image',
       static_url: 'https://example.com/image.png',
       url: 'https://example.com/image.png',
       visible_in_picker: false,
+      ...overrides[0],
     },
-      overrides[0],
-    ),
-    Object.assign(
     {
       shortcode: 'thinking',
       static_url: 'https://example.com/think.png',
       url: 'https://example.com/think.png',
       visible_in_picker: false,
+      ...overrides[1],
     },
-      overrides[1],
-    ),
   ]
 }