aboutsummaryrefslogtreecommitdiffstats
path: root/web/gulpfile.js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-10 12:03:56 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-10 12:03:56 -0700
commit0b241a1da71ef9eb7632fc0e32abcf061dcbd217 (patch)
tree703f1a5ff9d9c00b4bc36c5e4ded4583af6b87c3 /web/gulpfile.js
parent11fb21719179f243b9f2a069cba42c1d7f3722c0 (diff)
parentc33df55919cf2238deff34b22856f8304e6279e3 (diff)
downloadmitmproxy-0b241a1da71ef9eb7632fc0e32abcf061dcbd217.tar.gz
mitmproxy-0b241a1da71ef9eb7632fc0e32abcf061dcbd217.tar.bz2
mitmproxy-0b241a1da71ef9eb7632fc0e32abcf061dcbd217.zip
Merge remote-tracking branch 'jason/master'
Diffstat (limited to 'web/gulpfile.js')
-rw-r--r--web/gulpfile.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/web/gulpfile.js b/web/gulpfile.js
index ffa5387a..4a8c765f 100644
--- a/web/gulpfile.js
+++ b/web/gulpfile.js
@@ -142,6 +142,7 @@ function app_stream(dev) {
var bundler = browserify({
entries: [conf.js.app],
debug: true,
+ extensions: ['.jsx'],
cache: {}, // required for watchify
packageCache: {} // required for watchify
});