beachball 2.21.1 → 2.22.2

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.
package/CHANGELOG.json CHANGED
@@ -2,7 +2,52 @@
2
2
  "name": "beachball",
3
3
  "entries": [
4
4
  {
5
- "date": "Wed, 27 Apr 2022 23:30:43 GMT",
5
+ "date": "Wed, 04 May 2022 03:40:49 GMT",
6
+ "tag": "beachball_v2.22.2",
7
+ "version": "2.22.2",
8
+ "comments": {
9
+ "patch": [
10
+ {
11
+ "author": "elcraig@microsoft.com",
12
+ "package": "beachball",
13
+ "commit": "d7e0f53fb513de48e781a1b71123a49cf1486db0",
14
+ "comment": "Remove docs for nonexistent changelog command"
15
+ }
16
+ ]
17
+ }
18
+ },
19
+ {
20
+ "date": "Wed, 04 May 2022 03:07:37 GMT",
21
+ "tag": "beachball_v2.22.1",
22
+ "version": "2.22.1",
23
+ "comments": {
24
+ "patch": [
25
+ {
26
+ "author": "dannyvv@microsoft.com",
27
+ "package": "beachball",
28
+ "commit": "bf86ecb4ac13021ac255d365b33079f1bbcde15f",
29
+ "comment": "Update help and readme to not refer to 'master' branch"
30
+ }
31
+ ]
32
+ }
33
+ },
34
+ {
35
+ "date": "Thu, 28 Apr 2022 20:28:37 GMT",
36
+ "tag": "beachball_v2.22.0",
37
+ "version": "2.22.0",
38
+ "comments": {
39
+ "minor": [
40
+ {
41
+ "author": "dlannoye@microsoft.com",
42
+ "package": "beachball",
43
+ "commit": "12e8625052ded947b881e4ff2cdf81f098279c42",
44
+ "comment": "Add support for \"workspace:\" versions"
45
+ }
46
+ ]
47
+ }
48
+ },
49
+ {
50
+ "date": "Wed, 27 Apr 2022 23:30:47 GMT",
6
51
  "tag": "beachball_v2.21.1",
7
52
  "version": "2.21.1",
8
53
  "comments": {
package/CHANGELOG.md CHANGED
@@ -1,12 +1,36 @@
1
1
  # Change Log - beachball
2
2
 
3
- This log was last generated on Wed, 27 Apr 2022 23:30:43 GMT and should not be manually modified.
3
+ This log was last generated on Wed, 04 May 2022 03:40:49 GMT and should not be manually modified.
4
4
 
5
5
  <!-- Start content -->
6
6
 
7
+ ## 2.22.2
8
+
9
+ Wed, 04 May 2022 03:40:49 GMT
10
+
11
+ ### Patches
12
+
13
+ - Remove docs for nonexistent changelog command (elcraig@microsoft.com)
14
+
15
+ ## 2.22.1
16
+
17
+ Wed, 04 May 2022 03:07:37 GMT
18
+
19
+ ### Patches
20
+
21
+ - Update help and readme to not refer to 'master' branch (dannyvv@microsoft.com)
22
+
23
+ ## 2.22.0
24
+
25
+ Thu, 28 Apr 2022 20:28:37 GMT
26
+
27
+ ### Minor changes
28
+
29
+ - Add support for "workspace:" versions (dlannoye@microsoft.com)
30
+
7
31
  ## 2.21.1
8
32
 
9
- Wed, 27 Apr 2022 23:30:43 GMT
33
+ Wed, 27 Apr 2022 23:30:47 GMT
10
34
 
11
35
  ### Patches
12
36
 
package/README.md CHANGED
@@ -26,17 +26,13 @@ a tool to help create change files in the change/ folder
26
26
 
27
27
  checks whether a change file is needed for this branch
28
28
 
29
- ### changelog
30
-
31
- based on change files, create changelogs and then unlinks the change files
32
-
33
29
  ### [bump](https://microsoft.github.io/beachball/cli/bump.html)
34
30
 
35
31
  bumps versions as well as generating changelogs
36
32
 
37
33
  ### [publish](https://microsoft.github.io/beachball/cli/publish.html)
38
34
 
39
- bumps, publishes to npm registry (optionally does dist-tags), and pushes changelogs back into master
35
+ bumps, publishes to npm registry (optionally does dist-tags), and pushes changelogs back into the default branch
40
36
 
41
37
  ### [sync](https://microsoft.github.io/beachball/cli/sync.html)
42
38
 
@@ -61,7 +57,7 @@ registry, defaults to https://registry.npmjs.org
61
57
 
62
58
  ### --branch, -b
63
59
 
64
- target branch from origin (default: master)
60
+ target branch from origin (default: as configured in 'git config init.defaultBranch')
65
61
 
66
62
  ### --message, -m
67
63
 
@@ -1 +1 @@
1
- {"version":3,"file":"bumpMinSemverRange.d.ts","sourceRoot":"","sources":["../../src/bump/bumpMinSemverRange.ts"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAkBzE"}
1
+ {"version":3,"file":"bumpMinSemverRange.d.ts","sourceRoot":"","sources":["../../src/bump/bumpMinSemverRange.ts"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UA0BzE"}
@@ -9,11 +9,21 @@ function bumpMinSemverRange(minVersion, semverRange) {
9
9
  if (semverRange === '*') {
10
10
  return semverRange;
11
11
  }
12
- if (semverRange.startsWith('~') || semverRange.startsWith('^')) {
12
+ if (new Set(['workspace:*', 'workspace:~', 'workspace:^']).has(semverRange)) {
13
+ // For basic workspace ranges we can just preserve current value and replace during publish
14
+ // https://pnpm.io/workspaces#workspace-protocol-workspace
15
+ return semverRange;
16
+ }
17
+ else if (semverRange.startsWith('~') || semverRange.startsWith('^')) {
13
18
  // ~1.0.0
14
19
  // ^1.0.0
15
20
  return semverRange[0] + minVersion;
16
21
  }
22
+ else if (semverRange.startsWith('workspace:~') || semverRange.startsWith('workspace:^')) {
23
+ // workspace:~1.0.0
24
+ // workspace:^1.0.0
25
+ return `workspace:${semverRange[10]}${minVersion}`;
26
+ }
17
27
  else if (semverRange.includes('>')) {
18
28
  // Less frequently used, but we treat any of these kinds of ranges to be within a minor band for now: more complex understand of the semver range utility is needed to do more
19
29
  // >=1.0.0 <2.0.0
@@ -1 +1 @@
1
- {"version":3,"file":"bumpMinSemverRange.js","sourceRoot":"","sources":["../../src/bump/bumpMinSemverRange.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,SAAgB,kBAAkB,CAAC,UAAkB,EAAE,WAAmB;IACxE,IAAI,WAAW,KAAK,GAAG,EAAE;QACvB,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9D,SAAS;QACT,SAAS;QACT,OAAO,WAAW,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC;KACpC;SAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACpC,8KAA8K;QAC9K,iBAAiB;QACjB,OAAO,KAAK,UAAU,KAAK,gBAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC;KAC9D;SAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACtC,gBAAgB;QAChB,OAAO,GAAG,UAAU,MAAM,gBAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC;KAC7D;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAlBD,gDAkBC"}
1
+ {"version":3,"file":"bumpMinSemverRange.js","sourceRoot":"","sources":["../../src/bump/bumpMinSemverRange.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,SAAgB,kBAAkB,CAAC,UAAkB,EAAE,WAAmB;IACxE,IAAI,WAAW,KAAK,GAAG,EAAE;QACvB,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAC3E,2FAA2F;QAC3F,0DAA0D;QAC1D,OAAO,WAAW,CAAC;KACpB;SAAM,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACrE,SAAS;QACT,SAAS;QACT,OAAO,WAAW,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC;KACpC;SAAM,IAAI,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACzF,mBAAmB;QACnB,mBAAmB;QACnB,OAAO,aAAa,WAAW,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC;KACpD;SAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACpC,8KAA8K;QAC9K,iBAAiB;QACjB,OAAO,KAAK,UAAU,KAAK,gBAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC;KAC9D;SAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACtC,gBAAgB;QAChB,OAAO,GAAG,UAAU,MAAM,gBAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC;KAC7D;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AA1BD,gDA0BC"}
package/lib/help.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,SAG1B;AAED,wBAAgB,QAAQ,SAoDvB"}
1
+ {"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,SAG1B;AAED,wBAAgB,QAAQ,SAmDvB"}
package/lib/help.js CHANGED
@@ -20,9 +20,8 @@ Commands:
20
20
 
21
21
  change (default) - a tool to help create change files in the change/ folder
22
22
  check - checks whether a change file is needed for this branch
23
- changelog - based on change files, create changelogs and then unlinks the change files
24
23
  bump - bumps versions as well as generating changelogs
25
- publish - bumps, publishes to npm registry (optionally does dist-tags), and pushes changelogs back into master
24
+ publish - bumps, publishes to npm registry (optionally does dist-tags), and pushes changelogs back into the default branch
26
25
  sync - synchronizes published versions of packages from a registry, makes local package.json changes to match what is published
27
26
 
28
27
  Options:
@@ -30,7 +29,7 @@ Options:
30
29
  --registry, -r - registry, defaults to https://registry.npmjs.org
31
30
  --tag, -t - for the publish command: dist-tag for npm publishes
32
31
  - for the sync command: will use specified tag to set the version
33
- --branch, -b - target branch from origin (default: master)
32
+ --branch, -b - target branch from origin (default: as configured in 'git config init.defaultBranch')
34
33
  --message, -m - for the publish command: custom publish message for the checkin (default: applying package updates);
35
34
  for the change command: description of the change
36
35
  --no-push - skip pushing changes back to git remote origin
package/lib/help.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"help.js","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW;IACzB,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,cAAc,WAAW,CAAC,OAAO,sCAAsC,CAAC,CAAC;AACvF,CAAC;AAHD,kCAGC;AAED,SAAgB,QAAQ;IACtB,WAAW,EAAE,CAAC;IAEd,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDb,CAAC,CAAC;AACH,CAAC;AApDD,4BAoDC"}
1
+ {"version":3,"file":"help.js","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW;IACzB,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,cAAc,WAAW,CAAC,OAAO,sCAAsC,CAAC,CAAC;AACvF,CAAC;AAHD,kCAGC;AAED,SAAgB,QAAQ;IACtB,WAAW,EAAE,CAAC;IAEd,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+Cb,CAAC,CAAC;AACH,CAAC;AAnDD,4BAmDC"}
@@ -0,0 +1,4 @@
1
+ import { PackageInfos } from '../types/PackageInfo';
2
+ export declare const acceptedKeys: string[];
3
+ export declare function performPublishOverrides(packagesToPublish: string[], packageInfos: PackageInfos): void;
4
+ //# sourceMappingURL=performPublishOverrides.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"performPublishOverrides.d.ts","sourceRoot":"","sources":["../../src/publish/performPublishOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,eAAO,MAAM,YAAY,UAA6F,CAAC;AAEvH,wBAAgB,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,YAAY,QAU9F"}
@@ -0,0 +1,82 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
20
+ };
21
+ Object.defineProperty(exports, "__esModule", { value: true });
22
+ exports.performPublishOverrides = exports.acceptedKeys = void 0;
23
+ const fs = __importStar(require("fs-extra"));
24
+ exports.acceptedKeys = ['types', 'typings', 'main', 'module', 'exports', 'repository', 'bin', 'browser', 'files'];
25
+ function performPublishOverrides(packagesToPublish, packageInfos) {
26
+ for (const pkgName of packagesToPublish) {
27
+ const info = packageInfos[pkgName];
28
+ const packageJson = fs.readJSONSync(info.packageJsonPath);
29
+ performWorkspaceVersionOverrides(packageJson, packageInfos);
30
+ performPublishConfigOverrides(packageJson);
31
+ fs.writeJSONSync(info.packageJsonPath, packageJson, { spaces: 2 });
32
+ }
33
+ }
34
+ exports.performPublishOverrides = performPublishOverrides;
35
+ function performPublishConfigOverrides(packageJson) {
36
+ // Everything in publishConfig in accepted keys here will get overridden & removed from the publishConfig section
37
+ if (packageJson.publishConfig) {
38
+ for (const key of exports.acceptedKeys) {
39
+ const value = packageJson.publishConfig[key] || packageJson[key];
40
+ packageJson[key] = value;
41
+ delete packageJson.publishConfig[key];
42
+ }
43
+ }
44
+ }
45
+ /**
46
+ * When dependencies are defined using workspace protocol they need to be replaced with a correct version during
47
+ * publish. If publishing happened using a package manager that supports this protocol (pnpm/yarn) then it could
48
+ * handle this replacement for us, but as of this time publishing only happens via npm, which can't do this
49
+ * replacement.
50
+ */
51
+ function performWorkspaceVersionOverrides(packageJson, packageInfos) {
52
+ const depTypes = ['dependencies', 'devDependencies', 'peerDependencies'];
53
+ depTypes.forEach(depKind => {
54
+ const deps = packageJson[depKind];
55
+ if (deps) {
56
+ Object.keys(deps).forEach(dep => {
57
+ const packageInfo = packageInfos[dep];
58
+ if (packageInfo && deps[dep].startsWith('workspace:')) {
59
+ deps[dep] = resolveWorkspaceVersionForPublish(deps[dep], packageInfo.version);
60
+ }
61
+ });
62
+ }
63
+ });
64
+ }
65
+ /**
66
+ * Resolves version for publishing following the replacements defined here:
67
+ * https://pnpm.io/workspaces#workspace-protocol-workspace
68
+ * https://yarnpkg.com/features/workspaces#publishing-workspaces
69
+ */
70
+ function resolveWorkspaceVersionForPublish(workspaceDependency, packageInfoVersion) {
71
+ const versionStartIndex = "workspace:".length;
72
+ if (workspaceDependency === 'workspace:*') {
73
+ return packageInfoVersion;
74
+ }
75
+ else if (new Set(['workspace:~', 'workspace:^']).has(workspaceDependency)) {
76
+ return `${workspaceDependency[versionStartIndex]}${packageInfoVersion}`;
77
+ }
78
+ else {
79
+ return workspaceDependency.substring(versionStartIndex);
80
+ }
81
+ }
82
+ //# sourceMappingURL=performPublishOverrides.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"performPublishOverrides.js","sourceRoot":"","sources":["../../src/publish/performPublishOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;AAElB,QAAA,YAAY,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAEvH,SAAgB,uBAAuB,CAAC,iBAA2B,EAAE,YAA0B;IAC7F,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;QACvC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE1D,gCAAgC,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAC5D,6BAA6B,CAAC,WAAW,CAAC,CAAC;QAE3C,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AAVD,0DAUC;AAED,SAAS,6BAA6B,CAAC,WAAgB;IACrD,iHAAiH;IACjH,IAAI,WAAW,CAAC,aAAa,EAAE;QAC7B,KAAK,MAAM,GAAG,IAAI,oBAAY,EAAE;YAC9B,MAAM,KAAK,GAAG,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;YACjE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACzB,OAAO,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;SACvC;KACF;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,gCAAgC,CAAC,WAAgB,EAAE,YAA0B;IACpF,MAAM,QAAQ,GAAG,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAU,CAAC;IAClF,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACzB,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC9B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;gBACtC,IAAI,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;oBACrD,IAAI,CAAC,GAAG,CAAC,GAAG,iCAAiC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;iBAC/E;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,SAAS,iCAAiC,CAAC,mBAA2B,EAAE,kBAA0B;IAChG,MAAM,iBAAiB,GAAG,YAAY,CAAC,MAAM,CAAC;IAC9C,IAAI,mBAAmB,KAAK,aAAa,EAAE;QACzC,OAAO,kBAAkB,CAAC;KAC3B;SAAM,IAAI,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE;QAC3E,OAAO,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,GAAG,kBAAkB,EAAE,CAAC;KACzE;SAAM;QACL,OAAO,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;KACzD;AACH,CAAC"}
@@ -22,7 +22,7 @@ const displayManualRecovery_1 = require("./displayManualRecovery");
22
22
  const toposortPackages_1 = require("./toposortPackages");
23
23
  const shouldPublishPackage_1 = require("./shouldPublishPackage");
24
24
  const validatePackageDependencies_1 = require("./validatePackageDependencies");
25
- const performPublishConfigOverrides_1 = require("./performPublishConfigOverrides");
25
+ const performPublishOverrides_1 = require("./performPublishOverrides");
26
26
  function publishToRegistry(originalBumpInfo, options) {
27
27
  var _a, _b;
28
28
  return __awaiter(this, void 0, void 0, function* () {
@@ -53,8 +53,8 @@ function publishToRegistry(originalBumpInfo, options) {
53
53
  }
54
54
  return publish;
55
55
  });
56
- // perform publishConfig overrides requires this procedure to ONLY be run right before npm publish, but NOT in the git push
57
- performPublishConfigOverrides_1.performPublishConfigOverrides(packagesToPublish, bumpInfo.packageInfos);
56
+ // performing publishConfig and workspace version overrides requires this procedure to ONLY be run right before npm publish, but NOT in the git push
57
+ performPublishOverrides_1.performPublishOverrides(packagesToPublish, bumpInfo.packageInfos);
58
58
  // if there is a prepublish hook perform a prepublish pass, calling the routine on each package
59
59
  const prepublishHook = (_a = options.hooks) === null || _a === void 0 ? void 0 : _a.prepublish;
60
60
  if (prepublishHook) {
@@ -1 +1 @@
1
- {"version":3,"file":"publishToRegistry.js","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publishToRegistry.js","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "beachball",
3
- "version": "2.21.1",
3
+ "version": "2.22.2",
4
4
  "description": "The Sunniest Semantic Version Bumper",
5
5
  "repository": {
6
6
  "type": "git",
@@ -1,4 +0,0 @@
1
- import { PackageInfos } from '../types/PackageInfo';
2
- export declare const acceptedKeys: string[];
3
- export declare function performPublishConfigOverrides(packagesToPublish: string[], packageInfos: PackageInfos): void;
4
- //# sourceMappingURL=performPublishConfigOverrides.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"performPublishConfigOverrides.d.ts","sourceRoot":"","sources":["../../src/publish/performPublishConfigOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,eAAO,MAAM,YAAY,UAA6F,CAAC;AAEvH,wBAAgB,6BAA6B,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,YAAY,QAiBpG"}
@@ -1,41 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
- }) : (function(o, m, k, k2) {
6
- if (k2 === undefined) k2 = k;
7
- o[k2] = m[k];
8
- }));
9
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
- Object.defineProperty(o, "default", { enumerable: true, value: v });
11
- }) : function(o, v) {
12
- o["default"] = v;
13
- });
14
- var __importStar = (this && this.__importStar) || function (mod) {
15
- if (mod && mod.__esModule) return mod;
16
- var result = {};
17
- if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
- __setModuleDefault(result, mod);
19
- return result;
20
- };
21
- Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.performPublishConfigOverrides = exports.acceptedKeys = void 0;
23
- const fs = __importStar(require("fs-extra"));
24
- exports.acceptedKeys = ['types', 'typings', 'main', 'module', 'exports', 'repository', 'bin', 'browser', 'files'];
25
- function performPublishConfigOverrides(packagesToPublish, packageInfos) {
26
- // Everything in publishConfig in accepted keys here will get overridden & removed from the publishConfig section
27
- for (const pkgName of packagesToPublish) {
28
- const info = packageInfos[pkgName];
29
- const packageJson = fs.readJSONSync(info.packageJsonPath);
30
- if (packageJson.publishConfig) {
31
- for (const key of exports.acceptedKeys) {
32
- const value = packageJson.publishConfig[key] || packageJson[key];
33
- packageJson[key] = value;
34
- delete packageJson.publishConfig[key];
35
- }
36
- }
37
- fs.writeJSONSync(info.packageJsonPath, packageJson, { spaces: 2 });
38
- }
39
- }
40
- exports.performPublishConfigOverrides = performPublishConfigOverrides;
41
- //# sourceMappingURL=performPublishConfigOverrides.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"performPublishConfigOverrides.js","sourceRoot":"","sources":["../../src/publish/performPublishConfigOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;AAElB,QAAA,YAAY,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAEvH,SAAgB,6BAA6B,CAAC,iBAA2B,EAAE,YAA0B;IACnG,iHAAiH;IAEjH,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;QACvC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE1D,IAAI,WAAW,CAAC,aAAa,EAAE;YAC7B,KAAK,MAAM,GAAG,IAAI,oBAAY,EAAE;gBAC9B,MAAM,KAAK,GAAG,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;gBACjE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACzB,OAAO,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;aACvC;SACF;QAED,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AAjBD,sEAiBC"}