@ckeditor/ckeditor5-dev-release-tools 40.2.2 → 40.3.0

package/lib/index.js

@@ -29,6 +29,7 @@ const { getChangesForVersion, getChangelog, saveChangelog } = require( './utils/
 const executeInParallel = require( './utils/executeinparallel' );
 const validateRepositoryToRelease = require( './utils/validaterepositorytorelease' );
 const checkVersionAvailability = require( './utils/checkversionavailability' );
+const verifyPackagesPublishedCorrectly = require( './tasks/verifypackagespublishedcorrectly' );
 
 module.exports = {
 	generateChangelogForSinglePackage,
@@ -54,5 +55,6 @@ module.exports = {
 	getChangelog,
 	saveChangelog,
 	validateRepositoryToRelease,
+	verifyPackagesPublishedCorrectly,
 	checkVersionAvailability
 };

package/lib/tasks/verifypackagespublishedcorrectly.js

@@ -0,0 +1,55 @@
+/**
+ * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+'use strict';
+
+const upath = require( 'upath' );
+const { glob } = require( 'glob' );
+const fs = require( 'fs-extra' );
+const { checkVersionAvailability } = require( '../utils/checkversionavailability' );
+
+/**
+ * Npm sometimes throws incorrect error 409 while publishing, while the package uploads correctly.
+ * The purpose of the script is to validate if packages that threw 409 are uploaded correctly to npm.
+ *
+ * @param {Object} options
+ * @param {String} options.packagesDirectory Relative path to a location of packages to release.
+ * @param {String} options.version Version of the current release.
+ * @param {Function} options.onSuccess Callback fired when function is successful.
+ * @returns {Promise}
+ */
+module.exports = async function verifyPackagesPublishedCorrectly( options ) {
+	const { packagesDirectory, version, onSuccess } = options;
+	const packagesToVerify = await glob( upath.join( packagesDirectory, '*' ), { absolute: true } );
+	const errors = [];
+
+	if ( !packagesToVerify.length ) {
+		onSuccess( '✅ No packages found to check for upload error 409.' );
+
+		return;
+	}
+
+	for ( const packageToVerify of packagesToVerify ) {
+		const packageJson = await fs.readJson( upath.join( packageToVerify, 'package.json' ) );
+
+		try {
+			const packageWasUploadedCorrectly = !await checkVersionAvailability( version, packageJson.name );
+
+			if ( packageWasUploadedCorrectly ) {
+				await fs.remove( packageToVerify );
+			} else {
+				errors.push( packageJson.name );
+			}
+		} catch {
+			errors.push( packageJson.name );
+		}
+	}
+
+	if ( errors.length ) {
+		throw new Error( 'Packages that were uploaded incorrectly, and need manual verification:\n' + errors.join( '\n' ) );
+	}
+
+	onSuccess( '✅ All packages that returned 409 were uploaded correctly.' );
+};

package/lib/utils/checkversionavailability.js

@@ -31,7 +31,7 @@ module.exports = async function checkVersionAvailability( version, packageName )
 		} )
 		.catch( error => {
 			// All errors except the "E404" are re-thrown.
-			if ( !error.toString().includes( 'npm ERR! code E404' ) ) {
+			if ( !error.toString().includes( 'code E404' ) ) {
 				throw error;
 			}
 

package/lib/utils/publishpackageonnpmcallback.js

@@ -20,12 +20,22 @@ module.exports = async function publishPackageOnNpmCallback( packagePath, taskOp
 	const upath = require( 'upath' );
 	const fs = require( 'fs-extra' );
 
-	await tools.shExec( `npm publish --access=public --tag ${ taskOptions.npmTag }`, { cwd: packagePath, async: true, verbosity: 'error' } )
-		.catch( () => {
+	const result = await tools.shExec( `npm publish --access=public --tag ${ taskOptions.npmTag }`, {
+		cwd: packagePath,
+		async: true,
+		verbosity: 'error'
+	} )
+		.catch( e => {
 			const packageName = upath.basename( packagePath );
 
+			if ( e.toString().includes( 'code E409' ) ) {
+				return { shouldKeepDirectory: true };
+			}
+
 			throw new Error( `Unable to publish "${ packageName }" package.` );
 		} );
 
-	await fs.remove( packagePath );
+	if ( !result || !result.shouldKeepDirectory ) {
+		await fs.remove( packagePath );
+	}
 };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ckeditor/ckeditor5-dev-release-tools",
-  "version": "40.2.2",
+  "version": "40.3.0",
   "description": "Tools used for releasing CKEditor 5 and related packages.",
   "keywords": [],
   "main": "lib/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-dev-utils": "^40.2.2",
+    "@ckeditor/ckeditor5-dev-utils": "^40.3.0",
     "@octokit/rest": "^19.0.0",
     "chalk": "^4.0.0",
     "cli-table": "^0.3.1",