Skip to content

Commit

Permalink
Build: Fix the regex removing the ESLint comment from wrapper.js
Browse files Browse the repository at this point in the history
The new regex from after the switch from JSHint to ESLint wasn't catching
the ESLint pragma correctly.

Also, the spacing of the pragma comment was updated to match other comments.
  • Loading branch information
mgol committed Jul 13, 2016
1 parent 02c5e29 commit 6e605af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/tasks/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = function( grunt ) {
// Avoid breaking semicolons inserted by r.js
skipSemiColonInsertion: true,
wrap: {
start: wrapper[ 0 ].replace( /\/\*eslint .* \*\/\n/, "" ),
start: wrapper[ 0 ].replace( /\/\*\s*eslint(?: |-).*\s*\*\/\n/, "" ),
end: globals.replace(
/\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig,
""
Expand Down
2 changes: 1 addition & 1 deletion src/wrapper.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*eslint-disable no-unused-vars*/
/* eslint-disable no-unused-vars*/
/*!
* jQuery JavaScript Library v@VERSION
* https://jquery.com/
Expand Down

0 comments on commit 6e605af

Please sign in to comment.