This is an automated email from the ASF dual-hosted git repository.

poorejc pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git

commit 4485ed74472a5c4981630f9e02dbcd06f7a4a755
Merge: d36c3b9 68f08e3
Author: poorejc <[email protected]>
AuthorDate: Fri Mar 26 22:27:33 2021 -0400

    Merge branch 'refactor-vars' of 
https://github.com/UncleGedd/incubator-flagon-useralejs into 
UncleGedd-refactor-vars

 build/UserALEWebExtension/background.js |  58 +--
 build/UserALEWebExtension/content.js    | 209 +++++-----
 build/userale-2.1.1.js                  | 678 ++++++++++++++++++--------------
 build/userale-2.1.1.min.js              |   2 +-
 gulpfile.js                             |   4 +-
 package-lock.json                       |  44 ++-
 package.json                            |   2 +
 src/attachHandlers.js                   |  15 +-
 src/configure.js                        |   8 +-
 src/getInitialSettings.js               | 114 +++---
 src/main.js                             |  14 +-
 src/packageLogs.js                      |  52 +--
 src/sendLogs.js                         |   6 +-
 13 files changed, 656 insertions(+), 550 deletions(-)

diff --cc package-lock.json
index 5183fb4,cd2580a..e9ea84d
--- a/package-lock.json
+++ b/package-lock.json
@@@ -11337,13 -9941,10 +11358,10 @@@
        }
      },
      "node_modules/rollup": {
 -      "version": "2.41.2",
 -      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.41.2.tgz";,
 -      "integrity": 
"sha512-6u8fJJXJx6fmvKrAC9DHYZgONvSkz8S9b/VFBjoQ6dkKdHyPpPbpqiNl2Bao9XBzDHpq672X6sGZ9G1ZBqAHMg==",
 +      "version": "2.42.3",
 +      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.42.3.tgz";,
 +      "integrity": 
"sha512-JjaT9WaUS5vmjy6xUrnPOskjkQg2cN4WSACNCwbOvBz8VDmbiKVdmTFUoMPRqTud0tsex8Xy9/boLbDW9HKD1w==",
        "dev": true,
-       "dependencies": {
-         "fsevents": "~2.3.1"
-       },
        "bin": {
          "rollup": "dist/bin/rollup"
        },

Reply via email to