From 2c11f883cd7faa07be21b6c6b467057fce276c07 Mon Sep 17 00:00:00 2001 From: Joe Fleming Date: Tue, 21 Mar 2017 19:44:34 -0700 Subject: [PATCH] add and use object spread --- .babelrc | 3 ++- package.json | 1 + src/pages/Customers.vue | 15 +++++++++------ yarn.lock | 11 +++++++++++ 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.babelrc b/.babelrc index 9897749..ae89f39 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,6 @@ { "presets": [ ["es2015", { "modules": false }] - ] + ], + "plugins": ["transform-object-rest-spread"] } diff --git a/package.json b/package.json index baf8aa1..fbf0d71 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "devDependencies": { "babel-core": "^6.22.1", "babel-loader": "^6.2.10", + "babel-plugin-transform-object-rest-spread": "^6.23.0", "babel-preset-es2015": "^6.22.0", "bulma": "^0.3.1", "css-loader": "^0.26.1", diff --git a/src/pages/Customers.vue b/src/pages/Customers.vue index e5bc910..938f2ff 100644 --- a/src/pages/Customers.vue +++ b/src/pages/Customers.vue @@ -62,12 +62,15 @@ loading: false, } }, - computed: Object.assign({}, mapState('customers', [ - 'customers', - 'updatedAt', - ]), mapGetters('customers', [ - 'shouldUpdate' - ])), + computed: { + ...mapState('customers', [ + 'customers', + 'updatedAt', + ]), + ...mapGetters('customers', [ + 'shouldUpdate' + ]), + }, methods: { setMode(mode) { this.mode = (mode === 'table') ? 'table' : 'cards'; diff --git a/yarn.lock b/yarn.lock index ab28747..9e7928d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -376,6 +376,10 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" +babel-plugin-syntax-object-rest-spread@^6.8.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" + babel-plugin-transform-es2015-arrow-functions@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" @@ -544,6 +548,13 @@ babel-plugin-transform-es2015-unicode-regex@^6.22.0: babel-runtime "^6.22.0" regexpu-core "^2.0.0" +babel-plugin-transform-object-rest-spread@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921" + dependencies: + babel-plugin-syntax-object-rest-spread "^6.8.0" + babel-runtime "^6.22.0" + babel-plugin-transform-regenerator@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"