beachball 2.54.0 → 2.55.0

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.
@@ -2,8 +2,8 @@ import type { PackageChangelog } from '../types/ChangeLog';
2
2
  import type { PackageInfo } from '../types/PackageInfo';
3
3
  /**
4
4
  * Merge multiple package changelogs into one.
5
- * `name` and `version` will use the values from `primaryPackage`'s changelog.
5
+ * `name` and `version` will use the values from `mainPackage`'s changelog.
6
6
  * `comments` are merged. `date` will be now.
7
7
  */
8
- export declare function mergeChangelogs(changelogs: PackageChangelog[], primaryPackage: PackageInfo): PackageChangelog | undefined;
8
+ export declare function mergeChangelogs(changelogs: PackageChangelog[], mainPackage: PackageInfo): PackageChangelog | undefined;
9
9
  //# sourceMappingURL=mergeChangelogs.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"mergeChangelogs.d.ts","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,gBAAgB,EAAE,EAC9B,cAAc,EAAE,WAAW,GAC1B,gBAAgB,GAAG,SAAS,CAuB9B"}
1
+ {"version":3,"file":"mergeChangelogs.d.ts","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,gBAAgB,EAAE,EAC9B,WAAW,EAAE,WAAW,GACvB,gBAAgB,GAAG,SAAS,CAuB9B"}
@@ -4,18 +4,18 @@ exports.mergeChangelogs = void 0;
4
4
  const generateTag_1 = require("../git/generateTag");
5
5
  /**
6
6
  * Merge multiple package changelogs into one.
7
- * `name` and `version` will use the values from `primaryPackage`'s changelog.
7
+ * `name` and `version` will use the values from `mainPackage`'s changelog.
8
8
  * `comments` are merged. `date` will be now.
9
9
  */
10
- function mergeChangelogs(changelogs, primaryPackage) {
10
+ function mergeChangelogs(changelogs, mainPackage) {
11
11
  var _a;
12
- if (changelogs.length < 1 || !primaryPackage) {
12
+ if (changelogs.length < 1 || !mainPackage) {
13
13
  return undefined;
14
14
  }
15
15
  const result = {
16
- name: primaryPackage.name,
17
- version: primaryPackage.version,
18
- tag: (0, generateTag_1.generateTag)(primaryPackage.name, primaryPackage.version),
16
+ name: mainPackage.name,
17
+ version: mainPackage.version,
18
+ tag: (0, generateTag_1.generateTag)(mainPackage.name, mainPackage.version),
19
19
  date: new Date(),
20
20
  comments: {},
21
21
  };
@@ -1 +1 @@
1
- {"version":3,"file":"mergeChangelogs.js","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":";;;AAEA,oDAAiD;AAGjD;;;;GAIG;AACH,SAAgB,eAAe,CAC7B,UAA8B,EAC9B,cAA2B;;IAE3B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE;QAC5C,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,MAAM,GAAqB;QAC/B,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,OAAO,EAAE,cAAc,CAAC,OAAO;QAC/B,GAAG,EAAE,IAAA,yBAAW,EAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC;QAC7D,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAiB,EAAE;YACxE,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,QAAQ,EAAE,MAAM,EAAE;gBACpB,OAAC,MAAM,CAAC,QAAQ,EAAC,UAAU,SAAV,UAAU,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;aACxD;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA1BD,0CA0BC"}
1
+ {"version":3,"file":"mergeChangelogs.js","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":";;;AAEA,oDAAiD;AAGjD;;;;GAIG;AACH,SAAgB,eAAe,CAC7B,UAA8B,EAC9B,WAAwB;;IAExB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE;QACzC,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,MAAM,GAAqB;QAC/B,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,GAAG,EAAE,IAAA,yBAAW,EAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC;QACvD,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAiB,EAAE;YACxE,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,QAAQ,EAAE,MAAM,EAAE;gBACpB,OAAC,MAAM,CAAC,QAAQ,EAAC,UAAU,SAAV,UAAU,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;aACxD;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA1BD,0CA0BC"}
@@ -52,17 +52,19 @@ async function writeGroupedChangelog(bumpInfo, options) {
52
52
  const changelogs = (0, getPackageChangelogs_1.getPackageChangelogs)({ changeFileChangeInfos, calculatedChangeTypes, packageInfos }, options);
53
53
  const groupedChangelogs = {};
54
54
  // Validate groups and initialize groupedChangelogs
55
- for (const { masterPackageName, changelogAbsDir } of changelogGroups) {
56
- const masterPackage = packageInfos[masterPackageName];
57
- if (!masterPackage) {
58
- console.warn(`master package ${masterPackageName} does not exist.`);
55
+ for (const group of changelogGroups) {
56
+ const { changelogAbsDir } = group;
57
+ const mainPackageName = 'mainPackageName' in group ? group.mainPackageName : group.masterPackageName;
58
+ const mainPackage = packageInfos[mainPackageName];
59
+ if (!mainPackage) {
60
+ console.warn(`main package ${mainPackageName} does not exist.`);
59
61
  continue;
60
62
  }
61
63
  if (!fs_extra_1.default.existsSync(changelogAbsDir)) {
62
64
  console.warn(`changelog path ${changelogAbsDir} does not exist.`);
63
65
  continue;
64
66
  }
65
- groupedChangelogs[changelogAbsDir] = { masterPackage, changelogs: [] };
67
+ groupedChangelogs[changelogAbsDir] = { mainPackage, changelogs: [] };
66
68
  }
67
69
  // Put changelogs into groups
68
70
  for (const pkg of Object.keys(changelogs)) {
@@ -77,7 +79,7 @@ async function writeGroupedChangelog(bumpInfo, options) {
77
79
  }
78
80
  // Write each grouped changelog if it's not empty
79
81
  for (const [groupAbsDir, group] of Object.entries(groupedChangelogs)) {
80
- const groupedChangelog = (0, mergeChangelogs_1.mergeChangelogs)(group.changelogs, group.masterPackage);
82
+ const groupedChangelog = (0, mergeChangelogs_1.mergeChangelogs)(group.changelogs, group.mainPackage);
81
83
  if (groupedChangelog) {
82
84
  await writeChangelogFiles({
83
85
  options,
@@ -1 +1 @@
1
- {"version":3,"file":"writeChangelog.js","sourceRoot":"","sources":["../../src/changelog/writeChangelog.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"writeChangelog.js","sourceRoot":"","sources":["../../src/changelog/writeChangelog.ts"],"names":[],"mappings":"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"}
@@ -54,15 +54,7 @@ export interface ChangelogOptions {
54
54
  */
55
55
  includeCommitHashes?: boolean;
56
56
  }
57
- /**
58
- * Options for generating a changelog for a group of packages.
59
- */
60
- export interface ChangelogGroupOptions {
61
- /**
62
- * The main package which a group of changes bubbles up to.
63
- * All changes within the group are used to describe changes for the master package.
64
- */
65
- masterPackageName: string;
57
+ interface ChangelogGroupOptionsBase {
66
58
  /**
67
59
  * minimatch pattern(s) for package paths to include in this group.
68
60
  * Patterns are relative to the repo root and must use forward slashes.
@@ -83,6 +75,19 @@ export interface ChangelogGroupOptions {
83
75
  */
84
76
  changelogPath: string;
85
77
  }
78
+ /**
79
+ * Options for generating a changelog for a group of packages.
80
+ */
81
+ export type ChangelogGroupOptions = (ChangelogGroupOptionsBase & {
82
+ /**
83
+ * The main package which a group of changes bubbles up to.
84
+ * All changes within the group are used to describe changes for the main package.
85
+ */
86
+ mainPackageName: string;
87
+ }) | (ChangelogGroupOptionsBase & {
88
+ /** @deprecated Use `mainPackageName` */
89
+ masterPackageName: string;
90
+ });
86
91
  /**
87
92
  * Info used for rendering the changelog markdown for a particular package version.
88
93
  */
@@ -161,4 +166,5 @@ export interface ChangelogRenderers {
161
166
  */
162
167
  renderEntry?: (entry: ChangelogEntry, renderInfo: PackageChangelogRenderInfo) => string | Promise<string>;
163
168
  }
169
+ export {};
164
170
  //# sourceMappingURL=ChangelogOptions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ChangelogOptions.d.ts","sourceRoot":"","sources":["../../src/types/ChangelogOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,oEAAoE;IACpE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAEjC;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,CAAC,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9F;;;OAGG;IACH,eAAe,CAAC,EAAE,kBAAkB,CAAC;IAErC;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpF;;;;;;;;;;OAUG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;;;OAIG;IACH,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;IAElC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE5B;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,wCAAwC;IACxC,YAAY,EAAE,aAAa,GAAG,SAAS,CAAC;IAExC,mFAAmF;IACnF,mBAAmB,EAAE,gBAAgB,CAAC;IAEtC,2CAA2C;IAC3C,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,SAAS,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,kBAAkB;IACjC;;;;;;;;;OASG;IACH,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpF;;;;;;;;;OASG;IACH,uBAAuB,CAAC,EAAE,CACxB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,0BAA0B,KACnC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtH;;;;;;;;;;;;;;;;;OAiBG;IACH,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE7G;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3G"}
1
+ {"version":3,"file":"ChangelogOptions.d.ts","sourceRoot":"","sources":["../../src/types/ChangelogOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,oEAAoE;IACpE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAEjC;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,CAAC,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9F;;;OAGG;IACH,eAAe,CAAC,EAAE,kBAAkB,CAAC;IAErC;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpF;;;;;;;;;;OAUG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,yBAAyB;IACjC;;;;OAIG;IACH,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;IAElC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE5B;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAC7B,CAAC,yBAAyB,GAAG;IAC3B;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,GACF,CAAC,yBAAyB,GAAG;IAC3B,wCAAwC;IAExC,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC,CAAC;AAEP;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,wCAAwC;IACxC,YAAY,EAAE,aAAa,GAAG,SAAS,CAAC;IAExC,mFAAmF;IACnF,mBAAmB,EAAE,gBAAgB,CAAC;IAEtC,2CAA2C;IAC3C,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,SAAS,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,kBAAkB;IACjC;;;;;;;;;OASG;IACH,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpF;;;;;;;;;OASG;IACH,uBAAuB,CAAC,EAAE,CACxB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,0BAA0B,KACnC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtH;;;;;;;;;;;;;;;;;OAiBG;IACH,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE7G;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,0BAA0B,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3G"}
@@ -1 +1 @@
1
- {"version":3,"file":"isValidChangelogOptions.d.ts","sourceRoot":"","sources":["../../src/validation/isValidChangelogOptions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAiB1E"}
1
+ {"version":3,"file":"isValidChangelogOptions.d.ts","sourceRoot":"","sources":["../../src/validation/isValidChangelogOptions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAmB1E"}
@@ -6,9 +6,9 @@ function isValidChangelogOptions(options) {
6
6
  if (!options.groups) {
7
7
  return true;
8
8
  }
9
- const badGroups = options.groups.filter(group => !group.changelogPath || !group.masterPackageName || !group.include);
9
+ const badGroups = options.groups.filter(group => !group.changelogPath || !('masterPackageName' in group || 'mainPackageName' in group) || !group.include);
10
10
  if (badGroups.length) {
11
- console.error('ERROR: "changelog.groups" entries must define "changelogPath", "masterPackageName", and "include". ' +
11
+ console.error('ERROR: "changelog.groups" entries must define "changelogPath", "mainPackageName", and "include". ' +
12
12
  'Found invalid groups:\n' +
13
13
  badGroups.map(group => ' ' + (0, format_1.singleLineStringify)(group)).join('\n'));
14
14
  return false;
@@ -1 +1 @@
1
- {"version":3,"file":"isValidChangelogOptions.js","sourceRoot":"","sources":["../../src/validation/isValidChangelogOptions.ts"],"names":[],"mappings":";;;AAAA,8CAAwD;AAGxD,SAAgB,uBAAuB,CAAC,OAAyB;IAC/D,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAErH,IAAI,SAAS,CAAC,MAAM,EAAE;QACpB,OAAO,CAAC,KAAK,CACX,qGAAqG;YACnG,yBAAyB;YACzB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,GAAG,IAAA,4BAAmB,EAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACvE,CAAC;QACF,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAjBD,0DAiBC"}
1
+ {"version":3,"file":"isValidChangelogOptions.js","sourceRoot":"","sources":["../../src/validation/isValidChangelogOptions.ts"],"names":[],"mappings":";;;AAAA,8CAAwD;AAGxD,SAAgB,uBAAuB,CAAC,OAAyB;IAC/D,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CACrC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC,mBAAmB,IAAI,KAAK,IAAI,iBAAiB,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CACjH,CAAC;IAEF,IAAI,SAAS,CAAC,MAAM,EAAE;QACpB,OAAO,CAAC,KAAK,CACX,mGAAmG;YACjG,yBAAyB;YACzB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,GAAG,IAAA,4BAAmB,EAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CACvE,CAAC;QACF,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAnBD,0DAmBC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "beachball",
3
- "version": "2.54.0",
3
+ "version": "2.55.0",
4
4
  "description": "The Sunniest Semantic Version Bumper",
5
5
  "repository": {
6
6
  "type": "git",