beachball 2.63.0 → 2.63.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/changefile/getChangedPackages.d.ts.map +1 -1
- package/lib/changefile/getChangedPackages.js +5 -6
- package/lib/changefile/getChangedPackages.js.map +1 -1
- package/lib/changefile/unlinkChangeFiles.d.ts +1 -2
- package/lib/changefile/unlinkChangeFiles.d.ts.map +1 -1
- package/lib/changefile/unlinkChangeFiles.js.map +1 -1
- package/lib/changelog/renderChangelog.d.ts +1 -1
- package/lib/changelog/renderChangelog.d.ts.map +1 -1
- package/lib/changelog/renderChangelog.js +1 -0
- package/lib/changelog/renderChangelog.js.map +1 -1
- package/lib/changelog/renderPackageChangelog.js +9 -3
- package/lib/changelog/renderPackageChangelog.js.map +1 -1
- package/lib/cli.js +17 -8
- package/lib/cli.js.map +1 -1
- package/lib/commands/init.d.ts.map +1 -1
- package/lib/commands/init.js +6 -7
- package/lib/commands/init.js.map +1 -1
- package/lib/monorepo/createCommandContext.js +1 -1
- package/lib/monorepo/createCommandContext.js.map +1 -1
- package/lib/monorepo/filterIgnoredFiles.d.ts +11 -0
- package/lib/monorepo/filterIgnoredFiles.d.ts.map +1 -0
- package/lib/monorepo/filterIgnoredFiles.js +24 -0
- package/lib/monorepo/filterIgnoredFiles.js.map +1 -0
- package/lib/monorepo/getPackageDependencyGraph.js +2 -2
- package/lib/monorepo/getPackageDependencyGraph.js.map +1 -1
- package/lib/monorepo/getPackageGroups.d.ts.map +1 -1
- package/lib/monorepo/getPackageGroups.js +2 -3
- package/lib/monorepo/getPackageGroups.js.map +1 -1
- package/lib/monorepo/getPackageInfos.d.ts +7 -4
- package/lib/monorepo/getPackageInfos.d.ts.map +1 -1
- package/lib/monorepo/getPackageInfos.js +40 -45
- package/lib/monorepo/getPackageInfos.js.map +1 -1
- package/lib/options/getRepoOptions.d.ts.map +1 -1
- package/lib/options/getRepoOptions.js +2 -4
- package/lib/options/getRepoOptions.js.map +1 -1
- package/lib/packageManager/packPackage.js +7 -7
- package/lib/packageManager/packPackage.js.map +1 -1
- package/lib/packageManager/packagePublish.d.ts.map +1 -1
- package/lib/packageManager/packagePublish.js +3 -4
- package/lib/packageManager/packagePublish.js.map +1 -1
- package/lib/publish/bumpAndPush.d.ts.map +1 -1
- package/lib/publish/bumpAndPush.js +4 -3
- package/lib/publish/bumpAndPush.js.map +1 -1
- package/lib/publish/displayManualRecovery.d.ts +1 -1
- package/lib/publish/displayManualRecovery.d.ts.map +1 -1
- package/lib/publish/displayManualRecovery.js +7 -6
- package/lib/publish/displayManualRecovery.js.map +1 -1
- package/lib/publish/getPackagesToPublish.js +1 -1
- package/lib/publish/getPackagesToPublish.js.map +1 -1
- package/lib/publish/publishToRegistry.d.ts.map +1 -1
- package/lib/publish/publishToRegistry.js +18 -8
- package/lib/publish/publishToRegistry.js.map +1 -1
- package/lib/publish/tagPackages.js +1 -1
- 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 +3 -2
- package/lib/publish/toposortPackages.js.map +1 -1
- package/lib/publish/validatePackageDependencies.d.ts.map +1 -1
- package/lib/publish/validatePackageDependencies.js +3 -2
- package/lib/publish/validatePackageDependencies.js.map +1 -1
- package/lib/publish/validatePackageVersions.d.ts.map +1 -1
- package/lib/publish/validatePackageVersions.js +5 -4
- package/lib/publish/validatePackageVersions.js.map +1 -1
- package/lib/types/BeachballError.d.ts +15 -0
- package/lib/types/BeachballError.d.ts.map +1 -0
- package/lib/types/BeachballError.js +19 -0
- package/lib/types/BeachballError.js.map +1 -0
- package/lib/types/BeachballOptions.d.ts +8 -2
- package/lib/types/BeachballOptions.d.ts.map +1 -1
- package/lib/types/BumpInfo.d.ts +2 -3
- package/lib/types/BumpInfo.d.ts.map +1 -1
- package/lib/types/ChangelogOptions.d.ts +4 -0
- package/lib/types/ChangelogOptions.d.ts.map +1 -1
- package/lib/validation/validate.d.ts +1 -1
- package/lib/validation/validate.d.ts.map +1 -1
- package/lib/validation/validate.js +6 -13
- package/lib/validation/validate.js.map +1 -1
- package/package.json +4 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAe,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAmItF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,MAAM,EAAE,CAmDV"}
|
|
@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.getChangedPackages = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
|
-
const minimatch_1 = __importDefault(require("minimatch"));
|
|
10
9
|
const paths_1 = require("../paths");
|
|
11
10
|
const workspace_tools_1 = require("workspace-tools");
|
|
12
11
|
const ensureSharedHistory_1 = require("../git/ensureSharedHistory");
|
|
13
12
|
const readJson_1 = require("../object/readJson");
|
|
14
13
|
const bulletedList_1 = require("../logging/bulletedList");
|
|
14
|
+
const filterIgnoredFiles_1 = require("../monorepo/filterIgnoredFiles");
|
|
15
15
|
const count = (n, str) => `${n} ${str}${n === 1 ? '' : 's'}`;
|
|
16
16
|
function getMatchingPackageInfo(file, cwd, packageInfosByPath) {
|
|
17
17
|
// Normalize all the paths before comparing (the packageInfosByPath entries should also be normalized)
|
|
@@ -73,11 +73,10 @@ function getAllChangedPackages(options, packageInfos, scopedPackages) {
|
|
|
73
73
|
}
|
|
74
74
|
// Filter out changed files which are ignored by ignorePatterns.
|
|
75
75
|
// Also ignore the CHANGELOG files and change files because they're generated by beachball.
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
return !ignorePattern;
|
|
76
|
+
const nonIgnoredChanges = (0, filterIgnoredFiles_1.filterIgnoredFiles)({
|
|
77
|
+
filePaths: changes,
|
|
78
|
+
ignorePatterns: [...(options.ignorePatterns || []), `${changeDir}/*.json`, 'CHANGELOG.{md,json}'],
|
|
79
|
+
logIgnored,
|
|
81
80
|
});
|
|
82
81
|
if (!nonIgnoredChanges.length) {
|
|
83
82
|
verboseLog('All files were ignored');
|
|
@@ -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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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import type { ChangeSet } from '../types/ChangeInfo';
|
|
2
2
|
import type { BeachballOptions } from '../types/BeachballOptions';
|
|
3
|
-
import type { DeepReadonly } from '../types/DeepReadonly';
|
|
4
3
|
/**
|
|
5
4
|
* Unlink only change files that are specified in the `changeSet` param.
|
|
6
5
|
* Does nothing if `options.keepChangeFiles` is true.
|
|
7
6
|
*
|
|
8
7
|
* @param changeSet existing change files to be removed
|
|
9
8
|
*/
|
|
10
|
-
export declare function unlinkChangeFiles(changeSet:
|
|
9
|
+
export declare function unlinkChangeFiles(changeSet: Readonly<ChangeSet>, options: Pick<BeachballOptions, 'path' | 'changeDir' | 'keepChangeFiles'>): void;
|
|
11
10
|
//# sourceMappingURL=unlinkChangeFiles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unlinkChangeFiles.d.ts","sourceRoot":"","sources":["../../src/changefile/unlinkChangeFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"unlinkChangeFiles.d.ts","sourceRoot":"","sources":["../../src/changefile/unlinkChangeFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC9B,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,WAAW,GAAG,iBAAiB,CAAC,GACxE,IAAI,CAiBN"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unlinkChangeFiles.js","sourceRoot":"","sources":["../../src/changefile/unlinkChangeFiles.ts"],"names":[],"mappings":";;;;;;AACA,oCAAyC;AACzC,4CAAoB;AACpB,gDAAwB;
|
|
1
|
+
{"version":3,"file":"unlinkChangeFiles.js","sourceRoot":"","sources":["../../src/changefile/unlinkChangeFiles.ts"],"names":[],"mappings":";;;;;;AACA,oCAAyC;AACzC,4CAAoB;AACpB,gDAAwB;AAGxB;;;;;GAKG;AACH,SAAgB,iBAAiB,CAC/B,SAA8B,EAC9B,OAAyE;IAEzE,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,OAAO,CAAC,eAAe,EAAE;QAChD,OAAO;KACR;IAED,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC;IAC1C,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,SAAS,EAAE;QACtC,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,UAAU,EAAE,CAAC,CAAC;YAC/B,YAAE,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/D;KACF;IACD,IAAI,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,YAAE,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACxE,OAAO,CAAC,GAAG,CAAC,kBAAkB,OAAO,CAAC,SAAS,SAAS,CAAC,CAAC;QAC1D,YAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KACzD;AACH,CAAC;AApBD,8CAoBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ChangelogOptions, PackageChangelogRenderInfo } from '../types/ChangelogOptions';
|
|
2
|
-
export interface MarkdownChangelogRenderOptions extends Omit<PackageChangelogRenderInfo, 'renderers'> {
|
|
2
|
+
export interface MarkdownChangelogRenderOptions extends Omit<PackageChangelogRenderInfo, 'renderers' | 'defaultRenderers'> {
|
|
3
3
|
previousContent: string;
|
|
4
4
|
changelogOptions: ChangelogOptions;
|
|
5
5
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderChangelog.d.ts","sourceRoot":"","sources":["../../src/changelog/renderChangelog.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAG9F,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"renderChangelog.d.ts","sourceRoot":"","sources":["../../src/changelog/renderChangelog.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAG9F,MAAM,WAAW,8BACf,SAAQ,IAAI,CAAC,0BAA0B,EAAE,WAAW,GAAG,kBAAkB,CAAC;IAC1E,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAED,8FAA8F;AAC9F,eAAO,MAAM,aAAa,2BAA2B,CAAC;AAEtD,4DAA4D;AAC5D,eAAO,MAAM,mBAAmB,+EAA+E,CAAC;AAIhH,wBAAsB,eAAe,CAAC,aAAa,EAAE,8BAA8B,GAAG,OAAO,CAAC,MAAM,CAAC,CAiEpG;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CA6BT"}
|
|
@@ -35,6 +35,7 @@ async function renderChangelog(renderOptions) {
|
|
|
35
35
|
...renderPackageChangelog_1.defaultRenderers,
|
|
36
36
|
...customRenderers,
|
|
37
37
|
},
|
|
38
|
+
defaultRenderers: { ...renderPackageChangelog_1.defaultRenderers },
|
|
38
39
|
};
|
|
39
40
|
const packageChangelog = await (customRenderPackageChangelog || renderPackageChangelog_1.renderPackageChangelog)(renderInfo);
|
|
40
41
|
if (maxVersions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderChangelog.js","sourceRoot":"","sources":["../../src/changelog/renderChangelog.ts"],"names":[],"mappings":";;;AAAA,qEAAoF;
|
|
1
|
+
{"version":3,"file":"renderChangelog.js","sourceRoot":"","sources":["../../src/changelog/renderChangelog.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,9 +76,15 @@ async function _renderEntriesBasic(entries, renderInfo) {
|
|
|
76
76
|
return results;
|
|
77
77
|
}
|
|
78
78
|
function _renderEntry(entry) {
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
let comment = `- ${entry.comment}`;
|
|
80
|
+
if (comment.includes('<') && !/`[^`]*?</.test(comment)) {
|
|
81
|
+
// If the comment includes a < which definitely isn't inside a code block, escape it.
|
|
82
|
+
// (Not bothering with full backtick matching since it's generally low-consequence if wrong.)
|
|
83
|
+
// Full HTML escaping will be handled by the final markdown renderer; we just want to prevent
|
|
84
|
+
// comment contents that were likely not intended as HTML from breaking rendering.
|
|
85
|
+
// e.g. "Add --config <file> option"
|
|
86
|
+
comment = comment.replace(/</g, '\\<');
|
|
81
87
|
}
|
|
82
|
-
return
|
|
88
|
+
return entry.author === 'beachball' ? comment : `${comment} (${entry.author})`;
|
|
83
89
|
}
|
|
84
90
|
//# sourceMappingURL=renderPackageChangelog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderPackageChangelog.js","sourceRoot":"","sources":["../../src/changelog/renderPackageChangelog.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"renderPackageChangelog.js","sourceRoot":"","sources":["../../src/changelog/renderPackageChangelog.ts"],"names":[],"mappings":"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"}
|
package/lib/cli.js
CHANGED
|
@@ -12,15 +12,14 @@ const getPackageInfos_1 = require("./monorepo/getPackageInfos");
|
|
|
12
12
|
const getOptions_1 = require("./options/getOptions");
|
|
13
13
|
const validate_1 = require("./validation/validate");
|
|
14
14
|
const getScopedPackages_1 = require("./monorepo/getScopedPackages");
|
|
15
|
+
const BeachballError_1 = require("./types/BeachballError");
|
|
15
16
|
(async () => {
|
|
16
17
|
try {
|
|
17
18
|
// eslint-disable-next-line no-restricted-properties -- top-level call
|
|
18
19
|
(0, workspace_tools_1.findGitRoot)(process.cwd());
|
|
19
20
|
}
|
|
20
21
|
catch {
|
|
21
|
-
|
|
22
|
-
// eslint-disable-next-line no-restricted-properties
|
|
23
|
-
process.exit(1);
|
|
22
|
+
throw new BeachballError_1.BeachballError('beachball only works in a git repository. Please initialize git and try again.');
|
|
24
23
|
}
|
|
25
24
|
// eslint-disable-next-line no-restricted-properties -- this is the top level
|
|
26
25
|
const parsedOptions = (0, getOptions_1.getParsedOptions)({ cwd: process.cwd(), argv: process.argv });
|
|
@@ -63,7 +62,7 @@ const getScopedPackages_1 = require("./monorepo/getScopedPackages");
|
|
|
63
62
|
}
|
|
64
63
|
case 'sync': {
|
|
65
64
|
// This one is a special case where it doesn't run validate, so calculate the context here
|
|
66
|
-
const originalPackageInfos = (0, getPackageInfos_1.getPackageInfos)(parsedOptions
|
|
65
|
+
const originalPackageInfos = (0, getPackageInfos_1.getPackageInfos)(parsedOptions);
|
|
67
66
|
const scopedPackages = (0, getScopedPackages_1.getScopedPackages)(options, originalPackageInfos);
|
|
68
67
|
await (0, sync_1.sync)(options, { originalPackageInfos, scopedPackages });
|
|
69
68
|
break;
|
|
@@ -84,10 +83,20 @@ const getScopedPackages_1 = require("./monorepo/getScopedPackages");
|
|
|
84
83
|
throw new Error('Invalid command: ' + options.command);
|
|
85
84
|
}
|
|
86
85
|
})().catch(e => {
|
|
87
|
-
(
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
86
|
+
if (e instanceof BeachballError_1.BeachballError && e.alreadyLogged) {
|
|
87
|
+
// Error details were already printed -- just exit
|
|
88
|
+
}
|
|
89
|
+
else if (e instanceof BeachballError_1.BeachballError) {
|
|
90
|
+
// Expected error, not yet logged -- print the message (no stack trace)
|
|
91
|
+
console.error(e.message);
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
// Unexpected error -- print full details including stack
|
|
95
|
+
(0, help_1.showVersion)();
|
|
96
|
+
console.error('Unexpected error while running beachball!');
|
|
97
|
+
console.error(e?.stack || e);
|
|
98
|
+
}
|
|
99
|
+
// eslint-disable-next-line no-restricted-properties -- this is the only place that should call process.exit
|
|
91
100
|
process.exit(1);
|
|
92
101
|
});
|
|
93
102
|
//# sourceMappingURL=cli.js.map
|
package/lib/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AAAA,qDAA8C;AAC9C,0CAAuC;AACvC,8CAA2C;AAC3C,8CAA2C;AAC3C,0CAAuC;AACvC,gDAA6C;AAC7C,0CAAuC;AAEvC,iCAA+C;AAC/C,gEAA6D;AAC7D,qDAAwD;AACxD,oDAAiD;AACjD,oEAAiE;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAgBlE,wBAAsB,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqC9F"}
|
package/lib/commands/init.js
CHANGED
|
@@ -28,21 +28,20 @@ const fs = __importStar(require("fs"));
|
|
|
28
28
|
const path = __importStar(require("path"));
|
|
29
29
|
const readJson_1 = require("../object/readJson");
|
|
30
30
|
const getNpmPackageInfo_1 = require("../packageManager/getNpmPackageInfo");
|
|
31
|
-
|
|
32
|
-
function
|
|
31
|
+
const BeachballError_1 = require("../types/BeachballError");
|
|
32
|
+
function throwInitError(message) {
|
|
33
33
|
console.error(message);
|
|
34
34
|
console.log('You can still set up beachball manually by following the instructions here: https://microsoft.github.io/beachball/overview/getting-started.html');
|
|
35
|
-
|
|
36
|
-
process.exit(1);
|
|
35
|
+
throw new BeachballError_1.BeachballError(message, { alreadyLogged: true });
|
|
37
36
|
}
|
|
38
37
|
async function init(options) {
|
|
39
38
|
const packageJsonFilePath = path.join(options.path, 'package.json');
|
|
40
39
|
if (!fs.existsSync(packageJsonFilePath)) {
|
|
41
|
-
|
|
40
|
+
throwInitError(`Cannot find package.json at ${packageJsonFilePath}`);
|
|
42
41
|
}
|
|
43
42
|
const beachballInfo = await (0, getNpmPackageInfo_1.getNpmPackageInfo)('beachball', options);
|
|
44
43
|
if (!beachballInfo) {
|
|
45
|
-
|
|
44
|
+
throwInitError('Failed to retrieve beachball version from npm');
|
|
46
45
|
}
|
|
47
46
|
const beachballVersion = beachballInfo['dist-tags'].latest;
|
|
48
47
|
let packageJson = {};
|
|
@@ -50,7 +49,7 @@ async function init(options) {
|
|
|
50
49
|
packageJson = (0, readJson_1.readJson)(packageJsonFilePath);
|
|
51
50
|
}
|
|
52
51
|
catch {
|
|
53
|
-
|
|
52
|
+
throwInitError(`Failed to read package.json at ${packageJsonFilePath}`);
|
|
54
53
|
}
|
|
55
54
|
packageJson.devDependencies ?? (packageJson.devDependencies = {});
|
|
56
55
|
packageJson.devDependencies.beachball = beachballVersion;
|
package/lib/commands/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,2CAA6B;AAE7B,iDAA8C;AAC9C,2EAAwE;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,2CAA6B;AAE7B,iDAA8C;AAC9C,2EAAwE;AACxE,4DAAyD;AAEzD,SAAS,cAAc,CAAC,OAAe;IACrC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACvB,OAAO,CAAC,GAAG,CACT,iJAAiJ,CAClJ,CAAC;IACF,MAAM,IAAI,+BAAc,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7D,CAAC;AAEM,KAAK,UAAU,IAAI,CAAC,OAAoD;IAC7E,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEpE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;QACvC,cAAc,CAAC,+BAA+B,mBAAmB,EAAE,CAAC,CAAC;KACtE;IAED,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACpE,IAAI,CAAC,aAAa,EAAE;QAClB,cAAc,CAAC,+CAA+C,CAAC,CAAC;KACjE;IACD,MAAM,gBAAgB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;IAE3D,IAAI,WAAW,GAAG,EAAiB,CAAC;IACpC,IAAI;QACF,WAAW,GAAG,IAAA,mBAAQ,EAAc,mBAAmB,CAAC,CAAC;KAC1D;IAAC,MAAM;QACN,cAAc,CAAC,kCAAkC,mBAAmB,EAAE,CAAC,CAAC;KACzE;IAED,WAAW,CAAC,eAAe,KAA3B,WAAW,CAAC,eAAe,GAAK,EAAE,EAAC;IACnC,WAAW,CAAC,eAAe,CAAC,SAAS,GAAG,gBAAgB,CAAC;IACzD,WAAW,CAAC,OAAO,KAAnB,WAAW,CAAC,OAAO,GAAK,EAAE,EAAC;IAC3B,WAAW,CAAC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;IACpD,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,kBAAkB,CAAC;IAChD,WAAW,CAAC,OAAO,CAAC,OAAO,GAAG,mBAAmB,CAAC;IAElD,EAAE,CAAC,aAAa,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAE5E,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;QAC3B,OAAO,CAAC,IAAI,CACV,qFAAqF;YACnF,sDAAsD,CACzD,CAAC;KACH;IAED,OAAO,CAAC,GAAG,CAAC,uGAAuG,CAAC,CAAC;AACvH,CAAC;AArCD,oBAqCC"}
|
|
@@ -9,7 +9,7 @@ function createBasicCommandContext(_options, originalPackageInfos) {
|
|
|
9
9
|
const options = 'cliOptions' in _options ? _options.options : _options;
|
|
10
10
|
originalPackageInfos ?? (originalPackageInfos =
|
|
11
11
|
// eslint-disable-next-line etc/no-deprecated -- this is a compat helper
|
|
12
|
-
'cliOptions' in _options ? (0, getPackageInfos_1.getPackageInfos)(_options
|
|
12
|
+
'cliOptions' in _options ? (0, getPackageInfos_1.getPackageInfos)(_options) : (0, getPackageInfos_1.getPackageInfos)(options.path));
|
|
13
13
|
const scopedPackages = (0, getScopedPackages_1.getScopedPackages)(options, originalPackageInfos);
|
|
14
14
|
return {
|
|
15
15
|
originalPackageInfos,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createCommandContext.js","sourceRoot":"","sources":["../../src/monorepo/createCommandContext.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,yDAAsD;AACtD,uDAAoD;AACpD,2DAAwD;AAaxD,SAAgB,yBAAyB,CACvC,QAA0C,EAC1C,oBAAmC;IAEnC,MAAM,OAAO,GAAG,YAAY,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;IACvE,oBAAoB,KAApB,oBAAoB;IAClB,wEAAwE;IACxE,YAAY,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAA,iCAAe,EAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"createCommandContext.js","sourceRoot":"","sources":["../../src/monorepo/createCommandContext.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAIhE,yDAAsD;AACtD,uDAAoD;AACpD,2DAAwD;AAaxD,SAAgB,yBAAyB,CACvC,QAA0C,EAC1C,oBAAmC;IAEnC,MAAM,OAAO,GAAG,YAAY,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;IACvE,oBAAoB,KAApB,oBAAoB;IAClB,wEAAwE;IACxE,YAAY,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAA,iCAAe,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAA,iCAAe,EAAC,OAAO,CAAC,IAAI,CAAC,EAAC;IACvF,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IACxE,OAAO;QACL,oBAAoB;QACpB,cAAc;QACd,aAAa,EAAE,IAAA,mCAAgB,EAAC,oBAAoB,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC;KACpF,CAAC;AACJ,CAAC;AAdD,8DAcC;AAUD,SAAgB,oBAAoB,CAClC,QAA0C,EAC1C,oBAAmC;IAEnC,MAAM,OAAO,GACX,YAAY,IAAI,QAAQ;QACtB,CAAC,CAAC,yBAAyB,CAAC,QAAQ,CAAC;QACrC,CAAC,CAAC,6CAA6C;YAC7C,yBAAyB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,YAAY,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;IACvE,OAAO;QACL,GAAG,OAAO;QACV,SAAS,EAAE,IAAA,iCAAe,EAAC,OAAO,EAAE,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,cAAc,CAAC;QACzF,QAAQ,EAAE,SAAS;KACpB,CAAC;AACJ,CAAC;AAfD,oDAeC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { BeachballOptions } from '../types/BeachballOptions';
|
|
2
|
+
/**
|
|
3
|
+
* Filter `filePaths` to exclude any paths matching `ignorePatterns`.
|
|
4
|
+
*/
|
|
5
|
+
export declare function filterIgnoredFiles(params: Pick<BeachballOptions, 'ignorePatterns'> & {
|
|
6
|
+
/** Relative file paths */
|
|
7
|
+
filePaths: string[];
|
|
8
|
+
/** If specified, called for each ignored file */
|
|
9
|
+
logIgnored?: (filePath: string, reason: string) => void;
|
|
10
|
+
}): string[];
|
|
11
|
+
//# sourceMappingURL=filterIgnoredFiles.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterIgnoredFiles.d.ts","sourceRoot":"","sources":["../../src/monorepo/filterIgnoredFiles.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,GAAG;IACjD,0BAA0B;IAC1B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,iDAAiD;IACjD,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD,GACA,MAAM,EAAE,CAWV"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.filterIgnoredFiles = void 0;
|
|
7
|
+
const minimatch_1 = __importDefault(require("minimatch"));
|
|
8
|
+
const minimatchOptions = { matchBase: true };
|
|
9
|
+
/**
|
|
10
|
+
* Filter `filePaths` to exclude any paths matching `ignorePatterns`.
|
|
11
|
+
*/
|
|
12
|
+
function filterIgnoredFiles(params) {
|
|
13
|
+
const { filePaths, ignorePatterns, logIgnored } = params;
|
|
14
|
+
if (!ignorePatterns?.length) {
|
|
15
|
+
return filePaths;
|
|
16
|
+
}
|
|
17
|
+
return filePaths.filter(filePath => {
|
|
18
|
+
const ignorePattern = ignorePatterns.find(pattern => (0, minimatch_1.default)(filePath, pattern, minimatchOptions));
|
|
19
|
+
ignorePattern && logIgnored?.(filePath, `ignored by pattern "${ignorePattern}"`);
|
|
20
|
+
return !ignorePattern;
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
exports.filterIgnoredFiles = filterIgnoredFiles;
|
|
24
|
+
//# sourceMappingURL=filterIgnoredFiles.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterIgnoredFiles.js","sourceRoot":"","sources":["../../src/monorepo/filterIgnoredFiles.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAGlC,MAAM,gBAAgB,GAAuB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAEjE;;GAEG;AACH,SAAgB,kBAAkB,CAChC,MAKC;IAED,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IACzD,IAAI,CAAC,cAAc,EAAE,MAAM,EAAE;QAC3B,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACjC,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mBAAS,EAAC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACrG,aAAa,IAAI,UAAU,EAAE,CAAC,QAAQ,EAAE,uBAAuB,aAAa,GAAG,CAAC,CAAC;QACjF,OAAO,CAAC,aAAa,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC;AAlBD,gDAkBC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getPackageDependencyGraph = void 0;
|
|
4
|
-
const
|
|
4
|
+
const workspace_tools_1 = require("workspace-tools");
|
|
5
5
|
/**
|
|
6
6
|
* @returns Each element is a tuple of [dependency, dependent] where `dependent` depends on `dependency`.
|
|
7
7
|
* These are the edges of the dependency graph.
|
|
@@ -14,7 +14,7 @@ function getPackageDependencyGraph(packages, packageInfos) {
|
|
|
14
14
|
if (!info) {
|
|
15
15
|
throw new Error(`Package info is missing for ${pkgName}.`);
|
|
16
16
|
}
|
|
17
|
-
const allDeps = (0,
|
|
17
|
+
const allDeps = (0, workspace_tools_1.getPackageDependencies)(info, packageSet, {
|
|
18
18
|
withDevDependencies: true,
|
|
19
19
|
withPeerDependencies: true,
|
|
20
20
|
withOptionalDependencies: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageDependencyGraph.js","sourceRoot":"","sources":["../../src/monorepo/getPackageDependencyGraph.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getPackageDependencyGraph.js","sourceRoot":"","sources":["../../src/monorepo/getPackageDependencyGraph.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AAGzD;;;GAGG;AACH,SAAgB,yBAAyB,CACvC,QAAkB,EAClB,YAA0B;IAE1B,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,IAAA,wCAAsB,EAAC,IAAI,EAAE,UAAU,EAAE;YACvD,mBAAmB,EAAE,IAAI;YACzB,oBAAoB,EAAE,IAAI;YAC1B,wBAAwB,EAAE,IAAI;SAC/B,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,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,OAAO,eAAe,CAAC;AACzB,CAAC;AA5BD,8DA4BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageGroups.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"getPackageGroups.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAKxE,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,GACxC,aAAa,CA4Cf"}
|
|
@@ -7,6 +7,7 @@ exports.getPackageGroups = void 0;
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const isPathIncluded_1 = require("./isPathIncluded");
|
|
9
9
|
const bulletedList_1 = require("../logging/bulletedList");
|
|
10
|
+
const BeachballError_1 = require("../types/BeachballError");
|
|
10
11
|
function getPackageGroups(packageInfos, root, groups) {
|
|
11
12
|
var _a;
|
|
12
13
|
if (!groups?.length) {
|
|
@@ -38,9 +39,7 @@ function getPackageGroups(packageInfos, root, groups) {
|
|
|
38
39
|
if (errorEntries.length) {
|
|
39
40
|
console.error(`ERROR: Found package(s) belonging to multiple groups:\n` +
|
|
40
41
|
(0, bulletedList_1.bulletedList)(errorEntries.map(([pkgName, pkgGroups]) => `${pkgName}: ${pkgGroups.map(g => g.name).join(', ')}`).sort()));
|
|
41
|
-
|
|
42
|
-
// eslint-disable-next-line no-restricted-properties
|
|
43
|
-
process.exit(1);
|
|
42
|
+
throw new BeachballError_1.BeachballError('Found package(s) belonging to multiple groups', { alreadyLogged: true });
|
|
44
43
|
}
|
|
45
44
|
return packageGroups;
|
|
46
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageGroups.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,qDAAkD;AAClD,0DAAuD;
|
|
1
|
+
{"version":3,"file":"getPackageGroups.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,qDAAkD;AAClD,0DAAuD;AACvD,4DAAyD;AAEzD,SAAgB,gBAAgB,CAC9B,YAA0B,EAC1B,IAAY,EACZ,MAAyC;;IAEzC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE;QACnB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,aAAa,GAAkB,EAAE,CAAC;IAExC,MAAM,kBAAkB,GAAsC,EAAE,CAAC;IAEjE,MAAM,aAAa,GAA0C,EAAE,CAAC;IAEhE,uDAAuD;IACvD,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1D,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEtD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,+BAAc,EAAC,YAAY,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACxG,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,6DAA6D;YAC7D,aAAa,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC;SACvC;aAAM,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC9B,kBAAkB,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;YAEzC,aAAa,MAAC,KAAK,CAAC,IAAI,MAAxB,aAAa,OAAiB;gBAC5B,YAAY,EAAE,EAAE;gBAChB,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;aACnD,EAAC;YACF,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACtD;KACF;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACnD,IAAI,YAAY,CAAC,MAAM,EAAE;QACvB,OAAO,CAAC,KAAK,CACX,yDAAyD;YACvD,IAAA,2BAAY,EACV,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,KAAK,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAC1G,CACJ,CAAC;QACF,MAAM,IAAI,+BAAc,CAAC,+CAA+C,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;KACpG;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAhDD,4CAgDC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { PackageInfos } from '../types/PackageInfo';
|
|
2
|
-
import type {
|
|
3
|
-
/**
|
|
4
|
-
|
|
2
|
+
import type { BeachballOptions, ParsedOptions } from '../types/BeachballOptions';
|
|
3
|
+
/** Options subset used by `getPackageInfos` */
|
|
4
|
+
type PackageInfosOptions = Pick<ParsedOptions, 'cliOptions'> & {
|
|
5
|
+
options: Pick<BeachballOptions, 'ignorePatterns' | 'path'>;
|
|
6
|
+
};
|
|
5
7
|
/**
|
|
6
8
|
* Get a mapping from package name to package info for all packages in the workspace
|
|
7
9
|
* (reading from package.json files).
|
|
@@ -11,7 +13,8 @@ export type PackageInfosCliOptions = Partial<CliOptions> & Pick<CliOptions, 'pat
|
|
|
11
13
|
* into `PackageInfo.packageOptions` without going back through the whole process of
|
|
12
14
|
* getting CLI options.
|
|
13
15
|
*/
|
|
14
|
-
export declare function getPackageInfos(cliOptions:
|
|
16
|
+
export declare function getPackageInfos(cliOptions: PackageInfosOptions): PackageInfos;
|
|
15
17
|
/** @deprecated Pass the pre-parsed options */
|
|
16
18
|
export declare function getPackageInfos(cwd: string): PackageInfos;
|
|
19
|
+
export {};
|
|
17
20
|
//# sourceMappingURL=getPackageInfos.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageInfos.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getPackageInfos.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAGjF,+CAA+C;AAC/C,KAAK,mBAAmB,GAAG,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,GAAG;IAC7D,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,MAAM,CAAC,CAAC;CAC5D,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,mBAAmB,GAAG,YAAY,CAAC;AAC/E,8CAA8C;AAC9C,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC"}
|
|
@@ -7,41 +7,42 @@ exports.getPackageInfos = void 0;
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const workspace_tools_1 = require("workspace-tools");
|
|
9
9
|
const getPackageInfosWithOptions_1 = require("../options/getPackageInfosWithOptions");
|
|
10
|
-
const
|
|
10
|
+
const filterIgnoredFiles_1 = require("./filterIgnoredFiles");
|
|
11
11
|
function getPackageInfos(optionsOrCwd) {
|
|
12
|
-
const
|
|
12
|
+
const parsedOptions = typeof optionsOrCwd === 'string' ? undefined : optionsOrCwd;
|
|
13
|
+
const cwd = parsedOptions?.options.path || optionsOrCwd;
|
|
13
14
|
// If cwd comes from processed CLI options, it's already the root
|
|
14
15
|
const projectRoot = typeof optionsOrCwd === 'string' ? (0, workspace_tools_1.findProjectRoot)(cwd) : cwd;
|
|
15
16
|
const packageRoot = (0, workspace_tools_1.findPackageRoot)(cwd);
|
|
16
17
|
let wsPackageInfos;
|
|
17
18
|
if (projectRoot) {
|
|
18
|
-
wsPackageInfos =
|
|
19
|
+
wsPackageInfos =
|
|
20
|
+
getPackageInfosFromMonorepoManager(projectRoot) ||
|
|
21
|
+
getPackageInfosFromOtherMonorepo(projectRoot, parsedOptions?.options);
|
|
19
22
|
}
|
|
20
|
-
if (!wsPackageInfos && packageRoot) {
|
|
21
|
-
|
|
23
|
+
if (!wsPackageInfos?.length && packageRoot) {
|
|
24
|
+
const singlePackage = (0, workspace_tools_1.getPackageInfo)(packageRoot);
|
|
25
|
+
if (singlePackage) {
|
|
26
|
+
wsPackageInfos = [singlePackage];
|
|
27
|
+
}
|
|
22
28
|
}
|
|
23
29
|
if (wsPackageInfos) {
|
|
24
|
-
return
|
|
25
|
-
?
|
|
26
|
-
|
|
27
|
-
|
|
30
|
+
return parsedOptions
|
|
31
|
+
? (0, getPackageInfosWithOptions_1.getPackageInfosWithOptions)(wsPackageInfos, parsedOptions.cliOptions)
|
|
32
|
+
: // eslint-disable-next-line etc/no-deprecated
|
|
33
|
+
(0, getPackageInfosWithOptions_1.getPackageInfosWithOptions)(wsPackageInfos);
|
|
28
34
|
}
|
|
29
35
|
return {};
|
|
30
36
|
}
|
|
31
37
|
exports.getPackageInfos = getPackageInfos;
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
workspacePackages = (0, workspace_tools_1.getWorkspaces)(projectRoot).map(pkg => pkg.packageJson);
|
|
37
|
-
}
|
|
38
|
-
catch {
|
|
39
|
-
// not a recognized workspace from workspace-tools
|
|
40
|
-
}
|
|
41
|
-
return workspacePackages?.length ? workspacePackages : undefined;
|
|
38
|
+
/** Try to find packages from a monorepo manager */
|
|
39
|
+
function getPackageInfosFromMonorepoManager(projectRoot) {
|
|
40
|
+
const wsPackageInfos = (0, workspace_tools_1.getWorkspaceInfos)(projectRoot)?.map(({ packageJson }) => packageJson);
|
|
41
|
+
return wsPackageInfos?.length ? wsPackageInfos : undefined;
|
|
42
42
|
}
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
/** Glob for `package.json` files under the current folder */
|
|
44
|
+
function getPackageInfosFromOtherMonorepo(projectRoot, options) {
|
|
45
|
+
const allPackageJsons = (0, workspace_tools_1.listAllTrackedFiles)({
|
|
45
46
|
// Include both the root package.json and nested ones. This preserves existing behavior, which
|
|
46
47
|
// turns out to be important for the beachball repo itself. (The root package.json is the real
|
|
47
48
|
// package, but there's also a separately-managed "docs" folder with its own package.json. Any
|
|
@@ -50,41 +51,35 @@ function getPackageInfosFromNonWorkspaceMonorepo(projectRoot) {
|
|
|
50
51
|
cwd: projectRoot,
|
|
51
52
|
throwOnError: false, // mainly happens in tests if it's not a git repo
|
|
52
53
|
});
|
|
54
|
+
const packageJsonFiles = (0, filterIgnoredFiles_1.filterIgnoredFiles)({
|
|
55
|
+
filePaths: allPackageJsons,
|
|
56
|
+
ignorePatterns: options?.ignorePatterns,
|
|
57
|
+
});
|
|
53
58
|
if (!packageJsonFiles.length) {
|
|
54
59
|
return;
|
|
55
60
|
}
|
|
56
61
|
const wsPackageInfos = {};
|
|
57
62
|
let hasError = false;
|
|
58
63
|
for (const file of packageJsonFiles) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
else {
|
|
65
|
-
console.error(`ERROR: Two packages have the same name "${packageJson.name}". Please rename one of these packages:\n` +
|
|
66
|
-
`- ${path_1.default.relative(projectRoot, wsPackageInfos[packageJson.name].packageJsonPath)}\n` +
|
|
67
|
-
`- ${path_1.default.relative(projectRoot, packageJson.packageJsonPath)}`);
|
|
68
|
-
// Keep going so we can log all the errors
|
|
69
|
-
hasError = true;
|
|
70
|
-
}
|
|
64
|
+
const packageJson = (0, workspace_tools_1.getPackageInfo)(path_1.default.join(projectRoot, path_1.default.dirname(file)));
|
|
65
|
+
if (!packageJson)
|
|
66
|
+
continue;
|
|
67
|
+
if (!wsPackageInfos[packageJson.name]) {
|
|
68
|
+
wsPackageInfos[packageJson.name] = packageJson;
|
|
71
69
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
70
|
+
else {
|
|
71
|
+
console.error(`ERROR: Two packages have the same name "${packageJson.name}". Please rename one of these packages:\n` +
|
|
72
|
+
`- ${path_1.default.relative(projectRoot, wsPackageInfos[packageJson.name].packageJsonPath)}\n` +
|
|
73
|
+
`- ${path_1.default.relative(projectRoot, packageJson.packageJsonPath)}`);
|
|
74
|
+
// Keep going so we can log all the errors
|
|
75
|
+
hasError = true;
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
78
|
if (hasError) {
|
|
78
|
-
throw new Error('Duplicate package names found (see above for details)'
|
|
79
|
+
throw new Error('Duplicate package names found (see above for details).\n' +
|
|
80
|
+
"If you're getting this error due to test fixtures or other unexpected files, add the " +
|
|
81
|
+
'paths to ignorePatterns in the beachball config.');
|
|
79
82
|
}
|
|
80
83
|
return Object.values(wsPackageInfos);
|
|
81
84
|
}
|
|
82
|
-
function readWsPackageInfo(packageJsonPath) {
|
|
83
|
-
return {
|
|
84
|
-
// this is actually the properties of WSPackageInfo except the packageJsonPath, but using omit
|
|
85
|
-
// messes things up due to the index signature...
|
|
86
|
-
...(0, readJson_1.readJson)(packageJsonPath),
|
|
87
|
-
packageJsonPath,
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
85
|
//# sourceMappingURL=getPackageInfos.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":"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"}
|