Merge e0d143f into a55cf4a

mikespencer · Dec 14, 2016 · 5c761b7 · 5c761b7
2 parents a55cf4a + e0d143f
commit 5c761b7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,12 @@
 {
   "presets": [
-    "es2015",
-    "stage-2"
+    "stage-2",
+    ["env", {
+      "debug": true,
+      "targets": {
+        "node": "current"
+      }
+    }]
   ],
   "plugins": [
     "transform-flow-strip-types"

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "babel-cli": "^6.18.0",
     "babel-eslint": "^7.1.0",
     "babel-plugin-transform-flow-strip-types": "^6.18.0",
-    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-env": "^1.1.1",
     "babel-preset-stage-2": "^6.18.0",
     "babel-register": "^6.18.0",
     "chai": "^3.5.0",

diff --git a/src/Extractor.js b/src/Extractor.js
@@ -14,7 +14,7 @@ export default class Extractor {
   config: Object;
 
   constructor (props?: Object = {}) {
-    this.config = Object.assign({}, defaultConfig, props)
+    this.config = { ...defaultConfig, ...props }
   }
 
   extract (globPattern: string, _glob?: Function = glob): Promise<Object[]> {