beachball 2.49.1 → 2.50.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/bump/bumpInPlace.d.ts +2 -2
- package/lib/bump/bumpInPlace.d.ts.map +1 -1
- package/lib/bump/bumpInPlace.js +1 -1
- package/lib/bump/bumpInPlace.js.map +1 -1
- package/lib/bump/bumpPackageInfoVersion.d.ts +2 -2
- package/lib/bump/bumpPackageInfoVersion.d.ts.map +1 -1
- package/lib/bump/callHook.d.ts +2 -2
- package/lib/bump/callHook.d.ts.map +1 -1
- package/lib/bump/gatherBumpInfo.d.ts +3 -3
- package/lib/bump/gatherBumpInfo.d.ts.map +1 -1
- package/lib/bump/performBump.d.ts +2 -2
- package/lib/bump/performBump.d.ts.map +1 -1
- package/lib/bump/setDependentVersions.d.ts +1 -1
- package/lib/bump/setDependentVersions.d.ts.map +1 -1
- package/lib/bump/updateLockFile.d.ts.map +1 -1
- package/lib/bump/updateLockFile.js +6 -0
- package/lib/bump/updateLockFile.js.map +1 -1
- package/lib/bump/updatePackageJsons.d.ts +1 -1
- package/lib/bump/updatePackageJsons.d.ts.map +1 -1
- package/lib/bump/updatePackageJsons.js.map +1 -1
- package/lib/bump/updateRelatedChangeType.d.ts +1 -1
- package/lib/bump/updateRelatedChangeType.d.ts.map +1 -1
- package/lib/bump/updateRelatedChangeType.js +1 -1
- package/lib/bump/updateRelatedChangeType.js.map +1 -1
- package/lib/changefile/changeTypes.d.ts +1 -1
- package/lib/changefile/changeTypes.d.ts.map +1 -1
- package/lib/changefile/getChangedPackages.d.ts +2 -2
- package/lib/changefile/getChangedPackages.d.ts.map +1 -1
- package/lib/changefile/getChangedPackages.js +3 -1
- package/lib/changefile/getChangedPackages.js.map +1 -1
- package/lib/changefile/getDisallowedChangeTypes.d.ts +2 -2
- package/lib/changefile/getDisallowedChangeTypes.d.ts.map +1 -1
- package/lib/changefile/getQuestionsForPackage.d.ts +4 -4
- package/lib/changefile/getQuestionsForPackage.d.ts.map +1 -1
- package/lib/changefile/getQuestionsForPackage.js +3 -4
- package/lib/changefile/getQuestionsForPackage.js.map +1 -1
- package/lib/changefile/promptForChange.d.ts +5 -6
- package/lib/changefile/promptForChange.d.ts.map +1 -1
- package/lib/changefile/promptForChange.js +2 -3
- package/lib/changefile/promptForChange.js.map +1 -1
- package/lib/changefile/readChangeFiles.d.ts +3 -3
- package/lib/changefile/readChangeFiles.d.ts.map +1 -1
- package/lib/changefile/readChangeFiles.js.map +1 -1
- package/lib/changefile/unlinkChangeFiles.d.ts +3 -3
- package/lib/changefile/unlinkChangeFiles.d.ts.map +1 -1
- package/lib/changefile/unlinkChangeFiles.js +1 -1
- package/lib/changefile/unlinkChangeFiles.js.map +1 -1
- package/lib/changefile/writeChangeFiles.d.ts +1 -1
- package/lib/changefile/writeChangeFiles.d.ts.map +1 -1
- package/lib/changelog/getPackageChangelogs.d.ts +2 -2
- package/lib/changelog/getPackageChangelogs.d.ts.map +1 -1
- package/lib/changelog/getPackageChangelogs.js +2 -2
- package/lib/changelog/getPackageChangelogs.js.map +1 -1
- package/lib/changelog/mergeChangelogs.d.ts +2 -2
- package/lib/changelog/mergeChangelogs.d.ts.map +1 -1
- package/lib/changelog/mergeChangelogs.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 +6 -4
- package/lib/changelog/renderChangelog.js.map +1 -1
- package/lib/changelog/renderJsonChangelog.d.ts +1 -1
- package/lib/changelog/renderJsonChangelog.d.ts.map +1 -1
- package/lib/changelog/renderPackageChangelog.d.ts +1 -1
- package/lib/changelog/renderPackageChangelog.d.ts.map +1 -1
- package/lib/changelog/renderPackageChangelog.js +5 -5
- package/lib/changelog/renderPackageChangelog.js.map +1 -1
- package/lib/changelog/writeChangelog.d.ts +2 -2
- package/lib/changelog/writeChangelog.d.ts.map +1 -1
- package/lib/changelog/writeChangelog.js +6 -4
- package/lib/changelog/writeChangelog.js.map +1 -1
- package/lib/cli.js +2 -1
- package/lib/cli.js.map +1 -1
- package/lib/commands/bump.d.ts +2 -2
- package/lib/commands/bump.d.ts.map +1 -1
- package/lib/commands/canary.d.ts +1 -1
- package/lib/commands/canary.d.ts.map +1 -1
- package/lib/commands/change.d.ts +1 -1
- package/lib/commands/change.d.ts.map +1 -1
- package/lib/commands/init.d.ts +1 -1
- package/lib/commands/init.d.ts.map +1 -1
- package/lib/commands/init.js +3 -3
- package/lib/commands/init.js.map +1 -1
- package/lib/commands/publish.d.ts +1 -1
- package/lib/commands/publish.d.ts.map +1 -1
- package/lib/commands/sync.d.ts +1 -1
- package/lib/commands/sync.d.ts.map +1 -1
- package/lib/git/ensureSharedHistory.d.ts +1 -1
- package/lib/git/ensureSharedHistory.d.ts.map +1 -1
- package/lib/git/fetch.d.ts +1 -1
- package/lib/git/fetch.d.ts.map +1 -1
- package/lib/git/fetch.js.map +1 -1
- package/lib/git/gitAsync.js +2 -2
- package/lib/git/gitAsync.js.map +1 -1
- package/lib/help.d.ts.map +1 -1
- package/lib/help.js +66 -39
- package/lib/help.js.map +1 -1
- package/lib/index.d.ts +6 -6
- package/lib/index.d.ts.map +1 -1
- package/lib/logging/format.d.ts +1 -1
- package/lib/logging/format.d.ts.map +1 -1
- package/lib/logging/format.js.map +1 -1
- package/lib/monorepo/getPackageDependencyGraph.d.ts +1 -1
- package/lib/monorepo/getPackageDependencyGraph.d.ts.map +1 -1
- package/lib/monorepo/getPackageGraph.d.ts +5 -2
- package/lib/monorepo/getPackageGraph.d.ts.map +1 -1
- package/lib/monorepo/getPackageGraph.js +1 -1
- package/lib/monorepo/getPackageGraph.js.map +1 -1
- package/lib/monorepo/getPackageGroups.d.ts +2 -2
- package/lib/monorepo/getPackageGroups.d.ts.map +1 -1
- package/lib/monorepo/getPackageGroups.js +1 -1
- package/lib/monorepo/getPackageGroups.js.map +1 -1
- package/lib/monorepo/getPackageInfos.d.ts +1 -1
- package/lib/monorepo/getPackageInfos.d.ts.map +1 -1
- package/lib/monorepo/getPackageInfos.js +28 -38
- package/lib/monorepo/getPackageInfos.js.map +1 -1
- package/lib/monorepo/getScopedPackages.d.ts +2 -2
- package/lib/monorepo/getScopedPackages.d.ts.map +1 -1
- package/lib/options/getCliOptions.d.ts +1 -1
- package/lib/options/getCliOptions.d.ts.map +1 -1
- package/lib/options/getCliOptions.js +6 -5
- package/lib/options/getCliOptions.js.map +1 -1
- package/lib/options/getDefaultOptions.d.ts +1 -1
- package/lib/options/getDefaultOptions.d.ts.map +1 -1
- package/lib/options/getOptions.d.ts +1 -1
- package/lib/options/getOptions.d.ts.map +1 -1
- package/lib/options/getOptions.js +1 -0
- package/lib/options/getOptions.js.map +1 -1
- package/lib/options/getPackageInfosWithOptions.d.ts +8 -0
- package/lib/options/getPackageInfosWithOptions.d.ts.map +1 -0
- package/lib/options/getPackageInfosWithOptions.js +46 -0
- package/lib/options/getPackageInfosWithOptions.js.map +1 -0
- package/lib/options/getRepoOptions.d.ts +1 -1
- package/lib/options/getRepoOptions.d.ts.map +1 -1
- package/lib/options/getRepoOptions.js +3 -3
- package/lib/options/getRepoOptions.js.map +1 -1
- package/lib/packageManager/listPackageVersions.d.ts +2 -2
- package/lib/packageManager/listPackageVersions.d.ts.map +1 -1
- package/lib/packageManager/npm.d.ts +2 -6
- package/lib/packageManager/npm.d.ts.map +1 -1
- package/lib/packageManager/npm.js.map +1 -1
- package/lib/packageManager/npmArgs.d.ts +3 -3
- package/lib/packageManager/npmArgs.d.ts.map +1 -1
- package/lib/packageManager/packageManager.d.ts +4 -5
- package/lib/packageManager/packageManager.d.ts.map +1 -1
- package/lib/packageManager/packageManager.js.map +1 -1
- package/lib/packageManager/packagePublish.d.ts +4 -4
- package/lib/packageManager/packagePublish.d.ts.map +1 -1
- package/lib/packageManager/packagePublish.js +4 -4
- package/lib/packageManager/packagePublish.js.map +1 -1
- package/lib/publish/bumpAndPush.d.ts +2 -2
- package/lib/publish/bumpAndPush.d.ts.map +1 -1
- package/lib/publish/displayManualRecovery.d.ts +1 -1
- package/lib/publish/displayManualRecovery.d.ts.map +1 -1
- package/lib/publish/getNewPackages.d.ts +2 -2
- package/lib/publish/getNewPackages.d.ts.map +1 -1
- package/lib/publish/getPackagesToPublish.d.ts +1 -1
- package/lib/publish/getPackagesToPublish.d.ts.map +1 -1
- package/lib/publish/performPublishOverrides.js.map +1 -1
- package/lib/publish/publishToRegistry.d.ts +2 -2
- package/lib/publish/publishToRegistry.d.ts.map +1 -1
- package/lib/publish/publishToRegistry.js +3 -2
- package/lib/publish/publishToRegistry.js.map +1 -1
- package/lib/publish/tagPackages.d.ts +3 -3
- package/lib/publish/tagPackages.d.ts.map +1 -1
- package/lib/publish/toposortPackages.d.ts +1 -1
- package/lib/publish/toposortPackages.d.ts.map +1 -1
- package/lib/publish/validatePackageDependencies.d.ts +1 -1
- package/lib/publish/validatePackageDependencies.d.ts.map +1 -1
- package/lib/publish/validatePackageVersions.d.ts +2 -2
- package/lib/publish/validatePackageVersions.d.ts.map +1 -1
- package/lib/types/BeachballOptions.d.ts +34 -15
- package/lib/types/BeachballOptions.d.ts.map +1 -1
- package/lib/types/BumpInfo.d.ts +3 -3
- package/lib/types/BumpInfo.d.ts.map +1 -1
- package/lib/types/ChangeFilePrompt.d.ts +1 -1
- package/lib/types/ChangeFilePrompt.d.ts.map +1 -1
- package/lib/types/ChangeLog.d.ts +1 -1
- package/lib/types/ChangeLog.d.ts.map +1 -1
- package/lib/types/ChangelogOptions.d.ts +15 -12
- package/lib/types/ChangelogOptions.d.ts.map +1 -1
- package/lib/types/DeepReadonly.d.ts +1 -2
- package/lib/types/DeepReadonly.d.ts.map +1 -1
- package/lib/types/NpmOptions.d.ts +1 -1
- package/lib/types/NpmOptions.d.ts.map +1 -1
- package/lib/types/PackageInfo.d.ts +4 -4
- package/lib/types/PackageInfo.d.ts.map +1 -1
- package/lib/validation/areChangeFilesDeleted.d.ts +1 -1
- package/lib/validation/areChangeFilesDeleted.d.ts.map +1 -1
- package/lib/validation/isChangeFileNeeded.d.ts +1 -1
- package/lib/validation/isChangeFileNeeded.d.ts.map +1 -1
- package/lib/validation/isGitAvailable.js +1 -1
- package/lib/validation/isGitAvailable.js.map +1 -1
- package/lib/validation/isValidChangeType.d.ts.map +1 -1
- package/lib/validation/isValidChangeType.js.map +1 -1
- package/lib/validation/isValidChangelogOptions.d.ts +1 -1
- package/lib/validation/isValidChangelogOptions.d.ts.map +1 -1
- package/lib/validation/isValidGroupOptions.d.ts +2 -2
- package/lib/validation/isValidGroupOptions.d.ts.map +1 -1
- package/lib/validation/validate.d.ts +1 -1
- package/lib/validation/validate.d.ts.map +1 -1
- package/package.json +10 -10
- package/lib/changelog/renderMainHeader.d.ts +0 -3
- package/lib/changelog/renderMainHeader.d.ts.map +0 -1
- package/lib/changelog/renderMainHeader.js +0 -8
- package/lib/changelog/renderMainHeader.js.map +0 -1
- package/lib/monorepo/infoFromPackageJson.d.ts +0 -3
- package/lib/monorepo/infoFromPackageJson.d.ts.map +0 -1
- package/lib/monorepo/infoFromPackageJson.js +0 -25
- package/lib/monorepo/infoFromPackageJson.js.map +0 -1
- package/lib/options/getPackageOptions.d.ts +0 -11
- package/lib/options/getPackageOptions.d.ts.map +0 -1
- package/lib/options/getPackageOptions.js +0 -45
- package/lib/options/getPackageOptions.js.map +0 -1
package/lib/index.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { RepoOptions, PackageOptions } from './types/BeachballOptions';
|
|
1
|
+
import type { RepoOptions, PackageOptions } from './types/BeachballOptions';
|
|
2
2
|
export type BeachballConfig = Partial<RepoOptions> & Partial<PackageOptions>;
|
|
3
|
-
export { VersionGroupOptions } from './types/BeachballOptions';
|
|
4
|
-
export { ChangeFilePromptOptions } from './types/ChangeFilePrompt';
|
|
5
|
-
export { ChangeType } from './types/ChangeInfo';
|
|
6
|
-
export { ChangelogEntry, ChangelogJson, ChangelogJsonEntry, PackageChangelog } from './types/ChangeLog';
|
|
7
|
-
export { ChangelogOptions, ChangelogGroupOptions, PackageChangelogRenderInfo, ChangelogRenderers, } from './types/ChangelogOptions';
|
|
3
|
+
export type { VersionGroupOptions } from './types/BeachballOptions';
|
|
4
|
+
export type { ChangeFilePromptOptions } from './types/ChangeFilePrompt';
|
|
5
|
+
export type { ChangeType } from './types/ChangeInfo';
|
|
6
|
+
export type { ChangelogEntry, ChangelogJson, ChangelogJsonEntry, PackageChangelog } from './types/ChangeLog';
|
|
7
|
+
export type { ChangelogOptions, ChangelogGroupOptions, PackageChangelogRenderInfo, ChangelogRenderers, } from './types/ChangelogOptions';
|
|
8
8
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE5E,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7E,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,YAAY,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACxE,YAAY,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC7G,YAAY,EACV,gBAAgB,EAChB,qBAAqB,EACrB,0BAA0B,EAC1B,kBAAkB,GACnB,MAAM,0BAA0B,CAAC"}
|
package/lib/logging/format.d.ts
CHANGED
|
@@ -4,5 +4,5 @@ export declare function formatList(items: string[]): string;
|
|
|
4
4
|
* Format an object on a single line with spaces between the properties and brackets
|
|
5
5
|
* (similar to `JSON.stringify(obj, null, 2)` but without the line breaks).
|
|
6
6
|
*/
|
|
7
|
-
export declare function singleLineStringify(obj:
|
|
7
|
+
export declare function singleLineStringify(obj: unknown): string;
|
|
8
8
|
//# sourceMappingURL=format.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/logging/format.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAElD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/logging/format.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAElD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAExD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/logging/format.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,SAAgB,UAAU,CAAC,KAAe;IACxC,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC;AAFD,gCAEC;AAED;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/logging/format.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,SAAgB,UAAU,CAAC,KAAe;IACxC,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC;AAFD,gCAEC;AAED;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,GAAY;IAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAC7D,CAAC;AAFD,kDAEC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PackageInfos } from '../types/PackageInfo';
|
|
1
|
+
import type { PackageInfos } from '../types/PackageInfo';
|
|
2
2
|
/**
|
|
3
3
|
* @returns Each element is a tuple of [dependency, dependent] where `dependent` depends on `dependency`.
|
|
4
4
|
* These are the edges of the dependency graph.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageDependencyGraph.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageDependencyGraph.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"getPackageDependencyGraph.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageDependencyGraph.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,YAAY,GACzB,CAAC,MAAM,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,CAyBhC"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
-
import { PackageInfo, PackageInfos } from '../types/PackageInfo';
|
|
2
|
-
|
|
1
|
+
import type { PackageInfo, PackageInfos } from '../types/PackageInfo';
|
|
2
|
+
import pGraph from 'p-graph';
|
|
3
|
+
type PGraph = ReturnType<typeof pGraph>;
|
|
4
|
+
export declare function getPackageGraph(affectedPackages: Iterable<string>, packageInfos: PackageInfos, runHook: (packageInfo: PackageInfo) => Promise<void>): PGraph;
|
|
5
|
+
export {};
|
|
3
6
|
//# sourceMappingURL=getPackageGraph.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageGraph.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"getPackageGraph.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageGraph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,MAA8B,MAAM,SAAS,CAAC;AAIrD,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;AAExC,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,EAClC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GACnD,MAAM,CAcR"}
|
|
@@ -19,6 +19,6 @@ function getPackageGraph(affectedPackages, packageInfos, runHook) {
|
|
|
19
19
|
}
|
|
20
20
|
exports.getPackageGraph = getPackageGraph;
|
|
21
21
|
function filterDependencyGraph(dependencyGraph) {
|
|
22
|
-
return dependencyGraph.filter(([dep
|
|
22
|
+
return dependencyGraph.filter(([dep]) => dep !== undefined);
|
|
23
23
|
}
|
|
24
24
|
//# sourceMappingURL=getPackageGraph.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageGraph.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGraph.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"getPackageGraph.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGraph.ts"],"names":[],"mappings":";;;;;;AACA,sDAAqD;AACrD,2EAAwE;AAKxE,SAAgB,eAAe,CAC7B,gBAAkC,EAClC,YAA0B,EAC1B,OAAoD;IAEpD,MAAM,OAAO,GAAkB,IAAI,GAAG,EAAE,CAAC;IACzC,KAAK,MAAM,aAAa,IAAI,gBAAgB,EAAE;QAC5C,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE;YACzB,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;SAC5D,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAmC,IAAA,qDAAyB,EAC/E,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAC5B,YAAY,CACb,CAAC;IACF,MAAM,uBAAuB,GAAG,qBAAqB,CAAC,eAAe,CAAC,CAAC;IACvE,OAAO,IAAA,iBAAM,EAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;AAClD,CAAC;AAlBD,0CAkBC;AAED,SAAS,qBAAqB,CAAC,eAA+C;IAC5E,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAuB,CAAC;AACpF,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { VersionGroupOptions } from '../types/BeachballOptions';
|
|
2
|
-
import { PackageInfos, PackageGroups } from '../types/PackageInfo';
|
|
1
|
+
import type { VersionGroupOptions } from '../types/BeachballOptions';
|
|
2
|
+
import type { PackageInfos, PackageGroups } from '../types/PackageInfo';
|
|
3
3
|
export declare function getPackageGroups(packageInfos: PackageInfos, root: string, groups: VersionGroupOptions[] | undefined): PackageGroups;
|
|
4
4
|
//# sourceMappingURL=getPackageGroups.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageGroups.d.ts","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,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;AAGxE,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,mBAAmB,EAAE,GAAG,SAAS,GACxC,aAAa,CA6Cf"}
|
|
@@ -36,7 +36,7 @@ function getPackageGroups(packageInfos, root, groups) {
|
|
|
36
36
|
if (errorPackages.length) {
|
|
37
37
|
console.error(`ERROR: Found package(s) belonging to multiple groups:\n` +
|
|
38
38
|
Object.entries(errorPackages)
|
|
39
|
-
.map(([pkgName,
|
|
39
|
+
.map(([pkgName, pkgGroups]) => `- ${pkgName}: [${pkgGroups.map(g => g.name).join(', ')}]`)
|
|
40
40
|
.sort()
|
|
41
41
|
.join('\n'));
|
|
42
42
|
// TODO: probably more appropriate to throw here and let the caller handle it?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageGroups.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,qDAAkD;AAElD,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,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,OAAO,CAAC,KAAK,CACX,yDAAyD;YACvD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC;iBAC1B,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"getPackageGroups.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,qDAAkD;AAElD,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,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,OAAO,CAAC,KAAK,CACX,yDAAyD;YACvD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC;iBAC1B,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;iBACzF,IAAI,EAAE;iBACN,IAAI,CAAC,IAAI,CAAC,CAChB,CAAC;QACF,8EAA8E;QAC9E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAjDD,4CAiDC"}
|
|
@@ -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;AAGzD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAazD"}
|
|
@@ -7,7 +7,7 @@ exports.getPackageInfos = void 0;
|
|
|
7
7
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const workspace_tools_1 = require("workspace-tools");
|
|
10
|
-
const
|
|
10
|
+
const getPackageInfosWithOptions_1 = require("../options/getPackageInfosWithOptions");
|
|
11
11
|
/**
|
|
12
12
|
* Get a mapping from package name to package info for all packages in the workspace
|
|
13
13
|
* (reading from package.json files)
|
|
@@ -15,74 +15,64 @@ const infoFromPackageJson_1 = require("./infoFromPackageJson");
|
|
|
15
15
|
function getPackageInfos(cwd) {
|
|
16
16
|
const projectRoot = (0, workspace_tools_1.findProjectRoot)(cwd);
|
|
17
17
|
const packageRoot = (0, workspace_tools_1.findPackageRoot)(cwd);
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
let wsPackageInfos;
|
|
19
|
+
if (projectRoot) {
|
|
20
|
+
wsPackageInfos = getPackageInfosFromWorkspace(projectRoot) || getPackageInfosFromNonWorkspaceMonorepo(projectRoot);
|
|
21
|
+
}
|
|
22
|
+
if (!wsPackageInfos && packageRoot) {
|
|
23
|
+
wsPackageInfos = [readWsPackageInfo(path_1.default.join(packageRoot, 'package.json'))];
|
|
24
|
+
}
|
|
25
|
+
return wsPackageInfos ? (0, getPackageInfosWithOptions_1.getPackageInfosWithOptions)(wsPackageInfos) : {};
|
|
22
26
|
}
|
|
23
27
|
exports.getPackageInfos = getPackageInfos;
|
|
24
28
|
function getPackageInfosFromWorkspace(projectRoot) {
|
|
25
29
|
let workspacePackages;
|
|
26
30
|
try {
|
|
27
31
|
// first try using the workspace provided packages (if available)
|
|
28
|
-
workspacePackages = (0, workspace_tools_1.getWorkspaces)(projectRoot);
|
|
32
|
+
workspacePackages = (0, workspace_tools_1.getWorkspaces)(projectRoot).map(pkg => pkg.packageJson);
|
|
29
33
|
}
|
|
30
|
-
catch
|
|
34
|
+
catch {
|
|
31
35
|
// not a recognized workspace from workspace-tools
|
|
32
36
|
}
|
|
33
|
-
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
|
-
const packageInfos = {};
|
|
37
|
-
for (const { path: packagePath, packageJson } of workspacePackages) {
|
|
38
|
-
const packageJsonPath = path_1.default.join(packagePath, 'package.json');
|
|
39
|
-
try {
|
|
40
|
-
packageInfos[packageJson.name] = (0, infoFromPackageJson_1.infoFromPackageJson)(packageJson, packageJsonPath);
|
|
41
|
-
}
|
|
42
|
-
catch (e) {
|
|
43
|
-
// Pass, the package.json is invalid
|
|
44
|
-
console.warn(`Problem processing ${packageJsonPath}: ${e}`);
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
return packageInfos;
|
|
37
|
+
return workspacePackages?.length ? workspacePackages : undefined;
|
|
48
38
|
}
|
|
49
39
|
function getPackageInfosFromNonWorkspaceMonorepo(projectRoot) {
|
|
50
40
|
const packageJsonFiles = (0, workspace_tools_1.listAllTrackedFiles)(['**/package.json', 'package.json'], projectRoot);
|
|
51
41
|
if (!packageJsonFiles.length) {
|
|
52
42
|
return;
|
|
53
43
|
}
|
|
54
|
-
const
|
|
44
|
+
const wsPackageInfos = {};
|
|
55
45
|
let hasError = false;
|
|
56
|
-
for (const
|
|
46
|
+
for (const file of packageJsonFiles) {
|
|
57
47
|
try {
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
packageInfos[packageJson.name] = (0, infoFromPackageJson_1.infoFromPackageJson)(packageJson, packageJsonFullPath);
|
|
48
|
+
const packageJson = readWsPackageInfo(path_1.default.join(projectRoot, file));
|
|
49
|
+
if (!wsPackageInfos[packageJson.name]) {
|
|
50
|
+
wsPackageInfos[packageJson.name] = packageJson;
|
|
62
51
|
}
|
|
63
52
|
else {
|
|
64
53
|
console.error(`ERROR: Two packages have the same name "${packageJson.name}". Please rename one of these packages:\n` +
|
|
65
|
-
`- ${path_1.default.relative(projectRoot,
|
|
66
|
-
`- ${packageJsonPath}`);
|
|
54
|
+
`- ${path_1.default.relative(projectRoot, wsPackageInfos[packageJson.name].packageJsonPath)}\n` +
|
|
55
|
+
`- ${path_1.default.relative(projectRoot, packageJson.packageJsonPath)}`);
|
|
67
56
|
// Keep going so we can log all the errors
|
|
68
57
|
hasError = true;
|
|
69
58
|
}
|
|
70
59
|
}
|
|
71
60
|
catch (e) {
|
|
72
61
|
// Pass, the package.json is invalid
|
|
73
|
-
console.warn(`Problem processing ${
|
|
62
|
+
console.warn(`Problem processing ${file}: ${e}`);
|
|
74
63
|
}
|
|
75
64
|
}
|
|
76
65
|
if (hasError) {
|
|
77
66
|
throw new Error('Duplicate package names found (see above for details)');
|
|
78
67
|
}
|
|
79
|
-
return
|
|
68
|
+
return Object.values(wsPackageInfos);
|
|
80
69
|
}
|
|
81
|
-
function
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
70
|
+
function readWsPackageInfo(packageJsonPath) {
|
|
71
|
+
return {
|
|
72
|
+
// this is actually the properties of WSPackageInfo except the packageJsonPath, but using omit
|
|
73
|
+
// messes things up due to the index signature...
|
|
74
|
+
...fs_extra_1.default.readJSONSync(packageJsonPath),
|
|
75
|
+
packageJsonPath,
|
|
76
|
+
};
|
|
87
77
|
}
|
|
88
78
|
//# sourceMappingURL=getPackageInfos.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../../src/monorepo/getPackageInfos.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,qDAOyB;AAEzB,sFAAmF;AAEnF;;;GAGG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,MAAM,WAAW,GAAG,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC;IACzC,MAAM,WAAW,GAAG,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC;IAEzC,IAAI,cAA2C,CAAC;IAChD,IAAI,WAAW,EAAE;QACf,cAAc,GAAG,4BAA4B,CAAC,WAAW,CAAC,IAAI,uCAAuC,CAAC,WAAW,CAAC,CAAC;KACpH;IACD,IAAI,CAAC,cAAc,IAAI,WAAW,EAAE;QAClC,cAAc,GAAG,CAAC,iBAAiB,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;KAC9E;IAED,OAAO,cAAc,CAAC,CAAC,CAAC,IAAA,uDAA0B,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC1E,CAAC;AAbD,0CAaC;AAED,SAAS,4BAA4B,CAAC,WAAmB;IACvD,IAAI,iBAA8C,CAAC;IACnD,IAAI;QACF,iEAAiE;QACjE,iBAAiB,GAAG,IAAA,+BAAoB,EAAC,WAAW,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACnF;IAAC,MAAM;QACN,kDAAkD;KACnD;IAED,OAAO,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC;AACnE,CAAC;AAED,SAAS,uCAAuC,CAAC,WAAmB;IAClE,MAAM,gBAAgB,GAAG,IAAA,qCAAmB,EAAC,CAAC,iBAAiB,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAC;IAC/F,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;QAC5B,OAAO;KACR;IAED,MAAM,cAAc,GAAmB,EAAE,CAAC;IAC1C,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE;QACnC,IAAI;YACF,MAAM,WAAW,GAAG,iBAAiB,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;YAEpE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;gBACrC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC;aAChD;iBAAM;gBACL,OAAO,CAAC,KAAK,CACX,2CAA2C,WAAW,CAAC,IAAI,2CAA2C;oBACpG,KAAK,cAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,IAAI;oBACrF,KAAK,cAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,eAAe,CAAC,EAAE,CACjE,CAAC;gBACF,0CAA0C;gBAC1C,QAAQ,GAAG,IAAI,CAAC;aACjB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,oCAAoC;YACpC,OAAO,CAAC,IAAI,CAAC,sBAAsB,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;SAClD;KACF;IAED,IAAI,QAAQ,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;KAC1E;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,iBAAiB,CAAC,eAAuB;IAChD,OAAO;QACL,8FAA8F;QAC9F,iDAAiD;QACjD,GAAI,kBAAE,CAAC,YAAY,CAAC,eAAe,CAAmB;QACtD,eAAe;KAChB,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BeachballOptions } from '../types/BeachballOptions';
|
|
2
|
-
import { PackageInfos } from '../types/PackageInfo';
|
|
1
|
+
import type { BeachballOptions } from '../types/BeachballOptions';
|
|
2
|
+
import type { PackageInfos } from '../types/PackageInfo';
|
|
3
3
|
export declare function getScopedPackages(options: Pick<BeachballOptions, 'path' | 'scope'>, packageInfos: PackageInfos): string[];
|
|
4
4
|
//# sourceMappingURL=getScopedPackages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getScopedPackages.d.ts","sourceRoot":"","sources":["../../src/monorepo/getScopedPackages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"getScopedPackages.d.ts","sourceRoot":"","sources":["../../src/monorepo/getScopedPackages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIzD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,EACjD,YAAY,EAAE,YAAY,GACzB,MAAM,EAAE,CAiBV"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCliOptions.d.ts","sourceRoot":"","sources":["../../src/options/getCliOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"getCliOptions.d.ts","sourceRoot":"","sources":["../../src/options/getCliOptions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AA2G5D,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,UAAU,CAUhF"}
|
|
@@ -115,7 +115,7 @@ function getCliOptionsUncached(argv) {
|
|
|
115
115
|
try {
|
|
116
116
|
cwd = (0, workspace_tools_1.findProjectRoot)(process.cwd());
|
|
117
117
|
}
|
|
118
|
-
catch
|
|
118
|
+
catch {
|
|
119
119
|
cwd = process.cwd();
|
|
120
120
|
}
|
|
121
121
|
if (positionalArgs.length > 1) {
|
|
@@ -126,14 +126,15 @@ function getCliOptionsUncached(argv) {
|
|
|
126
126
|
command: positionalArgs.length ? String(positionalArgs[0]) : 'change',
|
|
127
127
|
path: cwd,
|
|
128
128
|
};
|
|
129
|
-
|
|
129
|
+
const branchArg = args.branch;
|
|
130
|
+
if (branchArg) {
|
|
130
131
|
// TODO: This logic assumes the first segment of any branch name with a slash must be the remote,
|
|
131
132
|
// which is not necessarily accurate. Ideally we should check if a remote with that name exists,
|
|
132
133
|
// and if not, perform the default remote lookup.
|
|
133
134
|
cliOptions.branch =
|
|
134
|
-
|
|
135
|
-
?
|
|
136
|
-
: (0, workspace_tools_1.getDefaultRemoteBranch)({ branch:
|
|
135
|
+
branchArg.indexOf('/') > -1
|
|
136
|
+
? branchArg
|
|
137
|
+
: (0, workspace_tools_1.getDefaultRemoteBranch)({ branch: branchArg, verbose: args.verbose, cwd });
|
|
137
138
|
}
|
|
138
139
|
if (cliOptions.command === 'canary') {
|
|
139
140
|
cliOptions.tag = cliOptions.canaryName || 'canary';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCliOptions.js","sourceRoot":"","sources":["../../src/options/getCliOptions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getCliOptions.js","sourceRoot":"","sources":["../../src/options/getCliOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDefaultOptions.d.ts","sourceRoot":"","sources":["../../src/options/getDefaultOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"getDefaultOptions.d.ts","sourceRoot":"","sources":["../../src/options/getDefaultOptions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,gBAAgB,CAmCpD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOptions.d.ts","sourceRoot":"","sources":["../../src/options/getOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"getOptions.d.ts","sourceRoot":"","sources":["../../src/options/getOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAKlE;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAI3D"}
|
|
@@ -9,6 +9,7 @@ const getDefaultOptions_1 = require("./getDefaultOptions");
|
|
|
9
9
|
*/
|
|
10
10
|
function getOptions(argv) {
|
|
11
11
|
const cliOptions = (0, getCliOptions_1.getCliOptions)(argv);
|
|
12
|
+
// TODO: proper recursive merging
|
|
12
13
|
return { ...(0, getDefaultOptions_1.getDefaultOptions)(), ...(0, getRepoOptions_1.getRepoOptions)(cliOptions), ...cliOptions };
|
|
13
14
|
}
|
|
14
15
|
exports.getOptions = getOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOptions.js","sourceRoot":"","sources":["../../src/options/getOptions.ts"],"names":[],"mappings":";;;AACA,mDAAgD;AAChD,qDAAkD;AAClD,2DAAwD;AAExD;;GAEG;AACH,SAAgB,UAAU,CAAC,IAAc;IACvC,MAAM,UAAU,GAAG,IAAA,6BAAa,EAAC,IAAI,CAAC,CAAC;IACvC,OAAO,EAAE,GAAG,IAAA,qCAAiB,GAAE,EAAE,GAAG,IAAA,+BAAc,EAAC,UAAU,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC;AAClF,CAAC;
|
|
1
|
+
{"version":3,"file":"getOptions.js","sourceRoot":"","sources":["../../src/options/getOptions.ts"],"names":[],"mappings":";;;AACA,mDAAgD;AAChD,qDAAkD;AAClD,2DAAwD;AAExD;;GAEG;AACH,SAAgB,UAAU,CAAC,IAAc;IACvC,MAAM,UAAU,GAAG,IAAA,6BAAa,EAAC,IAAI,CAAC,CAAC;IACvC,iCAAiC;IACjC,OAAO,EAAE,GAAG,IAAA,qCAAiB,GAAE,EAAE,GAAG,IAAA,+BAAc,EAAC,UAAU,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC;AAClF,CAAC;AAJD,gCAIC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { PackageInfo as WSPackageInfo } from 'workspace-tools';
|
|
2
|
+
import type { PackageInfos } from '../types/PackageInfo';
|
|
3
|
+
/**
|
|
4
|
+
* Fill in options to convert `workspace-tools` `PackageInfos` to the format used in this repo,
|
|
5
|
+
* which includes merged beachball options.
|
|
6
|
+
*/
|
|
7
|
+
export declare function getPackageInfosWithOptions(wsPackageInfos: WSPackageInfo[]): PackageInfos;
|
|
8
|
+
//# sourceMappingURL=getPackageInfosWithOptions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getPackageInfosWithOptions.d.ts","sourceRoot":"","sources":["../../src/options/getPackageInfosWithOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,cAAc,EAAE,aAAa,EAAE,GAAG,YAAY,CAoCxF"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getPackageInfosWithOptions = void 0;
|
|
4
|
+
const getCliOptions_1 = require("./getCliOptions");
|
|
5
|
+
const getRepoOptions_1 = require("./getRepoOptions");
|
|
6
|
+
const getDefaultOptions_1 = require("./getDefaultOptions");
|
|
7
|
+
const env_1 = require("../env");
|
|
8
|
+
/**
|
|
9
|
+
* Fill in options to convert `workspace-tools` `PackageInfos` to the format used in this repo,
|
|
10
|
+
* which includes merged beachball options.
|
|
11
|
+
*/
|
|
12
|
+
function getPackageInfosWithOptions(wsPackageInfos) {
|
|
13
|
+
const packageInfos = {};
|
|
14
|
+
// Get the CLI and repo options once instead of re-calculating for every package.
|
|
15
|
+
// TODO: pass the unmerged options in instead of re-calculating...
|
|
16
|
+
const defaultOptions = (0, getDefaultOptions_1.getDefaultOptions)();
|
|
17
|
+
// Don't use options from process.argv or the beachball repo in tests
|
|
18
|
+
const cliOptions = !env_1.env.isJest ? (0, getCliOptions_1.getCliOptions)(process.argv) : undefined;
|
|
19
|
+
const repoOptions = cliOptions?.path ? (0, getRepoOptions_1.getRepoOptions)(cliOptions) : undefined;
|
|
20
|
+
for (const packageJson of wsPackageInfos) {
|
|
21
|
+
// Package-level JS config files aren't currently supported - https://github.com/microsoft/beachball/issues/1021
|
|
22
|
+
// (just the "beachball" key in package.json)
|
|
23
|
+
const packageOptions = (packageJson.beachball || {});
|
|
24
|
+
packageInfos[packageJson.name] = {
|
|
25
|
+
name: packageJson.name,
|
|
26
|
+
version: packageJson.version,
|
|
27
|
+
packageJsonPath: packageJson.packageJsonPath,
|
|
28
|
+
dependencies: packageJson.dependencies,
|
|
29
|
+
devDependencies: packageJson.devDependencies,
|
|
30
|
+
peerDependencies: packageJson.peerDependencies,
|
|
31
|
+
optionalDependencies: packageJson.optionalDependencies,
|
|
32
|
+
private: packageJson.private !== undefined ? packageJson.private : false,
|
|
33
|
+
// TODO: proper recursive merging
|
|
34
|
+
combinedOptions: {
|
|
35
|
+
...defaultOptions,
|
|
36
|
+
...repoOptions,
|
|
37
|
+
...packageOptions,
|
|
38
|
+
...cliOptions,
|
|
39
|
+
},
|
|
40
|
+
packageOptions,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
return packageInfos;
|
|
44
|
+
}
|
|
45
|
+
exports.getPackageInfosWithOptions = getPackageInfosWithOptions;
|
|
46
|
+
//# sourceMappingURL=getPackageInfosWithOptions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getPackageInfosWithOptions.js","sourceRoot":"","sources":["../../src/options/getPackageInfosWithOptions.ts"],"names":[],"mappings":";;;AAEA,mDAAgD;AAChD,qDAAkD;AAClD,2DAAwD;AACxD,gCAA6B;AAG7B;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,cAA+B;IACxE,MAAM,YAAY,GAAiB,EAAE,CAAC;IAEtC,iFAAiF;IACjF,kEAAkE;IAClE,MAAM,cAAc,GAAG,IAAA,qCAAiB,GAAE,CAAC;IAC3C,qEAAqE;IACrE,MAAM,UAAU,GAAG,CAAC,SAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,6BAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACzE,MAAM,WAAW,GAAG,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9E,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE;QACxC,gHAAgH;QAChH,6CAA6C;QAC7C,MAAM,cAAc,GAAG,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAA4B,CAAC;QAEhF,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG;YAC/B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,eAAe,EAAE,WAAW,CAAC,eAAe;YAC5C,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,eAAe,EAAE,WAAW,CAAC,eAAe;YAC5C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;YAC9C,oBAAoB,EAAE,WAAW,CAAC,oBAAoB;YACtD,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;YACxE,iCAAiC;YACjC,eAAe,EAAE;gBACf,GAAG,cAAc;gBACjB,GAAG,WAAW;gBACd,GAAG,cAAc;gBACjB,GAAG,UAAU;aACd;YACD,cAAc;SACf,CAAC;KACH;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AApCD,gEAoCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRepoOptions.d.ts","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAoB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"getRepoOptions.d.ts","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAoB,MAAM,2BAA2B,CAAC;AAI3F,wBAAgB,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAmClE"}
|
|
@@ -4,7 +4,7 @@ exports.getRepoOptions = void 0;
|
|
|
4
4
|
const cosmiconfig_1 = require("cosmiconfig");
|
|
5
5
|
const workspace_tools_1 = require("workspace-tools");
|
|
6
6
|
const env_1 = require("../env");
|
|
7
|
-
|
|
7
|
+
const cachedRepoOptions = new Map();
|
|
8
8
|
function getRepoOptions(cliOptions) {
|
|
9
9
|
const { configPath, path: cwd, branch } = cliOptions;
|
|
10
10
|
if (!env_1.env.beachballDisableCache && cachedRepoOptions.has(cliOptions)) {
|
|
@@ -43,11 +43,11 @@ exports.getRepoOptions = getRepoOptions;
|
|
|
43
43
|
function tryLoadConfig(configPath) {
|
|
44
44
|
const configExplorer = (0, cosmiconfig_1.cosmiconfigSync)('beachball');
|
|
45
45
|
const loadResults = configExplorer.load(configPath);
|
|
46
|
-
return
|
|
46
|
+
return loadResults?.config || null;
|
|
47
47
|
}
|
|
48
48
|
function trySearchConfig() {
|
|
49
49
|
const configExplorer = (0, cosmiconfig_1.cosmiconfigSync)('beachball');
|
|
50
50
|
const searchResults = configExplorer.search();
|
|
51
|
-
return
|
|
51
|
+
return searchResults?.config || null;
|
|
52
52
|
}
|
|
53
53
|
//# sourceMappingURL=getRepoOptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRepoOptions.js","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,qDAAyD;AACzD,gCAA6B;AAG7B,
|
|
1
|
+
{"version":3,"file":"getRepoOptions.js","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,qDAAyD;AACzD,gCAA6B;AAG7B,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA2B,CAAC;AAE7D,SAAgB,cAAc,CAAC,UAAsB;IACnD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IACrD,IAAI,CAAC,SAAG,CAAC,qBAAqB,IAAI,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;QACnE,OAAO,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;KAC3C;IAED,IAAI,WAA+B,CAAC;IACpC,IAAI,UAAU,EAAE;QACd,WAAW,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,gBAAgB,UAAU,uBAAuB,CAAC,CAAC;YACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;KACF;SAAM;QACL,WAAW,GAAG,eAAe,EAAE,IAAK,EAAkB,CAAC;KACxD;IAED,iGAAiG;IACjG,8FAA8F;IAC9F,+FAA+F;IAC/F,qBAAqB;IACrB,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,OAAO,GAAI,WAAgC,CAAC,OAAO,CAAC;QAC1D,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC3D,0DAA0D;YAC1D,WAAW,CAAC,MAAM,GAAG,IAAA,wCAAsB,EAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;SAC3F;aAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YAC9B,wEAAwE;YACxE,WAAW,CAAC,MAAM,GAAG,IAAA,wCAAsB,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;SAC/D;KACF;IAED,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAE/C,OAAO,WAAW,CAAC;AACrB,CAAC;AAnCD,wCAmCC;AAED,SAAS,aAAa,CAAC,UAAkB;IACvC,MAAM,cAAc,GAAG,IAAA,6BAAe,EAAC,WAAW,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpD,OAAQ,WAAW,EAAE,MAAsB,IAAI,IAAI,CAAC;AACtD,CAAC;AAED,SAAS,eAAe;IACtB,MAAM,cAAc,GAAG,IAAA,6BAAe,EAAC,WAAW,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;IAC9C,OAAQ,aAAa,EAAE,MAAsB,IAAI,IAAI,CAAC;AACxD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PackageInfo, PackageJson } from '../types/PackageInfo';
|
|
2
|
-
import { NpmOptions } from '../types/NpmOptions';
|
|
1
|
+
import type { PackageInfo, PackageJson } from '../types/PackageInfo';
|
|
2
|
+
import type { NpmOptions } from '../types/NpmOptions';
|
|
3
3
|
/**
|
|
4
4
|
* Result returned by `npm show --json <package>`.
|
|
5
5
|
* (More properties can be added as needed.)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listPackageVersions.d.ts","sourceRoot":"","sources":["../../src/packageManager/listPackageVersions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"listPackageVersions.d.ts","sourceRoot":"","sources":["../../src/packageManager/listPackageVersions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKtD;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG;IACxC,gCAAgC;IAChC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,+CAA+C;IAC/C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAMF,wBAAgB,0BAA0B,IAAI,IAAI,CAEjD;AAsBD,wBAAsB,wBAAwB,CAC5C,YAAY,EAAE,WAAW,EAAE,EAC3B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,CAoBpC;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC,CActC"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
import { PackageManagerResult } from './packageManager';
|
|
1
|
+
import type { PackageManagerResult } from './packageManager';
|
|
2
2
|
export type NpmResult = PackageManagerResult;
|
|
3
3
|
/**
|
|
4
4
|
* Run an npm command. Returns the error result instead of throwing on failure.
|
|
5
5
|
*/
|
|
6
|
-
export declare const npm: (args: string[], options: import("
|
|
7
|
-
cwd: string | undefined;
|
|
8
|
-
}) => Promise<import("execa").ExecaReturnValue<string> & {
|
|
9
|
-
success: boolean;
|
|
10
|
-
}>;
|
|
6
|
+
export declare const npm: (args: string[], options: import("./packageManager").PackageManagerOptions) => Promise<PackageManagerResult>;
|
|
11
7
|
//# sourceMappingURL=npm.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAK7D,MAAM,MAAM,SAAS,GAAG,oBAAoB,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,GAAG,8GAAmC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":";;;AACA,qDAAkD;AAMlD;;GAEG;AACU,QAAA,GAAG,GAAG,+BAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AuthType } from '../types/Auth';
|
|
2
|
-
import { NpmOptions } from '../types/NpmOptions';
|
|
3
|
-
import { PackageInfo } from '../types/PackageInfo';
|
|
1
|
+
import type { AuthType } from '../types/Auth';
|
|
2
|
+
import type { NpmOptions } from '../types/NpmOptions';
|
|
3
|
+
import type { PackageInfo } from '../types/PackageInfo';
|
|
4
4
|
export declare function getNpmPublishArgs(packageInfo: PackageInfo, options: Omit<NpmOptions, 'path'>): string[];
|
|
5
5
|
export declare function getNpmAuthArgs(registry: string, token?: string, authType?: AuthType): string[];
|
|
6
6
|
//# sourceMappingURL=npmArgs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npmArgs.d.ts","sourceRoot":"","sources":["../../src/packageManager/npmArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"npmArgs.d.ts","sourceRoot":"","sources":["../../src/packageManager/npmArgs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAmBvG;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,CAQ9F"}
|
|
@@ -2,6 +2,9 @@ import execa from 'execa';
|
|
|
2
2
|
export type PackageManagerResult = execa.ExecaReturnValue & {
|
|
3
3
|
success: boolean;
|
|
4
4
|
};
|
|
5
|
+
export type PackageManagerOptions = execa.Options & {
|
|
6
|
+
cwd: string | undefined;
|
|
7
|
+
};
|
|
5
8
|
/**
|
|
6
9
|
* Run a package manager command. Returns the error result instead of throwing on failure.
|
|
7
10
|
* @param manager The package manager to use
|
|
@@ -9,9 +12,5 @@ export type PackageManagerResult = execa.ExecaReturnValue & {
|
|
|
9
12
|
* @param options cwd must be specified in options to reduce the chance of accidentally running
|
|
10
13
|
* commands in the wrong place. If it's definitely irrelevant in this case, use undefined.
|
|
11
14
|
*/
|
|
12
|
-
export declare function packageManager(manager: 'npm' | 'yarn' | 'pnpm', args: string[], options:
|
|
13
|
-
cwd: string | undefined;
|
|
14
|
-
}): Promise<execa.ExecaReturnValue & {
|
|
15
|
-
success: boolean;
|
|
16
|
-
}>;
|
|
15
|
+
export declare function packageManager(manager: 'npm' | 'yarn' | 'pnpm', args: string[], options: PackageManagerOptions): Promise<PackageManagerResult>;
|
|
17
16
|
//# sourceMappingURL=packageManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageManager.d.ts","sourceRoot":"","sources":["../../src/packageManager/packageManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,oBAAoB,GAAG,KAAK,CAAC,gBAAgB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"packageManager.d.ts","sourceRoot":"","sources":["../../src/packageManager/packageManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,oBAAoB,GAAG,KAAK,CAAC,gBAAgB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AACjF,MAAM,MAAM,qBAAqB,GAAG,KAAK,CAAC,OAAO,GAAG;IAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEhF;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAChC,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,oBAAoB,CAAC,CAiB/B"}
|