@@ -91,7 +91,8 @@ module.exports = function( grunt ) {
9191 dirs = {
9292 dist : dist ,
9393 cdn : {
94- noversion : path . join ( dist , "cdn-noversion" ) ,
94+ google : path . join ( dist , "cdn-google" ) ,
95+ jquery : path . join ( dist , "cdn" ) ,
9596 git : path . join ( dist , "git" )
9697 } ,
9798 tmp : path . join ( dist , "tmp" )
@@ -185,7 +186,7 @@ module.exports = function( grunt ) {
185186
186187 distZipOut : path . join ( dist , name + "<%= versionSuffix %>.zip" ) ,
187188
188- cdnNoversionZipOut : path . join ( "<%= dirs.cdn.noversion %>" , "<%= files.zipFileName %>" )
189+ googleCDNZipOut : path . join ( "<%= dirs.cdn.google %>" , "<%= files.zipFileName %>" )
189190 } ;
190191
191192 // Add minified property to files.css.*
@@ -495,7 +496,15 @@ module.exports = function( grunt ) {
495496 }
496497 ]
497498 } ,
498- noversion : {
499+ "jqueryCDN" : {
500+ files : {
501+ // WARNING: This will be modified by the config:copy:noversion task
502+ cwd : dist ,
503+ src : "<%= files.cdn %>" ,
504+ dest : "<%= dirs.cdn.jquery %>"
505+ }
506+ } ,
507+ "googleCDN" : {
499508 options : {
500509 processContent : function ( content , srcPath ) {
501510 if ( / \. m i n .j s $ | \. m i n .m a p $ / . test ( srcPath ) ) {
@@ -535,7 +544,7 @@ module.exports = function( grunt ) {
535544 } ,
536545
537546 "hash-manifest" : {
538- noversion : {
547+ googleCDN : {
539548 options : {
540549 algo : "md5" ,
541550 cwd : "<%= dirs.tmp %>"
@@ -558,9 +567,9 @@ module.exports = function( grunt ) {
558567 }
559568 ]
560569 } ,
561- "cdn-noversion " : {
570+ "googleCDN " : {
562571 options : {
563- archive : "<%= files.cdnNoversionZipOut %>"
572+ archive : "<%= files.googleCDNZipOut %>"
564573 } ,
565574 files : [
566575 {
@@ -720,7 +729,8 @@ module.exports = function( grunt ) {
720729 dist : [ dist ] ,
721730 git : [ path . join ( dist , "git" ) ] ,
722731 tmp : [ "<%= dirs.tmp %>" ] ,
723- "cdn-noversion" : [ "<%= dirs.cdn.noversion %>" ]
732+ "googleCDN" : [ "<%= dirs.cdn.google %>" ] ,
733+ "jqueryCDN" : [ "<%= dirs.cdn.jquery %>" ]
724734 }
725735 } ) ;
726736
@@ -752,19 +762,46 @@ module.exports = function( grunt ) {
752762 grunt . registerTask ( "css" , [ "cssbuild" ] ) ;
753763 grunt . registerTask ( "css:release" , [ "css" , "cssmin" ] ) ;
754764
755- grunt . registerTask ( "demos" , [ "concat:demos" , "copy:demos.nested-includes" , "copy:demos.processed" , "copy:demos.unprocessed" , "copy:demos.backbone" ] ) ;
756-
757- grunt . registerTask ( "cdn" , [ "release:init" , "clean:tmp" , "config:copy:noversion" , "copy:noversion" , "hash-manifest:noversion" , "compress:cdn-noversion" , "clean:tmp" ] ) ;
758-
759- grunt . registerTask ( "dist" , [ "config:fetchHeadHash" , "js:release" , "css:release" , "copy:images" , "demos" , "compress:dist" ] ) ;
765+ grunt . registerTask ( "demos" , [
766+ "concat:demos" ,
767+ "copy:demos.nested-includes" ,
768+ "copy:demos.processed" ,
769+ "copy:demos.unprocessed" ,
770+ "copy:demos.backbone"
771+ ] ) ;
772+
773+ grunt . registerTask ( "cdn" , [
774+ "release:init" ,
775+ "clean:jqueryCDN" , "config:copy:jqueryCDN" , "copy:jqueryCDN" ,
776+ "clean:tmp" ,
777+ "config:copy:googleCDN" , "copy:googleCDN" , "hash-manifest:googleCDN" , "compress:googleCDN" ,
778+ "clean:tmp"
779+ ] ) ;
780+
781+ grunt . registerTask ( "dist" , [
782+ "config:fetchHeadHash" ,
783+ "js:release" ,
784+ "css:release" ,
785+ "copy:images" ,
786+ "demos" ,
787+ "compress:dist"
788+ ] ) ;
760789 grunt . registerTask ( "dist:release" , [ "release:init" , "dist" , "cdn" ] ) ;
761790 grunt . registerTask ( "dist:git" , [ "dist" , "clean:git" , "config:copy:git:-git" , "copy:git" ] ) ;
762791
763792 grunt . registerTask ( "test" , [ "jshint" , "config:fetchHeadHash" , "js:release" , "connect" , "qunit:http" ] ) ;
764793 grunt . registerTask ( "test:ci" , [ "qunit_junit" , "connect" , "qunit:http" ] ) ;
765794
766- grunt . registerTask ( "deploy" , [ "release:init" , "release:fail-if-pre" , "dist:release" ] ) ; // TODO: Add copy to cdn repo and add / commit / push
767- grunt . registerTask ( "release" , [ "clean:dist" , "release:init" , "release:check-git-status" , "release:set-version" , "release:tag" , "recurse:deploy" , "release:set-next-version" ] ) ;
795+ grunt . registerTask ( "deploy" , [ "release:init" , "release:fail-if-pre" , "dist:release" ] ) ;
796+ grunt . registerTask ( "release" , [
797+ "clean:dist" ,
798+ "release:init" ,
799+ "release:check-git-status" ,
800+ "release:set-version" ,
801+ "release:tag" ,
802+ "recurse:deploy" ,
803+ "release:set-next-version"
804+ ] ) ;
768805
769806 // Default grunt
770807 grunt . registerTask ( "default" , [ "dist" ] ) ;
0 commit comments