diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2013-09-09 11:26:21 -0400 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2013-09-09 12:04:03 -0400 |
| commit | 2063d6c1896b0c46c39fa0fdecef817f2e6f57c3 (patch) | |
| tree | 1b642c7a1f956ddfb665487c13b8b04d5a4157ee /build | |
| parent | fb599f6315512f64e50d02661990cf34bb40c7db (diff) | |
| download | jquery-2063d6c1896b0c46c39fa0fdecef817f2e6f57c3.tar.gz jquery-2063d6c1896b0c46c39fa0fdecef817f2e6f57c3.zip | |
Break jQuery.access out into its own module to separate it from core; Adjust CommonJS+AMD build support to include non-var dependencies. Convert modules with more than a few dependencies to use CJS+AMD syntax.
Conflicts:
src/core.js
src/css.js
src/data.js
src/effects.js
src/event.js
src/manipulation.js
src/traversing.js
Diffstat (limited to 'build')
| -rw-r--r-- | build/tasks/build.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/tasks/build.js b/build/tasks/build.js index 93c47c0ff..1714957fa 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -18,6 +18,9 @@ module.exports = function( grunt ) { out: "dist/jquery.js", // We have multiple minify steps optimize: "none", + // Include dependencies loaded with require + findNestedDependencies: true, + // Avoid breaking semicolons inserted by r.js skipSemiColonInsertion: true, wrap: { startFile: "src/intro.js", @@ -65,7 +68,7 @@ module.exports = function( grunt ) { // Remove CommonJS-style require calls // Keep an ending semicolon contents = contents - .replace( /\w+ = require\(\s*(")[\w\.\/]+\1\s*\)([,;])/g, + .replace( /(?:\s+\w+ = )?\s*require\(\s*(")[\w\.\/]+\1\s*\)([,;])/g, function( all, quote, commaSemicolon ) { return commaSemicolon === ";" ? ";" : ""; }); |