beachball 2.65.1 → 2.65.3
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/README.md +4 -0
- package/lib/bump/bumpInMemory.js +1 -1
- package/lib/bump/bumpInMemory.js.map +1 -1
- package/lib/bump/bumpMinSemverRange.d.ts +7 -4
- package/lib/bump/bumpMinSemverRange.d.ts.map +1 -1
- package/lib/bump/bumpMinSemverRange.js +13 -7
- package/lib/bump/bumpMinSemverRange.js.map +1 -1
- package/lib/bump/setDependentVersions.d.ts +5 -1
- package/lib/bump/setDependentVersions.d.ts.map +1 -1
- package/lib/bump/setDependentVersions.js +14 -8
- package/lib/bump/setDependentVersions.js.map +1 -1
- package/lib/changefile/getAllChangedPackages.d.ts +18 -0
- package/lib/changefile/getAllChangedPackages.d.ts.map +1 -0
- package/lib/changefile/getAllChangedPackages.js +78 -0
- package/lib/changefile/getAllChangedPackages.js.map +1 -0
- package/lib/changefile/getCatalogChangedPackages.d.ts +19 -0
- package/lib/changefile/getCatalogChangedPackages.d.ts.map +1 -0
- package/lib/changefile/getCatalogChangedPackages.js +84 -0
- package/lib/changefile/getCatalogChangedPackages.js.map +1 -0
- package/lib/changefile/getChangedPackages.d.ts +12 -14
- package/lib/changefile/getChangedPackages.d.ts.map +1 -1
- package/lib/changefile/getChangedPackages.js +56 -109
- package/lib/changefile/getChangedPackages.js.map +1 -1
- package/lib/changefile/isPackageIncluded.d.ts +18 -0
- package/lib/changefile/isPackageIncluded.d.ts.map +1 -0
- package/lib/changefile/isPackageIncluded.js +33 -0
- package/lib/changefile/isPackageIncluded.js.map +1 -0
- package/lib/changefile/writeChangeFiles.d.ts.map +1 -1
- package/lib/changefile/writeChangeFiles.js +6 -10
- package/lib/changefile/writeChangeFiles.js.map +1 -1
- package/lib/changelog/writeChangelog.js +2 -3
- package/lib/changelog/writeChangelog.js.map +1 -1
- package/lib/commands/canary.js +1 -1
- package/lib/commands/canary.js.map +1 -1
- package/lib/commands/configGet.js +3 -3
- package/lib/commands/configGet.js.map +1 -1
- package/lib/commands/configList.js +2 -2
- package/lib/commands/configList.js.map +1 -1
- package/lib/commands/sync.js +6 -2
- package/lib/commands/sync.js.map +1 -1
- package/lib/env.d.ts +2 -0
- package/lib/env.d.ts.map +1 -1
- package/lib/env.js +3 -0
- package/lib/env.js.map +1 -1
- package/lib/git/ensureSharedHistory.d.ts +8 -2
- package/lib/git/ensureSharedHistory.d.ts.map +1 -1
- package/lib/git/ensureSharedHistory.js +25 -21
- package/lib/git/ensureSharedHistory.js.map +1 -1
- package/lib/git/fetch.d.ts +13 -4
- package/lib/git/fetch.d.ts.map +1 -1
- package/lib/git/fetch.js +18 -8
- package/lib/git/fetch.js.map +1 -1
- package/lib/monorepo/diffCatalogs.d.ts +14 -0
- package/lib/monorepo/diffCatalogs.d.ts.map +1 -0
- package/lib/monorepo/diffCatalogs.js +47 -0
- package/lib/monorepo/diffCatalogs.js.map +1 -0
- package/lib/monorepo/filterIgnoredFiles.d.ts +1 -1
- package/lib/monorepo/filterIgnoredFiles.d.ts.map +1 -1
- package/lib/monorepo/filterIgnoredFiles.js +11 -5
- package/lib/monorepo/filterIgnoredFiles.js.map +1 -1
- package/lib/types/BeachballOptions.d.ts +1 -0
- package/lib/types/BeachballOptions.d.ts.map +1 -1
- package/package.json +3 -3
|
@@ -3,129 +3,73 @@ 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.getChangedPackages =
|
|
6
|
+
exports.getChangedPackages = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
|
-
const paths_1 = require("../paths");
|
|
10
9
|
const workspace_tools_1 = require("workspace-tools");
|
|
11
|
-
const
|
|
10
|
+
const paths_1 = require("../paths");
|
|
12
11
|
const readJson_1 = require("../object/readJson");
|
|
13
12
|
const bulletedList_1 = require("../logging/bulletedList");
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
// to ensure that this doesn't break on Windows if any input paths have forward slashes
|
|
19
|
-
cwd = path_1.default.normalize(cwd);
|
|
20
|
-
const absFile = path_1.default.normalize(path_1.default.join(cwd, file));
|
|
21
|
-
let absDir = '';
|
|
22
|
-
do {
|
|
23
|
-
absDir = path_1.default.dirname(absDir || absFile);
|
|
24
|
-
if (packageInfosByPath[absDir]) {
|
|
25
|
-
return packageInfosByPath[absDir];
|
|
26
|
-
}
|
|
27
|
-
} while (absDir !== cwd);
|
|
28
|
-
return undefined;
|
|
29
|
-
}
|
|
13
|
+
const getAllChangedPackages_1 = require("./getAllChangedPackages");
|
|
14
|
+
const getCatalogChangedPackages_1 = require("./getCatalogChangedPackages");
|
|
15
|
+
const isPackageIncluded_1 = require("./isPackageIncluded");
|
|
16
|
+
const ensureSharedHistory_1 = require("../git/ensureSharedHistory");
|
|
30
17
|
/**
|
|
31
|
-
*
|
|
32
|
-
*
|
|
18
|
+
* Gets all the changed packages which **do not already have a change file** and are in scope.
|
|
19
|
+
* This includes all packages which should change due to catalog version changes.
|
|
20
|
+
* This is only used by the `change` and `check` commands, not the bump/publish process.
|
|
33
21
|
*
|
|
34
|
-
*
|
|
35
|
-
*/
|
|
36
|
-
function isPackageIncluded(packageInfo, scopedPackages) {
|
|
37
|
-
const reason = !packageInfo
|
|
38
|
-
? 'no corresponding package found'
|
|
39
|
-
: packageInfo.private
|
|
40
|
-
? `${packageInfo.name} is private`
|
|
41
|
-
: // This is a package-only option (can't be set at repo level or via CLI)
|
|
42
|
-
packageInfo.packageOptions?.shouldPublish === false
|
|
43
|
-
? `${packageInfo.name} has beachball.shouldPublish=false`
|
|
44
|
-
: !scopedPackages.has(packageInfo.name)
|
|
45
|
-
? `${packageInfo.name} is out of scope`
|
|
46
|
-
: ''; // not ignored
|
|
47
|
-
return { isIncluded: !reason, reason };
|
|
48
|
-
}
|
|
49
|
-
exports.isPackageIncluded = isPackageIncluded;
|
|
50
|
-
/**
|
|
51
|
-
* Gets all the changed package names, regardless of the change files.
|
|
52
|
-
* If `options.all` is set, returns all the packages in scope, regardless of whether they've changed.
|
|
53
|
-
*/
|
|
54
|
-
function getAllChangedPackages(options, packageInfos, scopedPackages) {
|
|
55
|
-
const { branch, path: cwd, verbose, all, changeDir } = options;
|
|
56
|
-
const verboseLog = (msg) => verbose && console.log(msg);
|
|
57
|
-
const logIgnored = (file, reason) => verboseLog(` - ~~${file}~~ (${reason})`);
|
|
58
|
-
const logIncluded = (file) => verboseLog(` - ${file}`);
|
|
59
|
-
// If --all is set, return all the packages in scope rather than looking at which files changed
|
|
60
|
-
if (all) {
|
|
61
|
-
verboseLog('--all option was provided, so including all packages that are in scope (regardless of changes)');
|
|
62
|
-
return Object.values(packageInfos)
|
|
63
|
-
.filter(pkg => {
|
|
64
|
-
const { isIncluded, reason } = isPackageIncluded(pkg, scopedPackages);
|
|
65
|
-
verboseLog(isIncluded ? ` - ${pkg.name}` : ` - ~~${pkg.name}~~ (${reason.replace(`${pkg.name} `, '')})`);
|
|
66
|
-
return isIncluded;
|
|
67
|
-
})
|
|
68
|
-
.map(pkg => pkg.name);
|
|
69
|
-
}
|
|
70
|
-
console.log(`Checking for changes against "${options.branch}"`);
|
|
71
|
-
(0, ensureSharedHistory_1.ensureSharedHistory)(options);
|
|
72
|
-
const changes = [...((0, workspace_tools_1.getBranchChanges)({ branch, cwd }) || []), ...((0, workspace_tools_1.getStagedChanges)({ cwd }) || [])];
|
|
73
|
-
verboseLog(`Found ${count(changes.length, 'changed file')} in current branch (before filtering)`);
|
|
74
|
-
if (!changes.length) {
|
|
75
|
-
return [];
|
|
76
|
-
}
|
|
77
|
-
// Filter out changed files which are ignored by ignorePatterns.
|
|
78
|
-
// Also ignore the CHANGELOG files and change files because they're generated by beachball.
|
|
79
|
-
const nonIgnoredChanges = (0, filterIgnoredFiles_1.filterIgnoredFiles)({
|
|
80
|
-
filePaths: changes,
|
|
81
|
-
ignorePatterns: [...(options.ignorePatterns || []), `${changeDir}/*.json`, 'CHANGELOG.{md,json}'],
|
|
82
|
-
logIgnored,
|
|
83
|
-
});
|
|
84
|
-
if (!nonIgnoredChanges.length) {
|
|
85
|
-
verboseLog('All files were ignored');
|
|
86
|
-
return [];
|
|
87
|
-
}
|
|
88
|
-
// Determine which package each changed file came from (using packageInfos[x].packageJsonPath),
|
|
89
|
-
// and whether that package is in scope and not private
|
|
90
|
-
const includedPackages = new Set();
|
|
91
|
-
let fileCount = 0;
|
|
92
|
-
const packageInfosByPath = {};
|
|
93
|
-
for (const info of Object.values(packageInfos)) {
|
|
94
|
-
packageInfosByPath[path_1.default.normalize(path_1.default.dirname(info.packageJsonPath))] = info;
|
|
95
|
-
}
|
|
96
|
-
for (const moddedFile of nonIgnoredChanges) {
|
|
97
|
-
const packageInfo = getMatchingPackageInfo(moddedFile, cwd, packageInfosByPath);
|
|
98
|
-
if (!packageInfo)
|
|
99
|
-
continue;
|
|
100
|
-
const { isIncluded, reason } = isPackageIncluded(packageInfo, scopedPackages);
|
|
101
|
-
if (!isIncluded) {
|
|
102
|
-
logIgnored(moddedFile, reason);
|
|
103
|
-
}
|
|
104
|
-
else {
|
|
105
|
-
includedPackages.add(packageInfo.name);
|
|
106
|
-
fileCount++;
|
|
107
|
-
logIncluded(moddedFile);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
verboseLog(`Found ${count(fileCount, 'file')} in ${count(includedPackages.size, 'package')} that should be published`);
|
|
111
|
-
return [...includedPackages];
|
|
112
|
-
}
|
|
113
|
-
/**
|
|
114
|
-
* Gets all the changed packages which do not already have a change file and are in scope.
|
|
115
|
-
* Exceptions:
|
|
22
|
+
* Special cases:
|
|
116
23
|
* - If `options.package` is provided, use that as-is (skipping all git operations).
|
|
117
|
-
* - If `options.all` is true,
|
|
118
|
-
*
|
|
24
|
+
* - If `options.all` is true, gets all the packages in scope regardless of whether they've changed
|
|
25
|
+
* (skipping git diff of files), omitting packages that already have change files.
|
|
26
|
+
*
|
|
27
|
+
* Usually (without `options.package`) this has the side effect of calling `ensureSharedHistory` to
|
|
28
|
+
* verify that enough git history is available to check for changes between `HEAD` and
|
|
29
|
+
* `options.branch` (only an issue for shallow clones), and deepens the history if needed.
|
|
30
|
+
* Unless `options.fetch` is `false`, it will also fetch from the remote.
|
|
119
31
|
*/
|
|
120
32
|
function getChangedPackages(options, packageInfos, scopedPackages) {
|
|
121
33
|
const { branch } = options;
|
|
34
|
+
const { verboseLog, logIncluded, logIgnored } = (0, isPackageIncluded_1.getIncludedLoggers)(options);
|
|
122
35
|
if (options.package) {
|
|
123
36
|
return typeof options.package === 'string' ? [options.package] : [...options.package];
|
|
124
37
|
}
|
|
125
|
-
|
|
38
|
+
console.log(`Checking for changes against "${branch}"`);
|
|
39
|
+
// Ensure the current branch and target branch have a common shared commit. This has the side
|
|
40
|
+
// effect of fetching from the remote (unless disabled), which should be done even if there's
|
|
41
|
+
// already shared history (and even with --all) for accurate added change file checks later.
|
|
42
|
+
(0, ensureSharedHistory_1.ensureSharedHistory)(options);
|
|
43
|
+
let changedPackages;
|
|
44
|
+
let stagedFiles;
|
|
45
|
+
if (options.all) {
|
|
46
|
+
// If --all is set, return all the packages in scope rather than looking at which files changed
|
|
47
|
+
verboseLog('--all option was provided, so including all packages that are in scope (regardless of changes)');
|
|
48
|
+
changedPackages = new Set(Object.values(packageInfos)
|
|
49
|
+
.filter(pkg => {
|
|
50
|
+
const { isIncluded, reason } = (0, isPackageIncluded_1.isPackageIncluded)(pkg, scopedPackages);
|
|
51
|
+
isIncluded ? logIncluded(pkg.name) : logIgnored(pkg.name, reason.replace(`${pkg.name} `, ''));
|
|
52
|
+
return isIncluded;
|
|
53
|
+
})
|
|
54
|
+
.map(pkg => pkg.name));
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
stagedFiles = (0, workspace_tools_1.getStagedChanges)({ cwd: options.path }) || [];
|
|
58
|
+
const committedFiles = (0, workspace_tools_1.getBranchChanges)({ branch, cwd: options.path }) || [];
|
|
59
|
+
// dedupe with a Set in case a file was already committed and has more changes staged
|
|
60
|
+
const allChangedFiles = new Set([...committedFiles, ...stagedFiles]);
|
|
61
|
+
const directChangedPackages = (0, getAllChangedPackages_1.getAllChangedPackages)({ options, packageInfos, scopedPackages, allChangedFiles });
|
|
62
|
+
const catalogChangedPackages = (0, getCatalogChangedPackages_1.getCatalogChangedPackages)({
|
|
63
|
+
options,
|
|
64
|
+
packageInfos,
|
|
65
|
+
scopedPackages,
|
|
66
|
+
allChangedFiles,
|
|
67
|
+
});
|
|
68
|
+
changedPackages = new Set([...directChangedPackages, ...catalogChangedPackages]);
|
|
69
|
+
}
|
|
126
70
|
const changePath = (0, paths_1.getChangePath)(options);
|
|
127
71
|
if (!fs_1.default.existsSync(changePath)) {
|
|
128
|
-
return changedPackages;
|
|
72
|
+
return [...changedPackages];
|
|
129
73
|
}
|
|
130
74
|
// TODO: this should probably reuse the result of readChangeFiles, but they use slightly different args...
|
|
131
75
|
const committedChangeFiles = (0, workspace_tools_1.getChangesBetweenRefs)({
|
|
@@ -137,7 +81,9 @@ function getChangedPackages(options, packageInfos, scopedPackages) {
|
|
|
137
81
|
throwOnError: false,
|
|
138
82
|
});
|
|
139
83
|
// Also consider staged change files (not yet committed) so that `check` respects them
|
|
140
|
-
const
|
|
84
|
+
const relChangeDir = path_1.default.relative(options.path, changePath).replace(/\\/g, '/') + '/';
|
|
85
|
+
const stagedChangeFiles = (stagedFiles?.filter(f => f.startsWith(relChangeDir)).map(f => f.replace(relChangeDir, '')) ||
|
|
86
|
+
(0, workspace_tools_1.getStagedChanges)({ cwd: changePath })).filter(f => f.endsWith('.json'));
|
|
141
87
|
const changeFiles = [...new Set([...committedChangeFiles, ...stagedChangeFiles])];
|
|
142
88
|
const changeFilePackageSet = new Set();
|
|
143
89
|
// Loop through the change files, building up a set of packages that we can skip
|
|
@@ -149,6 +95,7 @@ function getChangedPackages(options, packageInfos, scopedPackages) {
|
|
|
149
95
|
for (const change of changes) {
|
|
150
96
|
if (change.packageName) {
|
|
151
97
|
changeFilePackageSet.add(change.packageName);
|
|
98
|
+
changedPackages.delete(change.packageName);
|
|
152
99
|
}
|
|
153
100
|
}
|
|
154
101
|
}
|
|
@@ -160,7 +107,7 @@ function getChangedPackages(options, packageInfos, scopedPackages) {
|
|
|
160
107
|
console.log('Your local repository already has change files for these packages:\n' +
|
|
161
108
|
(0, bulletedList_1.bulletedList)([...changeFilePackageSet].sort()));
|
|
162
109
|
}
|
|
163
|
-
return changedPackages
|
|
110
|
+
return [...changedPackages];
|
|
164
111
|
}
|
|
165
112
|
exports.getChangedPackages = getChangedPackages;
|
|
166
113
|
//# sourceMappingURL=getChangedPackages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getChangedPackages.js","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;
|
|
1
|
+
{"version":3,"file":"getChangedPackages.js","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { BeachballOptions } from '../types/BeachballOptions';
|
|
2
|
+
import type { PackageInfo, ScopedPackages } from '../types/PackageInfo';
|
|
3
|
+
/**
|
|
4
|
+
* Determines whether the package is included in the list of potentially-changed published packages,
|
|
5
|
+
* based on private flags and scopedPackages.
|
|
6
|
+
*
|
|
7
|
+
* (All the reasons except nonexistent include the package name.)
|
|
8
|
+
*/
|
|
9
|
+
export declare function isPackageIncluded(packageInfo: PackageInfo | undefined, scopedPackages: ScopedPackages): {
|
|
10
|
+
isIncluded: boolean;
|
|
11
|
+
reason: string;
|
|
12
|
+
};
|
|
13
|
+
export declare function getIncludedLoggers(options: Pick<BeachballOptions, 'verbose'>): {
|
|
14
|
+
verboseLog: (msg: string) => void;
|
|
15
|
+
logIgnored: (name: string, reason: string) => void;
|
|
16
|
+
logIncluded: (name: string) => void;
|
|
17
|
+
};
|
|
18
|
+
//# sourceMappingURL=isPackageIncluded.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isPackageIncluded.d.ts","sourceRoot":"","sources":["../../src/changefile/isPackageIncluded.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAExE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,cAAc,EAAE,cAAc,GAC7B;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAazC;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,GAAG;IAC9E,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAOA"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getIncludedLoggers = exports.isPackageIncluded = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Determines whether the package is included in the list of potentially-changed published packages,
|
|
6
|
+
* based on private flags and scopedPackages.
|
|
7
|
+
*
|
|
8
|
+
* (All the reasons except nonexistent include the package name.)
|
|
9
|
+
*/
|
|
10
|
+
function isPackageIncluded(packageInfo, scopedPackages) {
|
|
11
|
+
const reason = !packageInfo
|
|
12
|
+
? 'no corresponding package found'
|
|
13
|
+
: packageInfo.private
|
|
14
|
+
? `${packageInfo.name} is private`
|
|
15
|
+
: // This is a package-only option (can't be set at repo level or via CLI)
|
|
16
|
+
packageInfo.packageOptions?.shouldPublish === false
|
|
17
|
+
? `${packageInfo.name} has beachball.shouldPublish=false`
|
|
18
|
+
: !scopedPackages.has(packageInfo.name)
|
|
19
|
+
? `${packageInfo.name} is out of scope`
|
|
20
|
+
: ''; // not ignored
|
|
21
|
+
return { isIncluded: !reason, reason };
|
|
22
|
+
}
|
|
23
|
+
exports.isPackageIncluded = isPackageIncluded;
|
|
24
|
+
function getIncludedLoggers(options) {
|
|
25
|
+
const verboseLog = (msg) => options.verbose && console.log(msg);
|
|
26
|
+
return {
|
|
27
|
+
verboseLog,
|
|
28
|
+
logIgnored: (name, reason) => verboseLog(` - ~~${name}~~ (${reason})`),
|
|
29
|
+
logIncluded: name => verboseLog(` - ${name}`),
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
exports.getIncludedLoggers = getIncludedLoggers;
|
|
33
|
+
//# sourceMappingURL=isPackageIncluded.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isPackageIncluded.js","sourceRoot":"","sources":["../../src/changefile/isPackageIncluded.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,SAAgB,iBAAiB,CAC/B,WAAoC,EACpC,cAA8B;IAE9B,MAAM,MAAM,GAAG,CAAC,WAAW;QACzB,CAAC,CAAC,gCAAgC;QAClC,CAAC,CAAC,WAAW,CAAC,OAAO;YACrB,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,aAAa;YAClC,CAAC,CAAC,wEAAwE;gBAC1E,WAAW,CAAC,cAAc,EAAE,aAAa,KAAK,KAAK;oBACnD,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,oCAAoC;oBACzD,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;wBACvC,CAAC,CAAC,GAAG,WAAW,CAAC,IAAI,kBAAkB;wBACvC,CAAC,CAAC,EAAE,CAAC,CAAC,cAAc;IAEtB,OAAO,EAAE,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;AACzC,CAAC;AAhBD,8CAgBC;AAED,SAAgB,kBAAkB,CAAC,OAA0C;IAK3E,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxE,OAAO;QACL,UAAU;QACV,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,IAAI,OAAO,MAAM,GAAG,CAAC;QACvE,WAAW,EAAE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC;KAC/C,CAAC;AACJ,CAAC;AAXD,gDAWC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeChangeFiles.d.ts","sourceRoot":"","sources":["../../src/changefile/writeChangeFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAM1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlE;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,cAAc,EAAE,EACzB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,GAAG,QAAQ,CAAC,GAChF,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"writeChangeFiles.d.ts","sourceRoot":"","sources":["../../src/changefile/writeChangeFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAM1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlE;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,cAAc,EAAE,EACzB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,GAAG,QAAQ,CAAC,GAChF,MAAM,EAAE,CA4CV"}
|
|
@@ -17,7 +17,6 @@ const writeJson_1 = require("../object/writeJson");
|
|
|
17
17
|
function writeChangeFiles(changes, options) {
|
|
18
18
|
const { path: cwd, groupChanges, commit: commitChangeFiles } = options;
|
|
19
19
|
const changePath = (0, paths_1.getChangePath)(options);
|
|
20
|
-
const branchName = (0, workspace_tools_1.getBranchName)({ cwd });
|
|
21
20
|
if (!Object.keys(changes).length) {
|
|
22
21
|
return [];
|
|
23
22
|
}
|
|
@@ -39,15 +38,12 @@ function writeChangeFiles(changes, options) {
|
|
|
39
38
|
return changeFile;
|
|
40
39
|
});
|
|
41
40
|
}
|
|
42
|
-
// Stage and maybe commit
|
|
43
|
-
|
|
44
|
-
if (
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
const commitOptions = ['--only', path_1.default.join(changePath, '*.json')];
|
|
49
|
-
(0, workspace_tools_1.commit)({ message: 'Change files', cwd, options: commitOptions });
|
|
50
|
-
}
|
|
41
|
+
// Stage and maybe commit
|
|
42
|
+
(0, workspace_tools_1.stage)({ patterns: changeFiles, cwd });
|
|
43
|
+
if (commitChangeFiles) {
|
|
44
|
+
// only commit change files, ignore other staged files/changes
|
|
45
|
+
const commitOptions = ['--only', path_1.default.join(changePath, '*.json')];
|
|
46
|
+
(0, workspace_tools_1.commit)({ message: 'Change files', cwd, options: commitOptions });
|
|
51
47
|
}
|
|
52
48
|
console.log(`git ${commitChangeFiles ? 'committed' : 'staged'} these change files: ${changeFiles
|
|
53
49
|
.map(f => `\n - ${f}`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeChangeFiles.js","sourceRoot":"","sources":["../../src/changefile/writeChangeFiles.ts"],"names":[],"mappings":";;;;;;AACA,oCAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"writeChangeFiles.js","sourceRoot":"","sources":["../../src/changefile/writeChangeFiles.ts"],"names":[],"mappings":";;;;;;AACA,oCAAyC;AACzC,qDAAgD;AAChD,oDAA4B;AAC5B,4CAAoB;AACpB,gDAAwB;AAExB,mDAAgD;AAEhD;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,OAAyB,EACzB,OAAiF;IAEjF,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACvE,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC;IAE1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE;QAChC,OAAO,EAAE,CAAC;KACX;IAED,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC9B,YAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KAC/C;IAED,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,IAAI,gBAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACzG,IAAI,WAAqB,CAAC;IAE1B,IAAI,YAAY,EAAE;QAChB,kDAAkD;QAClD,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3C,WAAW,GAAG,CAAC,UAAU,CAAC,CAAC;QAE3B,YAAE,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,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;YAC7E,IAAA,qBAAS,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC9B,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;KACJ;IAED,yBAAyB;IACzB,IAAA,uBAAK,EAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,IAAI,iBAAiB,EAAE;QACrB,8DAA8D;QAC9D,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClE,IAAA,wBAAM,EAAC,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;KAClE;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;AA/CD,4CA+CC"}
|
|
@@ -40,7 +40,7 @@ exports.writeChangelog = writeChangelog;
|
|
|
40
40
|
* @returns The list of directories where grouped changelogs were written.
|
|
41
41
|
*/
|
|
42
42
|
async function writeGroupedChangelog(bumpInfo, options) {
|
|
43
|
-
const {
|
|
43
|
+
const { packageInfos } = bumpInfo;
|
|
44
44
|
// Get the changelog groups with absolute paths.
|
|
45
45
|
const changelogGroups = options.changelog?.groups?.map(({ changelogPath, ...rest }) => ({
|
|
46
46
|
...rest,
|
|
@@ -50,8 +50,7 @@ async function writeGroupedChangelog(bumpInfo, options) {
|
|
|
50
50
|
return [];
|
|
51
51
|
}
|
|
52
52
|
// Get changelogs without dependency bump entries
|
|
53
|
-
|
|
54
|
-
const changelogs = (0, getPackageChangelogs_1.getPackageChangelogs)({ changeFileChangeInfos, calculatedChangeTypes, packageInfos }, options);
|
|
53
|
+
const changelogs = (0, getPackageChangelogs_1.getPackageChangelogs)({ ...bumpInfo, dependentChangedBy: undefined }, options);
|
|
55
54
|
const groupedChangelogs = {};
|
|
56
55
|
// Validate groups and initialize groupedChangelogs
|
|
57
56
|
for (const group of changelogGroups) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeChangelog.js","sourceRoot":"","sources":["../../src/changelog/writeChangelog.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AAEpB,iEAA8D;AAC9D,uDAAoD;AACpD,+DAA4D;AAG5D,+DAA4D;AAE5D,uDAAoD;AACpD,mEAAgE;AAChE,iDAA8C;AAC9C,mDAAgD;AAEzC,KAAK,UAAU,cAAc,CAClC,QAAmH,EACnH,OAAyF;IAEzF,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAElC,MAAM,oBAAoB,GAAG,MAAM,qBAAqB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE5E,6CAA6C;IAC7C,MAAM,UAAU,GAAG,IAAA,2CAAoB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE3D,4BAA4B;IAC5B,mGAAmG;IACnG,wDAAwD;IACxD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACzC,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC;QACpE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC/C,MAAM,mBAAmB,CAAC;gBACxB,OAAO;gBACP,mBAAmB,EAAE,UAAU,CAAC,GAAG,CAAC;gBACpC,eAAe,EAAE,WAAW;gBAC5B,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;SACJ;KACF;AACH,CAAC;AAzBD,wCAyBC;AAED;;;GAGG;AACH,KAAK,UAAU,qBAAqB,CAClC,QAA4F,EAC5F,OAAyF;IAEzF,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"writeChangelog.js","sourceRoot":"","sources":["../../src/changelog/writeChangelog.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/canary.js
CHANGED
|
@@ -32,7 +32,7 @@ async function canary(options, context) {
|
|
|
32
32
|
} while (packageVersions[pkg].includes(newVersion));
|
|
33
33
|
bumpInfo.packageInfos[pkg].version = newVersion;
|
|
34
34
|
}
|
|
35
|
-
(0, setDependentVersions_1.setDependentVersions)(bumpInfo, options);
|
|
35
|
+
(0, setDependentVersions_1.setDependentVersions)({ bumpInfo, options });
|
|
36
36
|
await (0, performBump_1.performBump)(bumpInfo, options);
|
|
37
37
|
if (options.publish || options.packToPath) {
|
|
38
38
|
await (0, publishToRegistry_1.publishToRegistry)(bumpInfo, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canary.js","sourceRoot":"","sources":["../../src/commands/canary.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,uDAAoD;AACpD,qDAAkD;AAClD,uEAAoE;AACpE,+EAA4E;AAC5E,oEAAiE;AAGjE,2EAAwE;AASjE,KAAK,UAAU,MAAM,CAAC,OAAyB,EAAE,OAAwB;IAC9E,4DAA4D;IAC5D,OAAO,KAAP,OAAO,GAAK,IAAA,2CAAoB,EAAC,OAAO,CAAC,EAAC;IAE1C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpE,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC;IAEzC,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,oBAAoB,CAAC,EAAE;YACnD,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACpC;KACF;IAED,MAAM,eAAe,GAAG,MAAM,IAAA,yCAAmB,EAAC,CAAC,GAAG,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,CAAC;IAE3F,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE;QAC3C,IAAI,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;QAEnD,GAAG;YACD,oEAAoE;YACpE,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,IAAA,2CAAoB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"canary.js","sourceRoot":"","sources":["../../src/commands/canary.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,uDAAoD;AACpD,qDAAkD;AAClD,uEAAoE;AACpE,+EAA4E;AAC5E,oEAAiE;AAGjE,2EAAwE;AASjE,KAAK,UAAU,MAAM,CAAC,OAAyB,EAAE,OAAwB;IAC9E,4DAA4D;IAC5D,OAAO,KAAP,OAAO,GAAK,IAAA,2CAAoB,EAAC,OAAO,CAAC,EAAC;IAE1C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpE,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC;IAEzC,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,oBAAoB,CAAC,EAAE;YACnD,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACpC;KACF;IAED,MAAM,eAAe,GAAG,MAAM,IAAA,yCAAmB,EAAC,CAAC,GAAG,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,CAAC;IAE3F,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE;QAC3C,IAAI,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;QAEnD,GAAG;YACD,oEAAoE;YACpE,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,IAAA,2CAAoB,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE5C,MAAM,IAAA,yBAAW,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAErC,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE;QACzC,MAAM,IAAA,qCAAiB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC5C;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;KACjC;AACH,CAAC;AAtCD,wBAsCC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configGet = void 0;
|
|
4
|
-
const
|
|
4
|
+
const isPackageIncluded_1 = require("../changefile/isPackageIncluded");
|
|
5
5
|
const getDisallowedChangeTypes_1 = require("../changefile/getDisallowedChangeTypes");
|
|
6
6
|
const formatValue_1 = require("../logging/formatValue");
|
|
7
7
|
const BeachballError_1 = require("../types/BeachballError");
|
|
@@ -96,7 +96,7 @@ function configGet(options, context) {
|
|
|
96
96
|
hasError = true;
|
|
97
97
|
}
|
|
98
98
|
else {
|
|
99
|
-
const { isIncluded, reason } = (0,
|
|
99
|
+
const { isIncluded, reason } = (0, isPackageIncluded_1.isPackageIncluded)(packageInfos[pkgName], scopedPackages);
|
|
100
100
|
if (!isIncluded) {
|
|
101
101
|
console.error(`Invalid package: ${reason}`);
|
|
102
102
|
hasError = true;
|
|
@@ -149,7 +149,7 @@ function printDefault(name, options, context) {
|
|
|
149
149
|
for (const pkgInfo of Object.values(packageInfos)) {
|
|
150
150
|
const pkgValue = pkgInfo.packageOptions?.[pkgKey];
|
|
151
151
|
// Verify the package is included, but it's not an error here since it wasn't explicitly requested
|
|
152
|
-
if ((0,
|
|
152
|
+
if ((0, isPackageIncluded_1.isPackageIncluded)(pkgInfo, scopedPackages).isIncluded && pkgValue !== undefined) {
|
|
153
153
|
pkgOverrides[pkgInfo.name] = pkgValue;
|
|
154
154
|
}
|
|
155
155
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configGet.js","sourceRoot":"","sources":["../../src/commands/configGet.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"configGet.js","sourceRoot":"","sources":["../../src/commands/configGet.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.configList = void 0;
|
|
4
|
-
const
|
|
4
|
+
const isPackageIncluded_1 = require("../changefile/isPackageIncluded");
|
|
5
5
|
const formatValue_1 = require("../logging/formatValue");
|
|
6
6
|
/**
|
|
7
7
|
* Handles the `beachball config list` command.
|
|
@@ -24,7 +24,7 @@ function configList(options, context) {
|
|
|
24
24
|
}
|
|
25
25
|
// Print per-package overrides
|
|
26
26
|
const packagesWithOverrides = Object.values(packageInfos)
|
|
27
|
-
.filter(pkg => Object.keys(pkg.packageOptions || {}).length && (0,
|
|
27
|
+
.filter(pkg => Object.keys(pkg.packageOptions || {}).length && (0, isPackageIncluded_1.isPackageIncluded)(pkg, scopedPackages))
|
|
28
28
|
.map(pkg => [pkg.name, pkg.packageOptions]);
|
|
29
29
|
if (packagesWithOverrides.length) {
|
|
30
30
|
console.log('\nPackage overrides:');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configList.js","sourceRoot":"","sources":["../../src/commands/configList.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"configList.js","sourceRoot":"","sources":["../../src/commands/configList.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AACpE,wDAAqD;AAIrD;;;GAGG;AACH,SAAgB,UAAU,CAAC,OAAyB,EAAE,OAA4B;IAChF,MAAM,EAAE,oBAAoB,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACtF,MAAM,aAAa,GAAG,OAA6C,CAAC;IAEpE,qFAAqF;IACrF,yFAAyF;IACzF,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/G,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,IAAA,yBAAW,EAAC,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEtD,sFAAsF;IACtF,oDAAoD;IACpD,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,uBAAuB,IAAI,KAAK,CAAC,CAAC;IACnH,IAAI,mBAAmB,CAAC,MAAM,EAAE;QAC9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,IAAA,yBAAW,EAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KACjF;IAED,8BAA8B;IAC9B,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;SACtD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,IAAA,qCAAiB,EAAC,GAAG,EAAE,cAAc,CAAC,CAAC;SACrG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,CAAU,CAAC,CAAC;IACvD,IAAI,qBAAqB,CAAC,MAAM,EAAE;QAChC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,IAAA,yBAAW,EAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KACnF;AACH,CAAC;AA1BD,gCA0BC"}
|
package/lib/commands/sync.js
CHANGED
|
@@ -29,8 +29,12 @@ async function sync(options, context) {
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
// Update dependencies on the packages with updated versions
|
|
33
|
-
const dependentModifiedPackages = (0, setDependentVersions_1.setDependentVersions)({
|
|
32
|
+
// Update dependencies on the packages with updated versions (only need to include package.json updates)
|
|
33
|
+
const dependentModifiedPackages = (0, setDependentVersions_1.setDependentVersions)({
|
|
34
|
+
bumpInfo: { packageInfos, scopedPackages, modifiedPackages },
|
|
35
|
+
options,
|
|
36
|
+
skipImplicitBumps: true,
|
|
37
|
+
});
|
|
34
38
|
// Add the dependent modified packages to the list that needs to be updated on disk
|
|
35
39
|
// (this is a different purpose than other use of modifiedPackages)
|
|
36
40
|
Object.keys(dependentModifiedPackages).forEach(pkg => modifiedPackages.add(pkg));
|
package/lib/commands/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":";;;;;;AACA,qEAAkE;AAClE,iEAA8D;AAC9D,+EAAiF;AACjF,oDAA4B;AAC5B,uEAAoE;AACpE,2DAAwD;AACxD,mEAAgE;AAWzD,KAAK,UAAU,IAAI,CAAC,OAAyB,EAAE,OAA4B;IAChF,6CAA6C;IAC7C,MAAM,YAAY,GAAG,OAAO,EAAE,oBAAoB,IAAI,IAAA,iCAAe,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,MAAM,cAAc,GAAG,OAAO,EAAE,cAAc,IAAI,IAAA,qCAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE3F,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEtH,OAAO,CAAC,GAAG,CAAC,sCAAsC,KAAK,CAAC,IAAI,gBAAgB,CAAC,CAAC;IAE9E,MAAM,iBAAiB,GAAG,MAAM,IAAA,8CAAwB,EAAC,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAEvF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE;QACzC,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE;YAC1B,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAEhD,IAAI,gBAAgB,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,gBAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAE;gBAC5F,OAAO,CAAC,GAAG,CACT,gCAAgC,GAAG,IAAI,IAAI,CAAC,OAAO,uCAAuC,gBAAgB,EAAE,CAC7G,CAAC;gBAEF,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,gBAAgB,CAAC;gBAC7C,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAC3B;SACF;KACF;IAED,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":";;;;;;AACA,qEAAkE;AAClE,iEAA8D;AAC9D,+EAAiF;AACjF,oDAA4B;AAC5B,uEAAoE;AACpE,2DAAwD;AACxD,mEAAgE;AAWzD,KAAK,UAAU,IAAI,CAAC,OAAyB,EAAE,OAA4B;IAChF,6CAA6C;IAC7C,MAAM,YAAY,GAAG,OAAO,EAAE,oBAAoB,IAAI,IAAA,iCAAe,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,MAAM,cAAc,GAAG,OAAO,EAAE,cAAc,IAAI,IAAA,qCAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE3F,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEtH,OAAO,CAAC,GAAG,CAAC,sCAAsC,KAAK,CAAC,IAAI,gBAAgB,CAAC,CAAC;IAE9E,MAAM,iBAAiB,GAAG,MAAM,IAAA,8CAAwB,EAAC,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAEvF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE;QACzC,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE;YAC1B,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAEhD,IAAI,gBAAgB,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,gBAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAE;gBAC5F,OAAO,CAAC,GAAG,CACT,gCAAgC,GAAG,IAAI,IAAI,CAAC,OAAO,uCAAuC,gBAAgB,EAAE,CAC7G,CAAC;gBAEF,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,gBAAgB,CAAC;gBAC7C,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAC3B;SACF;KACF;IAED,wGAAwG;IACxG,MAAM,yBAAyB,GAAG,IAAA,2CAAoB,EAAC;QACrD,QAAQ,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE;QAC5D,OAAO;QACP,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;IACH,mFAAmF;IACnF,mEAAmE;IACnE,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAEjF,IAAA,uCAAkB,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IACnD,MAAM,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;AAChC,CAAC;AAxCD,oBAwCC"}
|
package/lib/env.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export declare const env: Readonly<{
|
|
2
2
|
isCI: boolean;
|
|
3
3
|
isJest: boolean;
|
|
4
|
+
/** Whether this is one of the beachball repo's official release pipelines */
|
|
5
|
+
isBeachballAdoRelease: boolean | undefined;
|
|
4
6
|
/**
|
|
5
7
|
* @deprecated This should likely be replaced with a different strategy (it's never set)
|
|
6
8
|
* but actually disabling all the caching e.g. whenever running in jest would cause major
|
package/lib/env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,GAAG;;;IAMd,6EAA6E;;IAI7E;;;;;OAKG;;;;IAMH,mDAAmD;;EAInD,CAAC"}
|
package/lib/env.js
CHANGED
|
@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.env = void 0;
|
|
4
4
|
const isAzurePipelines = !!process.env.TF_BUILD;
|
|
5
5
|
const isJest = !!process.env.JEST_WORKER_ID;
|
|
6
|
+
const adoBuildNumber = process.env.BUILD_BUILDNUMBER;
|
|
6
7
|
exports.env = Object.freeze({
|
|
7
8
|
// most everything but ADO sets process.env.CI by default
|
|
8
9
|
isCI: !!process.env.CI || isAzurePipelines,
|
|
9
10
|
isJest,
|
|
11
|
+
/** Whether this is one of the beachball repo's official release pipelines */
|
|
12
|
+
isBeachballAdoRelease: adoBuildNumber?.startsWith('beachball-prepublish') || adoBuildNumber?.startsWith('beachball-release'),
|
|
10
13
|
/**
|
|
11
14
|
* @deprecated This should likely be replaced with a different strategy (it's never set)
|
|
12
15
|
* but actually disabling all the caching e.g. whenever running in jest would cause major
|
package/lib/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":";;;AAAA,MAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAChD,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":";;;AAAA,MAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAChD,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;AAC5C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;AAExC,QAAA,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/B,yDAAyD;IACzD,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,gBAAgB;IAE1C,MAAM;IAEN,6EAA6E;IAC7E,qBAAqB,EACnB,cAAc,EAAE,UAAU,CAAC,sBAAsB,CAAC,IAAI,cAAc,EAAE,UAAU,CAAC,mBAAmB,CAAC;IAEvG;;;;;OAKG;IACH,qBAAqB,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB;IAE5D,0CAA0C;IAC1C,sBAAsB,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS;IAC/C,0BAA0B,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,IAAI,SAAS;IACjH,mDAAmD;IACnD,mEAAmE;IACnE,kFAAkF;IAClF,cAAc,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC3G,CAAC,CAAC"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import type { BeachballOptions } from '../types/BeachballOptions';
|
|
2
2
|
/**
|
|
3
3
|
* Ensure that adequate history is available to check for changes between HEAD and `options.branch`.
|
|
4
|
-
* Otherwise attempting to get changes will fail with an error "no merge base".
|
|
5
|
-
*
|
|
4
|
+
* Otherwise attempting to get changes will fail with an error "no merge base". (This is mostly an
|
|
5
|
+
* issue with CI builds that use shallow clones and may not have a tracking branch configured for
|
|
6
|
+
* the remote target branch.)
|
|
7
|
+
*
|
|
8
|
+
* Since repo may be very large, it's important to avoid fetching the entire history or extra refs.
|
|
9
|
+
* If the repo is shallow and no common commit is found after a normal fetch, this function will
|
|
10
|
+
* iteratively deepen the history (100 commits at a time by default) and check for a common commit
|
|
11
|
+
* each round. If still not found, it will unshallow the clone.
|
|
6
12
|
*
|
|
7
13
|
* Throws an error if history is inadequate and cannot be fixed.
|
|
8
14
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureSharedHistory.d.ts","sourceRoot":"","sources":["../../src/git/ensureSharedHistory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"ensureSharedHistory.d.ts","sourceRoot":"","sources":["../../src/git/ensureSharedHistory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAKlE;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC,GACjF,IAAI,CAuEN"}
|