Merge pull request #2289 from recena/JENKINS-34438

[JENKINS-34438] Activate JSHint during the build process
jenkinsci · May 3, 2016 · 134abbd · 134abbd
2 parents 4927968 + ed21605
commit 134abbd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/war/gulpfile.js b/war/gulpfile.js
@@ -1,3 +1,6 @@
+var gulp = require('gulp');
+var jshint = require('gulp-jshint');
+
 //
 // See https://github.com/tfennelly/jenkins-js-builder
 //
@@ -44,3 +47,13 @@ builder.bundle('src/main/js/add-item.js')
     .withExternalModuleMapping('jquery-detached', 'core-assets/jquery-detached:jquery2')
     .less('src/main/js/add-item.less')
     .inDir('src/main/webapp/jsbundles');
+
+//
+// JSHint, a JavaScript Code Quality Tool
+//
+gulp.task('lint', function() {
+    return gulp.src('src/main/js/**/*.js')
+        .pipe(jshint())
+        .pipe(jshint.reporter('default'))
+        .pipe(jshint.reporter('fail'));
+});
diff --git a/war/package.json b/war/package.json
@@ -9,7 +9,9 @@
     "hbsfy": "^2.4.1",
     "jenkins-handlebars-rt": "^1.0.1",
     "jenkins-js-builder": "0.0.40",
-    "jenkins-js-test": "^1.0.0"
+    "jenkins-js-test": "^1.0.0",
+    "jshint": "^2.9.2",
+    "gulp-jshint": "^2.0.0"
   },
   "dependencies": {
     "bootstrap-detached": "^3.3.5-v1",

diff --git a/war/pom.xml b/war/pom.xml
@@ -700,8 +700,7 @@ THE SOFTWARE.
           <plugin>
             <groupId>com.github.eirslett</groupId>
             <artifactId>frontend-maven-plugin</artifactId>
-            <version>0.0.23</version>
-
+            <version>1.0</version>
             <executions>
 
               <execution>
@@ -737,7 +736,7 @@ THE SOFTWARE.
                   <goal>gulp</goal>
                 </goals>
                 <configuration>
-                  <arguments>bundle</arguments>
+                  <arguments>lint bundle</arguments>
                 </configuration>
               </execution>
 

diff --git a/war/src/main/js/api/pluginManager.js b/war/src/main/js/api/pluginManager.js
@@ -185,7 +185,7 @@ exports.installPluginsDone = function(handler) {
 			handler.call({ isError: true, message: errorThrown });
 		}
 	});
-}
+};
 
 /**
  * Restart Jenkins

diff --git a/war/src/main/js/pluginSetupWizardGui.js b/war/src/main/js/pluginSetupWizardGui.js
@@ -913,7 +913,7 @@ var createPluginSetupWizard = function(appendTarget) {
 								if (j.correlationId) {
 									selectedPluginNames.push(j.name);
 								}
-								setFailureStatus(j)
+								setFailureStatus(j);
 							}
 							showInstallProgress(data.state);
 						}));