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/15 02:33:51 UTC
[incubator-flagon-useralejs] branch FLAGON-407 updated:
[FLAGON-407] Added rollup-plugin-commonjs to resolve js in ES6 bundles
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 57c088f [FLAGON-407] Added rollup-plugin-commonjs to resolve js in ES6 bundles
57c088f is described below
commit 57c088f2b52991882f622ee6729d7ef5f6b69d9a
Author: poorejc <po...@apache.org>
AuthorDate: Fri Jun 14 22:33:21 2019 -0400
[FLAGON-407] Added rollup-plugin-commonjs to resolve js in ES6 bundles
---
gulpfile.js | 15 ++++++---
package-lock.json | 63 ++++++++++++++++++++------------------
package.json | 1 +
src/UserALEWebExtension/content.js | 4 +--
4 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/gulpfile.js b/gulpfile.js
index 9c1b0a5..2bd0d9a 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -30,7 +30,8 @@ var jsonModify = require('gulp-json-modify');
var filter = require('gulp-filter');
var pump = require('pump');
var replace = require('gulp-replace');
-var resolve = require('rollup-plugin-node-resolve')
+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;
@@ -64,7 +65,8 @@ gulp.task('rollup', function() {
'\n@preserved'
}),
json(),
- resolve()
+ resolve(),
+ commonjs()
]
})
.then(function(bundle) {
@@ -86,7 +88,8 @@ gulp.task('rollup-web-ext-content', function() {
resolve({
browser: true,
preferBuiltins: false
- })
+ }),
+ commonjs()
]
})
.then(function(bundle) {
@@ -107,7 +110,8 @@ gulp.task('rollup-web-ext-background', function() {
resolve({
browser: true,
preferBuiltins: false
- })
+ }),
+ commonjs()
]
})
.then(function(bundle) {
@@ -128,7 +132,8 @@ gulp.task('rollup-web-ext-options', function() {
resolve({
browser: true,
preferBuiltins: false
- })
+ }),
+ commonjs()
]
})
.then(function(bundle) {
diff --git a/package-lock.json b/package-lock.json
index 3338cad..d3163b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2908,8 +2908,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -2930,14 +2929,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -2952,20 +2949,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3082,8 +3076,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -3095,7 +3088,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -3110,7 +3102,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -3118,14 +3109,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -3144,7 +3133,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -3225,8 +3213,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -3238,7 +3225,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -3324,8 +3310,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -3361,7 +3346,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -3381,7 +3365,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -3425,14 +3408,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -4486,6 +4467,15 @@
"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",
@@ -6465,6 +6455,19 @@
}
}
},
+ "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",
diff --git a/package.json b/package.json
index c6385cf..ae00899 100755
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
"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",
diff --git a/src/UserALEWebExtension/content.js b/src/UserALEWebExtension/content.js
index 0832e77..385fa8d 100644
--- a/src/UserALEWebExtension/content.js
+++ b/src/UserALEWebExtension/content.js
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-/*
- eslint-disable
- */
+/* eslint-disable */
import * as globals from './globals';
import * as MessageTypes from './messageTypes.js';