beachball 2.30.0 → 2.30.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.
Files changed (7) hide show
  1. package/lib/changelog/mergeChangelogs.d.ts +4 -3
  2. package/lib/changelog/mergeChangelogs.d.ts.map +1 -1
  3. package/lib/changelog/mergeChangelogs.js +8 -7
  4. package/lib/changelog/mergeChangelogs.js.map +1 -1
  5. package/lib/monorepo/getPackageInfos.js +8 -0
  6. package/lib/monorepo/getPackageInfos.js.map +1 -1
  7. package/package.json +7 -7
package/lib/changelog/mergeChangelogs.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  import { PackageChangelog } from '../types/ChangeLog';
2
2
  import { PackageInfo } from '../types/PackageInfo';
3
3
  /**
4
- * Merge multiple PackageChangelog into one.
5
- * `name`, `date` and `version` will be using the values from master changelog. `comments` are merged.
4
+ * Merge multiple package changelogs into one.
5
+ * `name` and `version` will use the values from `primaryPackage`'s changelog.
6
+ * `comments` are merged. `date` will be now.
6
7
  */
7
- export declare function mergeChangelogs(changelogs: PackageChangelog[], masterPackage: PackageInfo): PackageChangelog | undefined;
8
+ export declare function mergeChangelogs(changelogs: PackageChangelog[], primaryPackage: PackageInfo): PackageChangelog | undefined;
8
9
  //# sourceMappingURL=mergeChangelogs.d.ts.map
package/lib/changelog/mergeChangelogs.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mergeChangelogs.d.ts","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,gBAAgB,EAAE,EAC9B,aAAa,EAAE,WAAW,GACzB,gBAAgB,GAAG,SAAS,CAsB9B"}
1
+ {"version":3,"file":"mergeChangelogs.d.ts","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,gBAAgB,EAAE,EAC9B,cAAc,EAAE,WAAW,GAC1B,gBAAgB,GAAG,SAAS,CAsB9B"}
package/lib/changelog/mergeChangelogs.js CHANGED
@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.mergeChangelogs = void 0;
4
4
  const tag_1 = require("../tag");
5
5
  /**
6
- * Merge multiple PackageChangelog into one.
7
- * `name`, `date` and `version` will be using the values from master changelog. `comments` are merged.
6
+ * Merge multiple package changelogs into one.
7
+ * `name` and `version` will use the values from `primaryPackage`'s changelog.
8
+ * `comments` are merged. `date` will be now.
8
9
  */
9
- function mergeChangelogs(changelogs, masterPackage) {
10
- if (changelogs.length < 1 || !masterPackage) {
10
+ function mergeChangelogs(changelogs, primaryPackage) {
11
+ if (changelogs.length < 1 || !primaryPackage) {
11
12
  return undefined;
12
13
  }
13
14
  const result = {
14
- name: masterPackage.name,
15
- version: masterPackage.version,
16
- tag: tag_1.generateTag(masterPackage.name, masterPackage.version),
15
+ name: primaryPackage.name,
16
+ version: primaryPackage.version,
17
+ tag: tag_1.generateTag(primaryPackage.name, primaryPackage.version),
17
18
  date: new Date(),
18
19
  comments: {},
19
20
  };
package/lib/changelog/mergeChangelogs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mergeChangelogs.js","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":";;;AAGA,gCAAqC;AAGrC;;;GAGG;AACH,SAAgB,eAAe,CAC7B,UAA8B,EAC9B,aAA0B;IAE1B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;QAC3C,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,MAAM,GAAqB;QAC/B,IAAI,EAAE,aAAa,CAAC,IAAI;QACxB,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,GAAG,EAAE,iBAAW,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC;QAC3D,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACrE,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAClC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAE,CAAC,CAAC;aAC3G;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,0CAyBC"}
1
+ {"version":3,"file":"mergeChangelogs.js","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":";;;AAGA,gCAAqC;AAGrC;;;;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,iBAAW,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC;QAC7D,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACrE,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAClC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAE,CAAC,CAAC;aAC3G;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,0CAyBC"}
package/lib/monorepo/getPackageInfos.js CHANGED
@@ -50,12 +50,20 @@ function getPackageInfosFromNonWorkspaceMonorepo(projectRoot) {
50
50
  const packageInfos = {};
51
51
  if (packageJsonFiles && packageJsonFiles.length > 0) {
52
52
  packageJsonFiles.forEach(packageJsonPath => {
53
+ let hasDuplicatePackage = false;
53
54
  try {
54
55
  const packageJsonFullPath = path_1.default.join(projectRoot, packageJsonPath);
55
56
  const packageJson = fs_extra_1.default.readJSONSync(packageJsonFullPath);
57
+ if (packageInfos[packageJson.name]) {
58
+ hasDuplicatePackage = true;
59
+ throw new Error(`Two packages in different workspaces have the same name. Please rename one of these packages:\n- ${packageInfos[packageJson.name].packageJsonPath}\n- ${packageJsonPath}`);
60
+ }
56
61
  packageInfos[packageJson.name] = infoFromPackageJson_1.infoFromPackageJson(packageJson, packageJsonFullPath);
57
62
  }
58
63
  catch (e) {
64
+ if (hasDuplicatePackage) {
65
+ throw e; // duplicate package error should propagate
66
+ }
59
67
  // Pass, the package.json is invalid
60
68
  console.warn(`Invalid package.json file detected ${packageJsonPath}: `, e);
61
69
  }
package/lib/monorepo/getPackageInfos.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,qDAAuG;AAEvG,+DAA4D;AAE5D;;;GAGG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,MAAM,WAAW,GAAG,iCAAe,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,WAAW,GAAG,iCAAe,CAAC,GAAG,CAAC,CAAC;IAEzC,OAAO,CACL,CAAC,WAAW,IAAI,4BAA4B,CAAC,WAAW,CAAC,CAAC;QAC1D,CAAC,WAAW,IAAI,uCAAuC,CAAC,WAAW,CAAC,CAAC;QACrE,CAAC,WAAW,IAAI,6BAA6B,CAAC,WAAW,CAAC,CAAC;QAC3D,EAAE,CACH,CAAC;AACJ,CAAC;AAVD,0CAUC;AAED,SAAS,4BAA4B,CAAC,WAAmB;IACvD,IAAI;QACF,MAAM,YAAY,GAAiB,EAAE,CAAC;QAEtC,iEAAiE;QACjE,MAAM,aAAa,GAAG,+BAAa,CAAC,WAAW,CAAC,CAAC;QAEjD,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7C,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC3B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;gBAChD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;gBAE/D,IAAI;oBACF,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,yCAAmB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;iBACpF;gBAAC,OAAO,CAAC,EAAE;oBACV,oCAAoC;oBACpC,OAAO,CAAC,IAAI,CAAC,sCAAsC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC;iBAC5E;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,YAAY,CAAC;SACrB;KACF;IAAC,OAAO,CAAC,EAAE;QACV,kDAAkD;KACnD;AACH,CAAC;AAED,SAAS,uCAAuC,CAAC,WAAmB;IAClE,MAAM,gBAAgB,GAAG,qCAAmB,CAAC,CAAC,iBAAiB,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAC;IAE/F,MAAM,YAAY,GAAiB,EAAE,CAAC;IAEtC,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YACzC,IAAI;gBACF,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;gBACpE,MAAM,WAAW,GAAG,kBAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;gBACzD,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,yCAAmB,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;aACxF;YAAC,OAAO,CAAC,EAAE;gBACV,oCAAoC;gBACpC,OAAO,CAAC,IAAI,CAAC,sCAAsC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC;aAC5E;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC;KACrB;AACH,CAAC;AAED,SAAS,6BAA6B,CAAC,WAAmB;IACxD,MAAM,YAAY,GAAiB,EAAE,CAAC;IACtC,MAAM,mBAAmB,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,kBAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACzD,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,yCAAmB,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;IACvF,OAAO,YAAY,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "beachball",
3
- "version": "2.30.0",
3
+ "version": "2.30.1",
4
4
  "description": "The Sunniest Semantic Version Bumper",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,10 +32,10 @@
32
32
  "release:docs": "yarn docs:build && yarn gh-pages -d docs/.vuepress/dist --dotfiles",
33
33
  "start": "tsc -w --preserveWatchOutput",
34
34
  "test": "yarn test:unit && yarn test:e2e",
35
- "test:e2e": "jest --runInBand --config jest.e2e.js",
35
+ "test:e2e": "jest --config jest.e2e.js",
36
36
  "test:unit": "jest --config jest.config.js",
37
37
  "test:watch": "jest --watch",
38
- "update-snapshots": "jest --config jest.config.js --updateSnapshot"
38
+ "update-snapshots": "yarn test:unit -u && yarn test:e2e -u"
39
39
  },
40
40
  "dependencies": {
41
41
  "cosmiconfig": "^7.0.0",
@@ -55,13 +55,13 @@
55
55
  "@types/cosmiconfig": "6.0.0",
56
56
  "@types/execa": "2.0.0",
57
57
  "@types/fs-extra": "9.0.13",
58
- "@types/jest": "28.1.6",
59
- "@types/lodash": "4.14.182",
58
+ "@types/jest": "28.1.7",
59
+ "@types/lodash": "4.14.183",
60
60
  "@types/minimatch": "3.0.5",
61
61
  "@types/node": "12.20.55",
62
62
  "@types/p-limit": "2.2.0",
63
63
  "@types/prompts": "2.0.14",
64
- "@types/semver": "7.3.11",
64
+ "@types/semver": "7.3.12",
65
65
  "@types/tmp": "0.2.3",
66
66
  "@types/toposort": "2.0.3",
67
67
  "@types/uuid": "8.3.4",
@@ -71,7 +71,7 @@
71
71
  "jest": "28.1.3",
72
72
  "prettier": "2.7.1",
73
73
  "tmp": "0.2.1",
74
- "ts-jest": "28.0.7",
74
+ "ts-jest": "28.0.8",
75
75
  "typescript": "4.3.5",
76
76
  "verdaccio": "4.13.2",
77
77
  "verdaccio-auth-memory": "10.2.0",