beachball 2.32.2 → 2.32.4
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/lib/bump/performBump.d.ts.map +1 -1
- package/lib/bump/performBump.js +5 -6
- package/lib/bump/performBump.js.map +1 -1
- package/lib/bump/setDependentVersions.js +21 -23
- package/lib/bump/setDependentVersions.js.map +1 -1
- package/lib/bump/setDependentsInBumpInfo.d.ts.map +1 -1
- package/lib/bump/setDependentsInBumpInfo.js +10 -16
- package/lib/bump/setDependentsInBumpInfo.js.map +1 -1
- package/lib/changefile/getChangedPackages.d.ts.map +1 -1
- package/lib/changefile/getChangedPackages.js +12 -15
- package/lib/changefile/getChangedPackages.js.map +1 -1
- package/lib/changefile/writeChangeFiles.js +2 -2
- package/lib/changefile/writeChangeFiles.js.map +1 -1
- package/lib/changelog/getPackageChangelogs.js +2 -2
- package/lib/changelog/getPackageChangelogs.js.map +1 -1
- package/lib/changelog/mergeChangelogs.js +2 -2
- package/lib/changelog/mergeChangelogs.js.map +1 -1
- package/lib/changelog/renderJsonChangelog.js +2 -2
- package/lib/changelog/renderJsonChangelog.js.map +1 -1
- package/lib/git/generateTag.d.ts +3 -0
- package/lib/git/generateTag.d.ts.map +1 -0
- package/lib/{tag.js → git/generateTag.js} +2 -1
- package/lib/git/generateTag.js.map +1 -0
- package/lib/paths.d.ts +3 -1
- package/lib/paths.d.ts.map +1 -1
- package/lib/paths.js +5 -3
- package/lib/paths.js.map +1 -1
- package/lib/publish/bumpAndPush.d.ts.map +1 -1
- package/lib/publish/bumpAndPush.js +17 -19
- package/lib/publish/bumpAndPush.js.map +1 -1
- package/lib/publish/performPublishOverrides.d.ts +0 -1
- package/lib/publish/performPublishOverrides.d.ts.map +1 -1
- package/lib/publish/performPublishOverrides.js +34 -24
- package/lib/publish/performPublishOverrides.js.map +1 -1
- package/lib/publish/tagPackages.d.ts +7 -2
- package/lib/publish/tagPackages.d.ts.map +1 -1
- package/lib/publish/tagPackages.js +15 -12
- package/lib/publish/tagPackages.js.map +1 -1
- package/lib/publish/toposortPackages.d.ts +1 -1
- package/lib/publish/toposortPackages.d.ts.map +1 -1
- package/lib/publish/toposortPackages.js +14 -20
- package/lib/publish/toposortPackages.js.map +1 -1
- package/lib/types/PackageInfo.d.ts +10 -0
- package/lib/types/PackageInfo.d.ts.map +1 -1
- package/package.json +2 -2
- package/lib/tag.d.ts +0 -2
- package/lib/tag.d.ts.map +0 -1
- package/lib/tag.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performBump.d.ts","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAgB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,
|
|
1
|
+
{"version":3,"file":"performBump.d.ts","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAgB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAIjE,wBAAgB,gBAAgB,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,YAAY,QA8BzF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,QAS5C;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,qBAqB9E"}
|
package/lib/bump/performBump.js
CHANGED
|
@@ -21,21 +21,20 @@ function writePackageJson(modifiedPackages, packageInfos) {
|
|
|
21
21
|
if (!info.private) {
|
|
22
22
|
packageJson.version = info.version;
|
|
23
23
|
}
|
|
24
|
-
['dependencies', 'devDependencies', 'peerDependencies']
|
|
24
|
+
for (const depKind of ['dependencies', 'devDependencies', 'peerDependencies']) {
|
|
25
25
|
// updatedDeps contains all of the dependencies in the bump info since the beginning of a build job
|
|
26
26
|
const updatedDepsVersions = info[depKind];
|
|
27
27
|
if (updatedDepsVersions) {
|
|
28
28
|
// to be cautious, only update internal && modifiedPackages, since some other dependency
|
|
29
29
|
// changes could have occurred since the beginning of the build job and the next merge step
|
|
30
30
|
// would overwrite those incorrectly!
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
packageJson[depKind][dep] = updatedDepsVersions[dep];
|
|
31
|
+
for (const [dep, updatedVersion] of Object.entries(updatedDepsVersions)) {
|
|
32
|
+
if (modifiedPackages.has(dep) && packageJson[depKind]?.[dep]) {
|
|
33
|
+
packageJson[depKind][dep] = updatedVersion;
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
|
-
}
|
|
37
|
+
}
|
|
39
38
|
fs_extra_1.default.writeJSONSync(info.packageJsonPath, packageJson, { spaces: 2 });
|
|
40
39
|
}
|
|
41
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performBump.js","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,uEAAoE;AACpE,gEAA6D;AAI7D,qDAAkD;AAClD,+CAA4C;AAE5C,SAAgB,gBAAgB,CAAC,gBAA6B,EAAE,YAA0B;IACxF,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE;QACtC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,YAAY,OAAO,oCAAoC,CAAC,CAAC;YACtE,SAAS;SACV;QACD,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"performBump.js","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,33 +4,31 @@ exports.setDependentVersions = void 0;
|
|
|
4
4
|
const bumpMinSemverRange_1 = require("./bumpMinSemverRange");
|
|
5
5
|
function setDependentVersions(packageInfos, scopedPackages, { verbose }) {
|
|
6
6
|
const dependentChangedBy = {};
|
|
7
|
-
Object.
|
|
7
|
+
for (const [pkgName, info] of Object.entries(packageInfos)) {
|
|
8
8
|
if (!scopedPackages.has(pkgName)) {
|
|
9
|
-
|
|
9
|
+
continue;
|
|
10
10
|
}
|
|
11
|
-
const info
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
}
|
|
11
|
+
for (const deps of [info.dependencies, info.devDependencies, info.peerDependencies]) {
|
|
12
|
+
if (!deps) {
|
|
13
|
+
continue;
|
|
14
|
+
}
|
|
15
|
+
for (const [dep, existingVersionRange] of Object.entries(deps)) {
|
|
16
|
+
const packageInfo = packageInfos[dep];
|
|
17
|
+
if (!packageInfo) {
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const bumpedVersionRange = bumpMinSemverRange_1.bumpMinSemverRange(packageInfo.version, existingVersionRange);
|
|
21
|
+
if (existingVersionRange !== bumpedVersionRange) {
|
|
22
|
+
deps[dep] = bumpedVersionRange;
|
|
23
|
+
dependentChangedBy[pkgName] ?? (dependentChangedBy[pkgName] = new Set());
|
|
24
|
+
dependentChangedBy[pkgName].add(dep);
|
|
25
|
+
if (verbose) {
|
|
26
|
+
console.log(`${pkgName} needs to be bumped because ${dep} ${existingVersionRange} -> ${bumpedVersionRange}`);
|
|
29
27
|
}
|
|
30
|
-
}
|
|
28
|
+
}
|
|
31
29
|
}
|
|
32
|
-
}
|
|
33
|
-
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
34
32
|
return dependentChangedBy;
|
|
35
33
|
}
|
|
36
34
|
exports.setDependentVersions = setDependentVersions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setDependentVersions.js","sourceRoot":"","sources":["../../src/bump/setDependentVersions.ts"],"names":[],"mappings":";;;AAEA,6DAA0D;AAE1D,SAAgB,oBAAoB,CAClC,YAA0B,EAC1B,cAA2B,EAC3B,EAAE,OAAO,EAAoB;IAE7B,MAAM,kBAAkB,GAAyC,EAAE,CAAC;IAEpE,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"setDependentVersions.js","sourceRoot":"","sources":["../../src/bump/setDependentVersions.ts"],"names":[],"mappings":";;;AAEA,6DAA0D;AAE1D,SAAgB,oBAAoB,CAClC,YAA0B,EAC1B,cAA2B,EAC3B,EAAE,OAAO,EAAoB;IAE7B,MAAM,kBAAkB,GAAyC,EAAE,CAAC;IAEpE,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAChC,SAAS;SACV;QAED,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE;YACnF,IAAI,CAAC,IAAI,EAAE;gBACT,SAAS;aACV;YAED,KAAK,MAAM,CAAC,GAAG,EAAE,oBAAoB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC9D,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;gBACtC,IAAI,CAAC,WAAW,EAAE;oBAChB,SAAS;iBACV;gBAED,MAAM,kBAAkB,GAAG,uCAAkB,CAAC,WAAW,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBACzF,IAAI,oBAAoB,KAAK,kBAAkB,EAAE;oBAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC;oBAE/B,kBAAkB,CAAC,OAAO,MAA1B,kBAAkB,CAAC,OAAO,IAAM,IAAI,GAAG,EAAU,EAAC;oBAClD,kBAAkB,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACrC,IAAI,OAAO,EAAE;wBACX,OAAO,CAAC,GAAG,CACT,GAAG,OAAO,+BAA+B,GAAG,IAAI,oBAAoB,OAAO,kBAAkB,EAAE,CAChG,CAAC;qBACH;iBACF;aACF;SACF;KACF;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAxCD,oDAwCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setDependentsInBumpInfo.d.ts","sourceRoot":"","sources":["../../src/bump/setDependentsInBumpInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"setDependentsInBumpInfo.d.ts","sourceRoot":"","sources":["../../src/bump/setDependentsInBumpInfo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAsBhE"}
|
|
@@ -8,28 +8,22 @@ exports.setDependentsInBumpInfo = void 0;
|
|
|
8
8
|
*/
|
|
9
9
|
function setDependentsInBumpInfo(bumpInfo) {
|
|
10
10
|
const { packageInfos, scopedPackages } = bumpInfo;
|
|
11
|
-
const packages = Object.keys(packageInfos);
|
|
12
11
|
const dependents = {};
|
|
13
|
-
|
|
12
|
+
for (const [pkgName, info] of Object.entries(packageInfos)) {
|
|
14
13
|
if (!scopedPackages.has(pkgName)) {
|
|
15
|
-
|
|
14
|
+
continue;
|
|
16
15
|
}
|
|
17
|
-
const info
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (packages.includes(dep)) {
|
|
24
|
-
dependents[dep] = dependents[dep] || [];
|
|
25
|
-
if (!dependents[dep].includes(pkgName)) {
|
|
26
|
-
dependents[dep].push(pkgName);
|
|
27
|
-
}
|
|
16
|
+
for (const deps of [info.dependencies, info.devDependencies, info.peerDependencies]) {
|
|
17
|
+
for (const dep of Object.keys(deps || {})) {
|
|
18
|
+
if (packageInfos[dep]) {
|
|
19
|
+
dependents[dep] ?? (dependents[dep] = []);
|
|
20
|
+
if (!dependents[dep].includes(pkgName)) {
|
|
21
|
+
dependents[dep].push(pkgName);
|
|
28
22
|
}
|
|
29
23
|
}
|
|
30
24
|
}
|
|
31
|
-
}
|
|
32
|
-
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
33
27
|
bumpInfo.dependents = dependents;
|
|
34
28
|
}
|
|
35
29
|
exports.setDependentsInBumpInfo = setDependentsInBumpInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setDependentsInBumpInfo.js","sourceRoot":"","sources":["../../src/bump/setDependentsInBumpInfo.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,QAAkB;IACxD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;IAClD,MAAM,
|
|
1
|
+
{"version":3,"file":"setDependentsInBumpInfo.js","sourceRoot":"","sources":["../../src/bump/setDependentsInBumpInfo.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,QAAkB;IACxD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;IAClD,MAAM,UAAU,GAA2B,EAAE,CAAC;IAE9C,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAChC,SAAS;SACV;QAED,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE;YACnF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE;gBACzC,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE;oBACrB,UAAU,CAAC,GAAG,MAAd,UAAU,CAAC,GAAG,IAAM,EAAE,EAAC;oBACvB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACtC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBAC/B;iBACF;aACF;SACF;KACF;IAED,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;AACnC,CAAC;AAtBD,0DAsBC"}
|
|
@@ -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;
|
|
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;AA2KjE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,YA+CvF"}
|
|
@@ -10,6 +10,7 @@ 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
|
+
const count = (count, str) => `${count} ${str}${count === 1 ? '' : 's'}`;
|
|
13
14
|
/**
|
|
14
15
|
* Ensure that adequate history is available to check for changes between HEAD and `options.branch`.
|
|
15
16
|
* Otherwise attempting to get changes will fail with an error "no merge base".
|
|
@@ -107,13 +108,13 @@ function getAllChangedPackages(options, packageInfos) {
|
|
|
107
108
|
const logIgnored = (file, reason) => verboseLog(` - ~~${file}~~ (${reason})`);
|
|
108
109
|
const logIncluded = (file) => verboseLog(` - ${file}`);
|
|
109
110
|
const changes = [...(workspace_tools_1.getChanges(branch, cwd) || []), ...(workspace_tools_1.getStagedChanges(cwd) || [])];
|
|
110
|
-
verboseLog(`Found ${changes.length
|
|
111
|
+
verboseLog(`Found ${count(changes.length, 'changed file')} in branch "${branch}" (before filtering)`);
|
|
111
112
|
if (!changes.length) {
|
|
112
113
|
return [];
|
|
113
114
|
}
|
|
114
115
|
// Filter out changed files which are ignored by ignorePatterns.
|
|
115
|
-
// Also ignore the CHANGELOG files because they're generated by beachball.
|
|
116
|
-
const ignorePatterns = [...(options.ignorePatterns || []), 'CHANGELOG.md
|
|
116
|
+
// Also ignore the CHANGELOG files and change files because they're generated by beachball.
|
|
117
|
+
const ignorePatterns = [...(options.ignorePatterns || []), `${paths_1.changeFolder}/*.json`, 'CHANGELOG.{md,json}'];
|
|
117
118
|
const nonIgnoredChanges = changes.filter(moddedFile => {
|
|
118
119
|
const ignorePattern = ignorePatterns.find(pattern => minimatch_1.default(moddedFile, pattern, { matchBase: true }));
|
|
119
120
|
ignorePattern && logIgnored(moddedFile, `ignored by pattern "${ignorePattern}"`);
|
|
@@ -152,7 +153,7 @@ function getAllChangedPackages(options, packageInfos) {
|
|
|
152
153
|
logIncluded(moddedFile);
|
|
153
154
|
}
|
|
154
155
|
}
|
|
155
|
-
verboseLog(`Found ${fileCount}
|
|
156
|
+
verboseLog(`Found ${count(fileCount, 'file')} in ${count(includedPackages.size, 'package')} that should be published`);
|
|
156
157
|
return [...includedPackages];
|
|
157
158
|
}
|
|
158
159
|
/**
|
|
@@ -168,25 +169,21 @@ function getChangedPackages(options, packageInfos) {
|
|
|
168
169
|
return changedPackages;
|
|
169
170
|
}
|
|
170
171
|
const changes = changeFilesResult.stdout.split(/\n/);
|
|
171
|
-
const changeFiles = changes.filter(name => path_1.default.dirname(name) ===
|
|
172
|
+
const changeFiles = changes.filter(name => path_1.default.dirname(name) === paths_1.changeFolder);
|
|
172
173
|
const changeFilePackageSet = new Set();
|
|
173
174
|
// Loop through the change files, building up a set of packages that we can skip
|
|
174
|
-
|
|
175
|
+
for (const file of changeFiles) {
|
|
175
176
|
try {
|
|
176
|
-
const changeInfo = fs_extra_1.default.readJSONSync(file);
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
else {
|
|
183
|
-
changeFilePackageSet.add(changeInfo.packageName);
|
|
177
|
+
const changeInfo = fs_extra_1.default.readJSONSync(path_1.default.join(cwd, file));
|
|
178
|
+
const changes = changeInfo.changes || [changeInfo];
|
|
179
|
+
for (const change of changes) {
|
|
180
|
+
changeFilePackageSet.add(change.packageName);
|
|
184
181
|
}
|
|
185
182
|
}
|
|
186
183
|
catch (e) {
|
|
187
184
|
console.warn(`Error reading or parsing change file ${file}: ${e}`);
|
|
188
185
|
}
|
|
189
|
-
}
|
|
186
|
+
}
|
|
190
187
|
if (changeFilePackageSet.size > 0) {
|
|
191
188
|
console.log('Your local repository already has change files for these packages:' +
|
|
192
189
|
[...changeFilePackageSet]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getChangedPackages.js","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,0DAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"getChangedPackages.js","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,8 +43,8 @@ function writeChangeFiles({ changes, cwd, commitChangeFiles = true, groupChanges
|
|
|
43
43
|
workspace_tools_1.commit('Change files', cwd, commitOptions);
|
|
44
44
|
}
|
|
45
45
|
console.log(`git ${commitChangeFiles ? 'committed' : 'staged'} these change files: ${changeFiles
|
|
46
|
-
.map(f =>
|
|
47
|
-
.join('
|
|
46
|
+
.map(f => `\n - ${f}`)
|
|
47
|
+
.join('')}`);
|
|
48
48
|
return changeFiles;
|
|
49
49
|
}
|
|
50
50
|
exports.writeChangeFiles = writeChangeFiles;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeChangeFiles.js","sourceRoot":"","sources":["../../src/changefile/writeChangeFiles.ts"],"names":[],"mappings":";;;;;;AACA,oCAAyC;AACzC,qDAA+D;AAC/D,wDAA0B;AAC1B,gDAAwB;AACxB,+BAAoC;AAEpC;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,EAC/B,OAAO,EACP,GAAG,EACH,iBAAiB,GAAG,IAAI,EACxB,YAAY,GAAG,KAAK,GAQrB;IACC,MAAM,UAAU,GAAG,qBAAa,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,+BAAa,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,UAAU,CAAC,EAAE;QAChD,OAAO,EAAE,CAAC;KACX;IAED,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC9B,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KAC3B;IAED,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,IAAI,SAAM,EAAE,OAAO,CAAC,CAAC;IAC9F,IAAI,WAAqB,CAAC;IAE1B,IAAI,YAAY,EAAE;QAChB,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3C,WAAW,GAAG,CAAC,UAAU,CAAC,CAAC;QAE3B,kBAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;KACpE;SAAM;QACL,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACjC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,CAAC;YACpF,kBAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YACpD,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;KACJ;IAED,uBAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACxB,IAAI,iBAAiB,EAAE;QACrB,8DAA8D;QAC9D,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClE,wBAAM,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;KAC5C;IAED,OAAO,CAAC,GAAG,CACT,OAAO,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,wBAAwB,WAAW;SACjF,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"writeChangeFiles.js","sourceRoot":"","sources":["../../src/changefile/writeChangeFiles.ts"],"names":[],"mappings":";;;;;;AACA,oCAAyC;AACzC,qDAA+D;AAC/D,wDAA0B;AAC1B,gDAAwB;AACxB,+BAAoC;AAEpC;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,EAC/B,OAAO,EACP,GAAG,EACH,iBAAiB,GAAG,IAAI,EACxB,YAAY,GAAG,KAAK,GAQrB;IACC,MAAM,UAAU,GAAG,qBAAa,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,+BAAa,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,UAAU,CAAC,EAAE;QAChD,OAAO,EAAE,CAAC;KACX;IAED,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC9B,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KAC3B;IAED,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,IAAI,SAAM,EAAE,OAAO,CAAC,CAAC;IAC9F,IAAI,WAAqB,CAAC;IAE1B,IAAI,YAAY,EAAE;QAChB,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3C,WAAW,GAAG,CAAC,UAAU,CAAC,CAAC;QAE3B,kBAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;KACpE;SAAM;QACL,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACjC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,CAAC;YACpF,kBAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YACpD,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;KACJ;IAED,uBAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACxB,IAAI,iBAAiB,EAAE;QACrB,8DAA8D;QAC9D,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClE,wBAAM,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;KAC5C;IAED,OAAO,CAAC,GAAG,CACT,OAAO,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,wBAAwB,WAAW;SACjF,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;SACrB,IAAI,CAAC,EAAE,CAAC,EAAE,CACd,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC;AAtDD,4CAsDC"}
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getPackageChangelogs = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
-
const
|
|
8
|
+
const generateTag_1 = require("../git/generateTag");
|
|
9
9
|
const paths_1 = require("../paths");
|
|
10
10
|
const workspace_tools_1 = require("workspace-tools");
|
|
11
11
|
function getPackageChangelogs(changeFileChangeInfos, calculatedChangeTypes, dependentChangedBy, packageInfos, cwd) {
|
|
@@ -64,7 +64,7 @@ function createChangeLog(packageInfo) {
|
|
|
64
64
|
return {
|
|
65
65
|
name,
|
|
66
66
|
version,
|
|
67
|
-
tag:
|
|
67
|
+
tag: generateTag_1.generateTag(name, version),
|
|
68
68
|
date: new Date(),
|
|
69
69
|
comments: {},
|
|
70
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageChangelogs.js","sourceRoot":"","sources":["../../src/changelog/getPackageChangelogs.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAGxB,
|
|
1
|
+
{"version":3,"file":"getPackageChangelogs.js","sourceRoot":"","sources":["../../src/changelog/getPackageChangelogs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.mergeChangelogs = void 0;
|
|
4
|
-
const
|
|
4
|
+
const generateTag_1 = require("../git/generateTag");
|
|
5
5
|
/**
|
|
6
6
|
* Merge multiple package changelogs into one.
|
|
7
7
|
* `name` and `version` will use the values from `primaryPackage`'s changelog.
|
|
@@ -14,7 +14,7 @@ function mergeChangelogs(changelogs, primaryPackage) {
|
|
|
14
14
|
const result = {
|
|
15
15
|
name: primaryPackage.name,
|
|
16
16
|
version: primaryPackage.version,
|
|
17
|
-
tag:
|
|
17
|
+
tag: generateTag_1.generateTag(primaryPackage.name, primaryPackage.version),
|
|
18
18
|
date: new Date(),
|
|
19
19
|
comments: {},
|
|
20
20
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeChangelogs.js","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"mergeChangelogs.js","sourceRoot":"","sources":["../../src/changelog/mergeChangelogs.ts"],"names":[],"mappings":";;;AAGA,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,yBAAW,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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.renderJsonChangelog = void 0;
|
|
4
|
-
const
|
|
4
|
+
const generateTag_1 = require("../git/generateTag");
|
|
5
5
|
function renderJsonChangelog(changelog, previousChangelog) {
|
|
6
6
|
const result = {
|
|
7
7
|
name: changelog.name,
|
|
@@ -9,7 +9,7 @@ function renderJsonChangelog(changelog, previousChangelog) {
|
|
|
9
9
|
};
|
|
10
10
|
const newEntry = {
|
|
11
11
|
date: changelog.date.toUTCString(),
|
|
12
|
-
tag:
|
|
12
|
+
tag: generateTag_1.generateTag(changelog.name, changelog.version),
|
|
13
13
|
version: changelog.version,
|
|
14
14
|
comments: changelog.comments,
|
|
15
15
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderJsonChangelog.js","sourceRoot":"","sources":["../../src/changelog/renderJsonChangelog.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"renderJsonChangelog.js","sourceRoot":"","sources":["../../src/changelog/renderJsonChangelog.ts"],"names":[],"mappings":";;;AAAA,oDAAiD;AAGjD,SAAgB,mBAAmB,CAAC,SAA2B,EAAE,iBAA4C;IAC3G,MAAM,MAAM,GAAkB;QAC5B,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;KAC1E,CAAC;IACF,MAAM,QAAQ,GAAuB;QACnC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE;QAClC,GAAG,EAAE,yBAAW,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC;QACnD,OAAO,EAAE,SAAS,CAAC,OAAO;QAC1B,QAAQ,EAAE,SAAS,CAAC,QAAQ;KAC7B,CAAC;IACF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,kDAaC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateTag.d.ts","sourceRoot":"","sources":["../../src/git/generateTag.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAExD"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateTag = void 0;
|
|
4
|
+
/** Get a standardized package version git tag: `${name}_v${version}` */
|
|
4
5
|
function generateTag(name, version) {
|
|
5
6
|
return `${name}_v${version}`;
|
|
6
7
|
}
|
|
7
8
|
exports.generateTag = generateTag;
|
|
8
|
-
//# sourceMappingURL=
|
|
9
|
+
//# sourceMappingURL=generateTag.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateTag.js","sourceRoot":"","sources":["../../src/git/generateTag.ts"],"names":[],"mappings":";;;AAAA,wEAAwE;AACxE,SAAgB,WAAW,CAAC,IAAY,EAAE,OAAe;IACvD,OAAO,GAAG,IAAI,KAAK,OAAO,EAAE,CAAC;AAC/B,CAAC;AAFD,kCAEC"}
|
package/lib/paths.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
/** Relative path to the change files folder */
|
|
2
|
+
export declare const changeFolder = "change";
|
|
1
3
|
/**
|
|
2
|
-
* Get the folder containing beachball change files.
|
|
4
|
+
* Get the absolute path to the folder containing beachball change files.
|
|
3
5
|
*/
|
|
4
6
|
export declare function getChangePath(cwd: string): string;
|
|
5
7
|
//# sourceMappingURL=paths.d.ts.map
|
package/lib/paths.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,UAGxC"}
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAGA,+CAA+C;AAC/C,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,UAGxC"}
|
package/lib/paths.js
CHANGED
|
@@ -3,15 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getChangePath = void 0;
|
|
6
|
+
exports.getChangePath = exports.changeFolder = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const workspace_tools_1 = require("workspace-tools");
|
|
9
|
+
/** Relative path to the change files folder */
|
|
10
|
+
exports.changeFolder = 'change';
|
|
9
11
|
/**
|
|
10
|
-
* Get the folder containing beachball change files.
|
|
12
|
+
* Get the absolute path to the folder containing beachball change files.
|
|
11
13
|
*/
|
|
12
14
|
function getChangePath(cwd) {
|
|
13
15
|
const root = workspace_tools_1.findProjectRoot(cwd);
|
|
14
|
-
return path_1.default.join(root,
|
|
16
|
+
return path_1.default.join(root, exports.changeFolder);
|
|
15
17
|
}
|
|
16
18
|
exports.getChangePath = getChangePath;
|
|
17
19
|
//# sourceMappingURL=paths.js.map
|
package/lib/paths.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,qDAAkD;AAElD;;GAEG;AACH,SAAgB,aAAa,CAAC,GAAW;IACvC,MAAM,IAAI,GAAG,iCAAe,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,qDAAkD;AAElD,+CAA+C;AAClC,QAAA,YAAY,GAAG,QAAQ,CAAC;AAErC;;GAEG;AACH,SAAgB,aAAa,CAAC,GAAW;IACvC,MAAM,IAAI,GAAG,iCAAe,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,oBAAY,CAAC,CAAC;AACvC,CAAC;AAHD,sCAGC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpAndPush.d.ts","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAQ7D,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"bumpAndPush.d.ts","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAQ7D,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,iBA0ErG"}
|
|
@@ -8,7 +8,7 @@ const mergePublishBranch_1 = require("./mergePublishBranch");
|
|
|
8
8
|
const displayManualRecovery_1 = require("./displayManualRecovery");
|
|
9
9
|
const BUMP_PUSH_RETRIES = 5;
|
|
10
10
|
async function bumpAndPush(bumpInfo, publishBranch, options) {
|
|
11
|
-
const { path: cwd, branch,
|
|
11
|
+
const { path: cwd, branch, depth, message, gitTimeout } = options;
|
|
12
12
|
const { remote, remoteBranch } = workspace_tools_1.parseRemoteBranch(branch);
|
|
13
13
|
let completed = false;
|
|
14
14
|
let tryNumber = 0;
|
|
@@ -17,24 +17,19 @@ async function bumpAndPush(bumpInfo, publishBranch, options) {
|
|
|
17
17
|
console.log(`Trying to push to git. Attempt ${tryNumber}/${BUMP_PUSH_RETRIES}`);
|
|
18
18
|
console.log('Reverting');
|
|
19
19
|
workspace_tools_1.revertLocalChanges(cwd);
|
|
20
|
+
const warnPrefix = `[WARN ${tryNumber}/${BUMP_PUSH_RETRIES}]:`;
|
|
20
21
|
// pull in latest from origin branch
|
|
21
22
|
if (options.fetch !== false) {
|
|
22
23
|
console.log('Fetching from remote');
|
|
23
|
-
|
|
24
|
-
if (options.depth) {
|
|
25
|
-
fetchResult = workspace_tools_1.git(['fetch', remote, remoteBranch, `--depth=${options.depth}`], { cwd });
|
|
26
|
-
}
|
|
27
|
-
else {
|
|
28
|
-
fetchResult = workspace_tools_1.git(['fetch', remote, remoteBranch], { cwd });
|
|
29
|
-
}
|
|
24
|
+
const fetchResult = workspace_tools_1.git(['fetch', remote, remoteBranch, ...(depth ? [`--depth=${depth}`] : [])], { cwd });
|
|
30
25
|
if (!fetchResult.success) {
|
|
31
|
-
console.warn(
|
|
26
|
+
console.warn(`${warnPrefix} fetch from ${branch} has failed!\n${fetchResult.stderr}`);
|
|
32
27
|
continue;
|
|
33
28
|
}
|
|
34
29
|
}
|
|
35
30
|
const mergeResult = workspace_tools_1.git(['merge', '-X', 'theirs', `${branch}`], { cwd });
|
|
36
31
|
if (!mergeResult.success) {
|
|
37
|
-
console.warn(
|
|
32
|
+
console.warn(`${warnPrefix} pull from ${branch} has failed!\n${mergeResult.stderr}`);
|
|
38
33
|
continue;
|
|
39
34
|
}
|
|
40
35
|
// bump the version
|
|
@@ -43,22 +38,25 @@ async function bumpAndPush(bumpInfo, publishBranch, options) {
|
|
|
43
38
|
// checkin
|
|
44
39
|
const mergePublishBranchResult = await mergePublishBranch_1.mergePublishBranch(publishBranch, branch, message, cwd, options);
|
|
45
40
|
if (!mergePublishBranchResult.success) {
|
|
46
|
-
console.warn(
|
|
41
|
+
console.warn(`${warnPrefix} merging to target has failed!`);
|
|
47
42
|
continue;
|
|
48
43
|
}
|
|
49
44
|
// Tag & Push to remote
|
|
50
|
-
tagPackages_1.tagPackages(bumpInfo,
|
|
51
|
-
if (options.gitTags) {
|
|
52
|
-
tagPackages_1.tagDistTag(tag, cwd);
|
|
53
|
-
}
|
|
45
|
+
tagPackages_1.tagPackages(bumpInfo, options);
|
|
54
46
|
console.log(`pushing to ${branch}, running the following command for git push:`);
|
|
55
47
|
const pushArgs = ['push', '--no-verify', '--follow-tags', '--verbose', remote, `HEAD:${remoteBranch}`];
|
|
56
48
|
console.log('git ' + pushArgs.join(' '));
|
|
57
49
|
try {
|
|
58
50
|
const pushResult = workspace_tools_1.git(pushArgs, { cwd, timeout: gitTimeout });
|
|
59
51
|
if (!pushResult.success) {
|
|
60
|
-
|
|
61
|
-
|
|
52
|
+
// If it timed out, the return value contains an "error" object with ETIMEDOUT code
|
|
53
|
+
// (it doesn't throw the error)
|
|
54
|
+
if (pushResult.error?.code === 'ETIMEDOUT') {
|
|
55
|
+
console.warn(`${warnPrefix} push to ${branch} has timed out!`);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
console.warn(`${warnPrefix} push to ${branch} has failed!\n${pushResult.stderr}`);
|
|
59
|
+
}
|
|
62
60
|
}
|
|
63
61
|
else {
|
|
64
62
|
console.log(pushResult.stdout.toString());
|
|
@@ -67,8 +65,8 @@ async function bumpAndPush(bumpInfo, publishBranch, options) {
|
|
|
67
65
|
}
|
|
68
66
|
}
|
|
69
67
|
catch (e) {
|
|
70
|
-
|
|
71
|
-
|
|
68
|
+
// This is likely not reachable (see comment above), but leaving it just in case for this critical operation
|
|
69
|
+
console.warn(`${warnPrefix} push to ${branch} has failed!\n${e}`);
|
|
72
70
|
}
|
|
73
71
|
}
|
|
74
72
|
if (!completed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAGlD,qDAA6E;AAC7E,+
|
|
1
|
+
{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performPublishOverrides.d.ts","sourceRoot":"","sources":["../../src/publish/performPublishOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"performPublishOverrides.d.ts","sourceRoot":"","sources":["../../src/publish/performPublishOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAgBjE,wBAAgB,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,YAAY,QAU9F"}
|
|
@@ -19,9 +19,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.performPublishOverrides =
|
|
22
|
+
exports.performPublishOverrides = void 0;
|
|
23
23
|
const fs = __importStar(require("fs-extra"));
|
|
24
|
-
|
|
24
|
+
const acceptedKeys = [
|
|
25
|
+
'types',
|
|
26
|
+
'typings',
|
|
27
|
+
'main',
|
|
28
|
+
'module',
|
|
29
|
+
'exports',
|
|
30
|
+
'repository',
|
|
31
|
+
'bin',
|
|
32
|
+
'browser',
|
|
33
|
+
'files',
|
|
34
|
+
];
|
|
35
|
+
const workspacePrefix = 'workspace:';
|
|
25
36
|
function performPublishOverrides(packagesToPublish, packageInfos) {
|
|
26
37
|
for (const pkgName of packagesToPublish) {
|
|
27
38
|
const info = packageInfos[pkgName];
|
|
@@ -35,10 +46,12 @@ exports.performPublishOverrides = performPublishOverrides;
|
|
|
35
46
|
function performPublishConfigOverrides(packageJson) {
|
|
36
47
|
// Everything in publishConfig in accepted keys here will get overridden & removed from the publishConfig section
|
|
37
48
|
if (packageJson.publishConfig) {
|
|
38
|
-
for (const
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
49
|
+
for (const [k, value] of Object.entries(packageJson.publishConfig)) {
|
|
50
|
+
const key = k;
|
|
51
|
+
if (acceptedKeys.includes(key)) {
|
|
52
|
+
packageJson[key] = value;
|
|
53
|
+
delete packageJson.publishConfig[key];
|
|
54
|
+
}
|
|
42
55
|
}
|
|
43
56
|
}
|
|
44
57
|
}
|
|
@@ -49,18 +62,17 @@ function performPublishConfigOverrides(packageJson) {
|
|
|
49
62
|
* replacement.
|
|
50
63
|
*/
|
|
51
64
|
function performWorkspaceVersionOverrides(packageJson, packageInfos) {
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
});
|
|
65
|
+
const { dependencies, devDependencies, peerDependencies } = packageJson;
|
|
66
|
+
for (const deps of [dependencies, devDependencies, peerDependencies]) {
|
|
67
|
+
if (!deps)
|
|
68
|
+
continue;
|
|
69
|
+
for (const [depName, depVersion] of Object.entries(deps)) {
|
|
70
|
+
const packageInfo = packageInfos[depName];
|
|
71
|
+
if (packageInfo && depVersion.startsWith(workspacePrefix)) {
|
|
72
|
+
deps[depName] = resolveWorkspaceVersionForPublish(depVersion, packageInfo.version);
|
|
73
|
+
}
|
|
62
74
|
}
|
|
63
|
-
}
|
|
75
|
+
}
|
|
64
76
|
}
|
|
65
77
|
/**
|
|
66
78
|
* Resolves version for publishing following the replacements defined here:
|
|
@@ -68,15 +80,13 @@ function performWorkspaceVersionOverrides(packageJson, packageInfos) {
|
|
|
68
80
|
* https://yarnpkg.com/features/workspaces#publishing-workspaces
|
|
69
81
|
*/
|
|
70
82
|
function resolveWorkspaceVersionForPublish(workspaceDependency, packageInfoVersion) {
|
|
71
|
-
const
|
|
72
|
-
if (
|
|
83
|
+
const workspaceVersion = workspaceDependency.substring(workspacePrefix.length);
|
|
84
|
+
if (workspaceVersion === '*') {
|
|
73
85
|
return packageInfoVersion;
|
|
74
86
|
}
|
|
75
|
-
|
|
76
|
-
return `${
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
79
|
-
return workspaceDependency.substring(versionStartIndex);
|
|
87
|
+
if (workspaceVersion === '^' || workspaceVersion === '~') {
|
|
88
|
+
return `${workspaceVersion}${packageInfoVersion}`;
|
|
80
89
|
}
|
|
90
|
+
return workspaceVersion;
|
|
81
91
|
}
|
|
82
92
|
//# sourceMappingURL=performPublishOverrides.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performPublishOverrides.js","sourceRoot":"","sources":["../../src/publish/performPublishOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;
|
|
1
|
+
{"version":3,"file":"performPublishOverrides.js","sourceRoot":"","sources":["../../src/publish/performPublishOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;AAE/B,MAAM,YAAY,GAAG;IACnB,OAAO;IACP,SAAS;IACT,MAAM;IACN,QAAQ;IACR,SAAS;IACT,YAAY;IACZ,KAAK;IACL,SAAS;IACT,OAAO;CACC,CAAC;AACX,MAAM,eAAe,GAAG,YAAY,CAAC;AAErC,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,WAAwB;IAC7D,iHAAiH;IACjH,IAAI,WAAW,CAAC,aAAa,EAAE;QAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE;YAClE,MAAM,GAAG,GAAG,CAAiD,CAAC;YAC9D,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC9B,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACzB,OAAO,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;aACvC;SACF;KACF;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,gCAAgC,CAAC,WAAwB,EAAE,YAA0B;IAC5F,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,WAAW,CAAC;IACxE,KAAK,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE,gBAAgB,CAAC,EAAE;QACpE,IAAI,CAAC,IAAI;YAAE,SAAS;QAEpB,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxD,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,WAAW,IAAI,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACzD,IAAI,CAAC,OAAO,CAAC,GAAG,iCAAiC,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;aACpF;SACF;KACF;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,iCAAiC,CAAC,mBAA2B,EAAE,kBAA0B;IAChG,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/E,IAAI,gBAAgB,KAAK,GAAG,EAAE;QAC5B,OAAO,kBAAkB,CAAC;KAC3B;IACD,IAAI,gBAAgB,KAAK,GAAG,IAAI,gBAAgB,KAAK,GAAG,EAAE;QACxD,OAAO,GAAG,gBAAgB,GAAG,kBAAkB,EAAE,CAAC;KACnD;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { BumpInfo } from '../types/BumpInfo';
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
import { BeachballOptions } from '../types/BeachballOptions';
|
|
3
|
+
/**
|
|
4
|
+
* Create git tags for each changed package, unless the package or repo has opted out of git tags.
|
|
5
|
+
* Also, if git tags aren't disabled for the repo and the overall dist-tag (`options.tag`) has a
|
|
6
|
+
* non-default value (not "latest"), create a git tag for the dist-tag.
|
|
7
|
+
*/
|
|
8
|
+
export declare function tagPackages(bumpInfo: BumpInfo, options: Pick<BeachballOptions, 'gitTags' | 'path' | 'tag'>): void;
|
|
4
9
|
//# sourceMappingURL=tagPackages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tagPackages.d.ts","sourceRoot":"","sources":["../../src/publish/tagPackages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"tagPackages.d.ts","sourceRoot":"","sources":["../../src/publish/tagPackages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAM7D;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC,QAmB1G"}
|
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const
|
|
3
|
+
exports.tagPackages = void 0;
|
|
4
|
+
const generateTag_1 = require("../git/generateTag");
|
|
5
5
|
const workspace_tools_1 = require("workspace-tools");
|
|
6
6
|
function createTag(tag, cwd) {
|
|
7
7
|
workspace_tools_1.gitFailFast(['tag', '-a', '-f', tag, '-m', tag], { cwd });
|
|
8
8
|
}
|
|
9
|
-
|
|
9
|
+
/**
|
|
10
|
+
* Create git tags for each changed package, unless the package or repo has opted out of git tags.
|
|
11
|
+
* Also, if git tags aren't disabled for the repo and the overall dist-tag (`options.tag`) has a
|
|
12
|
+
* non-default value (not "latest"), create a git tag for the dist-tag.
|
|
13
|
+
*/
|
|
14
|
+
function tagPackages(bumpInfo, options) {
|
|
15
|
+
const { gitTags, tag: distTag, path: cwd } = options;
|
|
10
16
|
const { modifiedPackages, newPackages } = bumpInfo;
|
|
11
|
-
[...modifiedPackages, ...newPackages]
|
|
17
|
+
for (const pkg of [...modifiedPackages, ...newPackages]) {
|
|
12
18
|
const packageInfo = bumpInfo.packageInfos[pkg];
|
|
13
19
|
const changeType = bumpInfo.calculatedChangeTypes[pkg];
|
|
14
20
|
// Do not tag change type of "none", private packages, or packages opting out of tagging
|
|
@@ -16,15 +22,12 @@ function tagPackages(bumpInfo, cwd) {
|
|
|
16
22
|
return;
|
|
17
23
|
}
|
|
18
24
|
console.log(`Tagging - ${packageInfo.name}@${packageInfo.version}`);
|
|
19
|
-
const generatedTag =
|
|
25
|
+
const generatedTag = generateTag_1.generateTag(packageInfo.name, packageInfo.version);
|
|
20
26
|
createTag(generatedTag, cwd);
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
function tagDistTag(tag, cwd) {
|
|
25
|
-
if (tag && tag !== 'latest') {
|
|
26
|
-
createTag(tag, cwd);
|
|
27
|
+
}
|
|
28
|
+
if (gitTags && distTag && distTag !== 'latest') {
|
|
29
|
+
createTag(distTag, cwd);
|
|
27
30
|
}
|
|
28
31
|
}
|
|
29
|
-
exports.
|
|
32
|
+
exports.tagPackages = tagPackages;
|
|
30
33
|
//# sourceMappingURL=tagPackages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tagPackages.js","sourceRoot":"","sources":["../../src/publish/tagPackages.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"tagPackages.js","sourceRoot":"","sources":["../../src/publish/tagPackages.ts"],"names":[],"mappings":";;;AACA,oDAAiD;AACjD,qDAA8C;AAG9C,SAAS,SAAS,CAAC,GAAW,EAAE,GAAW;IACzC,6BAAW,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,QAAkB,EAAE,OAA2D;IACzG,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACrD,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;IAEnD,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,gBAAgB,EAAE,GAAG,WAAW,CAAC,EAAE;QACvD,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,QAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACvD,wFAAwF;QACxF,IAAI,UAAU,KAAK,MAAM,IAAI,WAAW,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,EAAE;YACxF,OAAO;SACR;QACD,OAAO,CAAC,GAAG,CAAC,aAAa,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,MAAM,YAAY,GAAG,yBAAW,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;QACxE,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;KAC9B;IAED,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,KAAK,QAAQ,EAAE;QAC9C,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;KACzB;AACH,CAAC;AAnBD,kCAmBC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PackageInfos } from '../types/PackageInfo';
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
3
|
+
* Topologically sort the packages based on their dependency graph.
|
|
4
4
|
* Dependency comes first before dependent.
|
|
5
5
|
* @param packages Packages to be sorted.
|
|
6
6
|
* @param packageInfos PackagesInfos for the sorted packages.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toposortPackages.d.ts","sourceRoot":"","sources":["../../src/publish/toposortPackages.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"toposortPackages.d.ts","sourceRoot":"","sources":["../../src/publish/toposortPackages.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,MAAM,EAAE,CA6BzF"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.toposortPackages = void 0;
|
|
7
7
|
const toposort_1 = __importDefault(require("toposort"));
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
9
|
+
* Topologically sort the packages based on their dependency graph.
|
|
10
10
|
* Dependency comes first before dependent.
|
|
11
11
|
* @param packages Packages to be sorted.
|
|
12
12
|
* @param packageInfos PackagesInfos for the sorted packages.
|
|
@@ -14,34 +14,28 @@ const toposort_1 = __importDefault(require("toposort"));
|
|
|
14
14
|
function toposortPackages(packages, packageInfos) {
|
|
15
15
|
const packageSet = new Set(packages);
|
|
16
16
|
const dependencyGraph = [];
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
allDeps = allDeps.concat(depPkgNames);
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
|
-
allDeps = [...new Set(allDeps)].filter(pkg => packageSet.has(pkg));
|
|
31
|
-
if (allDeps.length > 0) {
|
|
32
|
-
allDeps.forEach(depPkgName => {
|
|
17
|
+
for (const pkgName of packageSet) {
|
|
18
|
+
const info = packageInfos[pkgName];
|
|
19
|
+
if (!info) {
|
|
20
|
+
throw new Error(`Package info is missing for ${pkgName}.`);
|
|
21
|
+
}
|
|
22
|
+
const allDeps = new Set([info.dependencies, info.devDependencies, info.peerDependencies]
|
|
23
|
+
.flatMap(deps => Object.keys(deps || {}))
|
|
24
|
+
.filter(pkg => packageSet.has(pkg)));
|
|
25
|
+
if (allDeps.size) {
|
|
26
|
+
for (const depPkgName of allDeps) {
|
|
33
27
|
dependencyGraph.push([depPkgName, pkgName]);
|
|
34
|
-
}
|
|
28
|
+
}
|
|
35
29
|
}
|
|
36
30
|
else {
|
|
37
31
|
dependencyGraph.push([undefined, pkgName]);
|
|
38
32
|
}
|
|
39
|
-
}
|
|
33
|
+
}
|
|
40
34
|
try {
|
|
41
35
|
return toposort_1.default(dependencyGraph).filter((pkg) => !!pkg);
|
|
42
36
|
}
|
|
43
37
|
catch (err) {
|
|
44
|
-
throw new Error(`Failed to
|
|
38
|
+
throw new Error(`Failed to topologically sort packages: ${err?.message}`);
|
|
45
39
|
}
|
|
46
40
|
}
|
|
47
41
|
exports.toposortPackages = toposortPackages;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toposortPackages.js","sourceRoot":"","sources":["../../src/publish/toposortPackages.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAGhC;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,QAAkB,EAAE,YAA0B;IAC7E,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,eAAe,GAAmC,EAAE,CAAC;IAE3D,
|
|
1
|
+
{"version":3,"file":"toposortPackages.js","sourceRoot":"","sources":["../../src/publish/toposortPackages.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAGhC;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,QAAkB,EAAE,YAA0B;IAC7E,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,eAAe,GAAmC,EAAE,CAAC;IAE3D,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE;QAChC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,GAAG,CAAC,CAAC;SAC5D;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC;aAC7D,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;aACxC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC;QACF,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE;gBAChC,eAAe,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;aAC7C;SACF;aAAM;YACL,eAAe,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;SAC5C;KACF;IAED,IAAI;QACF,OAAO,kBAAQ,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAiB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;KACxE;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,0CAA0C,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;KAC3E;AACH,CAAC;AA7BD,4CA6BC"}
|
|
@@ -7,11 +7,21 @@ export interface PackageJson {
|
|
|
7
7
|
name: string;
|
|
8
8
|
version: string;
|
|
9
9
|
main?: string;
|
|
10
|
+
module?: string;
|
|
11
|
+
types?: string;
|
|
12
|
+
typings?: string;
|
|
13
|
+
exports?: any;
|
|
14
|
+
repository?: any;
|
|
15
|
+
bin?: any;
|
|
16
|
+
browser?: any;
|
|
17
|
+
files?: string[];
|
|
10
18
|
dependencies?: PackageDeps;
|
|
11
19
|
devDependencies?: PackageDeps;
|
|
12
20
|
peerDependencies?: PackageDeps;
|
|
13
21
|
private?: boolean;
|
|
14
22
|
beachball?: BeachballOptions;
|
|
23
|
+
/** Overrides applied during publishing */
|
|
24
|
+
publishConfig?: Pick<PackageJson, 'types' | 'typings' | 'main' | 'module' | 'exports' | 'repository' | 'bin' | 'browser' | 'files'>;
|
|
15
25
|
}
|
|
16
26
|
export interface PackageInfo {
|
|
17
27
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PackageInfo.d.ts","sourceRoot":"","sources":["../../src/types/PackageInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,WAAW,WAAW;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"PackageInfo.d.ts","sourceRoot":"","sources":["../../src/types/PackageInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,WAAW,WAAW;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,0CAA0C;IAC1C,aAAa,CAAC,EAAE,IAAI,CAClB,WAAW,EACX,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,CACjG,CAAC;CACH;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IAEjB,4DAA4D;IAC5D,eAAe,EAAE,cAAc,CAAC;IAEhC,8FAA8F;IAC9F,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,qBAAqB,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CAC5C;AAED,oBAAY,aAAa,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "beachball",
|
|
3
|
-
"version": "2.32.
|
|
3
|
+
"version": "2.32.4",
|
|
4
4
|
"description": "The Sunniest Semantic Version Bumper",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"semver": "^7.0.0",
|
|
52
52
|
"toposort": "^2.0.2",
|
|
53
53
|
"uuid": "^9.0.0",
|
|
54
|
-
"workspace-tools": "^0.34.
|
|
54
|
+
"workspace-tools": "^0.34.2",
|
|
55
55
|
"yargs-parser": "^21.0.0"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
package/lib/tag.d.ts
DELETED
package/lib/tag.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../src/tag.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAExD"}
|
package/lib/tag.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tag.js","sourceRoot":"","sources":["../src/tag.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CAAC,IAAY,EAAE,OAAe;IACvD,OAAO,GAAG,IAAI,KAAK,OAAO,EAAE,CAAC;AAC/B,CAAC;AAFD,kCAEC"}
|