beachball 2.30.2 → 2.31.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"getChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAyFjE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,YAsDvF"}
1
+ {"version":3,"file":"getChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAuKjE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,YAkDvF"}
@@ -10,6 +10,80 @@ const minimatch_1 = __importDefault(require("minimatch"));
10
10
  const paths_1 = require("../paths");
11
11
  const workspace_tools_1 = require("workspace-tools");
12
12
  const getScopedPackages_1 = require("../monorepo/getScopedPackages");
13
+ /**
14
+ * Ensure that adequate history is available to check for changes between HEAD and `options.branch`.
15
+ * Otherwise attempting to get changes will fail with an error "no merge base".
16
+ */
17
+ function ensureHistory(options) {
18
+ const { fetch, path: cwd, branch } = options;
19
+ const { remote, remoteBranch } = workspace_tools_1.parseRemoteBranch(branch);
20
+ const fetchMitigationSteps = `- Omit the "--no-fetch" / "--fetch=false" option from the command line
21
+ - Remove "fetch: false" from the beachball config
22
+ - If this is a CI build, ensure that adequate history is being fetched
23
+ - For GitHub Actions (actions/checkout), add the option "fetch-depth: 0" in the checkout step`;
24
+ if (fetch) {
25
+ // Fetch the latest from the remote branch for comparison
26
+ console.log(`fetching latest from remotes "${remote}/${remoteBranch}"`);
27
+ workspace_tools_1.fetchRemoteBranch(remote, remoteBranch, cwd);
28
+ }
29
+ else {
30
+ // If fetching is disabled, ensure that the target branch is available for comparison locally
31
+ const hasTargetBranch = workspace_tools_1.git(['rev-parse', '--verify', branch], { cwd }).success;
32
+ if (!hasTargetBranch) {
33
+ // This is most likely to happen in a CI build which does a shallow checkout (github actions/checkout
34
+ // does this by default) and for some reason also disables beachball fetching.
35
+ const mainError = `Target branch "${branch}" does not exist locally, and fetching is disabled.`;
36
+ console.error(`
37
+
38
+ ${mainError} Some possible fixes:
39
+ - Fetch the branch manually: git fetch ${remote} ${remoteBranch}
40
+ ${fetchMitigationSteps}
41
+
42
+ `);
43
+ throw new Error(mainError);
44
+ }
45
+ }
46
+ // Verify that HEAD and the target branch share history
47
+ const hasCommonCommit = workspace_tools_1.git(['merge-base', branch, 'HEAD'], { cwd }).success;
48
+ if (!hasCommonCommit) {
49
+ // This might be a shallow repo, and it's necessary to unshallow the head branch for comparison
50
+ const isShallow = workspace_tools_1.git(['rev-parse', '--is-shallow-repository'], { cwd }).stdout.trim() === 'true';
51
+ if (isShallow) {
52
+ if (fetch) {
53
+ // Fetch more history (if needed, this could be optimized later to only deepen by e.g. 100 commits at a time)
54
+ // TODO switch to this after workspace-tools update
55
+ // try {
56
+ // console.log('This is a shallow clone. Unshallowing to check for changes...');
57
+ // git(['fetch', '--unshallow'], { cwd, throwOnError: true });
58
+ // } catch (err) {
59
+ // throw new GitError(`Failed to fetch more history for branch "${branch}"`, err);
60
+ // }
61
+ console.log('This is a shallow clone. Unshallowing to check for changes...');
62
+ const result = workspace_tools_1.git(['fetch', '--unshallow'], { cwd });
63
+ if (!result.success) {
64
+ throw new Error(`Failed to fetch more history for branch "${branch}":\n${result.stderr}`);
65
+ }
66
+ }
67
+ else {
68
+ console.error(`
69
+
70
+ This repo is a shallow clone, fetching is disabled, and not enough history is available to connect HEAD to "${branch}".
71
+ Some possible fixes:
72
+
73
+ - Verify that you're using the correct target branch
74
+ - Unshallow or deepen the clone manually
75
+ ${fetchMitigationSteps}
76
+
77
+ `);
78
+ throw new Error(`Inadequate history available for HEAD to connect it to target branch "${branch}".`);
79
+ }
80
+ }
81
+ else {
82
+ // Not a shallow repo, so it's probably using the wrong target branch
83
+ throw new Error(`HEAD does not appear to share history with "${branch}" -- are you using the correct target branch?`);
84
+ }
85
+ }
86
+ }
13
87
  function getMatchingPackageInfo(file, cwd, packageInfosByPath) {
14
88
  // Normalize all the paths before comparing (the packageInfosByPath entries should also be normalized)
15
89
  // to ensure ensure that this doesn't break on Windows if any input paths have forward slashes
@@ -85,13 +159,9 @@ function getAllChangedPackages(options, packageInfos) {
85
159
  * Gets all the changed packages, accounting for change files
86
160
  */
87
161
  function getChangedPackages(options, packageInfos) {
88
- const { fetch, path: cwd, branch } = options;
162
+ const { path: cwd, branch } = options;
89
163
  const changePath = paths_1.getChangePath(cwd);
90
- if (fetch) {
91
- const { remote, remoteBranch } = workspace_tools_1.parseRemoteBranch(branch);
92
- console.log(`fetching latest from remotes "${remote}/${remoteBranch}"`);
93
- workspace_tools_1.fetchRemoteBranch(remote, remoteBranch, cwd);
94
- }
164
+ ensureHistory(options);
95
165
  const changedPackages = getAllChangedPackages(options, packageInfos);
96
166
  const changeFilesResult = workspace_tools_1.git(['diff', '--name-only', '--relative', '--no-renames', '--diff-filter=A', `${branch}...`], { cwd });
97
167
  if (!fs_extra_1.default.existsSync(changePath) || !changeFilesResult.success) {
@@ -1 +1 @@
1
- {"version":3,"file":"getChangedPackages.js","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,0DAAkC;AAElC,oCAAyC;AACzC,qDAA0G;AAC1G,qEAAkE;AAIlE,SAAS,sBAAsB,CAC7B,IAAY,EACZ,GAAW,EACX,kBAAuE;IAEvE,sGAAsG;IACtG,8FAA8F;IAC9F,GAAG,GAAG,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC1B,MAAM,OAAO,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IACrD,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,GAAG;QACD,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,CAAC;QACzC,IAAI,kBAAkB,CAAC,MAAM,CAAC,EAAE;YAC9B,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;SACnC;KACF,QAAQ,MAAM,KAAK,GAAG,EAAE;IAEzB,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,OAAyB,EAAE,YAA0B;IAClF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE/C,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,IAAI,OAAO,MAAM,GAAG,CAAC,CAAC;IAC/F,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAEhE,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,4BAAU,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,kCAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACvF,UAAU,CAAC,SAAS,OAAO,CAAC,MAAM,6BAA6B,MAAM,sBAAsB,CAAC,CAAC;IAE7F,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO,EAAE,CAAC;KACX;IAED,gEAAgE;IAChE,0EAA0E;IAC1E,MAAM,cAAc,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC7F,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,mBAAS,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1G,aAAa,IAAI,UAAU,CAAC,UAAU,EAAE,uBAAuB,aAAa,GAAG,CAAC,CAAC;QACjF,OAAO,CAAC,aAAa,CAAC;IACxB,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE;QAC7B,UAAU,CAAC,wBAAwB,CAAC,CAAC;QACrC,OAAO,EAAE,CAAC;KACX;IAED,+FAA+F;IAC/F,uDAAuD;IACvD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,cAAc,GAAG,qCAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAwD,EAAE,CAAC;IACnF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC9C,kBAAkB,CAAC,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KAC/E;IACD,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;QAC1C,MAAM,WAAW,GAAG,sBAAsB,CAAC,UAAU,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAEhF,MAAM,UAAU,GAAG,CAAC,WAAW;YAC7B,CAAC,CAAC,gCAAgC;YAClC,CAAC,CAAC,WAAW,CAAC,OAAO;gBACrB,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,aAAa;gBAClC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa,KAAK,KAAK;oBACrD,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,oCAAoC;oBACzD,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;wBAC5C,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,kBAAkB;wBACvC,CAAC,CAAC,EAAE,CAAC,CAAC,cAAc;QAEtB,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;SACpC;aAAM;YACL,gBAAgB,CAAC,GAAG,CAAC,WAAY,CAAC,IAAI,CAAC,CAAC;YACxC,SAAS,EAAE,CAAC;YACZ,WAAW,CAAC,UAAU,CAAC,CAAC;SACzB;KACF;IAED,UAAU,CAAC,SAAS,SAAS,aAAa,gBAAgB,CAAC,IAAI,oCAAoC,CAAC,CAAC;IAErG,OAAO,CAAC,GAAG,gBAAgB,CAAC,CAAC;AAC/B,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,OAAyB,EAAE,YAA0B;IACtF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE7C,MAAM,UAAU,GAAG,qBAAa,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAI,KAAK,EAAE;QACT,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mCAAiB,CAAC,MAAM,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,iCAAiC,MAAM,IAAI,YAAY,GAAG,CAAC,CAAC;QACxE,mCAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;KAC9C;IAED,MAAM,eAAe,GAAG,qBAAqB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAErE,MAAM,iBAAiB,GAAG,qBAAG,CAC3B,CAAC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,GAAG,MAAM,KAAK,CAAC,EACxF,EAAE,GAAG,EAAE,CACR,CAAC;IAEF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE;QAC5D,OAAO,eAAe,CAAC;KACxB;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,CAAC;IAC5E,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/C,gFAAgF;IAChF,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACzB,IAAI;YACF,MAAM,UAAU,GAAwC,kBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAE9E,IAAI,SAAS,IAAI,UAAU,EAAE;gBAC3B,KAAK,MAAM,MAAM,IAAK,UAAiC,CAAC,OAAO,EAAE;oBAC/D,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;iBAC9C;aACF;iBAAM;gBACL,oBAAoB,CAAC,GAAG,CAAE,UAA6B,CAAC,WAAW,CAAC,CAAC;aACtE;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,IAAI,CAAC,wCAAwC,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;SACpE;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,oBAAoB,CAAC,IAAI,GAAG,CAAC,EAAE;QACjC,OAAO,CAAC,GAAG,CACT,oEAAoE;YAClE,CAAC,GAAG,oBAAoB,CAAC;iBACtB,IAAI,EAAE;iBACN,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;iBACxB,IAAI,CAAC,EAAE,CAAC,CACd,CAAC;KACH;IAED,OAAO,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;AAC/E,CAAC;AAtDD,gDAsDC"}
1
+ {"version":3,"file":"getChangedPackages.js","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"promptForChange.d.ts","sourceRoot":"","sources":["../../src/changefile/promptForChange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAMjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAM7D;;GAEG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC,CA8HtG"}
1
+ {"version":3,"file":"promptForChange.d.ts","sourceRoot":"","sources":["../../src/changefile/promptForChange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAMjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAM7D;;GAEG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC,CAyHtG"}
@@ -69,22 +69,20 @@ async function promptForChange(options) {
69
69
  changeType: showChangeTypePrompt ? changeTypePrompt : undefined,
70
70
  description: !options.message ? descriptionPrompt : undefined,
71
71
  };
72
- let questions = [defaultPrompt.changeType, defaultPrompt.description];
73
- if ((_a = packageInfo.combinedOptions.changeFilePrompt) === null || _a === void 0 ? void 0 : _a.changePrompt) {
74
- /**
75
- * We are providing the package name also as the parameter so
76
- * that the custom changelog can be specified at the package level
77
- */
78
- questions = (_b = packageInfo.combinedOptions.changeFilePrompt) === null || _b === void 0 ? void 0 : _b.changePrompt(defaultPrompt, pkg);
79
- }
80
- questions = questions.filter(q => !!q);
72
+ const defaultPrompts = [defaultPrompt.changeType, defaultPrompt.description];
73
+ const questions = (((_b = (_a = packageInfo.combinedOptions.changeFilePrompt) === null || _a === void 0 ? void 0 : _a.changePrompt) === null || _b === void 0 ? void 0 : _b.call(_a, defaultPrompt, pkg)) || defaultPrompts).filter((q) => !!q);
81
74
  let response = {
82
75
  type: options.type || 'none',
83
76
  comment: options.message || '',
84
77
  };
85
78
  if (questions.length > 0) {
86
- response = (await prompts_1.default(questions));
87
- if (Object.keys(response).length === 0) {
79
+ let isCancelled = false;
80
+ response = (await prompts_1.default(questions, {
81
+ onCancel: () => {
82
+ isCancelled = true;
83
+ },
84
+ }));
85
+ if (isCancelled) {
88
86
  console.log('Cancelled, no change files are written');
89
87
  return;
90
88
  }
@@ -1 +1 @@
1
- {"version":3,"file":"promptForChange.js","sourceRoot":"","sources":["../../src/changefile/promptForChange.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"promptForChange.js","sourceRoot":"","sources":["../../src/changefile/promptForChange.ts"],"names":[],"mappings":"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"}
@@ -41,7 +41,7 @@ async function bumpAndPush(bumpInfo, publishBranch, options) {
41
41
  console.log('Bumping the versions for git push');
42
42
  await performBump_1.performBump(bumpInfo, options);
43
43
  // checkin
44
- const mergePublishBranchResult = mergePublishBranch_1.mergePublishBranch(publishBranch, branch, message, cwd);
44
+ const mergePublishBranchResult = await mergePublishBranch_1.mergePublishBranch(publishBranch, branch, message, cwd, options);
45
45
  if (!mergePublishBranchResult.success) {
46
46
  console.warn(`[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]: merging to target has failed!`);
47
47
  continue;
@@ -1 +1 @@
1
- {"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,4 @@
1
- export declare function mergePublishBranch(publishBranch: string, branch: string, message: string, cwd: string): import("workspace-tools").GitProcessOutput;
1
+ import { GitProcessOutput } from 'workspace-tools';
2
+ import { BeachballOptions } from '../types/BeachballOptions';
3
+ export declare function mergePublishBranch(publishBranch: string, branch: string, message: string, cwd: string, options: BeachballOptions): Promise<GitProcessOutput>;
2
4
  //# sourceMappingURL=mergePublishBranch.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"mergePublishBranch.d.ts","sourceRoot":"","sources":["../../src/publish/mergePublishBranch.ts"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,8CAoBrG"}
1
+ {"version":3,"file":"mergePublishBranch.d.ts","sourceRoot":"","sources":["../../src/publish/mergePublishBranch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,gBAAgB,6BAuB1B"}
@@ -2,7 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.mergePublishBranch = void 0;
4
4
  const workspace_tools_1 = require("workspace-tools");
5
- function mergePublishBranch(publishBranch, branch, message, cwd) {
5
+ async function mergePublishBranch(publishBranch, branch, message, cwd, options) {
6
+ await precommitHook(options);
6
7
  let result;
7
8
  let mergeSteps = [
8
9
  ['add', '.'],
@@ -23,4 +24,13 @@ function mergePublishBranch(publishBranch, branch, message, cwd) {
23
24
  return result;
24
25
  }
25
26
  exports.mergePublishBranch = mergePublishBranch;
27
+ /** Calls the `precommit` hook specified in `options` */
28
+ async function precommitHook(options) {
29
+ var _a;
30
+ const hook = (_a = options.hooks) === null || _a === void 0 ? void 0 : _a.precommit;
31
+ if (!hook) {
32
+ return;
33
+ }
34
+ await hook(options.path);
35
+ }
26
36
  //# sourceMappingURL=mergePublishBranch.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"mergePublishBranch.js","sourceRoot":"","sources":["../../src/publish/mergePublishBranch.ts"],"names":[],"mappings":";;;AAAA,qDAAsC;AAEtC,SAAgB,kBAAkB,CAAC,aAAqB,EAAE,MAAc,EAAE,OAAe,EAAE,GAAW;IACpG,IAAI,MAA8B,CAAC;IACnC,IAAI,UAAU,GAAG;QACf,CAAC,KAAK,EAAE,GAAG,CAAC;QACZ,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC;QACzB,CAAC,UAAU,EAAE,MAAM,CAAC;QACpB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC;KACvC,CAAC;IAEF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACtD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAC/B,MAAM,GAAG,qBAAG,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,OAAO,CAAC,KAAK,CAAC,uBAAuB,KAAK,GAAG,CAAC,MAAM,UAAU,CAAC,MAAM,0BAA0B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClH,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YAChE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YAChE,OAAO,MAAM,CAAC;SACf;KACF;IACD,OAAO,MAAO,CAAC;AACjB,CAAC;AApBD,gDAoBC"}
1
+ {"version":3,"file":"mergePublishBranch.js","sourceRoot":"","sources":["../../src/publish/mergePublishBranch.ts"],"names":[],"mappings":";;;AAAA,qDAAwD;AAGjD,KAAK,UAAU,kBAAkB,CACtC,aAAqB,EACrB,MAAc,EACd,OAAe,EACf,GAAW,EACX,OAAyB;IAEzB,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAE7B,IAAI,MAAwB,CAAC;IAC7B,IAAI,UAAU,GAAG;QACf,CAAC,KAAK,EAAE,GAAG,CAAC;QACZ,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC;QACzB,CAAC,UAAU,EAAE,MAAM,CAAC;QACpB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC;KACvC,CAAC;IAEF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACtD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAC/B,MAAM,GAAG,qBAAG,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,OAAO,CAAC,KAAK,CAAC,uBAAuB,KAAK,GAAG,CAAC,MAAM,UAAU,CAAC,MAAM,0BAA0B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClH,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YAChE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YAChE,OAAO,MAAM,CAAC;SACf;KACF;IACD,OAAO,MAAO,CAAC;AACjB,CAAC;AA5BD,gDA4BC;AAED,wDAAwD;AACxD,KAAK,UAAU,aAAa,CAAC,OAAyB;;IACpD,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,KAAK,0CAAE,SAAS,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO;KACR;IAED,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC"}
@@ -121,6 +121,10 @@ export interface HooksOptions {
121
121
  * to the filesystem. May be called multiple times during publish.
122
122
  */
123
123
  postbump?: (packagePath: string, name: string, version: string) => void | Promise<void>;
124
+ /**
125
+ * Runs once after all bumps to all packages before committing changes
126
+ */
127
+ precommit?: (cwd: string) => void | Promise<void>;
124
128
  }
125
129
  export interface TransformOptions {
126
130
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"BeachballOptions.d.ts","sourceRoot":"","sources":["../../src/types/BeachballOptions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BeachballOptions.d.ts","sourceRoot":"","sources":["../../src/types/BeachballOptions.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ export interface DefaultPrompt {
5
5
  }
6
6
  /**
7
7
  * Options for customizing change file prompt.
8
+ * The package name is provided so that the prompt can be customized by package if desired.
8
9
  */
9
10
  export interface ChangeFilePromptOptions {
10
11
  changePrompt?(defaultPrompt: DefaultPrompt, pkg: string): prompts.PromptObject[];
@@ -1 +1 @@
1
- {"version":3,"file":"ChangeFilePrompt.d.ts","sourceRoot":"","sources":["../../src/types/ChangeFilePrompt.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IACrD,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CACvD;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,YAAY,CAAC,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAClF"}
1
+ {"version":3,"file":"ChangeFilePrompt.d.ts","sourceRoot":"","sources":["../../src/types/ChangeFilePrompt.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IACrD,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CACvD;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,YAAY,CAAC,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAClF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "beachball",
3
- "version": "2.30.2",
3
+ "version": "2.31.1",
4
4
  "description": "The Sunniest Semantic Version Bumper",
5
5
  "repository": {
6
6
  "type": "git",