Merge branch 'jquery:main' into master

Author: uplusware

.npmignore

@@ -1,4 +1,5 @@
 demos
+/dist/cdn
 tests
 .editorconfig
 .eslintrc.json

AUTHORS.txt

@@ -331,3 +331,35 @@ Peter Dave Hello <[email protected]>
 Johannes Schäfer <[email protected]>
 Ville Skyttä <[email protected]>
 Ryan Oriecuia <[email protected]>
+Sergei Ratnikov <[email protected]>
+milk54 <[email protected]>
+Evelyn Masso <[email protected]>
+Robin <[email protected]>
+Simon Asika <[email protected]>
+Kevin Cupp <[email protected]>
+Jeremy Mickelson <[email protected]>
+Kyle Rosenberg <[email protected]>
+Petri Partio <[email protected]>
+pallxk <[email protected]>
+Luke Brookhart <[email protected]>
+claudi <[email protected]>
+Eirik Sletteberg <[email protected]>
+Albert Johansson <[email protected]>
+A. Wells <[email protected]>
+Robert Brignull <[email protected]>
+Horus68 <[email protected]>
+Maksymenkov Eugene <[email protected]>
+OskarNS <[email protected]>
+Gez Quinn <[email protected]>
+jigar gala <[email protected]>
+Florian Wegscheider <[email protected]>
+Fatér Zsolt <[email protected]>
+Szabolcs Szabolcsi-Toth <[email protected]>
+Jérémy Munsch <[email protected]>
+Hrvoje Novosel <[email protected]>
+Paul Capron <[email protected]>
+Micah Miller <[email protected]>
+sakshi87 <[email protected]>
+Mikolaj Wolicki <[email protected]>
+Patrick McKay <[email protected]>
+c-lambert <[email protected]>

build/release-test.js

@@ -37,7 +37,7 @@ script( Release );
 
 // Ignores actual version installed, should be good enough for a test
 if ( shell.exec( "npm ls --depth 0 | grep download.jqueryui.com" ).code === 1 ) {
-	shell.exec( "npm install " + script.dependencies.join( " " ) );
+	shell.exec( "npm install --no-save " + script.dependencies.join( " " ) );
 }
 
 // If AUTHORS.txt is outdated, this will update it

build/release.js

@@ -59,8 +59,21 @@ function addManifest( packager ) {
 function buildCDNPackage( callback ) {
 	console.log( "Building CDN package" );
 	var JqueryUi = require( "download.jqueryui.com/lib/jquery-ui" );
-	var Package = require( "download.jqueryui.com/lib/package-1-12-themes" );
+	var PackageWithoutThemes = require( "download.jqueryui.com/lib/package-1-13" );
+	var PackageOfThemes = require( "download.jqueryui.com/lib/package-1-13-themes" );
 	var Packager = require( "node-packager" );
+
+	// PackageOfThemes doesn't contain JS files, PackageWithoutThemes doesn't contain themes;
+	// we need both.
+	function Package() {
+
+		// PackageOfThemes invokes PackageWithoutThemes's constructor in its own so we don't
+		// need to do it by ourselves; we just need to handle prototypes that way.
+		PackageOfThemes.apply( this, arguments );
+	}
+
+	Object.assign( Package.prototype, PackageWithoutThemes.prototype, PackageOfThemes.prototype );
+
 	var jqueryUi = new JqueryUi( path.resolve( "." ) );
 	var target = fs.createWriteStream( "../" + jqueryUi.pkg.name + "-" + jqueryUi.pkg.version +
 		"-cdn.zip" );
@@ -71,18 +84,22 @@ function buildCDNPackage( callback ) {
 		jqueryUi: jqueryUi,
 		themeVars: null
 	} );
-	packager.ready.then( function() {
-		removeExternals( packager );
-		addManifest( packager );
-		packager.toZip( target, {
-			basedir: ""
-		}, function( error ) {
-			if ( error ) {
-				Release.abort( "Failed to zip CDN package", error );
-			}
-			callback();
+	packager.ready
+		.then( function() {
+			removeExternals( packager );
+			addManifest( packager );
+			packager.toZip( target, {
+				basedir: ""
+			}, function( error ) {
+				if ( error ) {
+					Release.abort( "Failed to zip the CDN package", error );
+				}
+				callback();
+			} );
+		} )
+		.catch( function( error ) {
+			Release.abort( "Failed to create the CDN package", error );
 		} );
-	} );
 }
 
 Release.define( {
@@ -123,7 +140,7 @@ Release.define( {
 };
 
 module.exports.dependencies = [
-	"download.jqueryui.com@2.1.2",
+	"download.jqueryui.com@2.2.1",
 	"[email protected]",
-	"shelljs@0.2.6"
+	"shelljs@0.8.4"
 ];