aboutsummaryrefslogtreecommitdiffstats
path: root/build/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'build/tasks')
-rw-r--r--build/tasks/build.js11
-rw-r--r--build/tasks/lib/spawn_test.js4
2 files changed, 10 insertions, 5 deletions
diff --git a/build/tasks/build.js b/build/tasks/build.js
index ab1c993a0..d086ae8d6 100644
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -38,7 +38,7 @@ module.exports = function( grunt ) {
// Avoid breaking semicolons inserted by r.js
skipSemiColonInsertion: true,
wrap: {
- start: wrapper[ 0 ].replace( /\/\*jshint .* \*\/\n/, "" ),
+ start: wrapper[ 0 ].replace( /\/\*eslint .* \*\/\n/, "" ),
end: globals.replace(
/\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig,
""
@@ -64,7 +64,12 @@ module.exports = function( grunt ) {
// Convert var modules
if ( /.\/var\//.test( path.replace( process.cwd(), "" ) ) ) {
contents = contents
- .replace( /define\([\w\W]*?return/, "var " + ( /var\/([\w-]+)/.exec( name )[ 1 ] ) + " =" )
+ .replace(
+ /define\([\w\W]*?return/,
+ "var " +
+ ( /var\/([\w-]+)/.exec( name )[ 1 ] ) +
+ " ="
+ )
.replace( rdefineEnd, "" );
// Sizzle treatment
@@ -130,6 +135,7 @@ module.exports = function( grunt ) {
excluded = [],
included = [],
version = grunt.config( "pkg.version" ),
+
/**
* Recursively calls the excluder to remove on all modules in the list
* @param {Array} list
@@ -167,6 +173,7 @@ module.exports = function( grunt ) {
} );
}
},
+
/**
* Adds the specified module to the excluded or included list, depending on the flag
* @param {String} flag A module path relative to
diff --git a/build/tasks/lib/spawn_test.js b/build/tasks/lib/spawn_test.js
index e633755ee..34353a783 100644
--- a/build/tasks/lib/spawn_test.js
+++ b/build/tasks/lib/spawn_test.js
@@ -1,5 +1,3 @@
-/* jshint node: true */
-
"use strict";
// Run Node with provided parameters: the first one being the Grunt
@@ -13,4 +11,4 @@ module.exports = function spawnTest( done ) {
.on( "close", function( code ) {
done( code === 0 );
} );
-} ;
+};