Extract logic into node-merge-trees. Requires Node >= 4

broccolijs · Mar 6, 2017 · 3f5cbdb · 3f5cbdb
1 parent 7d96b90
commit 3f5cbdb
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 753 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,11 @@
+{
+  "extends": "eslint:recommended",
+  "rules": {
+    "semi": 2
+  },
+  "env": {
+    "node": true,
+    "mocha": true,
+    "es6": true
+  }
+}
diff --git a/.jshintignore b/.jshintignore
diff --git a/.jshintrc b/.jshintrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "4"
+  - "6"
+  - "stable"
+sudo: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # master
 
+* Require Node >= 4
+
 # 1.2.4
 
 * Revert to version 1.2.1 to restore Node 0.10 compatibility

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,8 +7,6 @@ init:
 # Test against these versions of Node.js.
 environment:
   matrix:
-    - nodejs_version: "0.10"
-    - nodejs_version: "0.12"
     - nodejs_version: "4.2"
     - nodejs_version: "5"
 

diff --git a/entry.js b/entry.js