beachball 2.29.0 → 2.30.1

package/lib/packageManager/npm.d.ts

@@ -1,6 +1,10 @@
 import execa from 'execa';
 import { AuthType } from '../types/Auth';
-export declare function npm(args: string[], options?: execa.SyncOptions): any;
-export declare function npmAsync(args: string[], options?: execa.Options): Promise<any>;
+export declare function npm(args: string[], options?: execa.SyncOptions): execa.ExecaSyncReturnValue & {
+    success: boolean;
+};
+export declare function npmAsync(args: string[], options?: execa.Options): Promise<execa.ExecaReturnValue & {
+    success: boolean;
+}>;
 export declare function getNpmAuthArgs(registry: string, token?: string, authType?: AuthType): string[];
 //# sourceMappingURL=npm.d.ts.map

package/lib/packageManager/npm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,KAAK,CAAC,WAAgB,OAalE;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,KAAK,CAAC,OAAY,gBAazE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,CAS9F"}
+{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,wBAAgB,GAAG,CACjB,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE,KAAK,CAAC,WAAgB,GAC9B,KAAK,CAAC,oBAAoB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAanD;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE,KAAK,CAAC,OAAY,GAC1B,OAAO,CAAC,KAAK,CAAC,gBAAgB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAaxD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,CAS9F"}

package/lib/packageManager/npm.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -16,24 +7,34 @@ exports.getNpmAuthArgs = exports.npmAsync = exports.npm = void 0;
 const execa_1 = __importDefault(require("execa"));
 function npm(args, options = {}) {
     try {
-        const result = execa_1.default.sync('npm', args, Object.assign({}, options));
-        return Object.assign(Object.assign({}, result), { success: !result.failed });
+        const result = execa_1.default.sync('npm', args, { ...options });
+        return {
+            ...result,
+            success: !result.failed,
+        };
     }
     catch (e) {
-        return Object.assign(Object.assign({}, e), { success: false });
+        return {
+            ...e,
+            success: false,
+        };
     }
 }
 exports.npm = npm;
-function npmAsync(args, options = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const result = yield execa_1.default('npm', args, Object.assign({}, options));
-            return Object.assign(Object.assign({}, result), { success: !result.failed });
-        }
-        catch (e) {
-            return Object.assign(Object.assign({}, e), { success: false });
-        }
-    });
+async function npmAsync(args, options = {}) {
+    try {
+        const result = await execa_1.default('npm', args, { ...options });
+        return {
+            ...result,
+            success: !result.failed,
+        };
+    }
+    catch (e) {
+        return {
+            ...e,
+            success: false,
+        };
+    }
 }
 exports.npmAsync = npmAsync;
 function getNpmAuthArgs(registry, token, authType) {

package/lib/packageManager/npm.js.map

@@ -1 +1 @@
-{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAG1B,SAAgB,GAAG,CAAC,IAAc,EAAE,UAA6B,EAAE;IACjE,IAAI;QACF,MAAM,MAAM,GAAG,eAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,oBAAO,OAAO,EAAG,CAAC;QACvD,uCACK,MAAM,KACT,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,IACvB;KACH;IAAC,OAAO,CAAC,EAAE;QACV,uCACK,CAAC,KACJ,OAAO,EAAE,KAAK,IACd;KACH;AACH,CAAC;AAbD,kBAaC;AAED,SAAsB,QAAQ,CAAC,IAAc,EAAE,UAAyB,EAAE;;QACxE,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,KAAK,EAAE,IAAI,oBAAO,OAAO,EAAG,CAAC;YACxD,uCACK,MAAM,KACT,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,IACvB;SACH;QAAC,OAAO,CAAC,EAAE;YACV,uCACK,CAAC,KACJ,OAAO,EAAE,KAAK,IACd;SACH;IACH,CAAC;CAAA;AAbD,4BAaC;AAED,SAAgB,cAAc,CAAC,QAAgB,EAAE,KAAc,EAAE,QAAmB;IAClF,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,IAAI,KAAK,EAAE;QACT,MAAM,UAAU,GAAG,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;QACxE,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC,CAAC;KACxD;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AATD,wCASC"}
+{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAG1B,SAAgB,GAAG,CACjB,IAAc,EACd,UAA6B,EAAE;IAE/B,IAAI;QACF,MAAM,MAAM,GAAG,eAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QACvD,OAAO;YACL,GAAG,MAAM;YACT,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM;SACxB,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;YACL,GAAI,CAA0B;YAC9B,OAAO,EAAE,KAAK;SACf,CAAC;KACH;AACH,CAAC;AAhBD,kBAgBC;AAEM,KAAK,UAAU,QAAQ,CAC5B,IAAc,EACd,UAAyB,EAAE;IAE3B,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QACxD,OAAO;YACL,GAAG,MAAM;YACT,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM;SACxB,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;YACL,GAAI,CAAsB;YAC1B,OAAO,EAAE,KAAK;SACf,CAAC;KACH;AACH,CAAC;AAhBD,4BAgBC;AAED,SAAgB,cAAc,CAAC,QAAgB,EAAE,KAAc,EAAE,QAAmB;IAClF,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,IAAI,KAAK,EAAE;QACT,MAAM,UAAU,GAAG,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;QACxE,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC,CAAC;KACxD;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AATD,wCASC"}

package/lib/packageManager/packagePublish.d.ts

@@ -1,4 +1,6 @@
 import { PackageInfo } from '../types/PackageInfo';
 import { AuthType } from '../types/Auth';
-export declare function packagePublish(packageInfo: PackageInfo, registry: string, token: string, access: string, authType?: AuthType, timeout?: number | undefined): any;
+export declare function packagePublish(packageInfo: PackageInfo, registry: string, token: string, access: string, authType?: AuthType, timeout?: number | undefined): Promise<import("execa").ExecaReturnValue<string> & {
+    success: boolean;
+}>;
 //# sourceMappingURL=packagePublish.d.ts.map

package/lib/packageManager/packagePublish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packagePublish.d.ts","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,OAqB7B"}
+{"version":3,"file":"packagePublish.d.ts","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;;GAqB7B"}

package/lib/packageManager/packagePublish.js

@@ -24,7 +24,7 @@ function packagePublish(packageInfo, registry, token, access, authType, timeout)
         args.push(access);
     }
     console.log(`publish command: ${args.join(' ')}`);
-    return npm_1.npm(args, { cwd: packagePath, timeout });
+    return npm_1.npmAsync(args, { cwd: packagePath, timeout, all: true });
 }
 exports.packagePublish = packagePublish;
 //# sourceMappingURL=packagePublish.js.map

package/lib/packageManager/packagePublish.js.map

@@ -1 +1 @@
-{"version":3,"file":"packagePublish.js","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,+BAA4C;AAG5C,SAAgB,cAAc,CAC5B,WAAwB,EACxB,QAAgB,EAChB,KAAa,EACb,MAAc,EACd,QAAmB,EACnB,OAA4B;IAE5B,MAAM,cAAc,GAAG,WAAW,CAAC,eAAe,CAAC;IACnD,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG;QACX,SAAS;QACT,YAAY;QACZ,QAAQ;QACR,OAAO;QACP,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,aAAa;QAClD,YAAY;QACZ,MAAM;QACN,GAAG,oBAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC;KAC7C,CAAC;IAEF,IAAI,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACnB;IACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClD,OAAO,SAAG,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;AAClD,CAAC;AA3BD,wCA2BC"}
+{"version":3,"file":"packagePublish.js","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,+BAAiD;AAGjD,SAAgB,cAAc,CAC5B,WAAwB,EACxB,QAAgB,EAChB,KAAa,EACb,MAAc,EACd,QAAmB,EACnB,OAA4B;IAE5B,MAAM,cAAc,GAAG,WAAW,CAAC,eAAe,CAAC;IACnD,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG;QACX,SAAS;QACT,YAAY;QACZ,QAAQ;QACR,OAAO;QACP,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,aAAa;QAClD,YAAY;QACZ,MAAM;QACN,GAAG,oBAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC;KAC7C,CAAC;IAEF,IAAI,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACnB;IACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClD,OAAO,cAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC;AA3BD,wCA2BC"}

package/lib/publish/bumpAndPush.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bumpAndPush = void 0;
 const performBump_1 = require("../bump/performBump");
@@ -16,70 +7,68 @@ const tagPackages_1 = require("./tagPackages");
 const mergePublishBranch_1 = require("./mergePublishBranch");
 const displayManualRecovery_1 = require("./displayManualRecovery");
 const BUMP_PUSH_RETRIES = 5;
-function bumpAndPush(bumpInfo, publishBranch, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { path: cwd, branch, tag, message } = options;
-        const { remote, remoteBranch } = workspace_tools_1.parseRemoteBranch(branch);
-        let completed = false;
-        let tryNumber = 0;
-        while (tryNumber < BUMP_PUSH_RETRIES && !completed) {
-            tryNumber++;
-            console.log(`Trying to push to git. Attempt ${tryNumber}/${BUMP_PUSH_RETRIES}`);
-            console.log('Reverting');
-            workspace_tools_1.revertLocalChanges(cwd);
-            // pull in latest from origin branch
-            console.log('Fetching from remote');
-            if (options.fetch !== false) {
-                let fetchResult;
-                if (options.depth) {
-                    fetchResult = workspace_tools_1.git(['fetch', remote, remoteBranch, `--depth=${options.depth}`], { cwd });
-                }
-                else {
-                    fetchResult = workspace_tools_1.git(['fetch', remote, remoteBranch], { cwd });
-                }
-                if (!fetchResult.success) {
-                    console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: fetch from ${branch} has failed!\n${fetchResult.stderr}`);
-                    continue;
-                }
+async function bumpAndPush(bumpInfo, publishBranch, options) {
+    const { path: cwd, branch, tag, message } = options;
+    const { remote, remoteBranch } = workspace_tools_1.parseRemoteBranch(branch);
+    let completed = false;
+    let tryNumber = 0;
+    while (tryNumber < BUMP_PUSH_RETRIES && !completed) {
+        tryNumber++;
+        console.log(`Trying to push to git. Attempt ${tryNumber}/${BUMP_PUSH_RETRIES}`);
+        console.log('Reverting');
+        workspace_tools_1.revertLocalChanges(cwd);
+        // pull in latest from origin branch
+        console.log('Fetching from remote');
+        if (options.fetch !== false) {
+            let fetchResult;
+            if (options.depth) {
+                fetchResult = workspace_tools_1.git(['fetch', remote, remoteBranch, `--depth=${options.depth}`], { cwd });
             }
-            const mergeResult = workspace_tools_1.git(['merge', '-X', 'theirs', `${branch}`], { cwd });
-            if (!mergeResult.success) {
-                console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: pull from ${branch} has failed!\n${mergeResult.stderr}`);
-                continue;
-            }
-            // bump the version
-            console.log('Bumping the versions for git push');
-            yield performBump_1.performBump(bumpInfo, options);
-            // checkin
-            const mergePublishBranchResult = mergePublishBranch_1.mergePublishBranch(publishBranch, branch, message, cwd);
-            if (!mergePublishBranchResult.success) {
-                console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: merging to target has failed!`);
-                continue;
-            }
-            // Tag & Push to remote
-            tagPackages_1.tagPackages(bumpInfo, cwd);
-            if (options.gitTags) {
-                tagPackages_1.tagDistTag(tag, cwd);
+            else {
+                fetchResult = workspace_tools_1.git(['fetch', remote, remoteBranch], { cwd });
             }
-            console.log(`pushing to ${branch}, running the following command for git push:`);
-            const pushArgs = ['push', '--no-verify', '--follow-tags', '--verbose', remote, `HEAD:${remoteBranch}`];
-            console.log('git ' + pushArgs.join(' '));
-            const pushResult = workspace_tools_1.git(pushArgs, { cwd });
-            if (!pushResult.success) {
-                console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: push to ${branch} has failed!\n${pushResult.stderr}`);
+            if (!fetchResult.success) {
+                console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: fetch from ${branch} has failed!\n${fetchResult.stderr}`);
                 continue;
             }
-            else {
-                console.log(pushResult.stdout.toString());
-                console.log(pushResult.stderr.toString());
-                completed = true;
-            }
         }
-        if (!completed) {
-            displayManualRecovery_1.displayManualRecovery(bumpInfo);
-            process.exit(1);
+        const mergeResult = workspace_tools_1.git(['merge', '-X', 'theirs', `${branch}`], { cwd });
+        if (!mergeResult.success) {
+            console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: pull from ${branch} has failed!\n${mergeResult.stderr}`);
+            continue;
+        }
+        // bump the version
+        console.log('Bumping the versions for git push');
+        await performBump_1.performBump(bumpInfo, options);
+        // checkin
+        const mergePublishBranchResult = mergePublishBranch_1.mergePublishBranch(publishBranch, branch, message, cwd);
+        if (!mergePublishBranchResult.success) {
+            console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: merging to target has failed!`);
+            continue;
+        }
+        // Tag & Push to remote
+        tagPackages_1.tagPackages(bumpInfo, cwd);
+        if (options.gitTags) {
+            tagPackages_1.tagDistTag(tag, cwd);
+        }
+        console.log(`pushing to ${branch}, running the following command for git push:`);
+        const pushArgs = ['push', '--no-verify', '--follow-tags', '--verbose', remote, `HEAD:${remoteBranch}`];
+        console.log('git ' + pushArgs.join(' '));
+        const pushResult = workspace_tools_1.git(pushArgs, { cwd });
+        if (!pushResult.success) {
+            console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: push to ${branch} has failed!\n${pushResult.stderr}`);
+            continue;
+        }
+        else {
+            console.log(pushResult.stdout.toString());
+            console.log(pushResult.stderr.toString());
+            completed = true;
         }
-    });
+    }
+    if (!completed) {
+        displayManualRecovery_1.displayManualRecovery(bumpInfo);
+        process.exit(1);
+    }
 }
 exports.bumpAndPush = bumpAndPush;
 //# sourceMappingURL=bumpAndPush.js.map

package/lib/publish/bumpAndPush.js.map

@@ -1 +1 @@
-{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"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"}

package/lib/publish/displayManualRecovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"displayManualRecovery.d.ts","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,GAAE,GAAG,CAAC,MAAM,CAAqB,QA4B3G"}
+{"version":3,"file":"displayManualRecovery.d.ts","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,GAAE,GAAG,CAAC,MAAM,CAAqB,QAyB3G"}

package/lib/publish/displayManualRecovery.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.displayManualRecovery = void 0;
 function displayManualRecovery(bumpInfo, succeededPackages = new Set()) {
-    console.error('Something went wrong with the publish! Manually update these package and versions:');
+    const errorLines = ['Something went wrong with publishing! Manually update these package and versions:'];
     const succeededLines = [];
     bumpInfo.modifiedPackages.forEach(pkg => {
         const packageInfo = bumpInfo.packageInfos[pkg];
@@ -11,16 +11,16 @@ function displayManualRecovery(bumpInfo, succeededPackages = new Set()) {
             succeededLines.push(entry);
         }
         else {
-            console.error(entry);
+            errorLines.push(entry);
         }
     });
+    console.error(errorLines.join('\n') + '\n');
     if (succeededLines.length) {
-        console.warn('These packages and versions were successfully published, but may be invalid due to depending on ' +
-            'package versions for which publishing failed:');
-        succeededLines.forEach(console.warn);
-        console.warn('To recover from this, you should run "beachball sync" to update local package.json ' +
-            'files to synchronize package.json version. If necessary, unpublish any invalid packages from the above ' +
-            'list after "beachball sync".');
+        console.warn('These packages and versions were successfully published, but may be invalid if they depend on ' +
+            'package versions for which publishing failed:\n' +
+            succeededLines.join('\n') +
+            '\n\nTo recover from this, run "beachball sync" to synchronize local package.json files with the registry. ' +
+            'If necessary, unpublish or deprecate any invalid packages from the above list after "beachball sync".');
     }
 }
 exports.displayManualRecovery = displayManualRecovery;

package/lib/publish/displayManualRecovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"displayManualRecovery.js","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":";;;AAEA,SAAgB,qBAAqB,CAAC,QAAkB,EAAE,oBAAiC,IAAI,GAAG,EAAU;IAC1G,OAAO,CAAC,KAAK,CAAC,oFAAoF,CAAC,CAAC;IACpG,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtC,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,KAAK,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QAC7D,IAAI,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC3C,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC5B;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACtB;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,OAAO,CAAC,IAAI,CACV,kGAAkG;YAChG,+CAA+C,CAClD,CAAC;QAEF,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAErC,OAAO,CAAC,IAAI,CACV,qFAAqF;YACnF,yGAAyG;YACzG,8BAA8B,CACjC,CAAC;KACH;AACH,CAAC;AA5BD,sDA4BC"}
+{"version":3,"file":"displayManualRecovery.js","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":";;;AAEA,SAAgB,qBAAqB,CAAC,QAAkB,EAAE,oBAAiC,IAAI,GAAG,EAAU;IAC1G,MAAM,UAAU,GAAG,CAAC,mFAAmF,CAAC,CAAC;IACzG,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtC,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,KAAK,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QAC7D,IAAI,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC3C,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC5B;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAE5C,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,OAAO,CAAC,IAAI,CACV,gGAAgG;YAC9F,iDAAiD;YACjD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;YACzB,4GAA4G;YAC5G,uGAAuG,CAC1G,CAAC;KACH;AACH,CAAC;AAzBD,sDAyBC"}

package/lib/publish/getNewPackages.js

@@ -1,32 +1,21 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNewPackages = void 0;
 const listPackageVersions_1 = require("../packageManager/listPackageVersions");
-function getNewPackages(bumpInfo, registry) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { modifiedPackages, packageInfos } = bumpInfo;
-        const newPackages = Object.keys(packageInfos).filter(pkg => !modifiedPackages.has(pkg));
-        const publishedVersions = yield listPackageVersions_1.listPackageVersions(newPackages, registry);
-        return newPackages.filter(pkg => {
-            const packageInfo = packageInfos[pkg];
-            // Ignore private packages or change type "none" packages
-            if (packageInfo.private) {
-                return false;
-            }
-            if (!publishedVersions[pkg] || publishedVersions[pkg].length === 0) {
-                console.log(`New package detected: ${pkg}`);
-                return true;
-            }
-        });
+async function getNewPackages(bumpInfo, registry) {
+    const { modifiedPackages, packageInfos } = bumpInfo;
+    const newPackages = Object.keys(packageInfos).filter(pkg => !modifiedPackages.has(pkg));
+    const publishedVersions = await listPackageVersions_1.listPackageVersions(newPackages, registry);
+    return newPackages.filter(pkg => {
+        const packageInfo = packageInfos[pkg];
+        // Ignore private packages or change type "none" packages
+        if (packageInfo.private) {
+            return false;
+        }
+        if (!publishedVersions[pkg] || publishedVersions[pkg].length === 0) {
+            console.log(`New package detected: ${pkg}`);
+            return true;
+        }
     });
 }
 exports.getNewPackages = getNewPackages;

package/lib/publish/getNewPackages.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNewPackages.js","sourceRoot":"","sources":["../../src/publish/getNewPackages.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+EAA4E;AAE5E,SAAsB,cAAc,CAAC,QAAkB,EAAE,QAAgB;;QACvE,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;QAEpD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAExF,MAAM,iBAAiB,GAAG,MAAM,yCAAmB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAE3E,OAAO,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;YACtC,yDAAyD;YACzD,IAAI,WAAW,CAAC,OAAO,EAAE;gBACvB,OAAO,KAAK,CAAC;aACd;YAED,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAClE,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,EAAE,CAAC,CAAC;gBAC5C,OAAO,IAAI,CAAC;aACb;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAnBD,wCAmBC"}
+{"version":3,"file":"getNewPackages.js","sourceRoot":"","sources":["../../src/publish/getNewPackages.ts"],"names":[],"mappings":";;;AACA,+EAA4E;AAErE,KAAK,UAAU,cAAc,CAAC,QAAkB,EAAE,QAAgB;IACvE,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAEpD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAExF,MAAM,iBAAiB,GAAG,MAAM,yCAAmB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE3E,OAAO,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;QAC9B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QACtC,yDAAyD;QACzD,IAAI,WAAW,CAAC,OAAO,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YAClE,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,EAAE,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,wCAmBC"}

package/lib/publish/publishToRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publishToRegistry.d.ts","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAS7D,wBAAsB,iBAAiB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,iBAqG5F"}
+{"version":3,"file":"publishToRegistry.d.ts","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAW7D,wBAAsB,iBAAiB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,iBA+G5F"}

package/lib/publish/publishToRegistry.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -23,89 +14,98 @@ const toposortPackages_1 = require("./toposortPackages");
 const shouldPublishPackage_1 = require("./shouldPublishPackage");
 const validatePackageDependencies_1 = require("./validatePackageDependencies");
 const performPublishOverrides_1 = require("./performPublishOverrides");
-function publishToRegistry(originalBumpInfo, options) {
+async function publishToRegistry(originalBumpInfo, options) {
     var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const { registry, token, access, timeout, authType } = options;
-        const bumpInfo = lodash_1.default.cloneDeep(originalBumpInfo);
-        const { modifiedPackages, newPackages, packageInfos } = bumpInfo;
-        if (options.bump) {
-            yield performBump_1.performBump(bumpInfo, options);
+    const { registry, token, access, timeout, authType } = options;
+    const bumpInfo = lodash_1.default.cloneDeep(originalBumpInfo);
+    const { modifiedPackages, newPackages, packageInfos } = bumpInfo;
+    if (options.bump) {
+        await performBump_1.performBump(bumpInfo, options);
+    }
+    const succeededPackages = new Set();
+    let invalid = false;
+    if (!(await validatePackageVersions_1.validatePackageVersions(bumpInfo, registry))) {
+        displayManualRecovery_1.displayManualRecovery(bumpInfo, succeededPackages);
+        invalid = true;
+    }
+    else if (!validatePackageDependencies_1.validatePackageDependencies(bumpInfo)) {
+        invalid = true;
+    }
+    if (invalid) {
+        console.error('No packages have been published');
+        process.exit(1);
+    }
+    // get the packages to publish, reducing the set by packages that don't need publishing
+    const packagesToPublish = toposortPackages_1.toposortPackages([...modifiedPackages, ...newPackages], packageInfos).filter(pkg => {
+        const { publish, reasonToSkip } = shouldPublishPackage_1.shouldPublishPackage(bumpInfo, pkg);
+        if (!publish) {
+            console.log(`Skipping publish - ${reasonToSkip}`);
         }
-        const succeededPackages = new Set();
-        let invalid = false;
-        if (!(yield validatePackageVersions_1.validatePackageVersions(bumpInfo, registry))) {
-            displayManualRecovery_1.displayManualRecovery(bumpInfo, succeededPackages);
-            invalid = true;
-        }
-        else if (!validatePackageDependencies_1.validatePackageDependencies(bumpInfo)) {
-            invalid = true;
+        return publish;
+    });
+    // performing publishConfig and workspace version overrides requires this procedure to ONLY be run right before npm publish, but NOT in the git push
+    performPublishOverrides_1.performPublishOverrides(packagesToPublish, bumpInfo.packageInfos);
+    // if there is a prepublish hook perform a prepublish pass, calling the routine on each package
+    const prepublishHook = (_a = options.hooks) === null || _a === void 0 ? void 0 : _a.prepublish;
+    if (prepublishHook) {
+        for (const pkg of packagesToPublish) {
+            const packageInfo = bumpInfo.packageInfos[pkg];
+            const maybeAwait = prepublishHook(path_1.default.dirname(packageInfo.packageJsonPath), packageInfo.name, packageInfo.version);
+            if (maybeAwait instanceof Promise) {
+                await maybeAwait;
+            }
         }
-        if (invalid) {
-            console.error('No packages have been published');
-            process.exit(1);
+    }
+    // finally pass through doing the actual npm publish command
+    let hasAuthError = false;
+    for (const pkg of packagesToPublish) {
+        if (hasAuthError) {
+            console.log(`Skipping attempt to publish ${pkg} due to previous auth error`);
+            continue;
         }
-        // get the packages to publish, reducing the set by packages that don't need publishing
-        const packagesToPublish = toposortPackages_1.toposortPackages([...modifiedPackages, ...newPackages], packageInfos).filter(pkg => {
-            const { publish, reasonToSkip } = shouldPublishPackage_1.shouldPublishPackage(bumpInfo, pkg);
-            if (!publish) {
-                console.log(`Skipping publish - ${reasonToSkip}`);
+        const packageInfo = bumpInfo.packageInfos[pkg];
+        console.log(`Publishing - ${packageInfo.name}@${packageInfo.version} with tag ${packageInfo.combinedOptions.tag}.`);
+        let result;
+        let retries = 0;
+        do {
+            result = await packagePublish_1.packagePublish(packageInfo, registry, token, access, authType, timeout);
+            if (result.success) {
+                console.log('Published!');
+                succeededPackages.add(pkg);
             }
-            return publish;
-        });
-        // performing publishConfig and workspace version overrides requires this procedure to ONLY be run right before npm publish, but NOT in the git push
-        performPublishOverrides_1.performPublishOverrides(packagesToPublish, bumpInfo.packageInfos);
-        // if there is a prepublish hook perform a prepublish pass, calling the routine on each package
-        const prepublishHook = (_a = options.hooks) === null || _a === void 0 ? void 0 : _a.prepublish;
-        if (prepublishHook) {
-            for (const pkg of packagesToPublish) {
-                const packageInfo = bumpInfo.packageInfos[pkg];
-                const maybeAwait = prepublishHook(path_1.default.dirname(packageInfo.packageJsonPath), packageInfo.name, packageInfo.version);
-                if (maybeAwait instanceof Promise) {
-                    yield maybeAwait;
+            else {
+                retries++;
+                hasAuthError = result.all.includes('ENEEDAUTH');
+                const failedMessage = `Publishing "${pkg}" failed${hasAuthError ? ' due to auth error' : ''}:\n\n` + result.all;
+                if (hasAuthError) {
+                    console.error(failedMessage);
                 }
-            }
-        }
-        // finally pass through doing the actual npm publish command
-        for (const pkg of packagesToPublish) {
-            const packageInfo = bumpInfo.packageInfos[pkg];
-            console.log(`Publishing - ${packageInfo.name}@${packageInfo.version} with tag ${packageInfo.combinedOptions.tag}.`);
-            let result;
-            let retries = 0;
-            do {
-                result = packagePublish_1.packagePublish(packageInfo, registry, token, access, authType, timeout);
-                if (result.success) {
-                    console.log('Published!');
-                    succeededPackages.add(pkg);
-                    break;
+                else if (retries <= options.retries) {
+                    // has retries left (not a fatal error)
+                    console.log(failedMessage + `\n\nRetrying... (${retries}/${options.retries})`);
                 }
                 else {
-                    retries++;
-                    console.log('Publish failed:');
-                    console.log(result.stderr);
-                    if (retries <= options.retries) {
-                        console.log(`\nRetrying... (${retries}/${options.retries})`);
-                    }
+                    // out of retries
+                    console.error(failedMessage);
                 }
-            } while (retries <= options.retries);
-            if (!result.success) {
-                displayManualRecovery_1.displayManualRecovery(bumpInfo, succeededPackages);
-                console.error(result.stderr);
-                throw new Error('Error publishing, refer to the previous error messages for recovery instructions');
             }
+        } while (!result.success && retries <= options.retries && !hasAuthError);
+        if (!result.success) {
+            displayManualRecovery_1.displayManualRecovery(bumpInfo, succeededPackages);
+            throw new Error('Error publishing! Refer to the previous logs for recovery instructions.');
         }
-        // if there is a postpublish hook perform a postpublish pass, calling the routine on each package
-        const postpublishHook = (_b = options.hooks) === null || _b === void 0 ? void 0 : _b.postpublish;
-        if (postpublishHook) {
-            for (const pkg of packagesToPublish) {
-                const packageInfo = bumpInfo.packageInfos[pkg];
-                const maybeAwait = postpublishHook(path_1.default.dirname(packageInfo.packageJsonPath), packageInfo.name, packageInfo.version);
-                if (maybeAwait instanceof Promise) {
-                    yield maybeAwait;
-                }
+    }
+    // if there is a postpublish hook perform a postpublish pass, calling the routine on each package
+    const postpublishHook = (_b = options.hooks) === null || _b === void 0 ? void 0 : _b.postpublish;
+    if (postpublishHook) {
+        for (const pkg of packagesToPublish) {
+            const packageInfo = bumpInfo.packageInfos[pkg];
+            const maybeAwait = postpublishHook(path_1.default.dirname(packageInfo.packageJsonPath), packageInfo.name, packageInfo.version);
+            if (maybeAwait instanceof Promise) {
+                await maybeAwait;
             }
         }
-    });
+    }
 }
 exports.publishToRegistry = publishToRegistry;
 //# sourceMappingURL=publishToRegistry.js.map

package/lib/publish/publishToRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"publishToRegistry.js","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"publishToRegistry.js","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"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"}