beachball 2.65.3 → 3.0.0-alpha.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/bumpInMemory.js +1 -2
- package/lib/bump/bumpInMemory.js.map +1 -1
- package/lib/bump/bumpMinSemverRange.js +1 -2
- package/lib/bump/bumpMinSemverRange.js.map +1 -1
- package/lib/bump/bumpPackageInfoVersion.js +1 -2
- package/lib/bump/bumpPackageInfoVersion.js.map +1 -1
- package/lib/bump/callHook.js +1 -2
- package/lib/bump/callHook.js.map +1 -1
- package/lib/bump/gatherBumpInfo.js +2 -3
- package/lib/bump/gatherBumpInfo.js.map +1 -1
- package/lib/bump/getDependentsForPackages.js +2 -3
- package/lib/bump/getDependentsForPackages.js.map +1 -1
- package/lib/bump/performBump.js +1 -2
- package/lib/bump/performBump.js.map +1 -1
- package/lib/bump/setDependentVersions.js +2 -3
- package/lib/bump/setDependentVersions.js.map +1 -1
- package/lib/bump/updateLockFile.js +1 -2
- package/lib/bump/updateLockFile.js.map +1 -1
- package/lib/bump/updatePackageJsons.d.ts.map +1 -1
- package/lib/bump/updatePackageJsons.js +1 -3
- package/lib/bump/updatePackageJsons.js.map +1 -1
- package/lib/bump/updateRelatedChangeType.js +1 -2
- package/lib/bump/updateRelatedChangeType.js.map +1 -1
- package/lib/changefile/changeTypes.js +3 -3
- package/lib/changefile/changeTypes.js.map +1 -1
- package/lib/changefile/getAllChangedPackages.js +1 -2
- package/lib/changefile/getAllChangedPackages.js.map +1 -1
- package/lib/changefile/getCatalogChangedPackages.js +1 -2
- package/lib/changefile/getCatalogChangedPackages.js.map +1 -1
- package/lib/changefile/getChangedPackages.d.ts.map +1 -1
- package/lib/changefile/getChangedPackages.js +2 -2
- package/lib/changefile/getChangedPackages.js.map +1 -1
- package/lib/changefile/getDisallowedChangeTypes.js +1 -2
- package/lib/changefile/getDisallowedChangeTypes.js.map +1 -1
- package/lib/changefile/getQuestionsForPackage.js +1 -2
- package/lib/changefile/getQuestionsForPackage.js.map +1 -1
- package/lib/changefile/isPackageIncluded.js +2 -3
- package/lib/changefile/isPackageIncluded.js.map +1 -1
- package/lib/changefile/promptForChange.js +3 -4
- package/lib/changefile/promptForChange.js.map +1 -1
- package/lib/changefile/readChangeFiles.js +3 -4
- package/lib/changefile/readChangeFiles.js.map +1 -1
- package/lib/changefile/unlinkChangeFiles.js +1 -2
- package/lib/changefile/unlinkChangeFiles.js.map +1 -1
- package/lib/changefile/writeChangeFiles.js +1 -2
- package/lib/changefile/writeChangeFiles.js.map +1 -1
- package/lib/changelog/getPackageChangelogs.js +11 -12
- package/lib/changelog/getPackageChangelogs.js.map +1 -1
- package/lib/changelog/mergeChangelogs.js +2 -4
- package/lib/changelog/mergeChangelogs.js.map +1 -1
- package/lib/changelog/prepareChangelogPaths.js +1 -2
- package/lib/changelog/prepareChangelogPaths.js.map +1 -1
- package/lib/changelog/renderChangelog.d.ts.map +1 -1
- package/lib/changelog/renderChangelog.js +3 -3
- package/lib/changelog/renderChangelog.js.map +1 -1
- package/lib/changelog/renderJsonChangelog.js +1 -2
- package/lib/changelog/renderJsonChangelog.js.map +1 -1
- package/lib/changelog/renderPackageChangelog.js +3 -4
- package/lib/changelog/renderPackageChangelog.js.map +1 -1
- package/lib/changelog/writeChangelog.js +2 -3
- package/lib/changelog/writeChangelog.js.map +1 -1
- package/lib/cli.js +5 -0
- package/lib/cli.js.map +1 -1
- package/lib/commands/bump.js +3 -4
- package/lib/commands/bump.js.map +1 -1
- package/lib/commands/canary.js +3 -4
- package/lib/commands/canary.js.map +1 -1
- package/lib/commands/change.js +3 -4
- package/lib/commands/change.js.map +1 -1
- package/lib/commands/configGet.d.ts.map +1 -1
- package/lib/commands/configGet.js +1 -3
- package/lib/commands/configGet.js.map +1 -1
- package/lib/commands/configList.js +1 -2
- package/lib/commands/configList.js.map +1 -1
- package/lib/commands/init.js +20 -11
- package/lib/commands/init.js.map +1 -1
- package/lib/commands/migrate.d.ts +9 -0
- package/lib/commands/migrate.d.ts.map +1 -0
- package/lib/commands/migrate.js +23 -0
- package/lib/commands/migrate.js.map +1 -0
- package/lib/commands/publish.d.ts.map +1 -1
- package/lib/commands/publish.js +9 -5
- package/lib/commands/publish.js.map +1 -1
- package/lib/commands/sync.js +2 -3
- package/lib/commands/sync.js.map +1 -1
- package/lib/git/ensureSharedHistory.js +16 -4
- package/lib/git/ensureSharedHistory.js.map +1 -1
- package/lib/git/fetch.d.ts +6 -3
- package/lib/git/fetch.d.ts.map +1 -1
- package/lib/git/fetch.js +9 -8
- package/lib/git/fetch.js.map +1 -1
- package/lib/git/generateTag.js +1 -2
- package/lib/git/generateTag.js.map +1 -1
- package/lib/git/gitAsync.js +2 -3
- package/lib/git/gitAsync.js.map +1 -1
- package/lib/help.js +2 -3
- package/lib/help.js.map +1 -1
- package/lib/logging/bulletedList.js +1 -2
- package/lib/logging/bulletedList.js.map +1 -1
- package/lib/logging/formatValue.js +1 -2
- package/lib/logging/formatValue.js.map +1 -1
- package/lib/logging/indent.js +1 -2
- package/lib/logging/indent.js.map +1 -1
- package/lib/logging/singleLineStringify.js +1 -2
- package/lib/logging/singleLineStringify.js.map +1 -1
- package/lib/monorepo/createCommandContext.js +6 -7
- package/lib/monorepo/createCommandContext.js.map +1 -1
- package/lib/monorepo/diffCatalogs.js +1 -2
- package/lib/monorepo/diffCatalogs.js.map +1 -1
- package/lib/monorepo/filterIgnoredFiles.js +1 -2
- package/lib/monorepo/filterIgnoredFiles.js.map +1 -1
- package/lib/monorepo/getPackageGraph.js +3 -4
- package/lib/monorepo/getPackageGraph.js.map +1 -1
- package/lib/monorepo/getPackageGroups.js +3 -5
- package/lib/monorepo/getPackageGroups.js.map +1 -1
- package/lib/monorepo/getPackageInfos.js +2 -3
- package/lib/monorepo/getPackageInfos.js.map +1 -1
- package/lib/monorepo/getScopedPackages.js +1 -2
- package/lib/monorepo/getScopedPackages.js.map +1 -1
- package/lib/monorepo/isPathIncluded.js +1 -2
- package/lib/monorepo/isPathIncluded.js.map +1 -1
- package/lib/object/cloneObject.js +1 -2
- package/lib/object/cloneObject.js.map +1 -1
- package/lib/object/readJson.js +1 -2
- package/lib/object/readJson.js.map +1 -1
- package/lib/object/writeJson.js +1 -2
- package/lib/object/writeJson.js.map +1 -1
- package/lib/options/getCliOptions.d.ts +0 -1
- package/lib/options/getCliOptions.d.ts.map +1 -1
- package/lib/options/getCliOptions.js +2 -3
- package/lib/options/getCliOptions.js.map +1 -1
- package/lib/options/getDefaultOptions.js +1 -2
- package/lib/options/getDefaultOptions.js.map +1 -1
- package/lib/options/getOptions.js +2 -3
- package/lib/options/getOptions.js.map +1 -1
- package/lib/options/getPackageInfosWithOptions.js +2 -3
- package/lib/options/getPackageInfosWithOptions.js.map +1 -1
- package/lib/options/getPackageOption.js +1 -2
- package/lib/options/getPackageOption.js.map +1 -1
- package/lib/options/getRepoOptions.js +1 -2
- package/lib/options/getRepoOptions.js.map +1 -1
- package/lib/packageManager/getNpmPackageInfo.js +2 -2
- package/lib/packageManager/getNpmPackageInfo.js.map +1 -1
- package/lib/packageManager/getWorkspaceRange.js +1 -2
- package/lib/packageManager/getWorkspaceRange.js.map +1 -1
- package/lib/packageManager/listPackageVersions.js +2 -3
- package/lib/packageManager/listPackageVersions.js.map +1 -1
- package/lib/packageManager/npmArgs.js +4 -5
- package/lib/packageManager/npmArgs.js.map +1 -1
- package/lib/packageManager/npmAuthEnvPassthrough.d.ts +32 -0
- package/lib/packageManager/npmAuthEnvPassthrough.d.ts.map +1 -0
- package/lib/packageManager/npmAuthEnvPassthrough.js +89 -0
- package/lib/packageManager/npmAuthEnvPassthrough.js.map +1 -0
- package/lib/packageManager/packPackage.d.ts +3 -11
- package/lib/packageManager/packPackage.d.ts.map +1 -1
- package/lib/packageManager/packPackage.js +10 -21
- package/lib/packageManager/packPackage.js.map +1 -1
- package/lib/packageManager/packageManager.d.ts.map +1 -1
- package/lib/packageManager/packageManager.js +3 -21
- package/lib/packageManager/packageManager.js.map +1 -1
- package/lib/packageManager/packagePublish.js +1 -2
- package/lib/packageManager/packagePublish.js.map +1 -1
- package/lib/packageManager/resolveSpecialVersion.js +1 -2
- package/lib/packageManager/resolveSpecialVersion.js.map +1 -1
- package/lib/paths.js +1 -2
- package/lib/paths.js.map +1 -1
- package/lib/publish/bumpAndPush.js +1 -2
- package/lib/publish/bumpAndPush.js.map +1 -1
- package/lib/publish/displayManualRecovery.js +1 -2
- package/lib/publish/displayManualRecovery.js.map +1 -1
- package/lib/publish/getNewPackages.js +1 -2
- package/lib/publish/getNewPackages.js.map +1 -1
- package/lib/publish/getPackageGraphLayers.js +1 -2
- package/lib/publish/getPackageGraphLayers.js.map +1 -1
- package/lib/publish/getPackagesToPublish.js +1 -2
- package/lib/publish/getPackagesToPublish.js.map +1 -1
- package/lib/publish/performPublishOverrides.js +3 -4
- package/lib/publish/performPublishOverrides.js.map +1 -1
- package/lib/publish/publishToRegistry.d.ts.map +1 -1
- package/lib/publish/publishToRegistry.js +5 -11
- package/lib/publish/publishToRegistry.js.map +1 -1
- package/lib/publish/tagPackages.js +1 -2
- package/lib/publish/tagPackages.js.map +1 -1
- package/lib/publish/validatePackageDependencies.js +2 -3
- package/lib/publish/validatePackageDependencies.js.map +1 -1
- package/lib/publish/validatePackageVersions.js +1 -2
- package/lib/publish/validatePackageVersions.js.map +1 -1
- package/lib/types/BeachballError.js +2 -0
- package/lib/types/BeachballError.js.map +1 -1
- package/lib/types/BeachballOptions.d.ts +0 -7
- package/lib/types/BeachballOptions.d.ts.map +1 -1
- package/lib/types/DeepReadonly.d.ts.map +1 -1
- package/lib/validation/areChangeFilesDeleted.js +1 -2
- package/lib/validation/areChangeFilesDeleted.js.map +1 -1
- package/lib/validation/isValidAuthType.js +1 -2
- package/lib/validation/isValidAuthType.js.map +1 -1
- package/lib/validation/isValidChangeType.js +1 -2
- package/lib/validation/isValidChangeType.js.map +1 -1
- package/lib/validation/isValidChangelogOptions.js +1 -2
- package/lib/validation/isValidChangelogOptions.js.map +1 -1
- package/lib/validation/isValidDependentChangeType.js +1 -2
- package/lib/validation/isValidDependentChangeType.js.map +1 -1
- package/lib/validation/isValidGroupOptions.js +2 -3
- package/lib/validation/isValidGroupOptions.js.map +1 -1
- package/lib/validation/validate.js +2 -3
- package/lib/validation/validate.js.map +1 -1
- package/package.json +22 -26
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRepoOptions.js","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getRepoOptions.js","sourceRoot":"","sources":["../../src/options/getRepoOptions.ts"],"names":[],"mappings":";;;;;AAYA,wCAoDC;AAhED,6CAA8C;AAC9C,qDAAsE;AAEtE,gDAAwB;AACxB,4DAAyD;AAEzD;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,UAAuC;IACpE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAErD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,yEAAyE;QACzE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,WAAoD,CAAC;IAEzD,IAAI,OAAe,CAAC;IACpB,IAAI,CAAC;QACH,OAAO,GAAG,IAAA,6BAAW,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,oFAAoF;QACpF,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;IACjC,CAAC;IACD,MAAM,cAAc,GAAG,IAAA,6BAAe,EAAC,WAAW,EAAE;QAClD,KAAK,EAAE,KAAK;QACZ,yFAAyF;QACzF,6FAA6F;QAC7F,2FAA2F;QAC3F,sDAAsD;QACtD,OAAO,EAAE,OAAO;QAChB,cAAc,EAAE,QAAQ;KACzB,CAAC,CAAC;IAEH,IAAI,UAAU,EAAE,CAAC;QACf,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,EAAE,MAA0C,CAAC;QAC7G,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,+BAAc,CAAC,gBAAgB,UAAU,uBAAuB,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;SAAM,CAAC;QACN,WAAW,GAAI,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAA2C,IAAI,EAAE,CAAC;IAC/F,CAAC;IAED,iGAAiG;IACjG,8FAA8F;IAC9F,+FAA+F;IAC/F,qBAAqB;IACrB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,OAAO,GAAI,WAAgC,CAAC,OAAO,CAAC;QAC1D,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5D,0DAA0D;YAC1D,WAAW,CAAC,MAAM,GAAG,IAAA,wCAAsB,EAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5F,CAAC;aAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YAC/B,wEAAwE;YACxE,WAAW,CAAC,MAAM,GAAG,IAAA,wCAAsB,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports._npmShowProperties = exports._packageContentTypeAccept = void 0;
|
|
4
|
+
exports.getNpmPackageInfo = getNpmPackageInfo;
|
|
4
5
|
const npmArgs_1 = require("./npmArgs");
|
|
5
6
|
const npm_1 = require("./npm");
|
|
6
7
|
/**
|
|
@@ -65,5 +66,4 @@ options) {
|
|
|
65
66
|
return undefined;
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
|
-
exports.getNpmPackageInfo = getNpmPackageInfo;
|
|
69
69
|
//# sourceMappingURL=getNpmPackageInfo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNpmPackageInfo.js","sourceRoot":"","sources":["../../src/packageManager/getNpmPackageInfo.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getNpmPackageInfo.js","sourceRoot":"","sources":["../../src/packageManager/getNpmPackageInfo.ts"],"names":[],"mappings":";;;AAiDA,8CAwDC;AAvGD,uCAA+D;AAE/D,+BAA4B;AA8B5B;;;;;GAKG;AACU,QAAA,yBAAyB,GAAG,0EAA0E,CAAC;AAEpH,uEAAuE;AAC1D,QAAA,kBAAkB,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AAE5D;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CACrC,WAAmB;AACnB,4EAA4E;AAC5E,OAAuF;IAEvF,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,UAAU,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEhG,MAAM,UAAU,GAAG,MAAM,IAAA,SAAG,EAC1B;YACE,MAAM;YACN,YAAY;YACZ,OAAO,CAAC,QAAQ;YAChB,QAAQ;YACR,WAAW;YACX,8EAA8E;YAC9E,GAAG,0BAAkB;SACtB,EACD;YACE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,GAAG,EAAE,OAAO,CAAC,IAAI;YACjB,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,EAAE;SACnD,CACF,CAAC;QAEF,IAAI,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAA2B,CAAC;YACrE,4FAA4F;YAC5F,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACtC,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;QAEjF,4EAA4E;QAC5E,gCAAgC;QAChC,8BAA8B;QAC9B,sBAAsB;QACtB,wBAAwB;QACxB,sCAAsC;QACtC,QAAQ;QACR,eAAe;QACf,yCAAyC;QACzC,OAAO;QACP,0CAA0C;QAE1C,WAAW;QACX,kDAAkD;QAClD,4CAA4C;QAC5C,KAAK;IACP,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,uCAAuC,WAAW,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtG,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getWorkspaceRange =
|
|
3
|
+
exports.getWorkspaceRange = getWorkspaceRange;
|
|
4
4
|
const workspacePrefix = 'workspace:';
|
|
5
5
|
/**
|
|
6
6
|
* If the version is a [workspace range](https://yarnpkg.com/features/workspaces/#workspace-ranges-workspace),
|
|
@@ -17,5 +17,4 @@ function getWorkspaceRange(version) {
|
|
|
17
17
|
}
|
|
18
18
|
return undefined;
|
|
19
19
|
}
|
|
20
|
-
exports.getWorkspaceRange = getWorkspaceRange;
|
|
21
20
|
//# sourceMappingURL=getWorkspaceRange.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getWorkspaceRange.js","sourceRoot":"","sources":["../../src/packageManager/getWorkspaceRange.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getWorkspaceRange.js","sourceRoot":"","sources":["../../src/packageManager/getWorkspaceRange.ts"],"names":[],"mappings":";;AAWA,8CAKC;AAhBD,MAAM,eAAe,GAAG,YAAY,CAAC;AAErC;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,IAAI,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.listPackageVersionsByTag = listPackageVersionsByTag;
|
|
7
|
+
exports.listPackageVersions = listPackageVersions;
|
|
7
8
|
const p_limit_1 = __importDefault(require("p-limit"));
|
|
8
9
|
const getNpmPackageInfo_1 = require("./getNpmPackageInfo");
|
|
9
10
|
const getPackageOption_1 = require("../options/getPackageOption");
|
|
@@ -32,7 +33,6 @@ async function listPackageVersionsByTag(packageInfos, options) {
|
|
|
32
33
|
})));
|
|
33
34
|
return versions;
|
|
34
35
|
}
|
|
35
|
-
exports.listPackageVersionsByTag = listPackageVersionsByTag;
|
|
36
36
|
/**
|
|
37
37
|
* List all the versions of each package name.
|
|
38
38
|
* Respects `options.npmReadConcurrency` for concurrency limiting.
|
|
@@ -47,5 +47,4 @@ async function listPackageVersions(packageList, options) {
|
|
|
47
47
|
})));
|
|
48
48
|
return versions;
|
|
49
49
|
}
|
|
50
|
-
exports.listPackageVersions = listPackageVersions;
|
|
51
50
|
//# sourceMappingURL=listPackageVersions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listPackageVersions.js","sourceRoot":"","sources":["../../src/packageManager/listPackageVersions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"listPackageVersions.js","sourceRoot":"","sources":["../../src/packageManager/listPackageVersions.ts"],"names":[],"mappings":";;;;;AAUA,4DA8BC;AAOD,kDAiBC;AAhED,sDAA6B;AAG7B,2DAAwD;AACxD,kEAA+D;AAE/D;;;GAGG;AACI,KAAK,UAAU,wBAAwB,CAC5C,YAA2B,EAC3B,OAAmB;IAEnB,MAAM,KAAK,GAAG,IAAA,iBAAM,EAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjD,MAAM,QAAQ,GAA8B,EAAE,CAAC;IAE/C,MAAM,WAAW,GAAG,YAAY;SAC7B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,uEAAuE;QACvE,oEAAoE;QACpE,GAAG,EAAE,IAAA,mCAAgB,EAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,IAAA,mCAAgB,EAAC,eAAe,EAAE,GAAG,EAAE,OAAO,CAAC;KAC9F,CAAC,CAAC;QACH,6CAA6C;SAC5C,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAoC,CAAC;IAE/D,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAChC,KAAK,CAAC,KAAK,IAAI,EAAE;QACf,MAAM,IAAI,GAAG,MAAM,IAAA,qCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,OAAO,EAAE,CAAC;YACZ,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC,CACH,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,mBAAmB,CACvC,WAAqB,EACrB,OAAmB;IAEnB,MAAM,KAAK,GAAG,IAAA,iBAAM,EAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAgC,EAAE,CAAC;IAEjD,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CACpB,KAAK,CAAC,KAAK,IAAI,EAAE;QACf,MAAM,IAAI,GAAG,MAAM,IAAA,qCAAiB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACnD,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC;IACvC,CAAC,CAAC,CACH,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getNpmLogLevelArgs = getNpmLogLevelArgs;
|
|
4
|
+
exports.getNpmPublishArgs = getNpmPublishArgs;
|
|
5
|
+
exports.getNpmAuthEnv = getNpmAuthEnv;
|
|
6
|
+
exports.getNpmAuthArgs = getNpmAuthArgs;
|
|
4
7
|
const getPackageOption_1 = require("../options/getPackageOption");
|
|
5
8
|
function getNpmLogLevelArgs(verbose) {
|
|
6
9
|
return ['--loglevel', verbose ? 'notice' : 'warn'];
|
|
7
10
|
}
|
|
8
|
-
exports.getNpmLogLevelArgs = getNpmLogLevelArgs;
|
|
9
11
|
function getNpmPublishArgs(packageInfo, options) {
|
|
10
12
|
const { registry, access } = options;
|
|
11
13
|
const args = [
|
|
@@ -25,7 +27,6 @@ function getNpmPublishArgs(packageInfo, options) {
|
|
|
25
27
|
}
|
|
26
28
|
return args;
|
|
27
29
|
}
|
|
28
|
-
exports.getNpmPublishArgs = getNpmPublishArgs;
|
|
29
30
|
/**
|
|
30
31
|
* Get the environment variable key and value for npm authentication.
|
|
31
32
|
*/
|
|
@@ -40,7 +41,6 @@ function getNpmAuthEnv(options) {
|
|
|
40
41
|
[`npm_config_${authArgs.key}`]: authArgs.value,
|
|
41
42
|
};
|
|
42
43
|
}
|
|
43
|
-
exports.getNpmAuthEnv = getNpmAuthEnv;
|
|
44
44
|
/**
|
|
45
45
|
* Get the npm auth args for the given registry and token.
|
|
46
46
|
*/
|
|
@@ -57,5 +57,4 @@ function getNpmAuthArgs(options) {
|
|
|
57
57
|
value: token,
|
|
58
58
|
};
|
|
59
59
|
}
|
|
60
|
-
exports.getNpmAuthArgs = getNpmAuthArgs;
|
|
61
60
|
//# sourceMappingURL=npmArgs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npmArgs.js","sourceRoot":"","sources":["../../src/packageManager/npmArgs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"npmArgs.js","sourceRoot":"","sources":["../../src/packageManager/npmArgs.ts"],"names":[],"mappings":";;AAMA,gDAEC;AAED,8CAuBC;AAKD,sCAUC;AAKD,wCAoBC;AAzED,kEAA+D;AAM/D,SAAgB,kBAAkB,CAAC,OAA4B;IAC7D,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACrD,CAAC;AAED,SAAgB,iBAAiB,CAC/B,WAAwB,EACxB,OAAwD;IAExD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,IAAI,GAAG;QACX,SAAS;QACT,YAAY;QACZ,QAAQ;QACR,OAAO;QACP,8EAA8E;QAC9E,oEAAoE;QACpE,IAAA,mCAAgB,EAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC;YAC3C,IAAA,mCAAgB,EAAC,eAAe,EAAE,WAAW,EAAE,OAAO,CAAC;YACvD,QAAQ;QACV,GAAG,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC;KACvC,CAAC;IAEF,IAAI,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,OAAuB;IACnD,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO;QACL,4DAA4D;QAC5D,+FAA+F;QAC/F,CAAC,cAAc,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,QAAQ,CAAC,KAAK;KAC/C,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc,CAAC,OAAuB;IAQpD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GAAG,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;IACxE,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAkB,CAAC;IAC9E,OAAO;QACL,0FAA0F;QAC1F,GAAG,EAAE,GAAG,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,UAAU,EAAE;QACtE,KAAK,EAAE,KAAK;KACb,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { BeachballOptions } from '../types/BeachballOptions';
|
|
2
|
+
/**
|
|
3
|
+
* Filter PATH for running npm commands, removing entries that contain shell-script node wrappers.
|
|
4
|
+
*
|
|
5
|
+
* Package managers inject temp directories into PATH with shims for `node` — yarn classic uses
|
|
6
|
+
* `yarn--*` dirs, yarn berry uses `xfs-*` dirs. (Context: https://github.com/yarnpkg/yarn/issues/6685 -
|
|
7
|
+
* yarn berry does similar but cleans up afterwards.)
|
|
8
|
+
*
|
|
9
|
+
* These shims are POSIX shell scripts, e.g. this `node` shim:
|
|
10
|
+
* ```sh
|
|
11
|
+
* #!/bin/sh
|
|
12
|
+
* exec "/path/to/node" "$@"
|
|
13
|
+
* ```
|
|
14
|
+
*
|
|
15
|
+
* Problem is POSIX `sh` drops env var names with invalid characters like `/` and `:`, which are
|
|
16
|
+
* needed for npm auth token env vars (e.g. `npm_config_//someRegistry/:_authToken`).
|
|
17
|
+
*
|
|
18
|
+
* Removing those path entries fixes the issue and is unlikely to cause other problems in this context.
|
|
19
|
+
* Use `checkNpmAuthEnvPassthrough` after this filter to detect unknown variants of this issue.
|
|
20
|
+
*/
|
|
21
|
+
export declare function filterPathForNpm(pathEnv: string): string;
|
|
22
|
+
/**
|
|
23
|
+
* Check whether env vars with special characters in their names (like npm auth token env vars,
|
|
24
|
+
* which contain `//` and `:`) will be passed through to npm subprocesses. Runs a test using the same
|
|
25
|
+
* PATH filtering applied to actual npm commands, so a failure here means the fix in
|
|
26
|
+
* `filterPathForNpm` doesn't cover this platform/environment variant.
|
|
27
|
+
*/
|
|
28
|
+
export declare function checkNpmAuthEnvPassthrough(options: Pick<BeachballOptions, 'registry' | 'path'> & {
|
|
29
|
+
/** PATH override only for testing */
|
|
30
|
+
pathEnv?: string;
|
|
31
|
+
}): Promise<void>;
|
|
32
|
+
//# sourceMappingURL=npmAuthEnvPassthrough.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"npmAuthEnvPassthrough.d.ts","sourceRoot":"","sources":["../../src/packageManager/npmAuthEnvPassthrough.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAKlE;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQxD;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,MAAM,CAAC,GAAG;IACrD,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAAC,IAAI,CAAC,CA+Cf"}
|
|
@@ -0,0 +1,89 @@
|
|
|
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.filterPathForNpm = filterPathForNpm;
|
|
7
|
+
exports.checkNpmAuthEnvPassthrough = checkNpmAuthEnvPassthrough;
|
|
8
|
+
const execa_1 = __importDefault(require("execa"));
|
|
9
|
+
const path_1 = __importDefault(require("path"));
|
|
10
|
+
const npmArgs_1 = require("./npmArgs");
|
|
11
|
+
const BeachballError_1 = require("../types/BeachballError");
|
|
12
|
+
const workspace_tools_1 = require("workspace-tools");
|
|
13
|
+
/**
|
|
14
|
+
* Filter PATH for running npm commands, removing entries that contain shell-script node wrappers.
|
|
15
|
+
*
|
|
16
|
+
* Package managers inject temp directories into PATH with shims for `node` — yarn classic uses
|
|
17
|
+
* `yarn--*` dirs, yarn berry uses `xfs-*` dirs. (Context: https://github.com/yarnpkg/yarn/issues/6685 -
|
|
18
|
+
* yarn berry does similar but cleans up afterwards.)
|
|
19
|
+
*
|
|
20
|
+
* These shims are POSIX shell scripts, e.g. this `node` shim:
|
|
21
|
+
* ```sh
|
|
22
|
+
* #!/bin/sh
|
|
23
|
+
* exec "/path/to/node" "$@"
|
|
24
|
+
* ```
|
|
25
|
+
*
|
|
26
|
+
* Problem is POSIX `sh` drops env var names with invalid characters like `/` and `:`, which are
|
|
27
|
+
* needed for npm auth token env vars (e.g. `npm_config_//someRegistry/:_authToken`).
|
|
28
|
+
*
|
|
29
|
+
* Removing those path entries fixes the issue and is unlikely to cause other problems in this context.
|
|
30
|
+
* Use `checkNpmAuthEnvPassthrough` after this filter to detect unknown variants of this issue.
|
|
31
|
+
*/
|
|
32
|
+
function filterPathForNpm(pathEnv) {
|
|
33
|
+
return pathEnv
|
|
34
|
+
.split(path_1.default.delimiter)
|
|
35
|
+
.filter(p => {
|
|
36
|
+
const base = path_1.default.basename(p);
|
|
37
|
+
return !base.startsWith('yarn--') && !base.startsWith('xfs-');
|
|
38
|
+
})
|
|
39
|
+
.join(path_1.default.delimiter);
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Check whether env vars with special characters in their names (like npm auth token env vars,
|
|
43
|
+
* which contain `//` and `:`) will be passed through to npm subprocesses. Runs a test using the same
|
|
44
|
+
* PATH filtering applied to actual npm commands, so a failure here means the fix in
|
|
45
|
+
* `filterPathForNpm` doesn't cover this platform/environment variant.
|
|
46
|
+
*/
|
|
47
|
+
async function checkNpmAuthEnvPassthrough(options) {
|
|
48
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
49
|
+
const pathEnv = options.pathEnv ?? process.env.PATH;
|
|
50
|
+
const fakeToken = 'fake-token';
|
|
51
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- always defined if token is passed
|
|
52
|
+
const tokenEnv = (0, npmArgs_1.getNpmAuthEnv)({ registry: options.registry, token: fakeToken });
|
|
53
|
+
const envName = Object.keys(tokenEnv)[0];
|
|
54
|
+
const filteredPath = filterPathForNpm(pathEnv);
|
|
55
|
+
try {
|
|
56
|
+
const result = await (0, execa_1.default)('node', ['-e', `process.stdout.write(process.env[${JSON.stringify(envName)}] || '')`], {
|
|
57
|
+
env: { ...tokenEnv, PATH: filteredPath },
|
|
58
|
+
extendEnv: true,
|
|
59
|
+
});
|
|
60
|
+
if (result.stdout === fakeToken) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
// ignore
|
|
66
|
+
}
|
|
67
|
+
let relBeachballBin;
|
|
68
|
+
const beachballRoot = (0, workspace_tools_1.findPackageRoot)(__dirname);
|
|
69
|
+
const beachballPkg = beachballRoot ? (0, workspace_tools_1.getPackageInfo)(beachballRoot) : undefined;
|
|
70
|
+
// This should usually be found unless the code was bundled or something
|
|
71
|
+
if (beachballRoot && beachballPkg?.name === 'beachball' && beachballPkg.bin) {
|
|
72
|
+
const binValue = typeof beachballPkg.bin === 'string' ? beachballPkg.bin : beachballPkg.bin.beachball;
|
|
73
|
+
const beachballBinPath = path_1.default.join(beachballRoot, binValue);
|
|
74
|
+
relBeachballBin = path_1.default.relative(options.path, beachballBinPath);
|
|
75
|
+
}
|
|
76
|
+
console.error([
|
|
77
|
+
`The environment variable used to pass the npm auth token to "npm publish" is not being ` +
|
|
78
|
+
`passed to npm subprocesses. This is typically caused by a shell script node wrapper in ` +
|
|
79
|
+
`your PATH (e.g. injected by a package manager).`,
|
|
80
|
+
'',
|
|
81
|
+
`Please file an issue with beachball so this can be investigated. Your PATH:`,
|
|
82
|
+
pathEnv,
|
|
83
|
+
...(relBeachballBin
|
|
84
|
+
? ['', `In the meantime, you can try running the CLI directly via Node:`, ` node ${relBeachballBin} <args>`]
|
|
85
|
+
: []),
|
|
86
|
+
].join('\n'));
|
|
87
|
+
throw new BeachballError_1.BeachballError('Error passing npm auth token', { alreadyLogged: true });
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=npmAuthEnvPassthrough.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"npmAuthEnvPassthrough.js","sourceRoot":"","sources":["../../src/packageManager/npmAuthEnvPassthrough.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,19 +2,11 @@ import type { PackageInfo } from '../types/PackageInfo';
|
|
|
2
2
|
import type { BeachballOptions } from '../types/BeachballOptions';
|
|
3
3
|
/**
|
|
4
4
|
* Attempts to pack the package and move the tgz to `options.packPath`.
|
|
5
|
-
*
|
|
6
|
-
* or it will be put in a numbered folder.
|
|
5
|
+
* The files will be put in numbered subfolders by layer.
|
|
7
6
|
* @returns true if successful, false if not.
|
|
8
7
|
*/
|
|
9
8
|
export declare function packPackage(packageInfo: PackageInfo, options: Required<Pick<BeachballOptions, 'packToPath'>> & Pick<BeachballOptions, 'verbose'> & {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
index: number;
|
|
13
|
-
/** Total number of packages to publish */
|
|
14
|
-
total: number;
|
|
15
|
-
} | {
|
|
16
|
-
/** Array of layers of package names returned by `getPackageGraphLayers` */
|
|
17
|
-
layers: string[][];
|
|
18
|
-
};
|
|
9
|
+
/** Array of layers of package names returned by `getPackageGraphLayers` */
|
|
10
|
+
layers: string[][];
|
|
19
11
|
}): Promise<boolean>;
|
|
20
12
|
//# sourceMappingURL=packPackage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packPackage.d.ts","sourceRoot":"","sources":["../../src/packageManager/packPackage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE
|
|
1
|
+
{"version":3,"file":"packPackage.d.ts","sourceRoot":"","sources":["../../src/packageManager/packPackage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GACrD,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,GAAG;IAClC,2EAA2E;IAC3E,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;CACpB,GACF,OAAO,CAAC,OAAO,CAAC,CAyDlB"}
|
|
@@ -3,19 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.packPackage =
|
|
6
|
+
exports.packPackage = packPackage;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const npm_1 = require("./npm");
|
|
10
10
|
const npmArgs_1 = require("./npmArgs");
|
|
11
11
|
/**
|
|
12
12
|
* Attempts to pack the package and move the tgz to `options.packPath`.
|
|
13
|
-
*
|
|
14
|
-
* or it will be put in a numbered folder.
|
|
13
|
+
* The files will be put in numbered subfolders by layer.
|
|
15
14
|
* @returns true if successful, false if not.
|
|
16
15
|
*/
|
|
17
16
|
async function packPackage(packageInfo, options) {
|
|
18
|
-
const { packToPath, verbose,
|
|
17
|
+
const { packToPath, verbose, layers } = options;
|
|
19
18
|
const packArgs = ['pack', ...(0, npmArgs_1.getNpmLogLevelArgs)(verbose)];
|
|
20
19
|
const packageRoot = path_1.default.dirname(packageInfo.packageJsonPath);
|
|
21
20
|
const packageSpec = `${packageInfo.name}@${packageInfo.version}`;
|
|
@@ -35,25 +34,16 @@ async function packPackage(packageInfo, options) {
|
|
|
35
34
|
console.error(`npm pack output for ${packageSpec} (above) did not end with a filename that exists\n`);
|
|
36
35
|
return false;
|
|
37
36
|
}
|
|
38
|
-
//
|
|
39
|
-
// Or for packStyle: "layer", put the pack file in a subfolder for its dependency tree layer.
|
|
37
|
+
// Put the pack file in a subfolder for its dependency tree layer.
|
|
40
38
|
// The prefix isn't strictly needed for single packages, but use it for consistency in case of a
|
|
41
39
|
// monorepo which usually publishes multiple packages but sometimes only one has changed.
|
|
42
|
-
|
|
43
|
-
if (
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (packageLayer === -1) {
|
|
47
|
-
console.error(`Internal error: package ${packageInfo.name} not found in order of packages to publish\n`);
|
|
48
|
-
return false;
|
|
49
|
-
}
|
|
50
|
-
const layerDir = makePrefix({ num: packageLayer, total: layers.length });
|
|
51
|
-
finalPackFilePath = path_1.default.join(packToPath, layerDir, packFile);
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
const packPrefix = makePrefix({ num: packInfo.index, total: packInfo.total });
|
|
55
|
-
finalPackFilePath = path_1.default.join(packToPath, `${packPrefix}-${packFile}`);
|
|
40
|
+
const packageLayer = layers.findIndex(layer => layer.includes(packageInfo.name));
|
|
41
|
+
if (packageLayer === -1) {
|
|
42
|
+
console.error(`Internal error: package ${packageInfo.name} not found in order of packages to publish\n`);
|
|
43
|
+
return false;
|
|
56
44
|
}
|
|
45
|
+
const layerDir = makePrefix({ num: packageLayer, total: layers.length });
|
|
46
|
+
const finalPackFilePath = path_1.default.join(packToPath, layerDir, packFile);
|
|
57
47
|
try {
|
|
58
48
|
if (fs_1.default.existsSync(finalPackFilePath)) {
|
|
59
49
|
throw new Error('Target path already exists');
|
|
@@ -75,7 +65,6 @@ async function packPackage(packageInfo, options) {
|
|
|
75
65
|
console.log(`Packed ${packageSpec} to ${finalPackFilePath}`);
|
|
76
66
|
return true;
|
|
77
67
|
}
|
|
78
|
-
exports.packPackage = packPackage;
|
|
79
68
|
/**
|
|
80
69
|
* Convert `num` from 0- to 1-indexed and pad with leading zeros based on the total.
|
|
81
70
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packPackage.js","sourceRoot":"","sources":["../../src/packageManager/packPackage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"packPackage.js","sourceRoot":"","sources":["../../src/packageManager/packPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageManager.d.ts","sourceRoot":"","sources":["../../src/packageManager/packageManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,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,CAAA;CAAE,CAAC;AAEpE;;;;;;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,
|
|
1
|
+
{"version":3,"file":"packageManager.d.ts","sourceRoot":"","sources":["../../src/packageManager/packageManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,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,CAAA;CAAE,CAAC;AAEpE;;;;;;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,CAwB/B"}
|
|
@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.packageManager =
|
|
6
|
+
exports.packageManager = packageManager;
|
|
7
7
|
const execa_1 = __importDefault(require("execa"));
|
|
8
|
-
const
|
|
8
|
+
const npmAuthEnvPassthrough_1 = require("./npmAuthEnvPassthrough");
|
|
9
9
|
/**
|
|
10
10
|
* Run a package manager command. Returns the error result instead of throwing on failure.
|
|
11
11
|
* @param manager The package manager to use
|
|
@@ -16,24 +16,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
16
16
|
async function packageManager(manager, args, options) {
|
|
17
17
|
let pathEnv = options.env?.PATH || process.env.PATH;
|
|
18
18
|
if (manager === 'npm' && pathEnv) {
|
|
19
|
-
|
|
20
|
-
// The auth environment variable (e.g. `npm_config_//someRegistry/:_authToken`) was not being
|
|
21
|
-
// passed through to the child process. This might be because:
|
|
22
|
-
// - Special characters such as / and : aren't valid in env var names for certain shells/platforms
|
|
23
|
-
// - On every `yarn run ...` command, yarn makes temp directories like /<temp>/yarn--1776822418161-0.7992675923334178
|
|
24
|
-
// with aliases for `node` and `yarn`. On Linux (and Mac), the `node` alias looks something like:
|
|
25
|
-
// #!/bin/sh
|
|
26
|
-
// exec "/path/to/node" "$@"
|
|
27
|
-
// (see https://github.com/yarnpkg/yarn/issues/6685 for context)
|
|
28
|
-
// - Best guess: invalid environment variable names are dropped by this extra `exec` step??
|
|
29
|
-
// (This consistently reproed on Ubuntu+bash, but not Mac+zsh or bash. The clue was that the
|
|
30
|
-
// tests passed even on Linux when run via debugTests.js, but failed when run via yarn test.)
|
|
31
|
-
//
|
|
32
|
-
// Removing the yarn-- segment from the PATH seems to consistently fix this issue.
|
|
33
|
-
pathEnv = pathEnv
|
|
34
|
-
.split(path_1.default.delimiter)
|
|
35
|
-
.filter(p => !path_1.default.basename(p).startsWith('yarn--'))
|
|
36
|
-
.join(path_1.default.delimiter);
|
|
19
|
+
pathEnv = (0, npmAuthEnvPassthrough_1.filterPathForNpm)(pathEnv);
|
|
37
20
|
}
|
|
38
21
|
try {
|
|
39
22
|
const result = await (0, execa_1.default)(manager, args, {
|
|
@@ -55,5 +38,4 @@ async function packageManager(manager, args, options) {
|
|
|
55
38
|
};
|
|
56
39
|
}
|
|
57
40
|
}
|
|
58
|
-
exports.packageManager = packageManager;
|
|
59
41
|
//# sourceMappingURL=packageManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../src/packageManager/packageManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../src/packageManager/packageManager.ts"],"names":[],"mappings":";;;;;AAaA,wCA4BC;AAzCD,kDAA0B;AAC1B,mEAA2D;AAK3D;;;;;;GAMG;AACI,KAAK,UAAU,cAAc,CAClC,OAAgC,EAChC,IAAc,EACd,OAA8B;IAE9B,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IACpD,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,EAAE,CAAC;QACjC,OAAO,GAAG,IAAA,wCAAgB,EAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAA,eAAK,EAAC,OAAO,EAAE,IAAI,EAAE;YACxC,GAAG,OAAO;YACV,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE;YACtC,8GAA8G;YAC9G,gFAAgF;YAChF,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACrD,CAAC,CAAC;QACH,OAAO;YACL,GAAG,MAAM;YACT,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM;SACxB,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO;YACL,GAAI,CAAsB;YAC1B,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.packagePublish =
|
|
6
|
+
exports.packagePublish = packagePublish;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const npm_1 = require("./npm");
|
|
9
9
|
const npmArgs_1 = require("./npmArgs");
|
|
@@ -84,5 +84,4 @@ async function packagePublish(packageInfo, options) {
|
|
|
84
84
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- loop will always execute at least once
|
|
85
85
|
return result;
|
|
86
86
|
}
|
|
87
|
-
exports.packagePublish = packagePublish;
|
|
88
87
|
//# sourceMappingURL=packagePublish.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packagePublish.js","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"packagePublish.js","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveSpecialVersion =
|
|
3
|
+
exports.resolveSpecialVersion = resolveSpecialVersion;
|
|
4
4
|
const workspace_tools_1 = require("workspace-tools");
|
|
5
5
|
const getWorkspaceRange_1 = require("./getWorkspaceRange");
|
|
6
6
|
/**
|
|
@@ -39,5 +39,4 @@ function resolveSpecialVersion(params) {
|
|
|
39
39
|
: workspaceRange;
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
exports.resolveSpecialVersion = resolveSpecialVersion;
|
|
43
42
|
//# sourceMappingURL=resolveSpecialVersion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveSpecialVersion.js","sourceRoot":"","sources":["../../src/packageManager/resolveSpecialVersion.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolveSpecialVersion.js","sourceRoot":"","sources":["../../src/packageManager/resolveSpecialVersion.ts"],"names":[],"mappings":";;AASA,sDAwCC;AAjDD,qDAAqF;AAErF,2DAAwD;AAExD;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,MAKrC;IACC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAE/D,IAAI,kBAAsC,CAAC;IAC3C,IAAI,IAAA,kCAAgB,EAAC,UAAU,CAAC,EAAE,CAAC;QACjC,4FAA4F;QAC5F,2FAA2F;QAC3F,kBAAkB,GAAG,IAAA,mCAAiB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzF,IAAI,kBAAkB,IAAI,CAAC,IAAA,qCAAiB,EAAC,kBAAkB,CAAC,EAAE,CAAC;YACjE,qEAAqE;YACrE,OAAO,kBAAkB,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,gGAAgG;IAChG,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,IAAI,IAAA,qCAAiB,EAAC,kBAAkB,CAAC,CAAC,CAAC;IACtH,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,iEAAiE;YACjE,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,UAAU,SAAS,kBAAkB,GAAG,CAAC,CAAC,CAAC,IAAI,UAAU,GAAG,CAAC;YAC/G,MAAM,IAAI,KAAK,CACb,YAAY,OAAO,4BAA4B,gBAAgB,mCAAmC,CACnG,CAAC;QACJ,CAAC;QAED,sCAAsC;QACtC,0DAA0D;QAC1D,gEAAgE;QAChE,OAAO,cAAc,KAAK,GAAG;YAC3B,CAAC,CAAC,WAAW,CAAC,OAAO;YACrB,CAAC,CAAC,cAAc,KAAK,GAAG,IAAI,cAAc,KAAK,GAAG;gBAChD,CAAC,CAAC,GAAG,cAAc,GAAG,WAAW,CAAC,OAAO,EAAE;gBAC3C,CAAC,CAAC,cAAc,CAAC;IACvB,CAAC;AACH,CAAC"}
|
package/lib/paths.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getChangePath =
|
|
6
|
+
exports.getChangePath = getChangePath;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
/**
|
|
9
9
|
* Get the absolute path to the folder containing beachball change files.
|
|
@@ -11,5 +11,4 @@ const path_1 = __importDefault(require("path"));
|
|
|
11
11
|
function getChangePath(options) {
|
|
12
12
|
return path_1.default.join(options.path, options.changeDir);
|
|
13
13
|
}
|
|
14
|
-
exports.getChangePath = getChangePath;
|
|
15
14
|
//# sourceMappingURL=paths.js.map
|
package/lib/paths.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":";;;;;AAMA,sCAEC;AARD,gDAAwB;AAGxB;;GAEG;AACH,SAAgB,aAAa,CAAC,OAAqD;IACjF,OAAO,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;AACpD,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.bumpAndPush =
|
|
3
|
+
exports.bumpAndPush = bumpAndPush;
|
|
4
4
|
const performBump_1 = require("../bump/performBump");
|
|
5
5
|
const workspace_tools_1 = require("workspace-tools");
|
|
6
6
|
const tagPackages_1 = require("./tagPackages");
|
|
@@ -78,7 +78,6 @@ async function bumpAndPush(bumpInfo, publishBranch, options, bumpPushRetries = d
|
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
-
exports.bumpAndPush = bumpAndPush;
|
|
82
81
|
async function mergePublishBranch(publishBranch, options) {
|
|
83
82
|
await options.hooks?.precommit?.(options.path);
|
|
84
83
|
console.log(`\nMerging ${publishBranch} into ${options.branch}...`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bumpAndPush.js","sourceRoot":"","sources":["../../src/publish/bumpAndPush.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.displayManualRecovery =
|
|
3
|
+
exports.displayManualRecovery = displayManualRecovery;
|
|
4
4
|
const bulletedList_1 = require("../logging/bulletedList");
|
|
5
5
|
function displayManualRecovery(bumpInfo, succeededPackages = new Set()) {
|
|
6
6
|
const errorLines = [];
|
|
@@ -26,5 +26,4 @@ function displayManualRecovery(bumpInfo, succeededPackages = new Set()) {
|
|
|
26
26
|
'\n\nTo recover from this, run "beachball sync" to synchronize local package.json files with the registry.\n');
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
exports.displayManualRecovery = displayManualRecovery;
|
|
30
29
|
//# sourceMappingURL=displayManualRecovery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayManualRecovery.js","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"displayManualRecovery.js","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":";;AAGA,sDAgCC;AAnCD,0DAAuD;AAGvD,SAAgB,qBAAqB,CACnC,QAA6D,EAC7D,oBAAiC,IAAI,GAAG,EAAU;IAElD,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QAC3D,IAAI,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5C,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,CAAC,KAAK,CACX,4GAA4G;QAC1G,IAAA,2BAAY,EAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,CACP,CAAC;IAEF,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;QAC1B,oGAAoG;QACpG,sFAAsF;QACtF,OAAO,CAAC,IAAI,CACV,wHAAwH;YACtH,IAAA,2BAAY,EAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACnC,6GAA6G,CAChH,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNewPackages =
|
|
3
|
+
exports.getNewPackages = getNewPackages;
|
|
4
4
|
const listPackageVersions_1 = require("../packageManager/listPackageVersions");
|
|
5
5
|
const bulletedList_1 = require("../logging/bulletedList");
|
|
6
6
|
/**
|
|
@@ -18,5 +18,4 @@ async function getNewPackages(bumpInfo, options) {
|
|
|
18
18
|
}
|
|
19
19
|
return result;
|
|
20
20
|
}
|
|
21
|
-
exports.getNewPackages = getNewPackages;
|
|
22
21
|
//# sourceMappingURL=getNewPackages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNewPackages.js","sourceRoot":"","sources":["../../src/publish/getNewPackages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getNewPackages.js","sourceRoot":"","sources":["../../src/publish/getNewPackages.ts"],"names":[],"mappings":";;AAUA,wCAiBC;AA1BD,+EAA4E;AAE5E,0DAAuD;AAEvD;;;;GAIG;AACI,KAAK,UAAU,cAAc,CAClC,QAA6D,EAC7D,OAAmB;IAEnB,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAEpD,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CACvD,GAAG,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAChE,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,IAAA,yCAAmB,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAE/E,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/E,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,6BAA6B,IAAA,2BAAY,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|