From c1e42dae473479394da5c6f5a79ad7b422a22fae Mon Sep 17 00:00:00 2001
From: Bret Comnes <bcomnes@gmail.com>
Date: Sun, 24 Dec 2017 15:43:38 -0800
Subject: [PATCH 1/2] Add rest spread support

---
 index.js                  | 5 +++--
 package.json              | 1 +
 test/files/rest-spread.js | 9 +++++++++
 test/rest-spread.js       | 9 +++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 test/files/rest-spread.js
 create mode 100644 test/rest-spread.js

diff --git a/index.js b/index.js
index ddd6ff99c8..60e036f56f 100644
--- a/index.js
+++ b/index.js
@@ -1,4 +1,4 @@
-var acorn = require('acorn');
+var acorn = require('acorn5-object-spread/inject')(require('acorn'));
 var walk = require('acorn/dist/walk');
 var defined = require('defined');
 
@@ -18,7 +18,8 @@ function parse (src, opts) {
         allowImportExportEverywhere: defined(
             opts.allowImportExportEverywhere, true
         ),
-        allowHashBang: defined(opts.allowHashBang, true)
+        allowHashBang: defined(opts.allowHashBang, true),
+        plugins: { objectSpread: true }
     });
 }
 
diff --git a/package.json b/package.json
index a4d2af2b45..c40736434b 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "acorn": "^5.2.1",
+    "acorn5-object-spread": "^5.0.0",
     "defined": "^1.0.0"
   },
   "devDependencies": {
diff --git a/test/files/rest-spread.js b/test/files/rest-spread.js
new file mode 100644
index 0000000000..de764cee1a
--- /dev/null
+++ b/test/files/rest-spread.js
@@ -0,0 +1,9 @@
+var a = require('a');
+var b = require('b');
+var c = require('c');
+
+
+var obj = { foo: 'bar', bee: 'bop' }
+var spread = { ...obj }
+var { foo, ...rest } = obj
+
diff --git a/test/rest-spread.js b/test/rest-spread.js
new file mode 100644
index 0000000000..5da31e708f
--- /dev/null
+++ b/test/rest-spread.js
@@ -0,0 +1,9 @@
+var test = require('tap').test;
+var detective = require('../');
+var fs = require('fs');
+var src = fs.readFileSync(__dirname + '/files/rest-spread.js');
+
+test('rest-spread', function (t) {
+    t.doesNotThrow(detective.bind(detective, src), 'Files with rest or spread do not throw')
+    t.end();
+});

From ad2b9965e26d2cfa58344bf3c05cc11a7db7d0fa Mon Sep 17 00:00:00 2001
From: Bret Comnes <bcomnes@gmail.com>
Date: Mon, 1 Jan 2018 18:53:07 -0800
Subject: [PATCH 2/2] Remove 0.12 support

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1f8cab0cd8..699d237e12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,3 @@ node_js:
   - 8
   - 6
   - 4
-  - "0.12"