Commit 74aa3eb7 authored by Dave Methvin's avatar Dave Methvin

Fix build until next grunt rc, disable compare_size.

parent a3055f3d
...@@ -22,40 +22,42 @@ module.exports = function( grunt ) { ...@@ -22,40 +22,42 @@ module.exports = function( grunt ) {
files: distpaths files: distpaths
}, },
selector: { selector: {
"src/selector.js": [ destFile: "src/selector.js",
"src/sizzle-jquery.js", apiFile: "src/sizzle-jquery.js",
"src/sizzle/sizzle.js" srcFile: "src/sizzle/sizzle.js"
]
}, },
build: { build: {
"dist/jquery.js": [ all:{
"src/intro.js", dest: "dist/jquery.js",
"src/core.js", src: [
"src/callbacks.js", "src/intro.js",
"src/deferred.js", "src/core.js",
"src/support.js", "src/callbacks.js",
"src/data.js", "src/deferred.js",
"src/queue.js", "src/support.js",
"src/attributes.js", "src/data.js",
"src/event.js", "src/queue.js",
"src/selector.js", "src/attributes.js",
"src/traversing.js", "src/event.js",
"src/manipulation.js", "src/selector.js",
"src/traversing.js",
{ flag: "css", src: "src/css.js" }, "src/manipulation.js",
"src/serialize.js",
{ flag: "ajax", src: "src/ajax.js" }, { flag: "css", src: "src/css.js" },
{ flag: "ajax/script", src: "src/ajax/script.js", needs: ["ajax"] }, "src/serialize.js",
{ flag: "ajax/jsonp", src: "src/ajax/jsonp.js", needs: [ "ajax", "ajax/script" ] }, { flag: "ajax", src: "src/ajax.js" },
{ flag: "ajax/xhr", src: "src/ajax/xhr.js", needs: ["ajax"] }, { flag: "ajax/script", src: "src/ajax/script.js", needs: ["ajax"] },
{ flag: "effects", src: "src/effects.js", needs: ["css"] }, { flag: "ajax/jsonp", src: "src/ajax/jsonp.js", needs: [ "ajax", "ajax/script" ] },
{ flag: "offset", src: "src/offset.js", needs: ["css"] }, { flag: "ajax/xhr", src: "src/ajax/xhr.js", needs: ["ajax"] },
{ flag: "dimensions", src: "src/dimensions.js", needs: ["css"] }, { flag: "effects", src: "src/effects.js", needs: ["css"] },
{ flag: "deprecated", src: "src/deprecated.js" }, { flag: "offset", src: "src/offset.js", needs: ["css"] },
{ flag: "dimensions", src: "src/dimensions.js", needs: ["css"] },
"src/exports.js", { flag: "deprecated", src: "src/deprecated.js" },
"src/outro.js"
] "src/exports.js",
"src/outro.js"
]
}
}, },
jshint: { jshint: {
...@@ -143,15 +145,15 @@ module.exports = function( grunt ) { ...@@ -143,15 +145,15 @@ module.exports = function( grunt ) {
}); });
// Build src/selector.js // Build src/selector.js
grunt.registerMultiTask( "selector", "Build src/selector.js", function() { grunt.registerTask( "selector", "Build src/selector.js", function() {
var name = this.file.dest, var cfg = grunt.config("selector"),
files = this.file.src, name = cfg.destFile,
sizzle = { sizzle = {
api: grunt.file.read( files[0] ), api: grunt.file.read( cfg.apiFile ),
src: grunt.file.read( files[1] ) src: grunt.file.read( cfg.srcFile )
}, },
compiled, parts; compiled, parts;
/** /**
...@@ -241,13 +243,14 @@ module.exports = function( grunt ) { ...@@ -241,13 +243,14 @@ module.exports = function( grunt ) {
"build", "build",
"Concatenate source (include/exclude modules with +/- flags), embed date/version", "Concatenate source (include/exclude modules with +/- flags), embed date/version",
function() { function() {
// Concat specified files. // Concat specified files.
var compiled = "", var compiled = "",
modules = this.flags, modules = this.flags,
optIn = !modules["*"], optIn = !modules["*"],
explicit = optIn || Object.keys(modules).length > 1, explicit = optIn || Object.keys(modules).length > 1,
name = this.file.dest, name = this.data.dest,
src = this.file.srcRaw, src = this.data.src,
deps = {}, deps = {},
excluded = {}, excluded = {},
version = grunt.config( "pkg.version" ), version = grunt.config( "pkg.version" ),
...@@ -479,7 +482,7 @@ module.exports = function( grunt ) { ...@@ -479,7 +482,7 @@ module.exports = function( grunt ) {
grunt.loadNpmTasks("grunt-contrib-uglify"); grunt.loadNpmTasks("grunt-contrib-uglify");
// Default grunt // Default grunt
grunt.registerTask( "default", [ "update_submodules", "selector", "build:*:*", "jshint", "uglify", "dist:*", "compare_size" ] ); grunt.registerTask( "default", [ "update_submodules", "selector", "build:*:*", "jshint", "uglify", "dist:*" ] );
// Short list as a high frequency watch task // Short list as a high frequency watch task
grunt.registerTask( "dev", [ "selector", "build:*:*", "jshint" ] ); grunt.registerTask( "dev", [ "selector", "build:*:*", "jshint" ] );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment