Permalink
Browse files

Build: Make the @CODE-replacing regex more robust

The code replacing @CODE in wrapper.js was written so that it expected
both the code and the next line to start in the first column. This commit
adjusts the regex so to get rid of that assumption and to work properly
regardless of number of lines with comments after this block.

While this is technically not necessary for our code, contributors sometimes
re-format the wrapper file in their pull requests and the error
messages they get don't tell them what's the real problem with their code.

Closes gh-3429
1 parent 7fbab88 commit 4e50967725e61a5d71c2792131de61dec0520f9c @mgol mgol committed Dec 4, 2016
Showing with 5 additions and 1 deletion.
  1. +5 −1 build/tasks/build.js
@@ -17,7 +17,11 @@ module.exports = function( grunt ) {
read = function( fileName ) {
return grunt.file.read( srcFolder + fileName );
},
- wrapper = read( "wrapper.js" ).split( /\/\/ \@CODE\n\/\/[^\n]+/ ),
+
+ // Catch `// @CODE` and subsequent comment lines event if they don't start
+ // in the first column.
+ wrapper = read( "wrapper.js" ).split( /[\x20\t]*\/\/ @CODE\n(?:[\x20\t]*\/\/[^\n]+\n)*/ ),
+
config = {
baseUrl: "src",
name: "jquery",

0 comments on commit 4e50967

Please sign in to comment.