Skip to content

Commit 0f08367

Browse files
authored
fix: remove object spread literals with object assing (#454)
* remove not used code * fix: remove object spread literals with object assign
1 parent 2da1045 commit 0f08367

File tree

10 files changed

+30
-23
lines changed

10 files changed

+30
-23
lines changed

docs/.vitepress/theme/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { h, watch } from 'vue'
1+
import { h } from 'vue'
22
import DefaultTheme from 'vitepress/dist/client/theme-default'
33
import Layout from './Layout.vue'
44
import Sponsor from './components/Sponsor.vue'

packages/core-base/src/context.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
isRegExp,
77
isFunction,
88
isPlainObject,
9+
assign,
910
isObject
1011
} from '@intlify/shared'
1112
import { VueDevToolsTimelineEvents } from '@intlify/vue-devtools'
@@ -243,7 +244,7 @@ export function createCoreContext<
243244
const numberFormats = isPlainObject(options.numberFormats)
244245
? options.numberFormats
245246
: ({ [locale]: {} } as NumberFormats)
246-
const modifiers = Object.assign(
247+
const modifiers = assign(
247248
{} as LinkedModifiers<Message>,
248249
options.modifiers || ({} as LinkedModifiers<Message>),
249250
getDefaultLinkedModifiers<Message>()

packages/core-base/src/datetime.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import {
44
isPlainObject,
55
isDate,
66
isNumber,
7-
isEmptyObject
7+
isEmptyObject,
8+
assign
89
} from '@intlify/shared'
910
import {
1011
getLocaleChain,
@@ -216,7 +217,7 @@ export function datetime<DateTimeFormats, Message = string>(
216217
if (!formatter) {
217218
formatter = new Intl.DateTimeFormat(
218219
targetLocale,
219-
Object.assign({}, format, overrides)
220+
assign({}, format, overrides)
220221
)
221222
__datetimeFormatters.set(id, formatter)
222223
}

packages/core-base/src/number.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import {
33
isBoolean,
44
isPlainObject,
55
isNumber,
6-
isEmptyObject
6+
isEmptyObject,
7+
assign
78
} from '@intlify/shared'
89
import {
910
getLocaleChain,
@@ -214,7 +215,7 @@ export function number<NumberFormats, Message = string>(
214215
if (!formatter) {
215216
formatter = new Intl.NumberFormat(
216217
targetLocale,
217-
Object.assign({}, format, overrides)
218+
assign({}, format, overrides)
218219
)
219220
__numberFormatters.set(id, formatter)
220221
}

packages/core-base/src/translate.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
warn,
1414
mark,
1515
measure,
16+
assign,
1617
isObject
1718
} from '@intlify/shared'
1819
import { resolveValue } from '@intlify/message-resolver'
@@ -405,7 +406,7 @@ export function translate<Messages, Message = string>(
405406
: '',
406407
message: ret as string
407408
}
408-
;(payloads as AdditionalPayloads).meta = Object.assign(
409+
;(payloads as AdditionalPayloads).meta = assign(
409410
{},
410411
((context as unknown) as CoreInternalContext).__meta,
411412
getAdditionalMeta() || {}
@@ -670,7 +671,7 @@ export function parseTranslateArgs<Message = string>(
670671
} else if (isString(arg3)) {
671672
options.default = arg3
672673
} else if (isPlainObject(arg3)) {
673-
Object.assign(options, arg3)
674+
assign(options, arg3)
674675
}
675676

676677
return [key, options]

packages/vue-i18n/src/components/formatRenderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export function renderFormatter<
7272
// Filter out number format options only
7373
overrides = Object.keys(props.format).reduce((options, prop) => {
7474
return slotKeys.includes(prop)
75-
? Object.assign({}, options, { [prop]: (props.format as any)[prop] }) // eslint-disable-line @typescript-eslint/no-explicit-any
75+
? assign({}, options, { [prop]: (props.format as any)[prop] }) // eslint-disable-line @typescript-eslint/no-explicit-any
7676
: options
7777
}, {})
7878
}

packages/vue-i18n/src/composer.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import {
1717
isPlainObject,
1818
makeSymbol,
1919
isObject,
20-
hasOwn
20+
hasOwn,
21+
assign
2122
} from '@intlify/shared'
2223
import {
2324
isTranslateFallbackWarn,
@@ -1524,9 +1525,7 @@ export function createComposer<
15241525
if (arg3 && !isObject(arg3)) {
15251526
throw createI18nError(I18nErrorCodes.INVALID_ARGUMENT)
15261527
}
1527-
return t(
1528-
...[arg1, arg2, Object.assign({ resolvedMessage: true }, arg3 || {})]
1529-
)
1528+
return t(...[arg1, arg2, assign({ resolvedMessage: true }, arg3 || {})])
15301529
}
15311530

15321531
// d
@@ -1706,7 +1705,7 @@ export function createComposer<
17061705

17071706
// mergeDateTimeFormat
17081707
function mergeDateTimeFormat(locale: Locale, format: DateTimeFormat): void {
1709-
_datetimeFormats.value[locale] = Object.assign(
1708+
_datetimeFormats.value[locale] = assign(
17101709
_datetimeFormats.value[locale] || {},
17111710
format
17121711
)
@@ -1728,7 +1727,7 @@ export function createComposer<
17281727

17291728
// mergeNumberFormat
17301729
function mergeNumberFormat(locale: Locale, format: NumberFormat): void {
1731-
_numberFormats.value[locale] = Object.assign(
1730+
_numberFormats.value[locale] = assign(
17321731
_numberFormats.value[locale] || {},
17331732
format
17341733
)

packages/vue-i18n/src/i18n.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import {
1212
isBoolean,
1313
warn,
1414
makeSymbol,
15-
createEmitter
15+
createEmitter,
16+
assign
1617
} from '@intlify/shared'
1718
import {
1819
getLocaleMessages,
@@ -622,9 +623,11 @@ export function useI18n<
622623
if (composer == null) {
623624
const type = instance.type as ComponentOptions
624625
const composerOptions: ComposerOptions &
625-
ComposerInternalOptions<Messages, DateTimeFormats, NumberFormats> = {
626-
...options
627-
}
626+
ComposerInternalOptions<
627+
Messages,
628+
DateTimeFormats,
629+
NumberFormats
630+
> = assign({}, options)
628631

629632
if (type.__i18n) {
630633
composerOptions.__i18n = type.__i18n

packages/vue-i18n/src/legacy.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
isBoolean,
1010
isFunction,
1111
isRegExp,
12+
assign,
1213
warn
1314
} from '@intlify/shared'
1415

@@ -1108,7 +1109,7 @@ function convertComposerOptions<
11081109
const locales: Locale[] = Object.keys(sharedMessages)
11091110
messages = locales.reduce((messages, locale) => {
11101111
const message = messages[locale] || (messages[locale] = {})
1111-
Object.assign(message, sharedMessages[locale])
1112+
assign(message, sharedMessages[locale])
11121113
return messages
11131114
}, (messages || {}) as LocaleMessages<VueMessageType>) as typeof options.messages
11141115
}

packages/vue-i18n/test/helper.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
import { compile } from '@vue/compiler-dom'
1616
import * as runtimeDom from '@vue/runtime-dom'
1717
import { I18n } from '../src/i18n'
18-
import { isBoolean } from '@intlify/shared'
18+
import { isBoolean, assign } from '@intlify/shared'
1919

2020
export interface MountOptions {
2121
propsData: Record<string, any> // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -93,7 +93,7 @@ export function mount<
9393
return new Promise((resolve, reject) => {
9494
// NOTE: only supports props as an object
9595
const propsData = reactive(
96-
Object.assign(
96+
assign(
9797
// @ts-ignore
9898
initialProps(TargetComponent.props || {}),
9999
options.propsData
@@ -102,7 +102,7 @@ export function mount<
102102

103103
// eslint-disable-next-line @typescript-eslint/no-explicit-any
104104
function setProps(partialProps: Record<string, any>) {
105-
Object.assign(propsData, partialProps)
105+
assign(propsData, partialProps)
106106
return nextTick()
107107
}
108108

0 commit comments

Comments
 (0)