beachball
Advanced tools
Comparing version 2.25.1 to 2.26.0
# Change Log - beachball | ||
This log was last generated on Thu, 14 Jul 2022 21:17:06 GMT and should not be manually modified. | ||
This log was last generated on Thu, 21 Jul 2022 00:41:11 GMT and should not be manually modified. | ||
<!-- Start content --> | ||
## 2.26.0 | ||
Thu, 21 Jul 2022 00:41:11 GMT | ||
### Minor changes | ||
- Update workspace-tools to fix remote detection (elcraig@microsoft.com) | ||
## 2.25.1 | ||
Thu, 14 Jul 2022 21:17:06 GMT | ||
Thu, 14 Jul 2022 21:17:09 GMT | ||
@@ -11,0 +19,0 @@ ### Patches |
@@ -64,3 +64,6 @@ "use strict"; | ||
if (args.branch) { | ||
cliOptions.branch = args.branch.indexOf('/') > -1 ? args.branch : workspace_tools_1.getDefaultRemoteBranch(args.branch, cwd); | ||
cliOptions.branch = | ||
args.branch.indexOf('/') > -1 | ||
? args.branch | ||
: workspace_tools_1.getDefaultRemoteBranch({ branch: args.branch, verbose: args.verbose, cwd }); | ||
} | ||
@@ -67,0 +70,0 @@ if (cliOptions.command === 'canary') { |
@@ -8,3 +8,3 @@ "use strict"; | ||
function getRepoOptions(cliOptions) { | ||
const { configPath, path: repoRoot, branch } = cliOptions; | ||
const { configPath, path: cwd, branch } = cliOptions; | ||
if (cachedRepoOptions.has(cliOptions)) { | ||
@@ -29,9 +29,10 @@ return cachedRepoOptions.get(cliOptions); | ||
if (!branch) { | ||
const verbose = repoOptions.verbose; | ||
if (repoOptions.branch && !repoOptions.branch.includes('/')) { | ||
// Add a remote to the branch if it's not already included | ||
repoOptions.branch = workspace_tools_1.getDefaultRemoteBranch(repoOptions.branch, repoRoot); | ||
repoOptions.branch = workspace_tools_1.getDefaultRemoteBranch({ branch: repoOptions.branch, cwd, verbose }); | ||
} | ||
else if (!repoOptions.branch) { | ||
// Branch is not specified at all. Add in the default remote and branch. | ||
repoOptions.branch = workspace_tools_1.getDefaultRemoteBranch(undefined, cliOptions.path); | ||
repoOptions.branch = workspace_tools_1.getDefaultRemoteBranch({ cwd, verbose }); | ||
} | ||
@@ -38,0 +39,0 @@ } |
@@ -1,6 +0,2 @@ | ||
export declare function mergePublishBranch(publishBranch: string, branch: string, message: string, cwd: string): { | ||
stderr: string; | ||
stdout: string; | ||
success: boolean; | ||
}; | ||
export declare function mergePublishBranch(publishBranch: string, branch: string, message: string, cwd: string): import("workspace-tools").GitProcessOutput; | ||
//# sourceMappingURL=mergePublishBranch.d.ts.map |
{ | ||
"name": "beachball", | ||
"version": "2.25.1", | ||
"version": "2.26.0", | ||
"description": "The Sunniest Semantic Version Bumper", | ||
@@ -48,3 +48,3 @@ "repository": { | ||
"uuid": "^8.3.1", | ||
"workspace-tools": "^0.22.0", | ||
"workspace-tools": "^0.24.0", | ||
"yargs-parser": "^20.2.4" | ||
@@ -51,0 +51,0 @@ }, |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
422953
6571
+ Addedworkspace-tools@0.24.0(transitive)
- Removedworkspace-tools@0.22.0(transitive)
Updatedworkspace-tools@^0.24.0