From 609f07449e03156a5bc2a5394faa07bd64953036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Fri, 6 Jul 2018 00:59:44 +0200
Subject: [PATCH] Concat before uglifying

---
 gulpfile.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index c3f1ddf1..1e240820 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -21,12 +21,12 @@ gulp.task('js', function () {
 gulp.task('embed', function () {
     return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/player.js', 'server/public/assets/js/helpers.js', 'server/public/assets/js/playercontrols.js', 'server/public/assets/js/list.js', 'server/public/assets/js/embed.js', '!server/public/assets/js/frontpage*', '!server/public/assets/js/remotecontroller.js', 'server/public/assets/js/hostcontroller.js'])
     //.pipe(sourcemaps.init())
+    .pipe(concat('embed.min.js'))
         .pipe(uglify({
             mangle: true,
             compress: true,
             enclose: true
         }))
-        .pipe(concat('embed.min.js'))
         //.pipe(sourcemaps.write('maps'))
         .pipe(gulp.dest('server/public/assets/dist'));
 });
@@ -34,12 +34,13 @@ gulp.task('embed', function () {
 gulp.task('token', function() {
     return gulp.src(['server/public/assets/js/token*', 'server/public/assets/js/helpers.js'])
     //.pipe(sourcemaps.init())
+    .pipe(concat('token.min.js'))
         .pipe(uglify({
             mangle: true,
             compress: true,
             enclose: true
         }))
-        .pipe(concat('token.min.js'))
+
         //.pipe(sourcemaps.write('maps'))
         .pipe(gulp.dest('server/public/assets/dist'));
 })
@@ -47,12 +48,13 @@ gulp.task('token', function() {
 gulp.task('callback', function () {
     return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/callback.js'])
     //.pipe(sourcemaps.init())
+    .pipe(concat('callback.min.js'))
         .pipe(uglify({
             mangle: true,
             compress: true,
             enclose: true
         }))
-        .pipe(concat('callback.min.js'))
+
         //.pipe(sourcemaps.write('maps'))
         .pipe(gulp.dest('server/public/assets/dist'));
 });
@@ -64,12 +66,13 @@ gulp.task('build', function() {
 gulp.task('remotecontroller', function () {
     return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/remotecontroller.js', 'server/public/assets/js/helpers.js'])
     ////.pipe(sourcemaps.init())
+    .pipe(concat('remote.min.js'))
         .pipe(uglify({
             mangle: true,
             compress: true,
             enclose: true
         }))
-        .pipe(concat('remote.min.js'))
+
         //.pipe(sourcemaps.write('maps'))
         .pipe(gulp.dest('server/public/assets/dist'));
 });