From 8b50fbe75d41d6dc95f84b205c45be6f5d4e2aa3 Mon Sep 17 00:00:00 2001 From: Timmy Willison <4timmywil@gmail.com> Date: Mon, 1 Mar 2021 17:41:18 -0500 Subject: [PATCH] Release: drop the need for npm as a local dependency - Not meant to be used like that anymore --- build/release.js | 1 - build/release/ensure-sizzle.js | 51 +++++++++++----------------------- 2 files changed, 16 insertions(+), 36 deletions(-) diff --git a/build/release.js b/build/release.js index 724de7ac6..b95e2b62f 100644 --- a/build/release.js +++ b/build/release.js @@ -90,6 +90,5 @@ module.exports.dependencies = [ "archiver@5.2.0", "shelljs@0.8.4", "inquirer@8.0.0", - "npm@7.6.0", "chalk@4.1.0" ]; diff --git a/build/release/ensure-sizzle.js b/build/release/ensure-sizzle.js index eb1cbd8e8..605b141ba 100644 --- a/build/release/ensure-sizzle.js +++ b/build/release/ensure-sizzle.js @@ -1,29 +1,10 @@ "use strict"; var fs = require( "fs" ), - npm = require( "npm" ), chalk = require( "chalk" ), sizzleLoc = __dirname + "/../../external/sizzle/dist/sizzle.js", rversion = /Engine v(\d+\.\d+\.\d+(?:-[-\.\d\w]+)?)/; -/** - * Retrieve the latest tag of Sizzle from npm - * @param {Function(string)} callback - */ -function getLatestSizzle( callback ) { - npm.load( function( err, npm ) { - if ( err ) { - throw err; - } - npm.commands.info( [ "sizzle", "version" ], function( err, info ) { - if ( err ) { - throw err; - } - callback( Object.keys( info )[ 0 ] ); - } ); - } ); -} - /** * Ensure the /src folder has the latest tag of Sizzle * @param {Object} Release @@ -32,23 +13,23 @@ function getLatestSizzle( callback ) { function ensureSizzle( Release, callback ) { console.log(); console.log( "Checking Sizzle version..." ); - getLatestSizzle( function( latest ) { - var match = rversion.exec( fs.readFileSync( sizzleLoc, "utf8" ) ), - version = match ? match[ 1 ] : "Not Found"; - - if ( version !== latest ) { + var match = rversion.exec( fs.readFileSync( sizzleLoc, "utf8" ) ), + version = match ? match[ 1 ] : "Not Found", + latest = Release.exec( { + command: "npm info sizzle version", + silent: true + } ); - // colors is inherited from jquery-release - console.log( - "The Sizzle version in the src folder (" + chalk.red( version ) + - ") is not the latest tag (" + chalk.green( latest ) + ")." - ); - Release.confirm( callback ); - } else { - console.log( "Sizzle is latest (" + chalk.green( latest ) + ")" ); - callback(); - } - } ); + if ( version !== latest ) { + console.log( + "The Sizzle version in the src folder (" + chalk.red( version ) + + ") is not the latest tag (" + chalk.green( latest ) + ")." + ); + Release.confirm( callback ); + } else { + console.log( "Sizzle is latest (" + chalk.green( latest ) + ")" ); + callback(); + } } module.exports = ensureSizzle; -- 2.39.5