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/06/16 01:27:49 UTC
[incubator-flagon-useralejs] branch FLAGON-407 updated:
[FLAGON-407] found foldername discrepancy]
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch FLAGON-407
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git
The following commit(s) were added to refs/heads/FLAGON-407 by this push:
new 174b233 [FLAGON-407] found foldername discrepancy]
174b233 is described below
commit 174b23313c1377be0d420831257ba0291b84e61c
Author: poorejc <po...@apache.org>
AuthorDate: Sat Jun 15 21:27:34 2019 -0400
[FLAGON-407] found foldername discrepancy]
---
gulpfile.js | 29 +++------------
package-lock.json | 103 +++++++++++++++++-------------------------------------
package.json | 2 --
3 files changed, 38 insertions(+), 96 deletions(-)
diff --git a/gulpfile.js b/gulpfile.js
index 2bd0d9a..9a2641c 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -30,12 +30,10 @@ var jsonModify = require('gulp-json-modify');
var filter = require('gulp-filter');
var pump = require('pump');
var replace = require('gulp-replace');
-var commonjs = require('rollup-plugin-commonjs');
-var resolve = require('rollup-plugin-node-resolve');
var version = require('./package.json').version;
var uglifyjs = require('uglify-es');
var userale = 'userale-' + version;
-var userAleWebExtDirName = 'UserAleWebExtension';
+var userAleWebExtDirName = 'UserALEWebExtension';
// Clean build directory
gulp.task('clean', function() {
@@ -64,9 +62,7 @@ gulp.task('rollup', function() {
'limitations under the License.' +
'\n@preserved'
}),
- json(),
- resolve(),
- commonjs()
+ json()
]
})
.then(function(bundle) {
@@ -84,12 +80,7 @@ gulp.task('rollup-web-ext-content', function() {
return rollup({
input : 'src/' + userAleWebExtDirName + '/content.js',
plugins : [
- json(),
- resolve({
- browser: true,
- preferBuiltins: false
- }),
- commonjs()
+ json()
]
})
.then(function(bundle) {
@@ -106,12 +97,7 @@ gulp.task('rollup-web-ext-background', function() {
return rollup({
input : 'src/' + userAleWebExtDirName + '/background.js',
plugins : [
- json(),
- resolve({
- browser: true,
- preferBuiltins: false
- }),
- commonjs()
+ json()
]
})
.then(function(bundle) {
@@ -128,12 +114,7 @@ gulp.task('rollup-web-ext-options', function() {
return rollup({
input : 'src/' + userAleWebExtDirName + '/options.js',
plugins : [
- json(),
- resolve({
- browser: true,
- preferBuiltins: false
- }),
- commonjs()
+ json()
]
})
.then(function(bundle) {
diff --git a/package-lock.json b/package-lock.json
index d3163b2..5d534d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,15 +16,6 @@
"integrity": "sha512-b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg==",
"dev": true
},
- "@types/resolve": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
- "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
- "dev": true,
- "requires": {
- "@types/node": "*"
- }
- },
"abab": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
@@ -1373,12 +1364,6 @@
"readable-stream": "^2.0.2"
}
},
- "builtin-modules": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
- "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
- "dev": true
- },
"bytes": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
@@ -2162,9 +2147,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.159",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.159.tgz",
- "integrity": "sha512-bhiEr8/A97GUBcUzNb9MFNhzQOjakbKmEKBEAa6UMY45zG2e8PM63LOgAPXEJE9bQiaQH6nOdYiYf8X821tZjQ==",
+ "version": "1.3.161",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.161.tgz",
+ "integrity": "sha512-i8cuS1zf7TW2t/NrfiaF8amTggCH4yLRe7Pirdf6gVDESP146jXO9NXttM8bJk1aupwA1NVMoaikBSbnTHgZGA==",
"dev": true
},
"encodeurl": {
@@ -2908,7 +2893,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -2929,12 +2915,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -2949,17 +2937,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3076,7 +3067,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -3088,6 +3080,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -3102,6 +3095,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -3109,12 +3103,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -3133,6 +3129,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -3213,7 +3210,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -3225,6 +3223,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -3310,7 +3309,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -3346,6 +3346,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -3365,6 +3366,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -3408,12 +3410,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
@@ -4359,12 +4363,6 @@
"is-path-inside": "^1.0.0"
}
},
- "is-module": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
- "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
- "dev": true
- },
"is-my-ip-valid": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
@@ -4467,15 +4465,6 @@
"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
"dev": true
},
- "is-reference": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.2.tgz",
- "integrity": "sha512-Kn5g8c7XHKejFOpTf2QN9YjiHHKl5xRj+2uAZf9iM2//nkBNi/NNeB5JMoun28nEaUVHyPUzqzhfRlfAirEjXg==",
- "dev": true,
- "requires": {
- "@types/estree": "0.0.39"
- }
- },
"is-regex": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
@@ -6455,19 +6444,6 @@
}
}
},
- "rollup-plugin-commonjs": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.0.0.tgz",
- "integrity": "sha512-B8MoX5GRpj3kW4+YaFO/di2JsZkBxNjVmZ9LWjUoTAjq8N9wc7HObMXPsrvolVV9JXVtYSscflXM14A19dXPNQ==",
- "dev": true,
- "requires": {
- "estree-walker": "^0.6.0",
- "is-reference": "^1.1.2",
- "magic-string": "^0.25.2",
- "resolve": "^1.10.1",
- "rollup-pluginutils": "^2.7.0"
- }
- },
"rollup-plugin-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz",
@@ -6490,19 +6466,6 @@
"moment": "2.24.0"
}
},
- "rollup-plugin-node-resolve": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.0.2.tgz",
- "integrity": "sha512-/KMxyYDSMoeE+06CwbbPD8gwYcU9uwyOgMjfw2MJPDmwzEw24HIur9TR80SMsUjP2QCLSZ9othB65xNHN3e0gw==",
- "dev": true,
- "requires": {
- "@types/resolve": "0.0.8",
- "builtin-modules": "^3.1.0",
- "is-module": "^1.0.0",
- "resolve": "^1.11.0",
- "rollup-pluginutils": "^2.8.0"
- }
- },
"rollup-pluginutils": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz",
diff --git a/package.json b/package.json
index ae00899..d54f48e 100755
--- a/package.json
+++ b/package.json
@@ -55,10 +55,8 @@
"jsdom": "^8.4.0",
"nodemon": "^1.9.2",
"rollup": "^1.15.5",
- "rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-license": "^0.9.0",
- "rollup-plugin-node-resolve": "^5.0.2",
"sinon": "^1.17.6",
"uglify-es": "^3.3.9",
"composer": "^4.1.0",