Package: Use package-1-13* files for UI 1.13 & newer

Closes gh-582

Author: mgol

Gruntfile.js

@@ -413,6 +413,11 @@ function buildPackages( folder, callback ) {
 
 			// (a) Build jquery-ui-[VERSION].zip;
 			function( callback ) {
+				if ( semver.gte( jqueryUi.pkg.version, "1.13.0-a" ) ) {
+					packagerZip( "./lib/package-1-13", "jquery-ui-" + jqueryUi.pkg.version,
+						new ThemeGallery( jqueryUi )[ 0 ].vars, folder, jqueryUi, callback );
+					return;
+				}
 				if ( semver.gte( jqueryUi.pkg.version, "1.12.0-a" ) ) {
 					packagerZip( "./lib/package-1-12", "jquery-ui-" + jqueryUi.pkg.version,
 						new ThemeGallery( jqueryUi )[ 0 ].vars, folder, jqueryUi, callback );
@@ -438,6 +443,11 @@ function buildPackages( folder, callback ) {
 
 			// (b) Build themes package jquery-ui-themes-[VERSION].zip;
 			function( callback ) {
+				if ( semver.gte( jqueryUi.pkg.version, "1.13.0-a" ) ) {
+					packagerZip( "./lib/package-1-13-themes", "jquery-ui-themes-" + jqueryUi.pkg.version,
+						null, folder, jqueryUi, callback );
+					return;
+				}
 				if ( semver.gte( jqueryUi.pkg.version, "1.12.0-a" ) ) {
 					packagerZip( "./lib/package-1-12-themes", "jquery-ui-themes-" + jqueryUi.pkg.version,
 						null, folder, jqueryUi, callback );

download.js

@@ -151,7 +151,11 @@ Frontend.prototype = {
 
 			// The new way to generate a package.
 			} else {
-				Package = require( "./lib/package-1-12" );
+				if ( semver.gte( jqueryUi.pkg.version, "1.13.0-a" ) ) {
+					Package = require( "./lib/package-1-13" );
+				} else {
+					Package = require( "./lib/package-1-12" );
+				}
 				packager = new Packager( jqueryUi.files().cache, Package, {
 					components: components,
 					themeVars: themeVars,

lib/package-1-13-themes.js

@@ -4,7 +4,7 @@ var async = require( "async" );
 var extend = require( "util" )._extend;
 var banner = require( "./banner" );
 var sqwish = require( "sqwish" );
-var Package1_12 = require( "./package-1-12" );
+var Package1_13 = require( "./package-1-13" );
 var path = require( "path" );
 var ThemeGallery = require( "./themeroller-themegallery" );
 
@@ -20,19 +20,19 @@ function Package( files, runtime ) {
 	if ( !runtime.themeVars ) {
 		runtime.themeVars = this.themeGallery[ 0 ].vars;
 	}
-	Package1_12.apply( this, arguments );
+	Package1_13.apply( this, arguments );
 }
 
 extend( Package.prototype, {
-	"AUTHORS.txt": Package1_12.prototype[ "AUTHORS.txt" ],
-	"LICENSE.txt": Package1_12.prototype[ "LICENSE.txt" ],
-	"images": Package1_12.prototype.images,
-	"jquery-ui.css": Package1_12.prototype[ "jquery-ui.css" ],
-	"jquery-ui.structure.css": Package1_12.prototype[ "jquery-ui.structure.css" ],
-	"jquery-ui.theme.css": Package1_12.prototype[ "jquery-ui.theme.css" ],
-	"jquery-ui.min.css": Package1_12.prototype[ "jquery-ui.min.css" ],
-	"jquery-ui.structure.min.css": Package1_12.prototype[ "jquery-ui.structure.min.css" ],
-	"jquery-ui.theme.min.css": Package1_12.prototype[ "jquery-ui.theme.min.css" ],
+	"AUTHORS.txt": Package1_13.prototype[ "AUTHORS.txt" ],
+	"LICENSE.txt": Package1_13.prototype[ "LICENSE.txt" ],
+	"images": Package1_13.prototype.images,
+	"jquery-ui.css": Package1_13.prototype[ "jquery-ui.css" ],
+	"jquery-ui.structure.css": Package1_13.prototype[ "jquery-ui.structure.css" ],
+	"jquery-ui.theme.css": Package1_13.prototype[ "jquery-ui.theme.css" ],
+	"jquery-ui.min.css": Package1_13.prototype[ "jquery-ui.min.css" ],
+	"jquery-ui.structure.min.css": Package1_13.prototype[ "jquery-ui.structure.min.css" ],
+	"jquery-ui.theme.min.css": Package1_13.prototype[ "jquery-ui.theme.min.css" ],
 
 	"themes": function( callback ) {
 		var files = {};

lib/package-1-13.js

@@ -13,6 +13,7 @@ var indexTemplate, jsBundleIntro, jsBundleOutro,
 	ThemeRoller = require( "jquery-ui-themeroller" ),
 	UglifyJS = require( "uglify-js" );
 
+// We're using the same template as 1.12 for now.
 indexTemplate = handlebars.compile( fs.readFileSync( __dirname + "/../template/zip/index-1-12.html", "utf8" ) );
 Q.longStackSupport = true;
 

test/package-1-12.0.js

@@ -196,7 +196,8 @@ tests = {
 JqueryUi.all().filter( function( jqueryUi ) {
 
 	// Filter supported releases only
-	return semver.gte( jqueryUi.pkg.version, "1.12.0-a" );
+	return semver.gte( jqueryUi.pkg.version, "1.12.0-a" ) &&
+		semver.lt( jqueryUi.pkg.version, "1.13.0-a" );
 } ).forEach( function( jqueryUi ) {
 	function deepTestBuild( obj, tests ) {
 		var allComponents = jqueryUi.components().map( function( component ) {

test/package-1-13.0.js

@@ -3,7 +3,7 @@
 var commonFiles, COMMON_FILES_TESTCASES, defaultTheme, newPackage, someWidgets1, someWidgets2, tests, themeFiles, THEME_FILES_TESTCASES,
 	async = require( "async" ),
 	JqueryUi = require( "../lib/jquery-ui" ),
-	Package = require( "../lib/package-1-12" ),
+	Package = require( "../lib/package-1-13" ),
 	Packager = require( "node-packager" ),
 	semver = require( "semver" ),
 	themeGallery = require( "../lib/themeroller-themegallery" )();
@@ -196,7 +196,7 @@ tests = {
 JqueryUi.all().filter( function( jqueryUi ) {
 
 	// Filter supported releases only
-	return semver.gte( jqueryUi.pkg.version, "1.12.0-a" );
+	return semver.gte( jqueryUi.pkg.version, "1.13.0-a" );
 } ).forEach( function( jqueryUi ) {
 	function deepTestBuild( obj, tests ) {
 		var allComponents = jqueryUi.components().map( function( component ) {