update build file

4 files changed, 22 insertions, 22 deletions

diff --git a/.travis.yml b/.travis.yml
index 74656b910..a3d0761aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+sudo: required
+dist: trusty
 language: php
 php:
     - 5.5
diff --git a/js/.jshintrc b/js/.jshintrc
index 19894c5ea..a5c3f3bec 100644
--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -48,6 +48,8 @@
         "t": true,
         "url": true,
         "navigator": true,
-        "oc_requesttoken": true
+        "oc_requesttoken": true,
+        "__dirname": true,
+        "require": true
     }
 }
diff --git a/js/gulpfile.js b/js/gulpfile.js
index 497fd6959..a3bd30eec 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-let gulp = require('gulp'),
+const gulp = require('gulp'),
     ngAnnotate = require('gulp-ng-annotate'),
     uglify = require('gulp-uglify'),
     jshint = require('gulp-jshint'),
@@ -22,10 +22,11 @@ let gulp = require('gulp'),
 /**
  * Configuration
  */
-let phpunitConfig = __dirname + '/../phpunit.xml';
-let karmaConfig = __dirname + '/karma.conf.js';
-let destinationFolder = __dirname + '/build/';
-let sources = [
+const buildName = 'app.min.js';
+const phpunitConfig = __dirname + '/../phpunit.xml';
+const karmaConfig = __dirname + '/karma.conf.js';
+const destinationFolder = __dirname + '/build/';
+const sources = [
     'app/App.js', 'app/Config.js', 'app/Run.js',
     'controller/**/*.js',
     'filter/**/*.js',
@@ -35,36 +36,30 @@ let sources = [
     'utility/**/*.js',
     'directive/**/*.js'
 ];
-
-let testSources = [
-    'tests/**/*.js'
-];
-
-let phpSources = [
-    '../*/**.php',
-    '!../js/*/**',
-    '!../vendor/*/**'
-];
+const testSources = ['tests/**/*.js'];
+const phpSources = ['../*/**.php', '!../js/**', '!../vendor/*/**'];
+const watchSources = sources.concat(testSources).concat('*.js');
+const lintSources = watchSources;
 
 gulp.task('default', ['lint'], () => {
     return gulp.src(sources)
         .pipe(ngAnnotate())
         .pipe(sourcemaps.init())
-        .pipe(concat('app.min.js'))
+        .pipe(concat(buildName))
         .pipe(uglify())
         .pipe(sourcemaps.write())
         .pipe(gulp.dest(destinationFolder));
 });
 
 gulp.task('lint', () => {
-    return gulp.src('*/**.js')
+    return gulp.src(lintSources)
         .pipe(jshint())
-        .pipe(jshint.reporter('jshint-stylish'))
+        .pipe(jshint.reporter('default'))
         .pipe(jshint.reporter('fail'));
 });
 
 gulp.task('watch', () => {
-    gulp.watch(sources.concat(testSources).concat('*.js'), ['default']);
+    gulp.watch(watchSources, ['default']);
 });
 
 gulp.task('karma', (done) => {
diff --git a/js/package.json b/js/package.json
index 09a2b6eeb..ebaa58b64 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,9 +1,9 @@
 {
   "name": "ownCloud-news",
   "description": "An RSS/Atom feed reader",
-  "main": "build/app.js",
+  "main": "build/app.min.js",
   "scripts": {
-    "test": "grunt js-unit"
+    "test": "gulp karma"
   },
   "repository": {
     "type": "git",
@@ -22,6 +22,7 @@
   "bugs": {
     "url": "https://github.com/owncloud/news/issues"
   },
+  "private": true,
   "homepage": "https://github.com/owncloud/news",
   "devDependencies": {
     "gulp": "^3.9.1",