From 3d218f8deeac304f131f75fe52f6cfd0279d15e8 Mon Sep 17 00:00:00 2001 From: Chris Cuilla Date: Fri, 21 Jul 2017 09:17:05 -0600 Subject: [PATCH 1/6] Updated version references. --- .versions | 2 +- examples/flow-router/.meteor/versions | 2 +- examples/iron-router/.meteor/versions | 2 +- examples/react-router/.meteor/versions | 2 +- package.js | 4 ++-- package.json | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.versions b/.versions index 53da470..aa4e432 100644 --- a/.versions +++ b/.versions @@ -8,6 +8,6 @@ es5-shim@4.6.15 meteor@1.6.1 modules@0.9.0 modules-runtime@0.8.0 -okgrow:analytics@3.0.1 +okgrow:analytics@4.0.0 promise@0.8.9 underscore@1.0.10 diff --git a/examples/flow-router/.meteor/versions b/examples/flow-router/.meteor/versions index 70f2a9b..54e8fa9 100644 --- a/examples/flow-router/.meteor/versions +++ b/examples/flow-router/.meteor/versions @@ -69,7 +69,7 @@ npm-mongo@2.2.24 oauth@1.1.13 oauth2@1.1.11 observe-sequence@1.0.16 -okgrow:analytics@3.0.1 +okgrow:analytics@4.0.0 ordered-dict@1.0.9 promise@0.8.8 random@1.0.10 diff --git a/examples/iron-router/.meteor/versions b/examples/iron-router/.meteor/versions index fc825e5..f1244b9 100644 --- a/examples/iron-router/.meteor/versions +++ b/examples/iron-router/.meteor/versions @@ -75,7 +75,7 @@ npm-mongo@2.2.24 oauth@1.1.13 oauth2@1.1.11 observe-sequence@1.0.16 -okgrow:analytics@3.0.1 +okgrow:analytics@4.0.0 ordered-dict@1.0.9 promise@0.8.8 random@1.0.10 diff --git a/examples/react-router/.meteor/versions b/examples/react-router/.meteor/versions index 0672786..e799eb9 100644 --- a/examples/react-router/.meteor/versions +++ b/examples/react-router/.meteor/versions @@ -57,7 +57,7 @@ npm-bcrypt@0.9.2 npm-mongo@2.2.24 observe-sequence@1.0.16 okgrow:accounts-ui-react@0.8.0 -okgrow:analytics@3.0.1 +okgrow:analytics@4.0.0 ordered-dict@1.0.9 promise@0.8.8 random@1.0.10 diff --git a/package.js b/package.js index e8a527b..723a9b4 100644 --- a/package.js +++ b/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'okgrow:analytics', - version: '3.0.1', + version: '4.0.0', summary: 'Extends @okgrow/auto-analytics adding automatic user identification for Meteor applications.', git: 'https://github.com/okgrow/analytics', documentation: 'README.md', @@ -29,5 +29,5 @@ Package.onUse((api) => { }); Npm.depends({ - '@okgrow/auto-analytics': '1.0.2', + '@okgrow/auto-analytics': '2.0.0', }); diff --git a/package.json b/package.json index 9ecb155..9ef2732 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "analytics", - "version": "3.0.1", + "version": "4.0.0", "description": "Complete Google Analytics, Mixpanel, KISSmetrics (and more) integration for Meteor", "repository": { "type": "git", @@ -29,6 +29,6 @@ "eslint-plugin-meteor": "^4.0.1" }, "dependencies": { - "@okgrow/auto-analytics": "1.0.2" + "@okgrow/auto-analytics": "2.0.0" } } From c4587aad2a729d1b8603b455d8994bc6455c9648 Mon Sep 17 00:00:00 2001 From: Chris Cuilla Date: Fri, 21 Jul 2017 09:17:41 -0600 Subject: [PATCH 2/6] Added Segment's analytics.js. --- examples/flow-router/package.json | 3 ++- examples/iron-router/package.json | 3 ++- examples/react-router/package.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/flow-router/package.json b/examples/flow-router/package.json index 2a94867..ca4bcb9 100644 --- a/examples/flow-router/package.json +++ b/examples/flow-router/package.json @@ -6,6 +6,7 @@ }, "dependencies": { "babel-runtime": "6.18.0", - "meteor-node-stubs": "~0.2.0" + "meteor-node-stubs": "~0.2.0", + "analytics.js": "^2.9.1" } } diff --git a/examples/iron-router/package.json b/examples/iron-router/package.json index c6ddf2e..5081fb8 100644 --- a/examples/iron-router/package.json +++ b/examples/iron-router/package.json @@ -6,6 +6,7 @@ }, "dependencies": { "babel-runtime": "6.18.0", - "meteor-node-stubs": "~0.2.0" + "meteor-node-stubs": "~0.2.0", + "analytics.js": "^2.9.1" } } diff --git a/examples/react-router/package.json b/examples/react-router/package.json index 77432d8..ef8baf3 100644 --- a/examples/react-router/package.json +++ b/examples/react-router/package.json @@ -12,6 +12,7 @@ "react-document-title": "^2.0.2", "react-dom": "^15.3.2", "react-komposer": "1.13.1", - "react-router": "^3.0.0" + "react-router": "^3.0.0", + "analytics.js": "^2.9.1" } } From 45a5086e985c319268af12a8c73b034016a04405 Mon Sep 17 00:00:00 2001 From: Chris Cuilla Date: Fri, 21 Jul 2017 09:18:13 -0600 Subject: [PATCH 3/6] Removed embedded analytics.js. --- vendor/analytics.min.js | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 vendor/analytics.min.js diff --git a/vendor/analytics.min.js b/vendor/analytics.min.js deleted file mode 100644 index 9c7a3dd..0000000 --- a/vendor/analytics.min.js +++ /dev/null @@ -1,7 +0,0 @@ -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.analytics=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o",ret);return ret;function integration(name){return!!(includes(name,list)||name.toLowerCase()==="all"||includes(name.toLowerCase(),lower))}}},{"@ndhoule/defaults":6,"@ndhoule/each":8,"@ndhoule/includes":12,"@ndhoule/map":14,"component-type":134,debug:137}],26:[function(require,module,exports){"use strict";var canonical=require("@segment/canonical");var includes=require("@ndhoule/includes");var url=require("component-url");function pageDefaults(){return{path:canonicalPath(),referrer:document.referrer,search:location.search,title:document.title,url:canonicalUrl(location.search)}}function canonicalPath(){var canon=canonical();if(!canon)return window.location.pathname;var parsed=url.parse(canon);return parsed.pathname}function canonicalUrl(search){var canon=canonical();if(canon)return includes("?",canon)?canon:canon+search;var url=window.location.href;var i=url.indexOf("#");return i===-1?url:url.slice(0,i)}module.exports=pageDefaults},{"@ndhoule/includes":12,"@segment/canonical":108,"component-url":135}],27:[function(require,module,exports){"use strict";var bindAll=require("bind-all");var defaults=require("@ndhoule/defaults");var store=require("@segment/store");function Store(options){this.options(options)}Store.prototype.options=function(options){if(arguments.length===0)return this._options;options=options||{};defaults(options,{enabled:true});this.enabled=options.enabled&&store.enabled;this._options=options};Store.prototype.set=function(key,value){if(!this.enabled)return false;return store.set(key,value)};Store.prototype.get=function(key){if(!this.enabled)return null;return store.get(key)};Store.prototype.remove=function(key){if(!this.enabled)return false;return store.remove(key)};module.exports=bindAll(new Store);module.exports.Store=Store},{"@ndhoule/defaults":6,"@segment/store":118,"bind-all":122}],28:[function(require,module,exports){"use strict";var Entity=require("./entity");var bindAll=require("bind-all");var cookie=require("./cookie");var debug=require("debug")("analytics:user");var inherit=require("inherits");var rawCookie=require("component-cookie");var uuid=require("uuid");User.defaults={persist:true,cookie:{key:"ajs_user_id",oldKey:"ajs_user"},localStorage:{key:"ajs_user_traits" -}};function User(options){this.defaults=User.defaults;this.debug=debug;Entity.call(this,options)}inherit(User,Entity);User.prototype.id=function(id){var prev=this._getId();var ret=Entity.prototype.id.apply(this,arguments);if(prev==null)return ret;if(prev!=id&&id)this.anonymousId(null);return ret};User.prototype.anonymousId=function(anonymousId){var store=this.storage();if(arguments.length){store.set("ajs_anonymous_id",anonymousId);return this}anonymousId=store.get("ajs_anonymous_id");if(anonymousId){return anonymousId}anonymousId=rawCookie("_sio");if(anonymousId){anonymousId=anonymousId.split("----")[0];store.set("ajs_anonymous_id",anonymousId);store.remove("_sio");return anonymousId}anonymousId=uuid.v4();store.set("ajs_anonymous_id",anonymousId);return store.get("ajs_anonymous_id")};User.prototype.logout=function(){Entity.prototype.logout.call(this);this.anonymousId(null)};User.prototype.load=function(){if(this._loadOldCookie())return;Entity.prototype.load.call(this)};User.prototype._loadOldCookie=function(){var user=cookie.get(this._options.cookie.oldKey);if(!user)return false;this.id(user.id);this.traits(user.traits);cookie.remove(this._options.cookie.oldKey);return true};module.exports=bindAll(new User);module.exports.User=User},{"./cookie":20,"./entity":21,"bind-all":122,"component-cookie":125,debug:137,inherits:144,uuid:187}],29:[function(require,module,exports){module.exports={_args:[["@segment/analytics.js-core@^3.0.0","/Users/work/dev/exp_analytics/analytics.js"]],_from:"@segment/analytics.js-core@>=3.0.0 <4.0.0",_id:"@segment/analytics.js-core@3.0.0",_inCache:true,_installable:true,_location:"/@segment/analytics.js-core",_nodeVersion:"4.4.5",_npmOperationalInternal:{host:"packages-16-east.internal.npmjs.com",tmp:"tmp/analytics.js-core-3.0.0.tgz_1464222726516_0.005199481267482042"},_npmUser:{email:"tools+npm@segment.com",name:"segment"},_npmVersion:"2.15.5",_phantomChildren:{},_requested:{name:"@segment/analytics.js-core",raw:"@segment/analytics.js-core@^3.0.0",rawSpec:"^3.0.0",scope:"@segment",spec:">=3.0.0 <4.0.0",type:"range"},_requiredBy:["/"],_resolved:"https://registry.npmjs.org/@segment/analytics.js-core/-/analytics.js-core-3.0.0.tgz",_shasum:"166e682023e6086d41e53abe5cddb23bf02b14ed",_shrinkwrap:null,_spec:"@segment/analytics.js-core@^3.0.0",_where:"/Users/work/dev/exp_analytics/analytics.js",author:{email:"friends@segment.com",name:"Segment"},bugs:{url:"https://github.com/segmentio/analytics.js-core/issues"},dependencies:{"@ndhoule/after":"^1.0.0","@ndhoule/clone":"^1.0.0","@ndhoule/defaults":"^2.0.1","@ndhoule/each":"^2.0.1","@ndhoule/extend":"^2.0.0","@ndhoule/foldl":"^2.0.1","@ndhoule/includes":"^2.0.1","@ndhoule/keys":"^2.0.0","@ndhoule/map":"^2.0.1","@ndhoule/pick":"^2.0.0","@segment/canonical":"^1.0.0","@segment/is-meta":"^1.0.0","@segment/isodate":"^1.0.2","@segment/isodate-traverse":"^1.0.1","@segment/prevent-default":"^1.0.0","@segment/store":"^1.3.20","@segment/top-domain":"^3.0.0","bind-all":"^1.0.0","component-cookie":"^1.1.2","component-emitter":"^1.2.1","component-event":"^0.1.4","component-querystring":"^2.0.0","component-type":"^1.2.1","component-url":"^0.2.1",debug:"^0.7.4",inherits:"^2.0.1",install:"^0.7.3",is:"^3.1.0",json3:"^3.3.2","new-date":"^1.0.0","next-tick":"^0.2.2","segmentio-facade":"^3.0.2",uuid:"^2.0.2"},description:"The hassle-free way to integrate analytics into any web application.",devDependencies:{"@segment/analytics.js-integration":"^2.0.0","@segment/eslint-config":"^3.1.1",browserify:"^13.0.0","browserify-istanbul":"^2.0.0","compat-trigger-event":"^1.0.0","component-each":"^0.2.6",eslint:"^2.9.0","eslint-plugin-mocha":"^2.2.0","eslint-plugin-require-path-exists":"^1.1.5",istanbul:"^0.4.3",jquery:"^1.12.3",karma:"^0.13.22","karma-browserify":"^5.0.4","karma-chrome-launcher":"^1.0.1","karma-coverage":"^1.0.0","karma-junit-reporter":"^1.0.0","karma-mocha":"^1.0.1","karma-phantomjs-launcher":"^1.0.0","karma-sauce-launcher":"^1.0.0","karma-spec-reporter":"0.0.26",mocha:"^2.2.5","phantomjs-prebuilt":"^2.1.7",proclaim:"^3.4.1",sinon:"^1.7.3",watchify:"^3.7.0"},directories:{},dist:{shasum:"166e682023e6086d41e53abe5cddb23bf02b14ed",tarball:"https://registry.npmjs.org/@segment/analytics.js-core/-/analytics.js-core-3.0.0.tgz"},homepage:"https://github.com/segmentio/analytics.js-core#readme",keywords:["analytics","analytics.js","segment","segment.io"],license:"SEE LICENSE IN LICENSE",main:"lib/index.js",maintainers:[{email:"tools+npm@segment.com",name:"segment"}],name:"@segment/analytics.js-core",optionalDependencies:{},readme:"ERROR: No README data found!",repository:{type:"git",url:"git+https://github.com/segmentio/analytics.js-core.git"},scripts:{test:"make test"},version:"3.0.0"}},{}],30:[function(require,module,exports){"use strict";var bind=require("component-bind");var integration=require("@segment/analytics.js-integration");var topDomain=require("@segment/top-domain");var when=require("do-when");var umd=typeof window.define==="function"&&window.define.amd;var src="//d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.12.1-min.gz.js";var Amplitude=module.exports=integration("Amplitude").global("amplitude").option("apiKey","").option("trackAllPages",false).option("trackNamedPages",true).option("trackCategorizedPages",true).option("trackUtmProperties",true).option("trackReferrer",false).option("batchEvents",false).option("eventUploadThreshold",30).option("eventUploadPeriodMillis",3e4).tag('