Skip to content

Build: Fix regex that removes empty definitions #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dcorb wants to merge 3 commits into from
Closed

Build: Fix regex that removes empty definitions #1569

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c46538e
Build: Fix regex that removes empty definitions
dcorb May 1, 2014
f47c6b2
Build: Avoid inserting define() placeholder
dcorb May 1, 2014
85aa0b8
Build: Fix code style
dcorb May 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build/tasks/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ module.exports = function( grunt ) {
optimize: "none",
// Include dependencies loaded with require
findNestedDependencies: true,
// Avoid inserting define() placeholder
skipModuleInsertion: true,
// Avoid breaking semicolons inserted by r.js
skipSemiColonInsertion: true,
wrap: {
Expand Down Expand Up @@ -79,7 +81,7 @@ module.exports = function( grunt ) {

// Remove empty definitions
contents = contents
.replace( /define\(\[[^\]]+\]\)[\W\n]+$/, "" );
.replace( /define\(\[[^\]]*\]\)[\W\n]+$/, "" );
}
// AMD Name
if ( (amdName = grunt.option( "amd" )) != null && /^exports\/amd$/.test( name ) ) {
Expand Down