Convert to es6 modules

.eslintrc

@@ -2,9 +2,6 @@
   "ecmaFeatures": {
     "modules": true
   },
-  "env": {
-    "es6": true
-  },
   "rules": {
     "strict": [2, "global"],
     "quotes": [2, "single"],
@@ -15,6 +12,7 @@
     "space-before-function-paren": [2, {anonymous: "always", named: "never"}]
   },
   "env": {
+    "es6": true,
     "node": true,
     "mocha": true
   }

gulpfile.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict'; // eslint-disable-line
 var path = require('path');
 var gulp = require('gulp');
 var eslint = require('gulp-eslint');
@@ -19,7 +19,7 @@ gulp.task('static', function () {
     .pipe(excludeGitignore())
     .pipe(eslint())
     .pipe(eslint.format())
-    .pipe(eslint.failAfterError())
+    .pipe(eslint.failAfterError());
 });
 
 gulp.task('nsp', function (cb) {
@@ -40,10 +40,12 @@ gulp.task('test', ['pre-test'], function (cb) {
     .pipe(plumber())
     .pipe(mocha({reporter: 'spec'}))
     .on('error', function (err) {
+      console.log('err', err);
       mochaErr = err;
     })
     .pipe(istanbul.writeReports())
     .on('end', function () {
+      console.log('end', mochaErr);
       cb(mochaErr);
     });
 });

lib/index.js

@@ -1,6 +1,10 @@
-const update = require('app/utils/update/update');
+import update from './update';
-update.omit = require('app/utils/update/omit');
+import omit from './omit';
-update.reject = require('app/utils/update/reject');
+import reject from './reject';
-update.withDefault = require('app/utils/update/with_default');
+import withDefault from './withDefault';
 
-module.exports = update;
+update.omit = omit;
+update.reject = reject;
+update.withDefault = withDefault;
+
+export default update;

lib/omit.js

@@ -1,4 +1,4 @@
-const omit = require('lodash/object/omit');
+import omit from 'lodash/object/omit';
-const curry = require('lodash/function/curry');
+import curry from 'lodash/function/curry';
 
-module.exports = curry((predicate, collection) => omit(collection, predicate));
+export default curry((predicate, collection) => omit(collection, predicate));

lib/reject.js

@@ -1,4 +1,4 @@
-const reject = require('lodash/collection/reject');
+import reject from 'lodash/collection/reject';
-const curry = require('lodash/function/curry');
+import curry from 'lodash/function/curry';
 
-module.exports = curry((predicate, collection) => reject(collection, predicate));
+export default curry((predicate, collection) => reject(collection, predicate));

lib/update.js

@@ -1,6 +1,6 @@
-const reduce = require('lodash/collection/reduce');
+import reduce from 'lodash/collection/reduce';
-const isEmpty = require('lodash/lang/isEmpty');
+import isEmpty from 'lodash/lang/isEmpty';
-const curry = require('lodash/function/curry');
+import curry from 'lodash/function/curry';
 
 function resolveUpdates(updates, obj = {}) {
   return reduce(updates, (acc, value, key) => {
@@ -56,4 +56,4 @@ function update(updates, obj) {
   return Object.assign({}, obj, resolvedUpdates);
 }
 
-module.exports = curry(update);
+export default curry(update);

lib/withDefault.js

@@ -0,0 +1,11 @@
+import update from './update';
+
+export default function withDefault(defaultValue, updates) {
+  return (value) => {
+    if (typeof value === 'undefined') {
+      return update(updates, defaultValue);
+    }
+
+    return update(updates, value);
+  };
+}

lib/with_default.js

@@ -1,11 +0,0 @@
-const update = require('app/utils/update/update');
-
-module.exports = function withDefault(defaultValue, updates) {
-  return (value) => {
-    if (typeof value === "undefined") {
-      return update(updates, defaultValue);
-    }
-
-    return update(updates, value);
-  };
-};

package.json

@@ -27,11 +27,12 @@
     "url": "https://github.com/aaronjensen/updeep/issues"
   },
   "peerDependencies": {
-    "lodash": "^3.10.0"
+    "lodash": "^3.0.0"
   },
   "devDependencies": {
     "babel-core": "^5.5.0",
     "chai": "^3.2.0",
+    "eslint-config-airbnb": "0.0.7",
     "gulp": "^3.6.0",
     "gulp-babel": "^5.1.0",
     "gulp-coveralls": "^0.1.0",

test/index.js

@@ -1,59 +1,57 @@
 import { expect } from 'chai';
 import updeep from '../lib';
 
-console.log("testing");
+describe('updeep', () => {
-describe("updeep", () => {
+  it('does not change anything if no updates are specified', () => {
-  it("does not change anything if no updates are specified", () => {
-console.log("testing2");
     const obj = { foo: 3, bar: [7, 5] };
     const result = updeep({}, obj);
 
     expect(result).to.equal(obj);
   });
 
-  it("can update with fixed values", () => {
+  it('can update with fixed values', () => {
     const obj = { foo: 3, bar: [7, 5] };
     const result = updeep({ foo: 4 }, obj);
 
     expect(result).to.deep.equal({ foo: 4, bar: [7, 5] });
   });
 
-  it("returns the same instance if an update doesn't make changes", () => {
+  it('returns the same instance if an update doesn\'t make changes', () => {
     const obj = { foo: 3 };
     const result = updeep({ foo: 3 }, obj);
 
     expect(result).to.equal(obj);
   });
 
-  it("can update a nested structure", () => {
+  it('can update a nested structure', () => {
     const obj = { foo: { bar: 7, bam: 3 }, baz: 32 };
     const result = updeep({ foo: { bar: 8 } }, obj);
 
     expect(result).to.deep.equal({ foo: { bar: 8, bam: 3 }, baz: 32 });
   });
 
-  it("can update arrays", () => {
+  it('can update arrays', () => {
     const obj = [1, 2, 3];
     const result = updeep({ 1: 7 }, obj);
 
     expect(result).to.deep.equal([1, 7, 3]);
   });
 
-  it("can add an element to an array", () => {
+  it('can add an element to an array', () => {
     const obj = [];
     const result = updeep({ 0: 3 }, obj);
 
     expect(result).to.eql([3]);
   });
 
-  it("can update nested arrays", () => {
+  it('can update nested arrays', () => {
     const obj = { foo: [1, 2, 3], bar: 9 };
     const result = updeep({ foo: { 1: 7 } }, obj);
 
     expect(result).to.deep.equal({ foo: [1, 7, 3], bar: 9 });
   });
 
-  it("can use functions to update values", () => {
+  it('can use functions to update values', () => {
     const inc = (i) => i + 1;
     const obj = { foo: 3, bar: 4, baz: 7 };
     const result = updeep({ foo: inc, bar: inc }, obj);
@@ -61,7 +59,7 @@ console.log("testing2");
     expect(result).to.deep.equal({ foo: 4, bar: 5, baz: 7 });
   });
 
-  it("is curryable", () => {
+  it('is curryable', () => {
     const inc = (i) => i + 1;
     const obj = { foo: 3 };
     const incFoo = updeep({ foo: inc });
@@ -71,17 +69,17 @@ console.log("testing2");
     expect(result).to.deep.equal({ foo: 4 });
   });
 
-  it("can update if the value is an array", () => {
+  it('can update if the value is an array', () => {
     const obj = {};
     const result = updeep({ foo: [0, 1] }, obj);
 
     expect(result).to.deep.equal({ foo: [0, 1] });
   });
 
-  it("can use withDefault to default things", () => {
+  it('can use withDefault to default things', () => {
     const obj = {};
     const result = updeep({
-      foo: update.withDefault([], {
+      foo: updeep.withDefault([], {
         0: 'bar'
       })
     }, obj);