From 832ecdb7cbcbf765d40f499990b069fba88ed818 Mon Sep 17 00:00:00 2001 From: Richard Gibson Date: Mon, 11 Mar 2013 10:06:36 -0400 Subject: [PATCH 1/6] No ticket: compare_size returns! (remember to `npm install`) --- Gruntfile.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 64b498f386..fb67d987cd 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -489,7 +489,7 @@ module.exports = function( grunt ) { grunt.loadNpmTasks("grunt-contrib-uglify"); // Default grunt - grunt.registerTask( "default", [ "update_submodules", "selector", "build:*:*", "jshint", "uglify", "dist:*" ] ); + grunt.registerTask( "default", [ "update_submodules", "selector", "build:*:*", "jshint", "uglify", "dist:*", "compare_size" ] ); // Short list as a high frequency watch task grunt.registerTask( "dev", [ "selector", "build:*:*", "jshint" ] ); diff --git a/package.json b/package.json index 7200951e67..8910917c30 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ ], "dependencies": {}, "devDependencies": { - "grunt-compare-size": "0.3.1", + "grunt-compare-size": "~0.4.0", "grunt-git-authors": "1.0.0", "grunt-update-submodules": "0.2.0", "grunt-contrib-watch": "0.1.4", From d55c46659b6008855e59541aede4d529b20f4337 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Mon, 11 Mar 2013 12:55:16 -0400 Subject: [PATCH 2/6] Update Sizzle: minor windows 8 issue --- src/sizzle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sizzle b/src/sizzle index 4bd24fccc7..65b2e6c63b 160000 --- a/src/sizzle +++ b/src/sizzle @@ -1 +1 @@ -Subproject commit 4bd24fccc7c00191d57c09f111b074f516203369 +Subproject commit 65b2e6c63b5895f095d547c6720da4329bf5be31 From 97e84fc68bb6fe07d5c4b85caa5ad37ea39dedc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Mon, 18 Mar 2013 12:58:53 -0400 Subject: [PATCH 3/6] updated Grunt to 0.4.1 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8910917c30..54df55aad0 100644 --- a/package.json +++ b/package.json @@ -24,12 +24,12 @@ "dependencies": {}, "devDependencies": { "grunt-compare-size": "~0.4.0", - "grunt-git-authors": "1.0.0", + "grunt-git-authors": "1.2.0", "grunt-update-submodules": "0.2.0", - "grunt-contrib-watch": "0.1.4", + "grunt-contrib-watch": "0.3.1", "grunt-contrib-jshint": "0.1.1rc6", - "grunt-contrib-uglify": "0.1.1rc6", - "grunt": "0.4.0rc5", + "grunt-contrib-uglify": "0.1.2", + "grunt": "0.4.1", "testswarm": "0.2.2" }, "keywords": [] From 87d91738b9a773443a19af75284194945d59ce1b Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Tue, 19 Mar 2013 15:31:53 -0400 Subject: [PATCH 4/6] Build selector.js from built sizzle --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index fb67d987cd..a8dd4d864f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -24,7 +24,7 @@ module.exports = function( grunt ) { selector: { destFile: "src/selector.js", apiFile: "src/sizzle-jquery.js", - srcFile: "src/sizzle/sizzle.js" + srcFile: "src/sizzle/dist/sizzle.js" }, build: { all:{ From 53021dad7f6c7f5c5a1c0d7b0493dd2ceee31166 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Tue, 19 Mar 2013 15:35:59 -0400 Subject: [PATCH 5/6] Update copyright year --- MIT-LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt index 7b154c1219..957f26d3e3 100644 --- a/MIT-LICENSE.txt +++ b/MIT-LICENSE.txt @@ -1,4 +1,4 @@ -Copyright 2012 jQuery Foundation and other contributors +Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ Permission is hereby granted, free of charge, to any person obtaining From ab5b0ff3f3f096c86dfbf74123d0a9a61f9a0528 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Tue, 19 Mar 2013 15:55:37 -0400 Subject: [PATCH 6/6] Update Sizzle: now uses built files --- src/sizzle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sizzle b/src/sizzle index 65b2e6c63b..4d0daa822c 160000 --- a/src/sizzle +++ b/src/sizzle @@ -1 +1 @@ -Subproject commit 65b2e6c63b5895f095d547c6720da4329bf5be31 +Subproject commit 4d0daa822c72a9925c36f777681977841c2e40ec