From 45f7a91780935f0060639ffdd70c8de8724e996c Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Tue, 12 Jan 2016 07:58:49 -0800 Subject: [PATCH] Update fp modules. --- lib/fp/{base.js => baseConvert.js} | 0 lib/fp/build.js | 2 +- lib/fp/{bower.js => convert.browser.js} | 6 +++--- lib/fp/{fp.js => convert.js} | 4 ++-- lib/fp/{node.js => convert.node.js} | 6 +++--- test/test-fp.js | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename lib/fp/{base.js => baseConvert.js} (100%) rename lib/fp/{bower.js => convert.browser.js} (67%) rename lib/fp/{fp.js => convert.js} (87%) rename lib/fp/{node.js => convert.node.js} (79%) diff --git a/lib/fp/base.js b/lib/fp/baseConvert.js similarity index 100% rename from lib/fp/base.js rename to lib/fp/baseConvert.js diff --git a/lib/fp/build.js b/lib/fp/build.js index 2ee8923f7..db3fbe40b 100644 --- a/lib/fp/build.js +++ b/lib/fp/build.js @@ -13,7 +13,7 @@ var basePath = path.join(__dirname, '..', '..'), filename = 'lodash.fp.js'; var fpConfig = { - 'entry': path.join(__dirname, 'bower.js'), + 'entry': path.join(__dirname, 'convert.browser.js'), 'output': { 'path': distPath, 'filename': filename, diff --git a/lib/fp/bower.js b/lib/fp/convert.browser.js similarity index 67% rename from lib/fp/bower.js rename to lib/fp/convert.browser.js index 22a8255b8..6855f34f8 100644 --- a/lib/fp/bower.js +++ b/lib/fp/convert.browser.js @@ -1,4 +1,4 @@ -var baseConvert = require('./base.js'); +var baseConvert = require('./baseConvert.js'); /** * Converts `lodash` to an auto-curried iteratee-first data-last version. @@ -6,8 +6,8 @@ var baseConvert = require('./base.js'); * @param {Function} lodash The lodash function. * @returns {Function} Returns the converted lodash function. */ -function bowerConvert(lodash) { +function browserConvert(lodash) { return baseConvert(lodash, lodash); } -module.exports = bowerConvert; +module.exports = browserConvert; diff --git a/lib/fp/fp.js b/lib/fp/convert.js similarity index 87% rename from lib/fp/fp.js rename to lib/fp/convert.js index 3a01b53e2..09626d8eb 100644 --- a/lib/fp/fp.js +++ b/lib/fp/convert.js @@ -1,5 +1,5 @@ var _ = require('lodash'), - base = require('./base.js'), + baseConvert = require('./baseConvert.js'), util = require('./util.js'); /** @@ -15,7 +15,7 @@ function convert() { name = args.length ? args[0] : _.noConflict().runInContext(), func = args[1]; - return base(util, name, func); + return baseConvert(util, name, func); } module.exports = convert; diff --git a/lib/fp/node.js b/lib/fp/convert.node.js similarity index 79% rename from lib/fp/node.js rename to lib/fp/convert.node.js index 943844f3f..ef26d5cbf 100644 --- a/lib/fp/node.js +++ b/lib/fp/convert.node.js @@ -1,4 +1,4 @@ -var baseConvert = require('./base.js'), +var baseConvert = require('./baseConvert.js'), util = require('./util.js'); /** @@ -9,8 +9,8 @@ var baseConvert = require('./base.js'), * @param {Function} func The function to wrap. * @returns {Function|Object} Returns the converted function or object. */ -function convert(name, func) { +function nodeConvert(name, func) { return baseConvert(util, name, func); } -module.exports = convert; +module.exports = nodeConvert; diff --git a/test/test-fp.js b/test/test-fp.js index c283dfd02..c27862285 100644 --- a/test/test-fp.js +++ b/test/test-fp.js @@ -43,7 +43,7 @@ QUnitExtras.runInContext(root); } - var convert = root.fp || load('../lib/fp/fp.js'), + var convert = root.fp || load('../lib/fp/convert.js'), mapping = root.mapping || load('../lib/fp/mapping.js'), fp = convert(_.runInContext());