Release: use buildDefaultFiles directly and pass version

- also add the ability to pass VERSION in env to test final builds - adjust sha regex to account for lack of shas - set the version on the dist package.json Close gh-5408
jquery · Feb 6, 2024 · b507c86 · b507c86
1 parent 6376765
commit b507c86
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/build/release.js b/build/release.js
@@ -24,6 +24,7 @@ module.exports = function( Release ) {
  ];
  const cdn = require( "./release/cdn" );
  const dist = require( "./release/dist" );
+ const { buildDefaultFiles } = require( "./tasks/build" );
 
  const npmTags = Release.npmTags;
 
@@ -53,8 +54,8 @@ module.exports = function( Release ) {
  * committed before creating the tag.
  * @param {Function} callback
  */
- generateArtifacts: function( callback ) {
- Release.exec( "npm run build:all" );
+ generateArtifacts: async function( callback ) {
+ await buildDefaultFiles( { version: Release.newVersion } );
 
  cdn.makeReleaseCopies( Release );
  Release._setSrcVersion();
@@ -77,7 +78,7 @@ module.exports = function( Release ) {
  * Publish to distribution repo and npm
  * @param {Function} callback
  */
- dist: async callback => {
+ dist: async function( callback ) {
  await cdn.makeArchives( Release );
  dist( Release, distFiles, callback );
  }

diff --git a/build/release/dist.js b/build/release/dist.js
@@ -119,6 +119,7 @@ module.exports = function( Release, files, complete ) {
  delete packageJson.devDependencies;
  delete packageJson.dependencies;
  delete packageJson.commitplease;
+ packageJson.version = Release.newVersion;
  await fs.writeFile(
  `${ Release.dir.dist }/package.json`,
  JSON.stringify( packageJson, null, 2 )

diff --git a/build/tasks/build.js b/build/tasks/build.js
@@ -352,7 +352,10 @@ async function build( {
  }
 }
 
-async function buildDefaultFiles( { version, watch } = {} ) {
+async function buildDefaultFiles( {
+ version = process.env.VERSION,
+ watch
+} = {} ) {
  await Promise.all( [
  build( { version, watch } ),
  build( { filename: "jquery.slim.js", slim: true, version, watch } ),

diff --git a/build/tasks/compare_size.mjs b/build/tasks/compare_size.mjs
@@ -109,7 +109,7 @@ export async function compareSize( { cache = ".sizecache.json", files } = {} ) {
  // Remove the short SHA and .dirty from comparisons.
  // The short SHA so commits can be compared against each other
  // and .dirty to compare with the existing branch during development.
- const sha = /jQuery v\d+.\d+.\d+(?:-\w+)?\+(?:slim.)?([^ \.]+(?:\.dirty)?)/.exec( contents )[ 1 ];
+ const sha = /jQuery v\d+.\d+.\d+(?:-\w+)?(?:\+|\+slim\.)?([^ \.]+(?:\.dirty)?)?/.exec( contents )[ 1 ];
  contents = contents.replace( new RegExp( sha, "g" ), "" );
 
  const size = Buffer.byteLength( contents, "utf8" );