beachball 2.29.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 (89) hide show
  1. package/lib/bump/gatherBumpInfo.d.ts.map +1 -1
  2. package/lib/bump/gatherBumpInfo.js +2 -24
  3. package/lib/bump/gatherBumpInfo.js.map +1 -1
  4. package/lib/bump/performBump.d.ts.map +1 -1
  5. package/lib/bump/performBump.js +29 -44
  6. package/lib/bump/performBump.js.map +1 -1
  7. package/lib/changefile/getChangedPackages.d.ts.map +1 -1
  8. package/lib/changefile/getChangedPackages.js +66 -29
  9. package/lib/changefile/getChangedPackages.js.map +1 -1
  10. package/lib/changefile/getPackageChangeTypes.js +4 -1
  11. package/lib/changefile/getPackageChangeTypes.js.map +1 -1
  12. package/lib/changefile/promptForChange.js +96 -102
  13. package/lib/changefile/promptForChange.js.map +1 -1
  14. package/lib/changefile/readChangeFiles.d.ts +11 -0
  15. package/lib/changefile/readChangeFiles.d.ts.map +1 -1
  16. package/lib/changefile/readChangeFiles.js +37 -20
  17. package/lib/changefile/readChangeFiles.js.map +1 -1
  18. package/lib/changelog/getPackageChangelogs.js +9 -13
  19. package/lib/changelog/getPackageChangelogs.js.map +1 -1
  20. package/lib/changelog/mergeChangelogs.d.ts +4 -3
  21. package/lib/changelog/mergeChangelogs.d.ts.map +1 -1
  22. package/lib/changelog/mergeChangelogs.js +8 -7
  23. package/lib/changelog/mergeChangelogs.js.map +1 -1
  24. package/lib/changelog/renderChangelog.js +38 -46
  25. package/lib/changelog/renderChangelog.js.map +1 -1
  26. package/lib/changelog/renderPackageChangelog.js +49 -72
  27. package/lib/changelog/renderPackageChangelog.js.map +1 -1
  28. package/lib/changelog/writeChangelog.js +91 -106
  29. package/lib/changelog/writeChangelog.js.map +1 -1
  30. package/lib/cli.js +6 -15
  31. package/lib/cli.js.map +1 -1
  32. package/lib/commands/bump.js +3 -14
  33. package/lib/commands/bump.js.map +1 -1
  34. package/lib/commands/canary.js +25 -36
  35. package/lib/commands/canary.js.map +1 -1
  36. package/lib/commands/change.js +10 -21
  37. package/lib/commands/change.js.map +1 -1
  38. package/lib/commands/init.d.ts.map +1 -1
  39. package/lib/commands/init.js +24 -37
  40. package/lib/commands/init.js.map +1 -1
  41. package/lib/commands/publish.js +70 -81
  42. package/lib/commands/publish.js.map +1 -1
  43. package/lib/commands/sync.js +18 -29
  44. package/lib/commands/sync.js.map +1 -1
  45. package/lib/monorepo/getPackageGroups.js +2 -2
  46. package/lib/monorepo/getPackageGroups.js.map +1 -1
  47. package/lib/monorepo/getPackageInfos.js +8 -0
  48. package/lib/monorepo/getPackageInfos.js.map +1 -1
  49. package/lib/monorepo/getScopedPackages.js +2 -2
  50. package/lib/monorepo/getScopedPackages.js.map +1 -1
  51. package/lib/monorepo/{utils.d.ts → isPathIncluded.d.ts} +1 -1
  52. package/lib/monorepo/isPathIncluded.d.ts.map +1 -0
  53. package/lib/monorepo/{utils.js → isPathIncluded.js} +1 -1
  54. package/lib/monorepo/isPathIncluded.js.map +1 -0
  55. package/lib/options/getCliOptions.js +11 -13
  56. package/lib/options/getCliOptions.js.map +1 -1
  57. package/lib/options/getOptions.js +1 -1
  58. package/lib/options/getOptions.js.map +1 -1
  59. package/lib/options/getPackageOptions.js +6 -1
  60. package/lib/options/getPackageOptions.js.map +1 -1
  61. package/lib/packageManager/listPackageVersions.js +37 -52
  62. package/lib/packageManager/listPackageVersions.js.map +1 -1
  63. package/lib/packageManager/npm.d.ts +6 -2
  64. package/lib/packageManager/npm.d.ts.map +1 -1
  65. package/lib/packageManager/npm.js +23 -22
  66. package/lib/packageManager/npm.js.map +1 -1
  67. package/lib/packageManager/packagePublish.d.ts +3 -1
  68. package/lib/packageManager/packagePublish.d.ts.map +1 -1
  69. package/lib/packageManager/packagePublish.js +1 -1
  70. package/lib/packageManager/packagePublish.js.map +1 -1
  71. package/lib/publish/bumpAndPush.js +56 -67
  72. package/lib/publish/bumpAndPush.js.map +1 -1
  73. package/lib/publish/displayManualRecovery.d.ts.map +1 -1
  74. package/lib/publish/displayManualRecovery.js +8 -8
  75. package/lib/publish/displayManualRecovery.js.map +1 -1
  76. package/lib/publish/getNewPackages.js +14 -25
  77. package/lib/publish/getNewPackages.js.map +1 -1
  78. package/lib/publish/publishToRegistry.d.ts.map +1 -1
  79. package/lib/publish/publishToRegistry.js +79 -79
  80. package/lib/publish/publishToRegistry.js.map +1 -1
  81. package/lib/publish/validatePackageVersions.js +21 -32
  82. package/lib/publish/validatePackageVersions.js.map +1 -1
  83. package/lib/types/BeachballOptions.d.ts +5 -0
  84. package/lib/types/BeachballOptions.d.ts.map +1 -1
  85. package/package.json +10 -9
  86. package/CHANGELOG.json +0 -3100
  87. package/CHANGELOG.md +0 -1418
  88. package/lib/monorepo/utils.d.ts.map +0 -1
  89. package/lib/monorepo/utils.js.map +0 -1
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -18,111 +9,105 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
18
9
  const getPackageChangelogs_1 = require("./getPackageChangelogs");
19
10
  const renderChangelog_1 = require("./renderChangelog");
20
11
  const renderJsonChangelog_1 = require("./renderJsonChangelog");
21
- const utils_1 = require("../monorepo/utils");
12
+ const isPathIncluded_1 = require("../monorepo/isPathIncluded");
22
13
  const mergeChangelogs_1 = require("./mergeChangelogs");
23
- function writeChangelog(options, changeFileChangeInfos, calculatedChangeTypes, dependentChangedBy, packageInfos) {
24
- return __awaiter(this, void 0, void 0, function* () {
25
- const groupedChangelogPaths = yield writeGroupedChangelog(options, changeFileChangeInfos, calculatedChangeTypes, packageInfos);
26
- const groupedChangelogPathSet = new Set(groupedChangelogPaths);
27
- const changelogs = getPackageChangelogs_1.getPackageChangelogs(changeFileChangeInfos, calculatedChangeTypes, dependentChangedBy, packageInfos, options.path);
28
- // Use a standard for loop here to prevent potentially firing off multiple network requests at once
29
- // (in case any custom renderers have network requests)
30
- for (const pkg of Object.keys(changelogs)) {
31
- const packagePath = path_1.default.dirname(packageInfos[pkg].packageJsonPath);
32
- if (groupedChangelogPathSet === null || groupedChangelogPathSet === void 0 ? void 0 : groupedChangelogPathSet.has(packagePath)) {
33
- console.log(`Changelog for ${pkg} has been written as a group here: ${packagePath}`);
34
- }
35
- else {
36
- yield writeChangelogFiles(options, changelogs[pkg], packagePath, false);
37
- }
14
+ async function writeChangelog(options, changeFileChangeInfos, calculatedChangeTypes, dependentChangedBy, packageInfos) {
15
+ const groupedChangelogPaths = await writeGroupedChangelog(options, changeFileChangeInfos, calculatedChangeTypes, packageInfos);
16
+ const groupedChangelogPathSet = new Set(groupedChangelogPaths);
17
+ const changelogs = getPackageChangelogs_1.getPackageChangelogs(changeFileChangeInfos, calculatedChangeTypes, dependentChangedBy, packageInfos, options.path);
18
+ // Use a standard for loop here to prevent potentially firing off multiple network requests at once
19
+ // (in case any custom renderers have network requests)
20
+ for (const pkg of Object.keys(changelogs)) {
21
+ const packagePath = path_1.default.dirname(packageInfos[pkg].packageJsonPath);
22
+ if (groupedChangelogPathSet === null || groupedChangelogPathSet === void 0 ? void 0 : groupedChangelogPathSet.has(packagePath)) {
23
+ console.log(`Changelog for ${pkg} has been written as a group here: ${packagePath}`);
24
+ }
25
+ else {
26
+ await writeChangelogFiles(options, changelogs[pkg], packagePath, false);
38
27
  }
39
- });
28
+ }
40
29
  }
41
30
  exports.writeChangelog = writeChangelog;
42
- function writeGroupedChangelog(options, changeFileChangeInfos, calculatedChangeTypes, packageInfos) {
43
- return __awaiter(this, void 0, void 0, function* () {
44
- if (!options.changelog) {
45
- return [];
46
- }
47
- const { groups: changelogGroups } = options.changelog;
48
- if (!changelogGroups || changelogGroups.length < 1) {
49
- return [];
50
- }
51
- // Grouped changelogs should not contain dependency bump entries
52
- const changelogs = getPackageChangelogs_1.getPackageChangelogs(changeFileChangeInfos, calculatedChangeTypes, {}, packageInfos, options.path);
53
- const groupedChangelogs = {};
54
- for (const pkg in changelogs) {
55
- const packagePath = path_1.default.dirname(packageInfos[pkg].packageJsonPath);
56
- const relativePath = path_1.default.relative(options.path, packagePath);
57
- for (const group of changelogGroups) {
58
- const { changelogPath, masterPackageName } = group;
59
- const masterPackage = packageInfos[masterPackageName];
60
- if (!masterPackage) {
61
- console.warn(`master package ${masterPackageName} does not exist.`);
62
- continue;
63
- }
64
- if (!fs_extra_1.default.existsSync(changelogPath)) {
65
- console.warn(`changelog path ${changelogPath} does not exist.`);
66
- continue;
67
- }
68
- const isInGroup = utils_1.isPathIncluded(relativePath, group.include, group.exclude);
69
- if (isInGroup) {
70
- if (!groupedChangelogs[changelogPath]) {
71
- groupedChangelogs[changelogPath] = {
72
- changelogs: [],
73
- masterPackage,
74
- };
75
- }
76
- groupedChangelogs[changelogPath].changelogs.push(changelogs[pkg]);
31
+ async function writeGroupedChangelog(options, changeFileChangeInfos, calculatedChangeTypes, packageInfos) {
32
+ if (!options.changelog) {
33
+ return [];
34
+ }
35
+ const { groups: changelogGroups } = options.changelog;
36
+ if (!(changelogGroups === null || changelogGroups === void 0 ? void 0 : changelogGroups.length)) {
37
+ return [];
38
+ }
39
+ // Grouped changelogs should not contain dependency bump entries
40
+ const changelogs = getPackageChangelogs_1.getPackageChangelogs(changeFileChangeInfos, calculatedChangeTypes, {}, packageInfos, options.path);
41
+ const groupedChangelogs = {};
42
+ for (const pkg of Object.keys(changelogs)) {
43
+ const packagePath = path_1.default.dirname(packageInfos[pkg].packageJsonPath);
44
+ const relativePath = path_1.default.relative(options.path, packagePath);
45
+ for (const group of changelogGroups) {
46
+ const { changelogPath, masterPackageName } = group;
47
+ const masterPackage = packageInfos[masterPackageName];
48
+ if (!masterPackage) {
49
+ console.warn(`master package ${masterPackageName} does not exist.`);
50
+ continue;
51
+ }
52
+ if (!fs_extra_1.default.existsSync(changelogPath)) {
53
+ console.warn(`changelog path ${changelogPath} does not exist.`);
54
+ continue;
55
+ }
56
+ const isInGroup = isPathIncluded_1.isPathIncluded(relativePath, group.include, group.exclude);
57
+ if (isInGroup) {
58
+ if (!groupedChangelogs[changelogPath]) {
59
+ groupedChangelogs[changelogPath] = {
60
+ changelogs: [],
61
+ masterPackage,
62
+ };
77
63
  }
64
+ groupedChangelogs[changelogPath].changelogs.push(changelogs[pkg]);
78
65
  }
79
66
  }
80
- const changelogAbsolutePaths = [];
81
- for (const changelogPath in groupedChangelogs) {
82
- const { masterPackage, changelogs } = groupedChangelogs[changelogPath];
83
- const groupedChangelog = mergeChangelogs_1.mergeChangelogs(changelogs, masterPackage);
84
- if (groupedChangelog) {
85
- yield writeChangelogFiles(options, groupedChangelog, changelogPath, true);
86
- changelogAbsolutePaths.push(path_1.default.resolve(changelogPath));
87
- }
67
+ }
68
+ const changelogAbsolutePaths = [];
69
+ for (const changelogPath in groupedChangelogs) {
70
+ const { masterPackage, changelogs } = groupedChangelogs[changelogPath];
71
+ const groupedChangelog = mergeChangelogs_1.mergeChangelogs(changelogs, masterPackage);
72
+ if (groupedChangelog) {
73
+ await writeChangelogFiles(options, groupedChangelog, changelogPath, true);
74
+ changelogAbsolutePaths.push(path_1.default.resolve(changelogPath));
88
75
  }
89
- return changelogAbsolutePaths;
90
- });
76
+ }
77
+ return changelogAbsolutePaths;
91
78
  }
92
- function writeChangelogFiles(options, newVersionChangelog, changelogPath, isGrouped) {
93
- return __awaiter(this, void 0, void 0, function* () {
94
- let previousJson;
95
- // Update CHANGELOG.json
96
- const changelogJsonFile = path_1.default.join(changelogPath, 'CHANGELOG.json');
97
- try {
98
- previousJson = fs_extra_1.default.existsSync(changelogJsonFile) ? fs_extra_1.default.readJSONSync(changelogJsonFile) : undefined;
99
- }
100
- catch (e) {
101
- console.warn('CHANGELOG.json is invalid:', e);
102
- }
103
- try {
104
- const nextJson = renderJsonChangelog_1.renderJsonChangelog(newVersionChangelog, previousJson);
105
- fs_extra_1.default.writeJSONSync(changelogJsonFile, nextJson, { spaces: 2 });
106
- }
107
- catch (e) {
108
- console.warn('Problem writing to CHANGELOG.json:', e);
109
- }
110
- // Update CHANGELOG.md
111
- if (newVersionChangelog.comments.major ||
112
- newVersionChangelog.comments.minor ||
113
- newVersionChangelog.comments.patch ||
114
- newVersionChangelog.comments.prerelease) {
115
- const changelogFile = path_1.default.join(changelogPath, 'CHANGELOG.md');
116
- const previousContent = fs_extra_1.default.existsSync(changelogFile) ? fs_extra_1.default.readFileSync(changelogFile).toString() : '';
117
- const newChangelog = yield renderChangelog_1.renderChangelog({
118
- previousJson,
119
- previousContent,
120
- newVersionChangelog,
121
- isGrouped,
122
- changelogOptions: options.changelog || {},
123
- });
124
- fs_extra_1.default.writeFileSync(changelogFile, newChangelog);
125
- }
126
- });
79
+ async function writeChangelogFiles(options, newVersionChangelog, changelogPath, isGrouped) {
80
+ let previousJson;
81
+ // Update CHANGELOG.json
82
+ const changelogJsonFile = path_1.default.join(changelogPath, 'CHANGELOG.json');
83
+ try {
84
+ previousJson = fs_extra_1.default.existsSync(changelogJsonFile) ? fs_extra_1.default.readJSONSync(changelogJsonFile) : undefined;
85
+ }
86
+ catch (e) {
87
+ console.warn('CHANGELOG.json is invalid:', e);
88
+ }
89
+ try {
90
+ const nextJson = renderJsonChangelog_1.renderJsonChangelog(newVersionChangelog, previousJson);
91
+ fs_extra_1.default.writeJSONSync(changelogJsonFile, nextJson, { spaces: 2 });
92
+ }
93
+ catch (e) {
94
+ console.warn('Problem writing to CHANGELOG.json:', e);
95
+ }
96
+ // Update CHANGELOG.md
97
+ if (newVersionChangelog.comments.major ||
98
+ newVersionChangelog.comments.minor ||
99
+ newVersionChangelog.comments.patch ||
100
+ newVersionChangelog.comments.prerelease) {
101
+ const changelogFile = path_1.default.join(changelogPath, 'CHANGELOG.md');
102
+ const previousContent = fs_extra_1.default.existsSync(changelogFile) ? fs_extra_1.default.readFileSync(changelogFile).toString() : '';
103
+ const newChangelog = await renderChangelog_1.renderChangelog({
104
+ previousJson,
105
+ previousContent,
106
+ newVersionChangelog,
107
+ isGrouped,
108
+ changelogOptions: options.changelog || {},
109
+ });
110
+ fs_extra_1.default.writeFileSync(changelogFile, newChangelog);
111
+ }
127
112
  }
128
113
  //# sourceMappingURL=writeChangelog.js.map
@@ -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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"}
package/lib/cli.js CHANGED
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  const bump_1 = require("./commands/bump");
13
4
  const canary_1 = require("./commands/canary");
@@ -18,7 +9,7 @@ const sync_1 = require("./commands/sync");
18
9
  const help_1 = require("./help");
19
10
  const getOptions_1 = require("./options/getOptions");
20
11
  const validate_1 = require("./validation/validate");
21
- (() => __awaiter(void 0, void 0, void 0, function* () {
12
+ (async () => {
22
13
  const options = getOptions_1.getOptions(process.argv);
23
14
  if (options.help) {
24
15
  help_1.showHelp();
@@ -38,18 +29,18 @@ const validate_1 = require("./validation/validate");
38
29
  validate_1.validate(options, { allowFetching: false });
39
30
  // set a default publish message
40
31
  options.message = options.message || 'applying package updates';
41
- yield publish_1.publish(options);
32
+ await publish_1.publish(options);
42
33
  break;
43
34
  case 'bump':
44
35
  validate_1.validate(options);
45
- yield bump_1.bump(options);
36
+ await bump_1.bump(options);
46
37
  break;
47
38
  case 'canary':
48
39
  validate_1.validate(options, { allowFetching: false });
49
- yield canary_1.canary(options);
40
+ await canary_1.canary(options);
50
41
  break;
51
42
  case 'init':
52
- yield init_1.init(options);
43
+ await init_1.init(options);
53
44
  break;
54
45
  case 'sync':
55
46
  sync_1.sync(options);
@@ -63,7 +54,7 @@ const validate_1 = require("./validation/validate");
63
54
  change_1.change(options);
64
55
  break;
65
56
  }
66
- }))().catch(e => {
57
+ })().catch(e => {
67
58
  help_1.showVersion();
68
59
  console.error('An error has been detected while running beachball!');
69
60
  console.error(e);
package/lib/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,0CAAuC;AACvC,8CAA2C;AAC3C,8CAA2C;AAC3C,0CAAuC;AACvC,gDAA6C;AAC7C,0CAAuC;AAEvC,iCAA+C;AAC/C,qDAAkD;AAClD,oDAAiD;AAEjD,CAAC,GAAS,EAAE;IACV,MAAM,OAAO,GAAG,uBAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,eAAQ,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,kBAAW,EAAE,CAAC;QACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,mBAAmB;IACnB,QAAQ,OAAO,CAAC,OAAO,EAAE;QACvB,KAAK,OAAO;YACV,mBAAQ,CAAC,OAAO,CAAC,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,SAAS;YACZ,mBAAQ,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YAE5C,gCAAgC;YAChC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,0BAA0B,CAAC;YAChE,MAAM,iBAAO,CAAC,OAAO,CAAC,CAAC;YACvB,MAAM;QAER,KAAK,MAAM;YACT,mBAAQ,CAAC,OAAO,CAAC,CAAC;YAClB,MAAM,WAAI,CAAC,OAAO,CAAC,CAAC;YACpB,MAAM;QAER,KAAK,QAAQ;YACX,mBAAQ,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5C,MAAM,eAAM,CAAC,OAAO,CAAC,CAAC;YACtB,MAAM;QAER,KAAK,MAAM;YACT,MAAM,WAAI,CAAC,OAAO,CAAC,CAAC;YACpB,MAAM;QAER,KAAK,MAAM;YACT,WAAI,CAAC,OAAO,CAAC,CAAC;YACd,MAAM;QAER;YACE,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAQ,CAAC,OAAO,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;YAEhF,IAAI,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACvC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC1C,OAAO;aACR;YAED,eAAM,CAAC,OAAO,CAAC,CAAC;YAEhB,MAAM;KACT;AACH,CAAC,CAAA,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACb,kBAAW,EAAE,CAAC;IACd,OAAO,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACrE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AAAA,0CAAuC;AACvC,8CAA2C;AAC3C,8CAA2C;AAC3C,0CAAuC;AACvC,gDAA6C;AAC7C,0CAAuC;AAEvC,iCAA+C;AAC/C,qDAAkD;AAClD,oDAAiD;AAEjD,CAAC,KAAK,IAAI,EAAE;IACV,MAAM,OAAO,GAAG,uBAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,eAAQ,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,kBAAW,EAAE,CAAC;QACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,mBAAmB;IACnB,QAAQ,OAAO,CAAC,OAAO,EAAE;QACvB,KAAK,OAAO;YACV,mBAAQ,CAAC,OAAO,CAAC,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,SAAS;YACZ,mBAAQ,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YAE5C,gCAAgC;YAChC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,0BAA0B,CAAC;YAChE,MAAM,iBAAO,CAAC,OAAO,CAAC,CAAC;YACvB,MAAM;QAER,KAAK,MAAM;YACT,mBAAQ,CAAC,OAAO,CAAC,CAAC;YAClB,MAAM,WAAI,CAAC,OAAO,CAAC,CAAC;YACpB,MAAM;QAER,KAAK,QAAQ;YACX,mBAAQ,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5C,MAAM,eAAM,CAAC,OAAO,CAAC,CAAC;YACtB,MAAM;QAER,KAAK,MAAM;YACT,MAAM,WAAI,CAAC,OAAO,CAAC,CAAC;YACpB,MAAM;QAER,KAAK,MAAM;YACT,WAAI,CAAC,OAAO,CAAC,CAAC;YACd,MAAM;QAER;YACE,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAQ,CAAC,OAAO,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;YAEhF,IAAI,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACvC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;gBAC1C,OAAO;aACR;YAED,eAAM,CAAC,OAAO,CAAC,CAAC;YAEhB,MAAM;KACT;AACH,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACb,kBAAW,EAAE,CAAC;IACd,OAAO,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACrE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
@@ -1,23 +1,12 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.bump = void 0;
13
4
  const gatherBumpInfo_1 = require("../bump/gatherBumpInfo");
14
5
  const performBump_1 = require("../bump/performBump");
15
6
  const getPackageInfos_1 = require("../monorepo/getPackageInfos");
16
- function bump(options) {
17
- return __awaiter(this, void 0, void 0, function* () {
18
- const bumpInfo = gatherBumpInfo_1.gatherBumpInfo(options, getPackageInfos_1.getPackageInfos(options.path));
19
- return yield performBump_1.performBump(bumpInfo, options);
20
- });
7
+ async function bump(options) {
8
+ const bumpInfo = gatherBumpInfo_1.gatherBumpInfo(options, getPackageInfos_1.getPackageInfos(options.path));
9
+ return await performBump_1.performBump(bumpInfo, options);
21
10
  }
22
11
  exports.bump = bump;
23
12
  //# sourceMappingURL=bump.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bump.js","sourceRoot":"","sources":["../../src/commands/bump.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAwD;AACxD,qDAAkD;AAClD,iEAA8D;AAG9D,SAAsB,IAAI,CAAC,OAAyB;;QAClD,MAAM,QAAQ,GAAG,+BAAc,CAAC,OAAO,EAAE,iCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,OAAO,MAAM,yBAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;CAAA;AAHD,oBAGC"}
1
+ {"version":3,"file":"bump.js","sourceRoot":"","sources":["../../src/commands/bump.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,qDAAkD;AAClD,iEAA8D;AAGvD,KAAK,UAAU,IAAI,CAAC,OAAyB;IAClD,MAAM,QAAQ,GAAG,+BAAc,CAAC,OAAO,EAAE,iCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACxE,OAAO,MAAM,yBAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAHD,oBAGC"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -20,34 +11,32 @@ const setDependentVersions_1 = require("../bump/setDependentVersions");
20
11
  const getPackageInfos_1 = require("../monorepo/getPackageInfos");
21
12
  const listPackageVersions_1 = require("../packageManager/listPackageVersions");
22
13
  const publishToRegistry_1 = require("../publish/publishToRegistry");
23
- function canary(options) {
24
- return __awaiter(this, void 0, void 0, function* () {
25
- const oldPackageInfo = getPackageInfos_1.getPackageInfos(options.path);
26
- const bumpInfo = gatherBumpInfo_1.gatherBumpInfo(options, oldPackageInfo);
27
- options.keepChangeFiles = true;
28
- options.generateChangelog = false;
29
- if (options.all) {
30
- for (const pkg of Object.keys(oldPackageInfo)) {
31
- bumpInfo.modifiedPackages.add(pkg);
32
- }
33
- }
34
- const packageVersions = yield listPackageVersions_1.listPackageVersions([...bumpInfo.modifiedPackages], options.registry);
35
- for (const pkg of bumpInfo.modifiedPackages) {
36
- let newVersion = oldPackageInfo[pkg].version;
37
- do {
38
- newVersion = semver_1.default.inc(newVersion, 'prerelease', options.canaryName || 'canary');
39
- } while (packageVersions[pkg].includes(newVersion));
40
- bumpInfo.packageInfos[pkg].version = newVersion;
41
- }
42
- setDependentVersions_1.setDependentVersions(bumpInfo.packageInfos, bumpInfo.scopedPackages, options);
43
- yield performBump_1.performBump(bumpInfo, options);
44
- if (options.publish) {
45
- yield publishToRegistry_1.publishToRegistry(bumpInfo, options);
46
- }
47
- else {
48
- console.log('Skipping publish');
14
+ async function canary(options) {
15
+ const oldPackageInfo = getPackageInfos_1.getPackageInfos(options.path);
16
+ const bumpInfo = gatherBumpInfo_1.gatherBumpInfo(options, oldPackageInfo);
17
+ options.keepChangeFiles = true;
18
+ options.generateChangelog = false;
19
+ if (options.all) {
20
+ for (const pkg of Object.keys(oldPackageInfo)) {
21
+ bumpInfo.modifiedPackages.add(pkg);
49
22
  }
50
- });
23
+ }
24
+ const packageVersions = await listPackageVersions_1.listPackageVersions([...bumpInfo.modifiedPackages], options.registry);
25
+ for (const pkg of bumpInfo.modifiedPackages) {
26
+ let newVersion = oldPackageInfo[pkg].version;
27
+ do {
28
+ newVersion = semver_1.default.inc(newVersion, 'prerelease', options.canaryName || 'canary');
29
+ } while (packageVersions[pkg].includes(newVersion));
30
+ bumpInfo.packageInfos[pkg].version = newVersion;
31
+ }
32
+ setDependentVersions_1.setDependentVersions(bumpInfo.packageInfos, bumpInfo.scopedPackages, options);
33
+ await performBump_1.performBump(bumpInfo, options);
34
+ if (options.publish) {
35
+ await publishToRegistry_1.publishToRegistry(bumpInfo, options);
36
+ }
37
+ else {
38
+ console.log('Skipping publish');
39
+ }
51
40
  }
52
41
  exports.canary = canary;
53
42
  //# sourceMappingURL=canary.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"canary.js","sourceRoot":"","sources":["../../src/commands/canary.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,2DAAwD;AACxD,qDAAkD;AAClD,uEAAoE;AACpE,iEAA8D;AAC9D,+EAA4E;AAC5E,oEAAiE;AAGjE,SAAsB,MAAM,CAAC,OAAyB;;QACpD,MAAM,cAAc,GAAG,iCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAErD,MAAM,QAAQ,GAAG,+BAAc,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAEzD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;QAC/B,OAAO,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAElC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;gBAC7C,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACpC;SACF;QAED,MAAM,eAAe,GAAG,MAAM,yCAAmB,CAAC,CAAC,GAAG,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEpG,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE;YAC3C,IAAI,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;YAE7C,GAAG;gBACD,UAAU,GAAG,gBAAM,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAE,CAAC;aACpF,QAAQ,eAAe,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAEpD,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,UAAU,CAAC;SACjD;QAED,2CAAoB,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAE9E,MAAM,yBAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAErC,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,MAAM,qCAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;SAC5C;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;SACjC;IACH,CAAC;CAAA;AAnCD,wBAmCC"}
1
+ {"version":3,"file":"canary.js","sourceRoot":"","sources":["../../src/commands/canary.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,2DAAwD;AACxD,qDAAkD;AAClD,uEAAoE;AACpE,iEAA8D;AAC9D,+EAA4E;AAC5E,oEAAiE;AAG1D,KAAK,UAAU,MAAM,CAAC,OAAyB;IACpD,MAAM,cAAc,GAAG,iCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD,MAAM,QAAQ,GAAG,+BAAc,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAEzD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAC/B,OAAO,CAAC,iBAAiB,GAAG,KAAK,CAAC;IAElC,IAAI,OAAO,CAAC,GAAG,EAAE;QACf,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YAC7C,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACpC;KACF;IAED,MAAM,eAAe,GAAG,MAAM,yCAAmB,CAAC,CAAC,GAAG,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEpG,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE;QAC3C,IAAI,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;QAE7C,GAAG;YACD,UAAU,GAAG,gBAAM,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAE,CAAC;SACpF,QAAQ,eAAe,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAEpD,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,UAAU,CAAC;KACjD;IAED,2CAAoB,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE9E,MAAM,yBAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAErC,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,MAAM,qCAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC5C;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;KACjC;AACH,CAAC;AAnCD,wBAmCC"}
@@ -1,29 +1,18 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.change = void 0;
13
4
  const promptForChange_1 = require("../changefile/promptForChange");
14
5
  const writeChangeFiles_1 = require("../changefile/writeChangeFiles");
15
- function change(options) {
16
- return __awaiter(this, void 0, void 0, function* () {
17
- const changes = yield promptForChange_1.promptForChange(options);
18
- if (changes) {
19
- writeChangeFiles_1.writeChangeFiles({
20
- changes,
21
- cwd: options.path,
22
- commitChangeFiles: options.commit,
23
- groupChanges: options.groupChanges,
24
- });
25
- }
26
- });
6
+ async function change(options) {
7
+ const changes = await promptForChange_1.promptForChange(options);
8
+ if (changes) {
9
+ writeChangeFiles_1.writeChangeFiles({
10
+ changes,
11
+ cwd: options.path,
12
+ commitChangeFiles: options.commit,
13
+ groupChanges: options.groupChanges,
14
+ });
15
+ }
27
16
  }
28
17
  exports.change = change;
29
18
  //# sourceMappingURL=change.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"change.js","sourceRoot":"","sources":["../../src/commands/change.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mEAAgE;AAChE,qEAAkE;AAElE,SAAsB,MAAM,CAAC,OAAyB;;QACpD,MAAM,OAAO,GAAG,MAAM,iCAAe,CAAC,OAAO,CAAC,CAAC;QAE/C,IAAI,OAAO,EAAE;YACX,mCAAgB,CAAC;gBACf,OAAO;gBACP,GAAG,EAAE,OAAO,CAAC,IAAI;gBACjB,iBAAiB,EAAE,OAAO,CAAC,MAAM;gBACjC,YAAY,EAAE,OAAO,CAAC,YAAY;aACnC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAXD,wBAWC"}
1
+ {"version":3,"file":"change.js","sourceRoot":"","sources":["../../src/commands/change.ts"],"names":[],"mappings":";;;AACA,mEAAgE;AAChE,qEAAkE;AAE3D,KAAK,UAAU,MAAM,CAAC,OAAyB;IACpD,MAAM,OAAO,GAAG,MAAM,iCAAe,CAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,OAAO,EAAE;QACX,mCAAgB,CAAC;YACf,OAAO;YACP,GAAG,EAAE,OAAO,CAAC,IAAI;YACjB,iBAAiB,EAAE,OAAO,CAAC,MAAM;YACjC,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CAAC,CAAC;KACJ;AACH,CAAC;AAXD,wBAWC"}
@@ -1 +1 @@
1
- {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAO7D,wBAAsB,IAAI,CAAC,OAAO,EAAE,gBAAgB,iBA8BnD"}
1
+ {"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAM7D,wBAAsB,IAAI,CAAC,OAAO,EAAE,gBAAgB,iBA6BnD"}
@@ -18,49 +18,36 @@ var __importStar = (this && this.__importStar) || function (mod) {
18
18
  __setModuleDefault(result, mod);
19
19
  return result;
20
20
  };
21
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
22
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
23
- return new (P || (P = Promise))(function (resolve, reject) {
24
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
25
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
26
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
27
- step((generator = generator.apply(thisArg, _arguments || [])).next());
28
- });
29
- };
30
21
  Object.defineProperty(exports, "__esModule", { value: true });
31
22
  exports.init = void 0;
32
23
  const fs = __importStar(require("fs"));
33
24
  const path = __importStar(require("path"));
34
- const child_process_1 = require("child_process");
35
- const os = __importStar(require("os"));
36
25
  const workspace_tools_1 = require("workspace-tools");
37
- function init(options) {
26
+ const npm_1 = require("../packageManager/npm");
27
+ async function init(options) {
38
28
  var _a, _b;
39
- return __awaiter(this, void 0, void 0, function* () {
40
- let root;
41
- try {
42
- root = workspace_tools_1.findProjectRoot(options.path);
43
- }
44
- catch (err) {
45
- console.log('Please run this command on an existing repository root.');
46
- return;
47
- }
48
- const packageJsonFilePath = path.join(root, 'package.json');
49
- const npmCmd = path.join(path.dirname(process.execPath), os.platform() === 'win32' ? 'npm.cmd' : 'npm');
50
- if (fs.existsSync(packageJsonFilePath)) {
51
- const beachballInfo = JSON.parse(child_process_1.spawnSync(npmCmd, ['info', 'beachball', '--json']).stdout.toString());
52
- const beachballVersion = beachballInfo['dist-tags'].latest;
53
- const packageJson = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
54
- packageJson.devDependencies = (_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {};
55
- packageJson.devDependencies.beachball = beachballVersion;
56
- packageJson.scripts = (_b = packageJson.scripts) !== null && _b !== void 0 ? _b : {};
57
- packageJson.scripts.checkchange = 'beachball check';
58
- packageJson.scripts.change = 'beachball change';
59
- packageJson.scripts.release = 'beachball publish';
60
- fs.writeFileSync(packageJsonFilePath, JSON.stringify(packageJson, null, 2));
61
- console.log('beachball has been initialized, please run `yarn` or `npm install` to install beachball into your repo');
62
- }
63
- });
29
+ let root;
30
+ try {
31
+ root = workspace_tools_1.findProjectRoot(options.path);
32
+ }
33
+ catch (err) {
34
+ console.log('Please run this command on an existing repository root.');
35
+ return;
36
+ }
37
+ const packageJsonFilePath = path.join(root, 'package.json');
38
+ if (fs.existsSync(packageJsonFilePath)) {
39
+ const beachballInfo = JSON.parse(npm_1.npm(['info', 'beachball', '--json']).stdout.toString());
40
+ const beachballVersion = beachballInfo['dist-tags'].latest;
41
+ const packageJson = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
42
+ packageJson.devDependencies = (_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {};
43
+ packageJson.devDependencies.beachball = beachballVersion;
44
+ packageJson.scripts = (_b = packageJson.scripts) !== null && _b !== void 0 ? _b : {};
45
+ packageJson.scripts.checkchange = 'beachball check';
46
+ packageJson.scripts.change = 'beachball change';
47
+ packageJson.scripts.release = 'beachball publish';
48
+ fs.writeFileSync(packageJsonFilePath, JSON.stringify(packageJson, null, 2));
49
+ console.log('beachball has been initialized, please run `yarn` or `npm install` to install beachball into your repo');
50
+ }
64
51
  }
65
52
  exports.init = init;
66
53
  //# sourceMappingURL=init.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,2CAA6B;AAC7B,iDAA0C;AAC1C,uCAAyB;AACzB,qDAAkD;AAElD,SAAsB,IAAI,CAAC,OAAyB;;;QAClD,IAAI,IAAY,CAAC;QACjB,IAAI;YACF,IAAI,GAAG,iCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACtC;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACvE,OAAO;SACR;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAExG,IAAI,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;YACtC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAS,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvG,MAAM,gBAAgB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;YAE3D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAC;YAC9E,WAAW,CAAC,eAAe,GAAG,MAAA,WAAW,CAAC,eAAe,mCAAI,EAAE,CAAC;YAChE,WAAW,CAAC,eAAe,CAAC,SAAS,GAAG,gBAAgB,CAAC;YACzD,WAAW,CAAC,OAAO,GAAG,MAAA,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC;YAChD,WAAW,CAAC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;YACpD,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,kBAAkB,CAAC;YAChD,WAAW,CAAC,OAAO,CAAC,OAAO,GAAG,mBAAmB,CAAC;YAElD,EAAE,CAAC,aAAa,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAE5E,OAAO,CAAC,GAAG,CACT,wGAAwG,CACzG,CAAC;SACH;;CACF;AA9BD,oBA8BC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,2CAA6B;AAC7B,qDAAkD;AAClD,+CAA4C;AAErC,KAAK,UAAU,IAAI,CAAC,OAAyB;;IAClD,IAAI,IAAY,CAAC;IACjB,IAAI;QACF,IAAI,GAAG,iCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KACtC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;QACvE,OAAO;KACR;IAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE5D,IAAI,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;QACtC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,SAAG,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzF,MAAM,gBAAgB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QAE3D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAC;QAC9E,WAAW,CAAC,eAAe,GAAG,MAAA,WAAW,CAAC,eAAe,mCAAI,EAAE,CAAC;QAChE,WAAW,CAAC,eAAe,CAAC,SAAS,GAAG,gBAAgB,CAAC;QACzD,WAAW,CAAC,OAAO,GAAG,MAAA,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC;QAChD,WAAW,CAAC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;QACpD,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,kBAAkB,CAAC;QAChD,WAAW,CAAC,OAAO,CAAC,OAAO,GAAG,mBAAmB,CAAC;QAElD,EAAE,CAAC,aAAa,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAE5E,OAAO,CAAC,GAAG,CACT,wGAAwG,CACzG,CAAC;KACH;AACH,CAAC;AA7BD,oBA6BC"}