Apply most changes from review

Author: gagik

.evergreen/evergreen.yml.in

@@ -917,9 +917,9 @@ functions:
           {
           export NODE_JS_VERSION=${node_js_version}
           source .evergreen/setup-env.sh
-          git add .
-          git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release"
           npm run evergreen-release draft
+          git add .
+          git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release" 
           }
 
   release_publish_download_and_list_artifacts:

.github/workflows/publish-auxiliary-packages.yml

@@ -47,9 +47,8 @@ jobs:
       env:
         NPM_TOKEN: ${{ secrets.DEVTOOLSBOT_NPM_TOKEN }}
       run: |
-        echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
+        echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc
         npm config list
         echo "Publishing packages as $(npm whoami)"
-        git update-index --assume-unchanged .npmrc
         npm run publish-auxiliary
 

packages/build/src/config/config.ts

@@ -46,5 +46,5 @@ export interface Config {
   artifactUrlExtraTag?: string;
   manpage?: ManPageConfig;
   isDryRun?: boolean;
-  isAuxiliaryOnly?: boolean;
+  useAuxiliaryPackagesOnly?: boolean;
 }

packages/build/src/index.ts

@@ -59,7 +59,7 @@ if (require.main === module) {
       }
 
       config.isDryRun ||= process.argv.includes('--dry-run');
-      config.isAuxiliaryOnly ||= process.argv.includes('--auxiliary');
+      config.useAuxiliaryPackagesOnly ||= process.argv.includes('--auxiliary');
 
       await release(command, config);
     }

packages/build/src/npm-packages/bump.ts

@@ -57,8 +57,8 @@ export async function bumpMongoshReleasePackages(): Promise<void> {
   }
 }
 
-/** Bumps independent packages without setting a new version of mongosh. */
-export function bumpIndependentPackages() {
+/** Bumps auxiliary packages without setting a new version of mongosh. */
+export function bumpAuxiliaryPackages() {
   spawnSync('bump-monorepo-packages', [], {
     stdio: 'inherit',
     cwd: PROJECT_ROOT,

packages/build/src/npm-packages/index.ts

@@ -1,2 +1,2 @@
-export { bumpIndependentPackages } from './bump';
+export { bumpAuxiliaryPackages } from './bump';
 export { publishNpmPackages } from './publish';

packages/build/src/npm-packages/publish.ts

@@ -7,15 +7,15 @@ import {
 } from './constants';
 import type { LernaPackageDescription } from './list';
 import { listNpmPackages as listNpmPackagesFn } from './list';
-import { spawnSync } from '../helpers/spawn-sync';
+import { spawnSync as spawnSyncFn } from '../helpers/spawn-sync';
 import type { SpawnSyncOptionsWithStringEncoding } from 'child_process';
 
 export function publishNpmPackages(
   isDryRun = false,
-  isAuxiliaryOnly = false,
+  useAuxiliaryPackagesOnly = false,
   listNpmPackages: typeof listNpmPackagesFn = listNpmPackagesFn,
   markBumpedFilesAsAssumeUnchangedFn: typeof markBumpedFilesAsAssumeUnchanged = markBumpedFilesAsAssumeUnchanged,
-  spawnSyncFn: typeof spawnSync = spawnSync
+  spawnSync: typeof spawnSyncFn = spawnSyncFn
 ): void {
   const commandOptions: SpawnSyncOptionsWithStringEncoding = {
     stdio: 'inherit',
@@ -30,7 +30,7 @@ export function publishNpmPackages(
     (packageConfig) => !EXCLUDE_RELEASE_PACKAGES.includes(packageConfig.name)
   );
 
-  if (isAuxiliaryOnly) {
+  if (useAuxiliaryPackagesOnly) {
     packages = packages.filter(
       (packageConfig) => !MONGOSH_RELEASE_PACKAGES.includes(packageConfig.name)
     );
@@ -39,7 +39,7 @@ export function publishNpmPackages(
   // we use git update-index --assume-unchanged on files we know have been bumped
   markBumpedFilesAsAssumeUnchangedFn(packages, true);
   try {
-    spawnSyncFn(
+    spawnSync(
       LERNA_BIN,
       [
         'publish',
@@ -48,7 +48,9 @@ export function publishNpmPackages(
         '--no-changelog',
         '--exact',
         // During mongosh releases we handle the tags manually
-        ...(!isAuxiliaryOnly ? ['--no-git-tag-version', '--no-push'] : []),
+        ...(!useAuxiliaryPackagesOnly
+          ? ['--no-git-tag-version', '--no-push']
+          : []),
         '--force-publish',
         '--yes',
         '--no-verify-access',
@@ -59,7 +61,7 @@ export function publishNpmPackages(
     markBumpedFilesAsAssumeUnchangedFn(packages, false);
   }
 
-  if (!isAuxiliaryOnly) {
+  if (!useAuxiliaryPackagesOnly) {
     const mongoshVersion = packages.find(
       (packageConfig) => packageConfig.name === 'mongosh'
     )?.version;
@@ -81,7 +83,7 @@ export function publishNpmPackages(
 export function markBumpedFilesAsAssumeUnchanged(
   packages: LernaPackageDescription[],
   assumeUnchanged: boolean,
-  spawnSyncFn: typeof spawnSync = spawnSync
+  spawnSync: typeof spawnSyncFn = spawnSyncFn
 ): void {
   const filesToAssume = [
     path.resolve(PROJECT_ROOT, 'lerna.json'),
@@ -93,7 +95,7 @@ export function markBumpedFilesAsAssumeUnchanged(
   }
 
   for (const f of filesToAssume) {
-    spawnSyncFn(
+    spawnSync(
       'git',
       [
         'update-index',

packages/build/src/release.ts

@@ -14,7 +14,7 @@ import {
 } from './evergreen';
 import { GithubRepo } from '@mongodb-js/devtools-github-repo';
 import { publishToHomebrew } from './homebrew';
-import { bumpIndependentPackages, publishNpmPackages } from './npm-packages';
+import { bumpAuxiliaryPackages, publishNpmPackages } from './npm-packages';
 import { runPackage } from './packaging';
 import { runDraft } from './run-draft';
 import { runPublish } from './run-publish';
@@ -56,8 +56,8 @@ export async function release(
   );
 
   if (command === 'bump') {
-    bumpIndependentPackages();
-    if (!config.isAuxiliaryOnly) {
+    bumpAuxiliaryPackages();
+    if (!config.useAuxiliaryPackagesOnly) {
       await bumpMongoshReleasePackages();
     }
     return;

packages/build/src/run-publish.ts

@@ -81,7 +81,7 @@ export async function runPublish(
   // ensures the segment api key to be present in the published packages
   await writeBuildInfo(config, 'packaged');
 
-  publishNpmPackages(config.isDryRun, config.isAuxiliaryOnly);
+  publishNpmPackages(config.isDryRun, config.useAuxiliaryPackagesOnly);
 
   await publishToHomebrew(
     homebrewCoreGithubRepo,