Use modularized imports for lodash (close snowplow#502)

Author: mhadam

Gruntfile.js

@@ -79,16 +79,6 @@ module.exports = function(grunt) {
 
     subdomain: process.env.SUBDOMAIN,
 
-    lodash: {
-      build: {
-        dest: 'src/js/lib_managed/lodash.js',
-        options: {
-          exports: 'node',
-          include: 'isArray, isFunction, isString, isObject, isUndefined, map, mapValues, forEach, filter, find'
-        }
-      }
-    },
-
     browserify: {
       main: {
         files: {
@@ -198,7 +188,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-aws');
   grunt.loadNpmTasks('grunt-browserify');
   grunt.loadNpmTasks('intern');
-  grunt.loadNpmTasks('grunt-lodash');
 
   grunt.registerTask('upload_setup', 'Read aws.json and configure upload tasks', function() {
     var aws = grunt.file.readJSON('aws.json');
@@ -266,11 +255,11 @@ module.exports = function(grunt) {
     });
   });
 
-  grunt.registerTask('default', 'Build lodash, Browserify, add banner, and minify', ['lodash', 'browserify:main', 'concat:deploy', 'min:deploy']);
-  grunt.registerTask('publish', 'Upload to S3 and invalidate Cloudfront (full semantic version only)', ['upload_setup', 'lodash', 'browserify:main', 'concat:deploy', 'min:deploy', 's3:not_pinned', 'cloudfront:not_pinned']);
-  grunt.registerTask('publish-pinned', 'Upload to S3 and invalidate Cloudfront (full semantic version and semantic major version)', ['upload_setup', 'lodash', 'browserify:main', 'concat:deploy', 'min:deploy', 's3', 'cloudfront']);
-  grunt.registerTask('quick', 'Build snowplow.js, skipping building lodash and minifying', ['browserify:main', 'concat:deploy']);
+  grunt.registerTask('default', 'Build Browserify, add banner, and minify', ['browserify:main', 'concat:deploy', 'min:deploy']);
+  grunt.registerTask('publish', 'Upload to S3 and invalidate Cloudfront (full semantic version only)', ['upload_setup', 'browserify:main', 'concat:deploy', 'min:deploy', 's3:not_pinned', 'cloudfront:not_pinned']);
+  grunt.registerTask('publish-pinned', 'Upload to S3 and invalidate Cloudfront (full semantic version and semantic major version)', ['upload_setup', 'browserify:main', 'concat:deploy', 'min:deploy', 's3', 'cloudfront']);
+  grunt.registerTask('quick', 'Build snowplow.js, skipping building and minifying', ['browserify:main', 'concat:deploy']);
   grunt.registerTask('test', 'Intern tests', ['browserify:test', 'intern']);
-  grunt.registerTask('travis', 'Intern tests for Travis CI',  ['lodash', 'concat:test', 'browserify:test', 'intern']);
+  grunt.registerTask('travis', 'Intern tests for Travis CI',  ['concat:test', 'browserify:test', 'intern']);
   grunt.registerTask('tags', 'Minifiy the Snowplow invocation tag', ['min:tag', 'concat:tag']);
 };

package.json

@@ -4,7 +4,6 @@
   "dependencies": {
     "browser-cookie-lite": "0.3.1",
     "jstimezonedetect": "1.0.5",
-    "lodash": "3.10.1",
     "snowplow-tracker-core": "0.6.1",
     "murmurhash": "0.0.2",
     "uuid": "2.0.3",
@@ -16,11 +15,10 @@
     "grunt-aws": "0.6.2",
     "grunt-browserify": "5.0.0",
     "grunt-contrib-concat": "0.5.1",
-    "grunt-lodash": "0.5.1",
     "grunt-yui-compressor": "git://github.com/snowplow/grunt-yui-compressor.git#fc70c3aa41bad8848b3569d6ea6ee70d270fd8a6",
+    "lodash": "^4.17.11",
     "intern": "3.3.2",
     "js-base64": "2.1.9",
-    "lodash-cli": "3.10.1",
     "semver": "4.3.2"
   },
   "contributors": [

src/js/errors.js

@@ -32,7 +32,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-var lodash = require('./lib_managed/lodash'),
+var isFunction = require('lodash/isFunction'),
     helpers = require('./lib/helpers'),
     object = typeof exports !== 'undefined' ? exports : this,
 	windowAlias = window;
@@ -75,7 +75,7 @@ object.errorManager = function (core) {
 	 */
 	function sendError(errorEvent, commonContexts, contextsAdder) {
 		var contexts;
-		if (lodash.isFunction(contextsAdder)) {
+		if (isFunction(contextsAdder)) {
 			contexts = commonContexts.concat(contextsAdder(errorEvent));
 		} else {
 			contexts = commonContexts;
@@ -116,7 +116,7 @@ object.errorManager = function (core) {
 			 * @param errorEvent ErrorEvent passed to event listener
 			 */
 			function captureError (errorEvent) {
-				if (lodash.isFunction(filter) && filter(errorEvent) || filter == null) {
+				if (isFunction(filter) && filter(errorEvent) || filter == null) {
 					sendError(errorEvent, contexts, contextsAdder)
 				}
 			}

src/js/forms.js

@@ -32,7 +32,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-var lodash = require('./lib_managed/lodash'),
+var forEach = require('lodash/forEach'),
+	filter = require('lodash/filter'),
+	find = require('lodash/find'),
 	helpers = require('./lib/helpers'),
 	object = typeof exports !== 'undefined' ? exports : this;
 
@@ -65,7 +67,7 @@ object.getFormTrackingManager = function (core, trackerId, contextAdder) {
 	 * Get an identifier for a form, input, textarea, or select element
 	 */
 	function getFormElementName(elt) {
-		return elt[lodash.find(['name', 'id', 'type', 'nodeName'], function (propName) {
+		return elt[find(['name', 'id', 'type', 'nodeName'], function (propName) {
 
 			// If elt has a child whose name is "id", that element will be returned
 			// instead of the actual id of elt unless we ensure that a string is returned
@@ -90,13 +92,13 @@ object.getFormTrackingManager = function (core, trackerId, contextAdder) {
 	 */
 	function getInnerFormElements(elt) {
 		var innerElements = [];
-		lodash.forEach(innerElementTags, function (tagname) {
+		forEach(innerElementTags, function (tagname) {
 
-			var trackedChildren = lodash.filter(elt.getElementsByTagName(tagname), function (child) {
+			var trackedChildren = filter(elt.getElementsByTagName(tagname), function (child) {
 				return child.hasOwnProperty(trackingMarker);
 			});
 
-			lodash.forEach(trackedChildren, function (child) {
+			forEach(trackedChildren, function (child) {
 				if (child.type === 'submit') {
 					return;
 				}
@@ -138,7 +140,7 @@ object.getFormTrackingManager = function (core, trackerId, contextAdder) {
 		return function (e) {
 			var elt = e.target;
 			var innerElements = getInnerFormElements(elt);
-			lodash.forEach(innerElements, function (innerElement) {
+			forEach(innerElements, function (innerElement) {
 				innerElement.value = fieldTransform(innerElement.value);
 			});
 			core.trackFormSubmission(getFormElementName(elt), helpers.getCssClasses(elt), innerElements, contextAdder(context));
@@ -163,11 +165,11 @@ object.getFormTrackingManager = function (core, trackerId, contextAdder) {
 		 * Add value change event listeners to all mutable inner form elements
 		 */
 		addFormListeners: function (context) {
-			lodash.forEach(document.getElementsByTagName('form'), function (form) {
+			forEach(document.getElementsByTagName('form'), function (form) {
 				if (formFilter(form) && !form[trackingMarker]) {
 
-					lodash.forEach(innerElementTags, function (tagname) {
-						lodash.forEach(form.getElementsByTagName(tagname), function (innerElement) {
+					forEach(innerElementTags, function (tagname) {
+						forEach(form.getElementsByTagName(tagname), function (innerElement) {
 							if (fieldFilter(innerElement) && !innerElement[trackingMarker] && innerElement.type.toLowerCase() !== 'password') {
 								helpers.addEventListener(innerElement, 'change', getFormChangeListener(context), false);
 								innerElement[trackingMarker] = true;

src/js/in_queue.js

@@ -35,7 +35,9 @@
 ;(function() {
 
 	var
-		lodash = require('./lib_managed/lodash'),
+		map = require('lodash/map'),
+		isUndefined = require('lodash/isUndefined'),
+		isFunction = require('lodash/isFunction'),
 		helpers = require('./lib/helpers'),
 
 		object = typeof exports !== 'undefined' ? exports : this; // For eventual node.js environment support
@@ -60,7 +62,7 @@
 			var namedTrackers = [];
 
 			if (!names || names.length === 0) {
-				namedTrackers = lodash.map(trackerDictionary);
+				namedTrackers = map(trackerDictionary);
 			} else {
 				for (var i = 0; i < names.length; i++) {
 					if (trackerDictionary.hasOwnProperty(names[i])) {
@@ -92,7 +94,7 @@
 
 			var name;
 
-			if (lodash.isUndefined(namespace)) {
+			if (isUndefined(namespace)) {
 				name = 'sp';
 			} else {
 				name = namespace;
@@ -151,7 +153,7 @@
 				input = Array.prototype.shift.call(parameterArray);
 
 				// Custom callback rather than tracker method, called with trackerDictionary as the context
-				if (lodash.isFunction(input)) {
+				if (isFunction(input)) {
 					input.apply(trackerDictionary, parameterArray);
 					continue;
 				}

src/js/lib/detectors.js

@@ -34,8 +34,9 @@
 
 ;(function() {
 
-	var 
-		lodash = require('../lib_managed/lodash'),
+	var
+		isFunction = require('lodash/isFunction'),
+		isUndefined = require('lodash/isUndefined'),
 		murmurhash3_32_gc = require('murmurhash').v3,
 		tz = require('jstimezonedetect').jstz.determine(),
 		cookie = require('browser-cookie-lite'),
@@ -98,7 +99,7 @@
 	object.hasCookies = function(testCookieName) {
 		var cookieName = testCookieName || 'testcookie';
 
-		if (lodash.isUndefined(navigatorAlias.cookieEnabled)) {
+		if (isUndefined(navigatorAlias.cookieEnabled)) {
 			cookie.cookie(cookieName, '1');
 			return cookie.cookie(cookieName) === '1' ? '1' : '0';
 		}
@@ -230,13 +231,13 @@
 		// IE6/IE7 navigator.javaEnabled can't be aliased, so test directly
 		if (navigatorAlias.constructor === window.Navigator &&
 				typeof navigatorAlias.javaEnabled !== 'unknown' &&
-				!lodash.isUndefined(navigatorAlias.javaEnabled) &&
+				!isUndefined(navigatorAlias.javaEnabled) &&
 				navigatorAlias.javaEnabled()) {
 			features.java = '1';
 		}
 
 		// Firefox
-		if (lodash.isFunction(windowAlias.GearsFactory)) {
+		if (isFunction(windowAlias.GearsFactory)) {
 			features.gears = '1';
 		}
 

src/js/lib/helpers.js

@@ -33,8 +33,10 @@
  */
 ;(function () {
 
-	var 
-		lodash = require('../lib_managed/lodash'),
+	var
+		isString = require('lodash/isString'),
+		isUndefined = require('lodash/isUndefined'),
+		isObject = require('lodash/isObject'),
 		cookie = require('browser-cookie-lite'),
 
 		object = typeof exports !== 'undefined' ? exports : this; // For eventual node.js environment support
@@ -43,11 +45,11 @@
 	 * Cleans up the page title
 	 */
 	object.fixupTitle = function (title) {
-		if (!lodash.isString(title)) {
+		if (!isString(title)) {
 			title = title.text || '';
 
 			var tmp = document.getElementsByTagName('title');
-			if (tmp && !lodash.isUndefined(tmp[0])) {
+			if (tmp && !isUndefined(tmp[0])) {
 				title = tmp[0].text;
 			}
 		}
@@ -193,7 +195,7 @@
 	object.getFilter = function (criterion, byClass) {
 
 		// If the criterion argument is not an object, add listeners to all elements
-		if (lodash.isArray(criterion) || !lodash.isObject(criterion)) {
+		if (Array.isArray(criterion) || !isObject(criterion)) {
 			return function () {
 				return true;
 			};
@@ -204,7 +206,7 @@
 		} else {
 			var inclusive = criterion.hasOwnProperty('whitelist');
 			var specifiedClasses = criterion.whitelist || criterion.blacklist;
-			if (!lodash.isArray(specifiedClasses)) {
+			if (!Array.isArray(specifiedClasses)) {
 				specifiedClasses = [specifiedClasses];
 			}
 
@@ -232,7 +234,7 @@
 	 * @param object criterion {transform: function (elt) {return the result of transform function applied to element}
 	 */
 	object.getTransform = function (criterion) {
-		if (!lodash.isObject(criterion)) {
+		if (!isObject(criterion)) {
 			return function(x) { return x };
 		}
 

src/js/links.js

@@ -32,7 +32,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-var lodash = require('./lib_managed/lodash'),
+var isUndefined = require('lodash/isUndefined'),
 	helpers = require('./lib/helpers'),
 	object = typeof exports !== 'undefined' ? exports : this;
 
@@ -75,12 +75,12 @@ object.getLinkTrackingManager = function (core, trackerId, contextAdder) {
 			elementContent;
 
 		while ((parentElement = sourceElement.parentNode) !== null &&
-				!lodash.isUndefined(parentElement) && // buggy IE5.5
+				!isUndefined(parentElement) && // buggy IE5.5
 				((tag = sourceElement.tagName.toUpperCase()) !== 'A' && tag !== 'AREA')) {
 			sourceElement = parentElement;
 		}
 
-		if (!lodash.isUndefined(sourceElement.href)) {
+		if (!isUndefined(sourceElement.href)) {
 			// browsers, such as Safari, don't downcase hostname and href
 			var originalSourceHostName = sourceElement.hostname || helpers.getHostName(sourceElement.href),
 				sourceHostName = originalSourceHostName.toLowerCase(),

src/js/out_queue.js

@@ -35,7 +35,9 @@
 ;(function() {
 
 	var
-		lodash = require('./lib_managed/lodash'),
+		mapValues = require('lodash/mapValues'),
+		isString = require('lodash/isString'),
+		map = require('lodash/map'),
 		localStorageAccessible = require('./lib/detectors').localStorageAccessible,
 		helpers = require('./lib/helpers'),
 		object = typeof exports !== 'undefined' ? exports : this; // For eventual node.js environment support
@@ -82,7 +84,7 @@
 		}
 
 		// Initialize to and empty array if we didn't get anything out of localStorage
-		if (!lodash.isArray(outQueue)) {
+		if (!Array.isArray(outQueue)) {
 			outQueue = [];
 		}
 
@@ -130,7 +132,7 @@
 		 * Convert numeric fields to strings to match payload_data schema
 		 */
 		function getBody(request) {
-			var cleanedRequest = lodash.mapValues(request, function (v) {
+			var cleanedRequest = mapValues(request, function (v) {
 				return v.toString();
 			});
 			return {
@@ -214,7 +216,7 @@
 			}
 
 			// Let's check that we have a Url to ping
-			if (!lodash.isString(configCollectorUrl)) {
+			if (!isString(configCollectorUrl)) {
 				throw "No Snowplow collector configured, cannot track";
 			}
 
@@ -265,7 +267,7 @@
 					}
 				};
 
-				var batch = lodash.map(outQueue.slice(0, numberToSend), function (x) {
+				var batch = map(outQueue.slice(0, numberToSend), function (x) {
 					return x.evt;
 				});
 

src/js/snowplow.js

@@ -76,7 +76,8 @@
 	// Load all our modules (at least until we fully modularize & remove grunt-concat)
 	var
 		uuid = require('uuid'),
-		lodash = require('./lib_managed/lodash'),
+		forEach = require('lodash/forEach'),
+		filter = require('lodash/filter'),
 		helpers = require('./lib/helpers'),
 		queue = require('./in_queue'),
 		tracker = require('./tracker'),
@@ -127,7 +128,7 @@
 			var now;
 
 			// Flush all POST queues
-			lodash.forEach(mutSnowplowState.bufferFlushers, function (flusher) {
+			forEach(mutSnowplowState.bufferFlushers, function (flusher) {
 				flusher();
 			});
 
@@ -140,7 +141,7 @@
 				//     while (Date.now() < mutSnowplowState.expireDateTime) { }
 				do {
 					now = new Date();
-					if (lodash.filter(mutSnowplowState.outQueues, function (queue) {
+					if (filter(mutSnowplowState.outQueues, function (queue) {
 						return queue.length > 0;
 					}).length === 0) {
 						break;