From 0f4f7dffffeb6dfcffe9a0e6fd1dffc70f21cb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= Date: Mon, 8 Oct 2018 12:46:29 +0200 Subject: [PATCH] Object rest spread --- packages/@uppy/aws-s3/src/index.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/@uppy/aws-s3/src/index.js b/packages/@uppy/aws-s3/src/index.js index 590364471..73db2d305 100644 --- a/packages/@uppy/aws-s3/src/index.js +++ b/packages/@uppy/aws-s3/src/index.js @@ -39,9 +39,12 @@ module.exports = class AwsS3 extends Plugin { locale: defaultLocale } - this.opts = Object.assign({}, defaultOptions, opts) - this.locale = Object.assign({}, defaultLocale, this.opts.locale) - this.locale.strings = Object.assign({}, defaultLocale.strings, this.opts.locale.strings) + this.opts = { ...defaultOptions, ...opts } + this.locale = { + ...defaultLocale, + ...this.opts.locale, + strings: { ...defaultLocale.strings, ...this.opts.locale.strings } + } this.translator = new Translator({ locale: this.locale }) this.i18n = this.translator.translate.bind(this.translator)