From 4cc17c72927131386da44cb236ffeee044bccdf2 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 23 Jul 2018 19:06:15 -0700
Subject: [PATCH] Add object spread

---
 ui/.eslintrc.js       |  3 +++
 ui/ember-cli-build.js |  3 +++
 ui/package.json       |  1 +
 ui/yarn.lock          | 11 +++++++++++
 4 files changed, 18 insertions(+)

diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js
index 5d19a7da5..d4f4d42a0 100644
--- a/ui/.eslintrc.js
+++ b/ui/.eslintrc.js
@@ -10,6 +10,9 @@ module.exports = {
   parserOptions: {
     ecmaVersion: 2017,
     sourceType: 'module',
+    ecmaFeatures: {
+      experimentalObjectRestSpread: true,
+    },
   },
   rules: {
     indent: ['error', 2, { SwitchCase: 1 }],
diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js
index 8e879ba07..121823950 100644
--- a/ui/ember-cli-build.js
+++ b/ui/ember-cli-build.js
@@ -19,6 +19,9 @@ module.exports = function(defaults) {
         `${defaults.project.pkg.name}/templates/components/freestyle/**/*`,
       ],
     },
+    babel: {
+      plugins: ['transform-object-rest-spread'],
+    },
   });
 
   // Use `app.import` to add additional libraries to the generated
diff --git a/ui/package.json b/ui/package.json
index 6a33c98c4..b8c4f5839 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -24,6 +24,7 @@
     ]
   },
   "devDependencies": {
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "broccoli-asset-rev": "^2.4.5",
     "bulma": "0.6.1",
     "core-js": "^2.4.1",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 2a1e4205b..ff3b1fc8f 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -854,6 +854,10 @@ babel-plugin-syntax-exponentiation-operator@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
 
+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-syntax-trailing-function-commas@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
@@ -1042,6 +1046,13 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-object-rest-spread@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.26.0"
+
 babel-plugin-transform-regenerator@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"