concat non vendor and test js into one file

Gulpfile.js

@@ -9,7 +9,8 @@ var basePath = 'resources/frontend_client/app/';
 
 var SRC = {
     css: [basePath + 'css/**/*.css', basePath + 'components/**/*.css'],
-    jsx: [basePath + 'query_builder/*.js']
+    jsx: [basePath + 'query_builder/*.js'],
+    appJS: [basePath + '**/*.js', '!' + basePath + 'bower_components/**/*.js', '!' + basePath + 'dist/*.js', '!' + basePath + 'query_builder/*.js', '!' + basePath + '/test/**/*.js']
 };
 
 var DEST = {
@@ -41,16 +42,21 @@ gulp.task('jsx', function () {
     return gulp.src(SRC.jsx)
         .pipe(concat('query_builder.js'))
         .pipe(react())
-        .pipe(gulp.dest(DEST.js))
-})
+        .pipe(gulp.dest(DEST.js));
+});
 
+gulp.task('build-js', function () {
+    return gulp.src(SRC.appJS)
+        .pipe(concat('app.js'))
+        .pipe(gulp.dest(DEST.js));
+});
 
 gulp.task('watch', function(){
     gulp.watch(SRC.css, ['css']);
     gulp.watch(SRC.jsx, ['jsx']);
+    gulp.watch(SRC.appJS, ['build-js']);
 });
 
+gulp.task('build', ['css', 'jsx', 'build-js']);
 
-gulp.task('build', ['css', 'jsx']);
-
-gulp.task('default', ['build','watch', 'jsx']);
+gulp.task('default', ['build', 'watch']);

resources/frontend_client/index.html

@@ -203,83 +203,7 @@
 <script src="/app/js/google_maps.js"></script>
 
 <!-- global app -->
-<script src="/app/app.js"></script>
-<script src="/app/services.js"></script>
-<script src="/app/controllers.js"></script>
-<script src="/app/filters.js"></script>
-<script src="/app/directives.js"></script>
-<script src="/app/auth/auth.module.js"></script>
-<script src="/app/auth/auth.controllers.js"></script>
-
-<!-- components and shared bits -->
-
-<script src="/app/annotation/annotation.services.js"></script>
-<script src="/app/annotation/annotation.directives.js"></script>
-<script src="/app/metabase/metabase.services.js"></script>
-
-<script src="/app/components/components.module.js"></script>
-<script src="/app/components/core_nav/core_nav.js"></script>
-<script src="/app/components/workspace/workspace.js"></script>
-<script src="/app/components/icons/icons.js"></script>
-
-<!-- superadmin section -->
-<script src="/app/superadmin/index/index.module.js"></script>
-<script src="/app/superadmin/index/index.controllers.js"></script>
-<script src="/app/superadmin/index/index.services.js"></script>
-<script src="/app/superadmin/organization/organization.module.js"></script>
-<script src="/app/superadmin/organization/organization.controllers.js"></script>
-
-<!-- admin section -->
-<script src="/app/admin/admin.controllers.js"></script>
-<script src="/app/admin/databases/databases.module.js"></script>
-<script src="/app/admin/databases/databases.controllers.js"></script>
-<script src="/app/admin/datasets/datasets.module.js"></script>
-<script src="/app/admin/datasets/datasets.controllers.js"></script>
-<script src="/app/admin/datasets/datasets.directives.js"></script>
-<script src="/app/admin/emailreport/emailreport.module.js"></script>
-<script src="/app/admin/emailreport/emailreport.controllers.js"></script>
-<script src="/app/admin/emailreport/emailreport.services.js"></script>
-<script src="/app/admin/people/people.module.js"></script>
-<script src="/app/admin/people/people.controllers.js"></script>
-<script src="/app/admin/people/people.directives.js"></script>
-<script src="/app/admin/query/query.module.js"></script>
-<script src="/app/admin/query/query.controllers.js"></script>
-<script src="/app/admin/query/query.services.js"></script>
-<script src="/app/admin/annotation/annotation.module.js"></script>
-<script src="/app/admin/annotation/annotation.controllers.js"></script>
-<script src="/app/admin/search/search.module.js"></script>
-<script src="/app/admin/search/search.controllers.js"></script>
-
-<!-- main app -->
-<script src="/app/card/card.module.js"></script>
-<script src="/app/card/card.controllers.js"></script>
-<script src="/app/card/card.services.js"></script>
-<script src="/app/card/card.directives.js"></script>
-<script src="/app/card/card.charting.js"></script>
-<script src="/app/dashboard/dashboard.module.js"></script>
-<script src="/app/dashboard/dashboard.controllers.js"></script>
-<script src="/app/dashboard/dashboard.services.js"></script>
-<script src="/app/dashboard/dashboard.directives.js"></script>
-<script src="/app/explore/explore.module.js"></script>
-<script src="/app/explore/explore.controllers.js"></script>
-<script src="/app/explore/explore.directives.js"></script>
-<script src="/app/explore/explore.services.js"></script>
-<script src="/app/user/user.module.js"></script>
-<script src="/app/user/user.controllers.js"></script>
-<script src="/app/user/user.directives.js"></script>
-<script src="/app/search/search.module.js"></script>
-<script src="/app/search/search.controllers.js"></script>
-<script src="/app/search/search.services.js"></script>
-
-<!-- custom shtuff:  be wary -->
-<script src="/app/operator/operator.module.js"></script>
-<script src="/app/operator/operator.controllers.js"></script>
-<script src="/app/operator/operator.services.js"></script>
-
-<script src="/app/reserve/reserve.module.js"></script>
-<script src="/app/reserve/reserve.controllers.js"></script>
-<script src="/app/reserve/reserve.services.js"></script>
-
+<script src="/app/dist/app.js"></script>
 <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
 <script>
     WebFont.load({