You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flagon.apache.org by po...@apache.org on 2019/03/29 00:32:59 UTC
[incubator-flagon-useralejs] branch FLAGON-336 created (now 73a4f61)
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a change to branch FLAGON-336
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git.
at 73a4f61 [Patch: SENSSOFT-340] Updates to NPM dep. in package.js, including engines (NPM/NJS), Rollup, and Rollup-plugin-json
This branch includes the following new commits:
new 3014428 added pageTitle, pageUrl, pageReferrer fields to UserALE.js
new 508a387 resolves minor inconsistency with branch-192
new 73a4f61 [Patch: SENSSOFT-340] Updates to NPM dep. in package.js, including engines (NPM/NJS), Rollup, and Rollup-plugin-json
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-flagon-useralejs] 03/03: [Patch: SENSSOFT-340] Updates
to NPM dep. in package.js, including engines (NPM/NJS), Rollup,
and Rollup-plugin-json
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch FLAGON-336
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git
commit 73a4f61e99c20d9e16f9460cfc2fe413975bb82f
Author: poorejc <po...@apache.org>
AuthorDate: Fri Mar 1 01:39:28 2019 -0500
[Patch: SENSSOFT-340] Updates to NPM dep. in package.js, including engines (NPM/NJS), Rollup, and Rollup-plugin-json
---
gulpfile.js | 27 +++++++++++++++------------
package.json | 8 ++++----
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/gulpfile.js b/gulpfile.js
index 7fc8d34..626831c 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -42,16 +42,16 @@ gulp.task('clean', function() {
// Build the module with Rollup
gulp.task('rollup', function() {
return rollup({
- entry : 'src/main.js',
+ input : 'src/main.js',
plugins : [
json()
]
})
.then(function(bundle) {
return bundle.write({
+ file : 'build/' + userale + '.js',
format : 'iife',
- moduleName : 'userale',
- dest : 'build/' + userale + '.js'
+ name : 'userale',
});
});
});
@@ -60,15 +60,16 @@ gulp.task('rollup', function() {
// Build the module with Rollup
gulp.task('rollup-web-ext-content', function() {
return rollup({
- entry : 'src/' + userAleWebExtDirName + '/content.js',
+ input : 'src/' + userAleWebExtDirName + '/content.js',
plugins : [
json()
]
})
.then(function(bundle) {
return bundle.write({
- moduleName : 'user-ale-ext-content',
- dest : 'build/' + userAleWebExtDirName + '/content.js'
+ file : 'build/' + userAleWebExtDirName + '/content.js',
+ name : 'user-ale-ext-content',
+ format : 'esm'
});
});
});
@@ -76,15 +77,16 @@ gulp.task('rollup-web-ext-content', function() {
// Build the module with Rollup
gulp.task('rollup-web-ext-background', function() {
return rollup({
- entry : 'src/' + userAleWebExtDirName + '/background.js',
+ input : 'src/' + userAleWebExtDirName + '/background.js',
plugins : [
json()
]
})
.then(function(bundle) {
return bundle.write({
- moduleName : 'user-ale-ext-background',
- dest : 'build/' + userAleWebExtDirName + '/background.js'
+ file : 'build/' + userAleWebExtDirName + '/background.js',
+ name : 'user-ale-ext-background',
+ format : 'esm'
});
});
});
@@ -92,15 +94,16 @@ gulp.task('rollup-web-ext-background', function() {
// Build the module with Rollup
gulp.task('rollup-web-ext-options', function() {
return rollup({
- entry : 'src/' + userAleWebExtDirName + '/options.js',
+ input : 'src/' + userAleWebExtDirName + '/options.js',
plugins : [
json()
]
})
.then(function(bundle) {
return bundle.write({
- moduleName : 'user-ale-ext-options',
- dest : 'build/' + userAleWebExtDirName + '/options.js'
+ file : 'build/' + userAleWebExtDirName + '/options.js',
+ name : 'user-ale-ext-options',
+ format : "esm"
});
});
});
diff --git a/package.json b/package.json
index bb61ea9..9765f23 100755
--- a/package.json
+++ b/package.json
@@ -33,8 +33,8 @@
},
"homepage": "http://senssoft.incubator.apache.org",
"engines": {
- "node": "~8.2.1",
- "npm": "~5.3.0"
+ "node": "~11.10.1",
+ "npm": "~6.7.0"
},
"devDependencies": {
"babel-preset-env": "^1.7.0",
@@ -54,8 +54,8 @@
"gulp-uglify": "^3.0.1",
"jsdom": "^8.4.0",
"nodemon": "^1.9.2",
- "rollup": "^0.26.0",
- "rollup-plugin-json": "^2.0.1",
+ "rollup": "^1.3.2",
+ "rollup-plugin-json": "^3.1.0",
"sinon": "^1.17.6"
},
"dependencies": {
[incubator-flagon-useralejs] 02/03: resolves minor inconsistency
with branch-192
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch FLAGON-336
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git
commit 508a387142f4391d4f5d73bb722edfd94d8d40f3
Author: poorejc <po...@apache.org>
AuthorDate: Thu Feb 28 20:19:36 2019 -0500
resolves minor inconsistency with branch-192
---
src/packageLogs.js | 64 +++++++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/packageLogs.js b/src/packageLogs.js
index 49684b1..81553cf 100755
--- a/src/packageLogs.js
+++ b/src/packageLogs.js
@@ -71,38 +71,38 @@ export function initPackager(newLogs, newConfig) {
* @return {boolean} Whether the event was logged.
*/
export function packageLog(e, detailFcn) {
- var log;
- if (!config.on) {
- return false;
- }
+ if (!config.on) {
+ return false;
+ }
- var details = null;
- if (detailFcn) {
- details = detailFcn(e);
- }
+ var details = null;
+ if (detailFcn) {
+ details = detailFcn(e);
+ }
- var timeFields = extractTimeFields(
- (e.timeStamp && e.timeStamp > 0) ? config.time(e.timeStamp) : Date.now()
- );
+ var timeFields = extractTimeFields(
+ (e.timeStamp && e.timeStamp > 0) ? config.time(e.timeStamp) : Date.now()
+ );
- log = {
- 'target': getSelector(e.target),
- 'path': buildPath(e),
- 'pageUrl': window.location.href,
- 'pageTitle': document.title,
- 'pageReferrer': document.referrer,
- 'clientTime': timeFields.milli,
- 'microTime': timeFields.micro,
- 'location': getLocation(e),
- 'type': e.type,
- 'logType': 'raw',
- 'details': details,
- 'userId': config.userId,
- 'toolVersion': config.version,
- 'toolName': config.toolName,
- 'useraleVersion': config.useraleVersion,
- 'sessionID': config.sessionID
- };
+ var log = {
+ 'target' : getSelector(e.target),
+ 'path' : buildPath(e),
+ 'pageUrl': window.location.href,
+ 'pageTitle': document.title,
+ 'pageReferrer': document.referrer,
+ 'clientTime' : timeFields.milli,
+ 'microTime' : timeFields.micro,
+ 'location' : getLocation(e),
+ 'type' : e.type,
+ 'logType': 'raw',
+ 'userAction' : true,
+ 'details' : details,
+ 'userId' : config.userId,
+ 'toolVersion' : config.version,
+ 'toolName' : config.toolName,
+ 'useraleVersion': config.useraleVersion,
+ 'sessionID': config.sessionID
+ };
if ((typeof filterHandler === 'function') && !filterHandler(log)) {
return false;
@@ -157,9 +157,9 @@ export function packageIntervalLog(e) {
intervalLog = {
'target': intervalID,
'path': intervalPath,
- 'pageUrl' : window.location.href,
- 'pageTitle' : document.title,
- 'pageReferrer' : document.referrer,
+ 'pageUrl': window.location.href,
+ 'pageTitle': document.title,
+ 'pageReferrer': document.referrer,
'count': intervalCounter,
'duration': timestamp - intervalTimer, // microseconds
'startTime': intervalTimer,
[incubator-flagon-useralejs] 01/03: added pageTitle, pageUrl,
pageReferrer fields to UserALE.js
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch FLAGON-336
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git
commit 30144285ca82d69f24530885d7512a8c0b5959eb
Author: poorejc <po...@apache.org>
AuthorDate: Sun Feb 24 21:50:23 2019 -0500
added pageTitle, pageUrl, pageReferrer fields to UserALE.js
---
src/packageLogs.js | 58 ++++++++++++++++++++++++++++++------------------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/src/packageLogs.js b/src/packageLogs.js
old mode 100644
new mode 100755
index 439e816..49684b1
--- a/src/packageLogs.js
+++ b/src/packageLogs.js
@@ -71,35 +71,38 @@ export function initPackager(newLogs, newConfig) {
* @return {boolean} Whether the event was logged.
*/
export function packageLog(e, detailFcn) {
- if (!config.on) {
- return false;
- }
+ var log;
+ if (!config.on) {
+ return false;
+ }
- var details = null;
- if (detailFcn) {
- details = detailFcn(e);
- }
+ var details = null;
+ if (detailFcn) {
+ details = detailFcn(e);
+ }
- var timeFields = extractTimeFields(
- (e.timeStamp && e.timeStamp > 0) ? config.time(e.timeStamp) : Date.now()
- );
+ var timeFields = extractTimeFields(
+ (e.timeStamp && e.timeStamp > 0) ? config.time(e.timeStamp) : Date.now()
+ );
- var log = {
- 'target' : getSelector(e.target),
- 'path' : buildPath(e),
- 'clientTime' : timeFields.milli,
- 'microTime' : timeFields.micro,
- 'location' : getLocation(e),
- 'type' : e.type,
- 'logType': 'raw',
- 'userAction' : true,
- 'details' : details,
- 'userId' : config.userId,
- 'toolVersion' : config.version,
- 'toolName' : config.toolName,
- 'useraleVersion': config.useraleVersion,
- 'sessionID': config.sessionID
- };
+ log = {
+ 'target': getSelector(e.target),
+ 'path': buildPath(e),
+ 'pageUrl': window.location.href,
+ 'pageTitle': document.title,
+ 'pageReferrer': document.referrer,
+ 'clientTime': timeFields.milli,
+ 'microTime': timeFields.micro,
+ 'location': getLocation(e),
+ 'type': e.type,
+ 'logType': 'raw',
+ 'details': details,
+ 'userId': config.userId,
+ 'toolVersion': config.version,
+ 'toolName': config.toolName,
+ 'useraleVersion': config.useraleVersion,
+ 'sessionID': config.sessionID
+ };
if ((typeof filterHandler === 'function') && !filterHandler(log)) {
return false;
@@ -154,6 +157,9 @@ export function packageIntervalLog(e) {
intervalLog = {
'target': intervalID,
'path': intervalPath,
+ 'pageUrl' : window.location.href,
+ 'pageTitle' : document.title,
+ 'pageReferrer' : document.referrer,
'count': intervalCounter,
'duration': timestamp - intervalTimer, // microseconds
'startTime': intervalTimer,