beachball 2.42.0 → 2.43.0
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/bumpPackageInfoVersion.d.ts.map +1 -1
- package/lib/bump/bumpPackageInfoVersion.js +6 -1
- package/lib/bump/bumpPackageInfoVersion.js.map +1 -1
- package/lib/bump/performBump.js +1 -1
- package/lib/bump/performBump.js.map +1 -1
- package/lib/bump/setDependentVersions.js +1 -1
- package/lib/bump/setDependentVersions.js.map +1 -1
- package/lib/bump/setDependentsInBumpInfo.js +1 -1
- package/lib/bump/setDependentsInBumpInfo.js.map +1 -1
- package/lib/monorepo/infoFromPackageJson.d.ts.map +1 -1
- package/lib/monorepo/infoFromPackageJson.js +1 -0
- package/lib/monorepo/infoFromPackageJson.js.map +1 -1
- package/lib/publish/performPublishOverrides.js +2 -2
- package/lib/publish/performPublishOverrides.js.map +1 -1
- package/lib/publish/toposortPackages.js +1 -1
- package/lib/publish/toposortPackages.js.map +1 -1
- package/lib/types/PackageInfo.d.ts +2 -0
- package/lib/types/PackageInfo.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpPackageInfoVersion.d.ts","sourceRoot":"","sources":["../../src/bump/bumpPackageInfoVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"bumpPackageInfoVersion.d.ts","sourceRoot":"","sources":["../../src/bump/bumpPackageInfoVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,GAAG,IAAI,CA2B3G"}
|
|
@@ -22,8 +22,13 @@ function bumpPackageInfoVersion(pkgName, bumpInfo, options) {
|
|
|
22
22
|
console.log(`Skipping bumping private package "${pkgName}"`);
|
|
23
23
|
}
|
|
24
24
|
else {
|
|
25
|
+
// Ensure we can bump the correct versions
|
|
26
|
+
let bumpAsPrerelease = false;
|
|
27
|
+
if (options.prereleasePrefix && !["premajor", "preminor", "prepatch"].includes(changeType)) {
|
|
28
|
+
bumpAsPrerelease = true;
|
|
29
|
+
}
|
|
25
30
|
// Version should be updated
|
|
26
|
-
info.version = semver_1.default.inc(info.version,
|
|
31
|
+
info.version = semver_1.default.inc(info.version, bumpAsPrerelease ? 'prerelease' : changeType, options.prereleasePrefix || undefined, options.identifierBase);
|
|
27
32
|
modifiedPackages.add(pkgName);
|
|
28
33
|
}
|
|
29
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpPackageInfoVersion.js","sourceRoot":"","sources":["../../src/bump/bumpPackageInfoVersion.ts"],"names":[],"mappings":";;;;;;AACA,oDAA4B;AAG5B;;GAEG;AACH,SAAgB,sBAAsB,CAAC,OAAe,EAAE,QAAkB,EAAE,OAAyB;IACnG,MAAM,EAAE,qBAAqB,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;IAC3E,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAElD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,CAAC,GAAG,CAAC,0BAA0B,OAAO,yCAAyC,CAAC,CAAC;KACzF;SAAM,IAAI,UAAU,KAAK,MAAM,EAAE;QAChC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,0DAA0D,CAAC,CAAC;KACpF;SAAM,IAAI,IAAI,CAAC,OAAO,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC;KAC9D;SAAM;QACL,4BAA4B;QAC5B,IAAI,CAAC,OAAO,GAAG,gBAAM,CAAC,GAAG,CACvB,IAAI,CAAC,OAAO,EACZ,
|
|
1
|
+
{"version":3,"file":"bumpPackageInfoVersion.js","sourceRoot":"","sources":["../../src/bump/bumpPackageInfoVersion.ts"],"names":[],"mappings":";;;;;;AACA,oDAA4B;AAG5B;;GAEG;AACH,SAAgB,sBAAsB,CAAC,OAAe,EAAE,QAAkB,EAAE,OAAyB;IACnG,MAAM,EAAE,qBAAqB,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;IAC3E,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAElD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,CAAC,GAAG,CAAC,0BAA0B,OAAO,yCAAyC,CAAC,CAAC;KACzF;SAAM,IAAI,UAAU,KAAK,MAAM,EAAE;QAChC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,0DAA0D,CAAC,CAAC;KACpF;SAAM,IAAI,IAAI,CAAC,OAAO,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC;KAC9D;SAAM;QACL,0CAA0C;QAC1C,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,OAAO,CAAC,gBAAgB,IAAI,CAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC3F,gBAAgB,GAAG,IAAI,CAAC;SACzB;QAED,4BAA4B;QAC5B,IAAI,CAAC,OAAO,GAAG,gBAAM,CAAC,GAAG,CACvB,IAAI,CAAC,OAAO,EACZ,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,EAC5C,OAAO,CAAC,gBAAgB,IAAI,SAAS,EACrC,OAAO,CAAC,cAAc,CACb,CAAC;QACZ,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;KAC/B;AACH,CAAC;AA3BD,wDA2BC"}
|
package/lib/bump/performBump.js
CHANGED
|
@@ -24,7 +24,7 @@ function writePackageJson(modifiedPackages, packageInfos) {
|
|
|
24
24
|
if (!info.private) {
|
|
25
25
|
packageJson.version = info.version;
|
|
26
26
|
}
|
|
27
|
-
for (const depKind of ['dependencies', 'devDependencies', 'peerDependencies']) {
|
|
27
|
+
for (const depKind of ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies']) {
|
|
28
28
|
// updatedDeps contains all of the dependencies in the bump info since the beginning of a build job
|
|
29
29
|
const updatedDepsVersions = info[depKind];
|
|
30
30
|
if (updatedDepsVersions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performBump.js","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,uEAAoE;AACpE,gEAA6D;AAI7D,qDAAkD;AAClD,+CAA4C;AAC5C,iDAA8C;AAC9C,iDAA8C;AAC9C,yCAAsC;AAEtC,SAAgB,gBAAgB,CAAC,gBAA6B,EAAE,YAA0B;IACxF,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE;QACtC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,YAAY,OAAO,oCAAoC,CAAC,CAAC;YACtE,SAAS;SACV;QACD,MAAM,WAAW,GAAgB,kBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAEvE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;SACpC;QAED,KAAK,MAAM,OAAO,IAAI,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"performBump.js","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ function setDependentVersions(packageInfos, scopedPackages, { verbose }) {
|
|
|
8
8
|
if (!scopedPackages.has(pkgName)) {
|
|
9
9
|
continue;
|
|
10
10
|
}
|
|
11
|
-
for (const deps of [info.dependencies, info.devDependencies, info.peerDependencies]) {
|
|
11
|
+
for (const deps of [info.dependencies, info.devDependencies, info.peerDependencies, info.optionalDependencies]) {
|
|
12
12
|
if (!deps) {
|
|
13
13
|
continue;
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setDependentVersions.js","sourceRoot":"","sources":["../../src/bump/setDependentVersions.ts"],"names":[],"mappings":";;;AAEA,6DAA0D;AAE1D,SAAgB,oBAAoB,CAClC,YAA0B,EAC1B,cAA2B,EAC3B,EAAE,OAAO,EAAoB;IAE7B,MAAM,kBAAkB,GAAyC,EAAE,CAAC;IAEpE,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAChC,SAAS;SACV;QAED,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"setDependentVersions.js","sourceRoot":"","sources":["../../src/bump/setDependentVersions.ts"],"names":[],"mappings":";;;AAEA,6DAA0D;AAE1D,SAAgB,oBAAoB,CAClC,YAA0B,EAC1B,cAA2B,EAC3B,EAAE,OAAO,EAAoB;IAE7B,MAAM,kBAAkB,GAAyC,EAAE,CAAC;IAEpE,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAChC,SAAS;SACV;QAED,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAAE;YAC9G,IAAI,CAAC,IAAI,EAAE;gBACT,SAAS;aACV;YAED,KAAK,MAAM,CAAC,GAAG,EAAE,oBAAoB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC9D,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;gBACtC,IAAI,CAAC,WAAW,EAAE;oBAChB,SAAS;iBACV;gBAED,MAAM,kBAAkB,GAAG,IAAA,uCAAkB,EAAC,WAAW,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBACzF,IAAI,oBAAoB,KAAK,kBAAkB,EAAE;oBAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC;oBAE/B,kBAAkB,CAAC,OAAO,MAA1B,kBAAkB,CAAC,OAAO,IAAM,IAAI,GAAG,EAAU,EAAC;oBAClD,kBAAkB,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACrC,IAAI,OAAO,EAAE;wBACX,OAAO,CAAC,GAAG,CACT,GAAG,OAAO,+BAA+B,GAAG,IAAI,oBAAoB,OAAO,kBAAkB,EAAE,CAChG,CAAC;qBACH;iBACF;aACF;SACF;KACF;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAxCD,oDAwCC"}
|
|
@@ -13,7 +13,7 @@ function setDependentsInBumpInfo(bumpInfo) {
|
|
|
13
13
|
if (!scopedPackages.has(pkgName)) {
|
|
14
14
|
continue;
|
|
15
15
|
}
|
|
16
|
-
for (const deps of [info.dependencies, info.devDependencies, info.peerDependencies]) {
|
|
16
|
+
for (const deps of [info.dependencies, info.devDependencies, info.peerDependencies, info.optionalDependencies]) {
|
|
17
17
|
for (const dep of Object.keys(deps || {})) {
|
|
18
18
|
if (packageInfos[dep]) {
|
|
19
19
|
dependents[dep] ?? (dependents[dep] = []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setDependentsInBumpInfo.js","sourceRoot":"","sources":["../../src/bump/setDependentsInBumpInfo.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,QAAkB;IACxD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;IAClD,MAAM,UAAU,GAA2B,EAAE,CAAC;IAE9C,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAChC,SAAS;SACV;QAED,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"setDependentsInBumpInfo.js","sourceRoot":"","sources":["../../src/bump/setDependentsInBumpInfo.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,QAAkB;IACxD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;IAClD,MAAM,UAAU,GAA2B,EAAE,CAAC;IAE9C,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAC1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAChC,SAAS;SACV;QAED,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,oBAAoB,CAAC,EAAE;YAC9G,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE;gBACzC,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE;oBACrB,UAAU,CAAC,GAAG,MAAd,UAAU,CAAC,GAAG,IAAM,EAAE,EAAC;oBACvB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACtC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBAC/B;iBACF;aACF;SACF;KACF;IAED,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;AACnC,CAAC;AAtBD,0DAsBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infoFromPackageJson.d.ts","sourceRoot":"","sources":["../../src/monorepo/infoFromPackageJson.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGhE,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,GAAG,WAAW,
|
|
1
|
+
{"version":3,"file":"infoFromPackageJson.d.ts","sourceRoot":"","sources":["../../src/monorepo/infoFromPackageJson.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGhE,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,GAAG,WAAW,CAclG"}
|
|
@@ -15,6 +15,7 @@ function infoFromPackageJson(packageJson, packageJsonPath) {
|
|
|
15
15
|
dependencies: packageJson.dependencies,
|
|
16
16
|
devDependencies: packageJson.devDependencies,
|
|
17
17
|
peerDependencies: packageJson.peerDependencies,
|
|
18
|
+
optionalDependencies: packageJson.optionalDependencies,
|
|
18
19
|
private: packageJson.private !== undefined ? packageJson.private : false,
|
|
19
20
|
combinedOptions: (0, getPackageOptions_1.getCombinedPackageOptions)(packageOptions),
|
|
20
21
|
packageOptions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infoFromPackageJson.js","sourceRoot":"","sources":["../../src/monorepo/infoFromPackageJson.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,oEAA4F;AAE5F,SAAgB,mBAAmB,CAAC,WAAwB,EAAE,eAAuB;IACnF,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IACxE,OAAO;QACL,IAAI,EAAE,WAAW,CAAC,IAAK;QACvB,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,eAAe;QACf,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,eAAe,EAAE,WAAW,CAAC,eAAe;QAC5C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;QAC9C,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;QACxE,eAAe,EAAE,IAAA,6CAAyB,EAAC,cAAc,CAAC;QAC1D,cAAc;KACf,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"infoFromPackageJson.js","sourceRoot":"","sources":["../../src/monorepo/infoFromPackageJson.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,oEAA4F;AAE5F,SAAgB,mBAAmB,CAAC,WAAwB,EAAE,eAAuB;IACnF,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IACxE,OAAO;QACL,IAAI,EAAE,WAAW,CAAC,IAAK;QACvB,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,eAAe;QACf,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,eAAe,EAAE,WAAW,CAAC,eAAe;QAC5C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;QAC9C,oBAAoB,EAAE,WAAW,CAAC,oBAAoB;QACtD,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;QACxE,eAAe,EAAE,IAAA,6CAAyB,EAAC,cAAc,CAAC;QAC1D,cAAc;KACf,CAAC;AACJ,CAAC;AAdD,kDAcC"}
|
|
@@ -66,8 +66,8 @@ function performPublishConfigOverrides(packageJson) {
|
|
|
66
66
|
* replacement.
|
|
67
67
|
*/
|
|
68
68
|
function performWorkspaceVersionOverrides(packageJson, packageInfos) {
|
|
69
|
-
const { dependencies, devDependencies, peerDependencies } = packageJson;
|
|
70
|
-
for (const deps of [dependencies, devDependencies, peerDependencies]) {
|
|
69
|
+
const { dependencies, devDependencies, peerDependencies, optionalDependencies } = packageJson;
|
|
70
|
+
for (const deps of [dependencies, devDependencies, peerDependencies, optionalDependencies]) {
|
|
71
71
|
if (!deps)
|
|
72
72
|
continue;
|
|
73
73
|
for (const [depName, depVersion] of Object.entries(deps)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performPublishOverrides.js","sourceRoot":"","sources":["../../src/publish/performPublishOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;AAE/B,MAAM,YAAY,GAA4B;IAC5C,OAAO;IACP,SAAS;IACT,MAAM;IACN,QAAQ;IACR,SAAS;IACT,YAAY;IACZ,KAAK;IACL,SAAS;IACT,OAAO;CACR,CAAC;AACF,MAAM,eAAe,GAAG,YAAY,CAAC;AAErC,SAAgB,uBAAuB,CAAC,iBAA2B,EAAE,YAA0B;IAC7F,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;QACvC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE1D,gCAAgC,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAC5D,6BAA6B,CAAC,WAAW,CAAC,CAAC;QAE3C,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AAVD,0DAUC;AAED,SAAS,6BAA6B,CAAC,WAAwB;IAC7D,iHAAiH;IACjH,IAAI,WAAW,CAAC,aAAa,EAAE;QAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE;YAClE,MAAM,GAAG,GAAG,CAAiD,CAAC;YAC9D,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC9B,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACzB,OAAO,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;aACvC;SACF;KACF;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,gCAAgC,CAAC,WAAwB,EAAE,YAA0B;IAC5F,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"performPublishOverrides.js","sourceRoot":"","sources":["../../src/publish/performPublishOverrides.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;AAE/B,MAAM,YAAY,GAA4B;IAC5C,OAAO;IACP,SAAS;IACT,MAAM;IACN,QAAQ;IACR,SAAS;IACT,YAAY;IACZ,KAAK;IACL,SAAS;IACT,OAAO;CACR,CAAC;AACF,MAAM,eAAe,GAAG,YAAY,CAAC;AAErC,SAAgB,uBAAuB,CAAC,iBAA2B,EAAE,YAA0B;IAC7F,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;QACvC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE1D,gCAAgC,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAC5D,6BAA6B,CAAC,WAAW,CAAC,CAAC;QAE3C,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AAVD,0DAUC;AAED,SAAS,6BAA6B,CAAC,WAAwB;IAC7D,iHAAiH;IACjH,IAAI,WAAW,CAAC,aAAa,EAAE;QAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE;YAClE,MAAM,GAAG,GAAG,CAAiD,CAAC;YAC9D,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC9B,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACzB,OAAO,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;aACvC;SACF;KACF;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,gCAAgC,CAAC,WAAwB,EAAE,YAA0B;IAC5F,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,GAAG,WAAW,CAAC;IAC9F,KAAK,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,EAAE;QAC1F,IAAI,CAAC,IAAI;YAAE,SAAS;QAEpB,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxD,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,WAAW,IAAI,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBACzD,IAAI,CAAC,OAAO,CAAC,GAAG,iCAAiC,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;aACpF;SACF;KACF;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,iCAAiC,CAAC,mBAA2B,EAAE,kBAA0B;IAChG,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/E,IAAI,gBAAgB,KAAK,GAAG,EAAE;QAC5B,OAAO,kBAAkB,CAAC;KAC3B;IACD,IAAI,gBAAgB,KAAK,GAAG,IAAI,gBAAgB,KAAK,GAAG,EAAE;QACxD,OAAO,GAAG,gBAAgB,GAAG,kBAAkB,EAAE,CAAC;KACnD;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
|
@@ -19,7 +19,7 @@ function toposortPackages(packages, packageInfos) {
|
|
|
19
19
|
if (!info) {
|
|
20
20
|
throw new Error(`Package info is missing for ${pkgName}.`);
|
|
21
21
|
}
|
|
22
|
-
const allDeps = new Set([info.dependencies, info.devDependencies, info.peerDependencies]
|
|
22
|
+
const allDeps = new Set([info.dependencies, info.devDependencies, info.peerDependencies, info.optionalDependencies]
|
|
23
23
|
.flatMap(deps => Object.keys(deps || {}))
|
|
24
24
|
.filter(pkg => packageSet.has(pkg)));
|
|
25
25
|
if (allDeps.size) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toposortPackages.js","sourceRoot":"","sources":["../../src/publish/toposortPackages.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAGhC;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,QAAkB,EAAE,YAA0B;IAC7E,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,eAAe,GAAmC,EAAE,CAAC;IAE3D,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE;QAChC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,GAAG,CAAC,CAAC;SAC5D;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"toposortPackages.js","sourceRoot":"","sources":["../../src/publish/toposortPackages.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAGhC;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,QAAkB,EAAE,YAA0B;IAC7E,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,eAAe,GAAmC,EAAE,CAAC;IAE3D,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE;QAChC,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,GAAG,CAAC,CAAC;SAC5D;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,oBAAoB,CAAC;aACxF,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;aACxC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC;QACF,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE;gBAChC,eAAe,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;aAC7C;SACF;aAAM;YACL,eAAe,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;SAC5C;KACF;IAED,IAAI;QACF,OAAO,IAAA,kBAAQ,EAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAiB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;KACxE;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,0CAA2C,GAAa,EAAE,OAAO,EAAE,CAAC,CAAC;KACtF;AACH,CAAC;AA7BD,4CA6BC"}
|
|
@@ -23,6 +23,7 @@ export interface PackageJson {
|
|
|
23
23
|
dependencies?: PackageDeps;
|
|
24
24
|
devDependencies?: PackageDeps;
|
|
25
25
|
peerDependencies?: PackageDeps;
|
|
26
|
+
optionalDependencies?: PackageDeps;
|
|
26
27
|
private?: boolean;
|
|
27
28
|
scripts?: Record<string, string>;
|
|
28
29
|
beachball?: BeachballOptions;
|
|
@@ -36,6 +37,7 @@ export interface PackageInfo {
|
|
|
36
37
|
dependencies?: PackageDeps;
|
|
37
38
|
devDependencies?: PackageDeps;
|
|
38
39
|
peerDependencies?: PackageDeps;
|
|
40
|
+
optionalDependencies?: PackageDeps;
|
|
39
41
|
private: boolean;
|
|
40
42
|
/** options that are combined from the root configuration */
|
|
41
43
|
combinedOptions: PackageOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PackageInfo.d.ts","sourceRoot":"","sources":["../../src/types/PackageInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,WAAW,WAAW;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,IAAI,CAC9B,WAAW,EACX,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,CACjG,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,0CAA0C;IAC1C,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IAEjB,4DAA4D;IAC5D,eAAe,EAAE,cAAc,CAAC;IAEhC,8FAA8F;IAC9F,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,qBAAqB,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CAC5C;AAED,MAAM,MAAM,aAAa,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"PackageInfo.d.ts","sourceRoot":"","sources":["../../src/types/PackageInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,WAAW,WAAW;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,IAAI,CAC9B,WAAW,EACX,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,CACjG,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,oBAAoB,CAAC,EAAE,WAAW,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,0CAA0C;IAC1C,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAC/B,oBAAoB,CAAC,EAAE,WAAW,CAAC;IACnC,OAAO,EAAE,OAAO,CAAC;IAEjB,4DAA4D;IAC5D,eAAe,EAAE,cAAc,CAAC;IAEhC,8FAA8F;IAC9F,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,qBAAqB,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CAC5C;AAED,MAAM,MAAM,aAAa,GAAG;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAAA;CAAE,CAAC"}
|