Stopped using grunt-browserify's alias option as it created a global require variable

Author: fblundun

Gruntfile.js

@@ -82,20 +82,6 @@ module.exports = function(grunt) {
 
     browserify: {
       dist: {
-        options: {
-          alias: [
-          'src/js/lib/identifiers.js:identifiers',
-          'src/js/lib/helpers.js:helpers',
-          'src/js/payload.js:payload',
-          'src/js/lib/cookie.js:cookie',
-          'src/js/lib/detectors.js:detectors',
-          'src/js/lib/jstz.js:jstz',
-          'src/js/queue.js:queue',
-          'src/js/lib/sha1.js:sha1',
-          'src/js/tracker.js:tracker',
-          'src/js/snowplow.js:snowplow'
-          ]
-        },
         files: {
           'dist/bundle.js': ['src/js/init.js']
         }

src/js/init.js

@@ -35,5 +35,5 @@
 // Snowplow Asynchronous Queue
 window._snaq = window._snaq || [];
 
-var snowplow = require('snowplow');
+var snowplow = require('./snowplow.js');
 window.Snowplow = window.Snowplow || new snowplow.Snowplow();

src/js/lib/detectors.js

@@ -34,9 +34,10 @@
 
 ;(function() {
 
-	var identifiers = require('identifiers');
-	var helpers = require('helpers');
+	var identifiers = require('./identifiers.js');
+	var helpers = require('./helpers.js');
 	var murmurhash3_32_gc = require('murmurhash').v3;
+	var tz = require('./jstz.js').determine();
 
 	var object = typeof module.exports != 'undefined' ? module.exports : this; // For eventual node.js environment support
 
@@ -123,8 +124,7 @@
 	 */
 	object.detectTimezone = function() {
 		//var tz = require('jstimezonedetect').determine(); // For the online version
-		var tz = require('jstz').determine();  
-	    	return (typeof (tz) === 'undefined') ? '' : tz.name();
+	    return (typeof (tz) === 'undefined') ? '' : tz.name();
 	}
 
 	/**

src/js/lib/helpers.js

@@ -33,7 +33,7 @@
  */
 ;(function () {
 
-	var identifiers = require('identifiers');
+	var identifiers = require('./identifiers.js');
 
 	var object = typeof module.exports != 'undefined' ? module.exports : this; // For eventual node.js environment support
 

src/js/lib/sha1.js

@@ -20,7 +20,7 @@
 
 ;(function(){
 
-	var helpers = require('helpers');
+	var helpers = require('./helpers.js');
 
 	var object = typeof module.exports != 'undefined' ? module.exports : this; // For eventual node.js environment support 
 

src/js/payload.js

@@ -36,7 +36,7 @@
 
 	var object = typeof module.exports != 'undefined' ? module.exports : this; // For eventual node.js environment support
 
-	var identifiers = require('identifiers');
+	var identifiers = require('./lib/identifiers.js');
 
 	var json2 = require('JSON');
 

src/js/queue.js

@@ -34,7 +34,7 @@
 
 ;(function() {
 
-	var identifiers = require('identifiers');
+	var identifiers = require('./lib/identifiers.js');
 
 	var object = typeof module.exports != 'undefined' ? module.exports : this; // For eventual node.js environment support
 

src/js/snowplow.js

@@ -74,10 +74,10 @@
 ;(function() {
 
 	// Load all our modules (at least until we fully modularize & remove grunt-concat)
-	var identifiers = require('identifiers');
-	var tracker = require('tracker');
-	var helpers = require('helpers');
-	var queue = require('queue');
+	var identifiers = require('./lib/identifiers.js');
+	var tracker = require('./tracker.js');
+	var helpers = require('./lib/helpers.js');
+	var queue = require('./queue.js');
 
 	var object = typeof module.exports != 'undefined' ? module.exports : this; // For eventual node.js environment support
 

src/js/tracker.js

@@ -34,12 +34,12 @@
 
 ;(function() {
 
-	var identifiers = require('identifiers');
-	var helpers = require('helpers');
-	var sha1 = require('sha1');
-	var cookie = require('cookie');
-	var detectors = require('detectors');
-	var payload = require('payload');
+	var identifiers = require('./lib/identifiers.js');
+	var helpers = require('./lib/helpers.js');
+	var sha1 = require('./lib/sha1.js');
+	var cookie = require('./lib/cookie.js');
+	var detectors = require('./lib/detectors.js');
+	var payload = require('./payload.js');
 	var json2 = require('JSON');
 
 	var object = typeof module.exports != 'undefined' ? module.exports : this; // For eventual node.js environment support