beachball 2.29.0 → 2.29.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/performBump.d.ts.map +1 -1
- package/lib/bump/performBump.js +3 -5
- package/lib/bump/performBump.js.map +1 -1
- package/lib/changefile/getChangedPackages.d.ts.map +1 -1
- package/lib/changefile/getChangedPackages.js +66 -29
- package/lib/changefile/getChangedPackages.js.map +1 -1
- package/lib/changelog/writeChangelog.js +2 -2
- package/lib/changelog/writeChangelog.js.map +1 -1
- package/lib/commands/init.d.ts.map +1 -1
- package/lib/commands/init.js +2 -4
- package/lib/commands/init.js.map +1 -1
- package/lib/monorepo/getPackageGroups.js +2 -2
- package/lib/monorepo/getPackageGroups.js.map +1 -1
- package/lib/monorepo/getScopedPackages.js +2 -2
- package/lib/monorepo/getScopedPackages.js.map +1 -1
- package/lib/monorepo/{utils.d.ts → isPathIncluded.d.ts} +1 -1
- package/lib/monorepo/isPathIncluded.d.ts.map +1 -0
- package/lib/monorepo/{utils.js → isPathIncluded.js} +1 -1
- package/lib/monorepo/isPathIncluded.js.map +1 -0
- package/lib/packageManager/npm.d.ts +6 -2
- package/lib/packageManager/npm.d.ts.map +1 -1
- package/lib/packageManager/npm.js.map +1 -1
- package/lib/packageManager/packagePublish.d.ts +3 -1
- package/lib/packageManager/packagePublish.d.ts.map +1 -1
- package/lib/packageManager/packagePublish.js +1 -1
- package/lib/packageManager/packagePublish.js.map +1 -1
- package/lib/publish/displayManualRecovery.d.ts.map +1 -1
- package/lib/publish/displayManualRecovery.js +8 -8
- package/lib/publish/displayManualRecovery.js.map +1 -1
- package/lib/publish/publishToRegistry.d.ts.map +1 -1
- package/lib/publish/publishToRegistry.js +20 -9
- package/lib/publish/publishToRegistry.js.map +1 -1
- package/lib/publish/validatePackageVersions.js +2 -2
- package/lib/publish/validatePackageVersions.js.map +1 -1
- package/lib/types/BeachballOptions.d.ts +5 -0
- package/lib/types/BeachballOptions.d.ts.map +1 -1
- package/package.json +7 -6
- package/CHANGELOG.json +0 -3100
- package/CHANGELOG.md +0 -1418
- package/lib/monorepo/utils.d.ts.map +0 -1
- package/lib/monorepo/utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performBump.d.ts","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"performBump.d.ts","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAgB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAe,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIjE,wBAAgB,gBAAgB,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,YAAY,QA0BzF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,QAS5C;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,qBAqB9E"}
|
package/lib/bump/performBump.js
CHANGED
|
@@ -13,13 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.performBump = exports.updatePackageLock = exports.writePackageJson = void 0;
|
|
16
|
-
const child_process_1 = require("child_process");
|
|
17
16
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
18
|
-
const os_1 = __importDefault(require("os"));
|
|
19
17
|
const path_1 = __importDefault(require("path"));
|
|
20
18
|
const unlinkChangeFiles_1 = require("../changefile/unlinkChangeFiles");
|
|
21
19
|
const writeChangelog_1 = require("../changelog/writeChangelog");
|
|
22
20
|
const workspace_tools_1 = require("workspace-tools");
|
|
21
|
+
const npm_1 = require("../packageManager/npm");
|
|
23
22
|
function writePackageJson(modifiedPackages, packageInfos) {
|
|
24
23
|
for (const pkgName of modifiedPackages) {
|
|
25
24
|
const info = packageInfos[pkgName];
|
|
@@ -51,9 +50,8 @@ function updatePackageLock(cwd) {
|
|
|
51
50
|
const root = workspace_tools_1.findProjectRoot(cwd);
|
|
52
51
|
if (root && fs_extra_1.default.existsSync(path_1.default.join(root, 'package-lock.json'))) {
|
|
53
52
|
console.log('Updating package-lock.json after bumping packages');
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
if (res.status !== 0) {
|
|
53
|
+
const res = npm_1.npm(['install', '--package-lock-only'], { stdio: 'inherit' });
|
|
54
|
+
if (!res.success) {
|
|
57
55
|
console.warn('Updating package-lock.json failed. Continuing...');
|
|
58
56
|
}
|
|
59
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performBump.js","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"performBump.js","sourceRoot":"","sources":["../../src/bump/performBump.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getChangedPackages.d.ts","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAyFjE;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,YAsDvF"}
|
|
@@ -4,45 +4,82 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getChangedPackages = void 0;
|
|
7
|
-
const paths_1 = require("../paths");
|
|
8
|
-
const workspace_tools_1 = require("workspace-tools");
|
|
9
7
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
10
8
|
const path_1 = __importDefault(require("path"));
|
|
11
9
|
const minimatch_1 = __importDefault(require("minimatch"));
|
|
10
|
+
const paths_1 = require("../paths");
|
|
11
|
+
const workspace_tools_1 = require("workspace-tools");
|
|
12
12
|
const getScopedPackages_1 = require("../monorepo/getScopedPackages");
|
|
13
|
+
function getMatchingPackageInfo(file, cwd, packageInfosByPath) {
|
|
14
|
+
// Normalize all the paths before comparing (the packageInfosByPath entries should also be normalized)
|
|
15
|
+
// to ensure ensure that this doesn't break on Windows if any input paths have forward slashes
|
|
16
|
+
cwd = path_1.default.normalize(cwd);
|
|
17
|
+
const absFile = path_1.default.normalize(path_1.default.join(cwd, file));
|
|
18
|
+
let absDir = '';
|
|
19
|
+
do {
|
|
20
|
+
absDir = path_1.default.dirname(absDir || absFile);
|
|
21
|
+
if (packageInfosByPath[absDir]) {
|
|
22
|
+
return packageInfosByPath[absDir];
|
|
23
|
+
}
|
|
24
|
+
} while (absDir !== cwd);
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
13
27
|
/**
|
|
14
|
-
* Gets all the changed
|
|
28
|
+
* Gets all the changed package names, regardless of the change files
|
|
15
29
|
*/
|
|
16
30
|
function getAllChangedPackages(options, packageInfos) {
|
|
17
|
-
const { branch, path: cwd } = options;
|
|
31
|
+
const { branch, path: cwd, verbose } = options;
|
|
32
|
+
const verboseLog = (msg) => verbose && console.log(msg);
|
|
33
|
+
const logIgnored = (file, reason) => verboseLog(` - ~~${file}~~ (${reason})`);
|
|
34
|
+
const logIncluded = (file) => verboseLog(` - ${file}`);
|
|
18
35
|
const changes = [...(workspace_tools_1.getChanges(branch, cwd) || []), ...(workspace_tools_1.getStagedChanges(cwd) || [])];
|
|
19
|
-
|
|
20
|
-
|
|
36
|
+
verboseLog(`Found ${changes.length} changed files in branch "${branch}" (before filtering)`);
|
|
37
|
+
if (!changes.length) {
|
|
38
|
+
return [];
|
|
39
|
+
}
|
|
40
|
+
// Filter out changed files which are ignored by ignorePatterns.
|
|
41
|
+
// Also ignore the CHANGELOG files because they're generated by beachball.
|
|
21
42
|
const ignorePatterns = [...(options.ignorePatterns || []), 'CHANGELOG.md', 'CHANGELOG.json'];
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
43
|
+
const nonIgnoredChanges = changes.filter(moddedFile => {
|
|
44
|
+
const ignorePattern = ignorePatterns.find(pattern => minimatch_1.default(moddedFile, pattern, { matchBase: true }));
|
|
45
|
+
ignorePattern && logIgnored(moddedFile, `ignored by pattern "${ignorePattern}"`);
|
|
46
|
+
return !ignorePattern;
|
|
47
|
+
});
|
|
48
|
+
if (!nonIgnoredChanges.length) {
|
|
49
|
+
verboseLog('All files were ignored');
|
|
50
|
+
return [];
|
|
51
|
+
}
|
|
52
|
+
// Determine which package each changed file came from (using packageInfos[x].packageJsonPath),
|
|
53
|
+
// and whether that package is in scope and not private
|
|
54
|
+
const includedPackages = new Set();
|
|
55
|
+
let fileCount = 0;
|
|
56
|
+
const scopedPackages = getScopedPackages_1.getScopedPackages(options, packageInfos);
|
|
57
|
+
const packageInfosByPath = {};
|
|
58
|
+
for (const info of Object.values(packageInfos)) {
|
|
59
|
+
packageInfosByPath[path_1.default.normalize(path_1.default.dirname(info.packageJsonPath))] = info;
|
|
60
|
+
}
|
|
61
|
+
for (const moddedFile of nonIgnoredChanges) {
|
|
62
|
+
const packageInfo = getMatchingPackageInfo(moddedFile, cwd, packageInfosByPath);
|
|
63
|
+
const omitReason = !packageInfo
|
|
64
|
+
? 'no corresponding package found'
|
|
65
|
+
: packageInfo.private
|
|
66
|
+
? `${packageInfo.name} is private`
|
|
67
|
+
: packageInfo.combinedOptions.shouldPublish === false
|
|
68
|
+
? `${packageInfo.name} has beachball.shouldPublish=false`
|
|
69
|
+
: !scopedPackages.includes(packageInfo.name)
|
|
70
|
+
? `${packageInfo.name} is out of scope`
|
|
71
|
+
: ''; // not ignored
|
|
72
|
+
if (omitReason) {
|
|
73
|
+
logIgnored(moddedFile, omitReason);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
includedPackages.add(packageInfo.name);
|
|
77
|
+
fileCount++;
|
|
78
|
+
logIncluded(moddedFile);
|
|
79
|
+
}
|
|
44
80
|
}
|
|
45
|
-
|
|
81
|
+
verboseLog(`Found ${fileCount} files in ${includedPackages.size} packages that should be published`);
|
|
82
|
+
return [...includedPackages];
|
|
46
83
|
}
|
|
47
84
|
/**
|
|
48
85
|
* Gets all the changed packages, accounting for change files
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getChangedPackages.js","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"getChangedPackages.js","sourceRoot":"","sources":["../../src/changefile/getChangedPackages.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
|
18
18
|
const getPackageChangelogs_1 = require("./getPackageChangelogs");
|
|
19
19
|
const renderChangelog_1 = require("./renderChangelog");
|
|
20
20
|
const renderJsonChangelog_1 = require("./renderJsonChangelog");
|
|
21
|
-
const
|
|
21
|
+
const isPathIncluded_1 = require("../monorepo/isPathIncluded");
|
|
22
22
|
const mergeChangelogs_1 = require("./mergeChangelogs");
|
|
23
23
|
function writeChangelog(options, changeFileChangeInfos, calculatedChangeTypes, dependentChangedBy, packageInfos) {
|
|
24
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -65,7 +65,7 @@ function writeGroupedChangelog(options, changeFileChangeInfos, calculatedChangeT
|
|
|
65
65
|
console.warn(`changelog path ${changelogPath} does not exist.`);
|
|
66
66
|
continue;
|
|
67
67
|
}
|
|
68
|
-
const isInGroup =
|
|
68
|
+
const isInGroup = isPathIncluded_1.isPathIncluded(relativePath, group.include, group.exclude);
|
|
69
69
|
if (isInGroup) {
|
|
70
70
|
if (!groupedChangelogs[changelogPath]) {
|
|
71
71
|
groupedChangelogs[changelogPath] = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeChangelog.js","sourceRoot":"","sources":["../../src/changelog/writeChangelog.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,wDAA0B;AAG1B,iEAA8D;AAC9D,uDAAoD;AACpD,+DAA4D;AAG5D
|
|
1
|
+
{"version":3,"file":"writeChangelog.js","sourceRoot":"","sources":["../../src/changelog/writeChangelog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAM7D,wBAAsB,IAAI,CAAC,OAAO,EAAE,gBAAgB,iBA6BnD"}
|
package/lib/commands/init.js
CHANGED
|
@@ -31,9 +31,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
31
31
|
exports.init = void 0;
|
|
32
32
|
const fs = __importStar(require("fs"));
|
|
33
33
|
const path = __importStar(require("path"));
|
|
34
|
-
const child_process_1 = require("child_process");
|
|
35
|
-
const os = __importStar(require("os"));
|
|
36
34
|
const workspace_tools_1 = require("workspace-tools");
|
|
35
|
+
const npm_1 = require("../packageManager/npm");
|
|
37
36
|
function init(options) {
|
|
38
37
|
var _a, _b;
|
|
39
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -46,9 +45,8 @@ function init(options) {
|
|
|
46
45
|
return;
|
|
47
46
|
}
|
|
48
47
|
const packageJsonFilePath = path.join(root, 'package.json');
|
|
49
|
-
const npmCmd = path.join(path.dirname(process.execPath), os.platform() === 'win32' ? 'npm.cmd' : 'npm');
|
|
50
48
|
if (fs.existsSync(packageJsonFilePath)) {
|
|
51
|
-
const beachballInfo = JSON.parse(
|
|
49
|
+
const beachballInfo = JSON.parse(npm_1.npm(['info', 'beachball', '--json']).stdout.toString());
|
|
52
50
|
const beachballVersion = beachballInfo['dist-tags'].latest;
|
|
53
51
|
const packageJson = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
|
|
54
52
|
packageJson.devDependencies = (_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {};
|
package/lib/commands/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,2CAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,2CAA6B;AAC7B,qDAAkD;AAClD,+CAA4C;AAE5C,SAAsB,IAAI,CAAC,OAAyB;;;QAClD,IAAI,IAAY,CAAC;QACjB,IAAI;YACF,IAAI,GAAG,iCAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACtC;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACvE,OAAO;SACR;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE5D,IAAI,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;YACtC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,SAAG,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzF,MAAM,gBAAgB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;YAE3D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAC;YAC9E,WAAW,CAAC,eAAe,GAAG,MAAA,WAAW,CAAC,eAAe,mCAAI,EAAE,CAAC;YAChE,WAAW,CAAC,eAAe,CAAC,SAAS,GAAG,gBAAgB,CAAC;YACzD,WAAW,CAAC,OAAO,GAAG,MAAA,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC;YAChD,WAAW,CAAC,OAAO,CAAC,WAAW,GAAG,iBAAiB,CAAC;YACpD,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,kBAAkB,CAAC;YAChD,WAAW,CAAC,OAAO,CAAC,OAAO,GAAG,mBAAmB,CAAC;YAElD,EAAE,CAAC,aAAa,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAE5E,OAAO,CAAC,GAAG,CACT,wGAAwG,CACzG,CAAC;SACH;;CACF;AA7BD,oBA6BC"}
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getPackageGroups = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
-
const
|
|
8
|
+
const isPathIncluded_1 = require("./isPathIncluded");
|
|
9
9
|
function getPackageGroups(packageInfos, root, groups) {
|
|
10
10
|
const packageGroups = {};
|
|
11
11
|
const packageNameToGroup = {};
|
|
@@ -15,7 +15,7 @@ function getPackageGroups(packageInfos, root, groups) {
|
|
|
15
15
|
const packagePath = path_1.default.dirname(info.packageJsonPath);
|
|
16
16
|
const relativePath = path_1.default.relative(root, packagePath);
|
|
17
17
|
for (const groupOption of groups) {
|
|
18
|
-
if (
|
|
18
|
+
if (isPathIncluded_1.isPathIncluded(relativePath, groupOption.include, groupOption.exclude)) {
|
|
19
19
|
const groupName = groupOption.name;
|
|
20
20
|
if (packageNameToGroup[pkgName]) {
|
|
21
21
|
console.error(`Error: ${pkgName} cannot belong to multiple groups: [${groupName}, ${packageNameToGroup[pkgName]}]!`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageGroups.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"getPackageGroups.js","sourceRoot":"","sources":["../../src/monorepo/getPackageGroups.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,qDAAkD;AAElD,SAAgB,gBAAgB,CAAC,YAA0B,EAAE,IAAY,EAAE,MAAyC;IAClH,MAAM,aAAa,GAAkB,EAAE,CAAC;IAExC,MAAM,kBAAkB,GAAsC,EAAE,CAAC;IAEjE,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QAC3B,uDAAuD;QACvD,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC1D,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACvD,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEtD,KAAK,MAAM,WAAW,IAAI,MAAM,EAAE;gBAChC,IAAI,+BAAc,CAAC,YAAY,EAAE,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE;oBAC1E,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;oBAEnC,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE;wBAC/B,OAAO,CAAC,KAAK,CACX,UAAU,OAAO,uCAAuC,SAAS,KAAK,kBAAkB,CAAC,OAAO,CAAC,IAAI,CACtG,CAAC;wBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;qBACjB;oBAED,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;oBAExC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;wBAC7B,aAAa,CAAC,SAAS,CAAC,GAAG;4BACzB,YAAY,EAAE,EAAE;4BAChB,qBAAqB,EAAE,WAAW,CAAC,qBAAqB;yBACzD,CAAC;qBACH;oBAED,aAAa,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACrD;aACF;SACF;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAtCD,4CAsCC"}
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getScopedPackages = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
-
const
|
|
8
|
+
const isPathIncluded_1 = require("./isPathIncluded");
|
|
9
9
|
function getScopedPackages(options, packageInfos) {
|
|
10
10
|
if (!options.scope) {
|
|
11
11
|
return Object.keys(packageInfos);
|
|
@@ -16,7 +16,7 @@ function getScopedPackages(options, packageInfos) {
|
|
|
16
16
|
const scopedPackages = [];
|
|
17
17
|
for (let [pkgName, info] of Object.entries(packageInfos)) {
|
|
18
18
|
const relativePath = path_1.default.relative(options.path, path_1.default.dirname(info.packageJsonPath));
|
|
19
|
-
const shouldInclude =
|
|
19
|
+
const shouldInclude = isPathIncluded_1.isPathIncluded(relativePath, includeScopes, excludeScopes);
|
|
20
20
|
if (shouldInclude) {
|
|
21
21
|
scopedPackages.push(pkgName);
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getScopedPackages.js","sourceRoot":"","sources":["../../src/monorepo/getScopedPackages.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"getScopedPackages.js","sourceRoot":"","sources":["../../src/monorepo/getScopedPackages.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,qDAAkD;AAElD,SAAgB,iBAAiB,CAAC,OAAyB,EAAE,YAA0B;IACrF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;QAClB,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAClC;IAED,IAAI,aAAa,GAAG,OAAO,CAAC,KAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,aAAa,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC7E,MAAM,aAAa,GAAG,OAAO,CAAC,KAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAEpE,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,KAAK,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACxD,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;QAErF,MAAM,aAAa,GAAG,+BAAc,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QACjF,IAAI,aAAa,EAAE;YACjB,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC9B;KACF;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AArBD,8CAqBC"}
|
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
* Check if a relative path should be included given include and exclude patterns using minimatch.
|
|
3
3
|
*/
|
|
4
4
|
export declare function isPathIncluded(relativePath: string, include: string | string[], exclude?: string | string[]): boolean;
|
|
5
|
-
//# sourceMappingURL=
|
|
5
|
+
//# sourceMappingURL=isPathIncluded.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isPathIncluded.d.ts","sourceRoot":"","sources":["../../src/monorepo/isPathIncluded.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,WAgB3G"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isPathIncluded.js","sourceRoot":"","sources":["../../src/monorepo/isPathIncluded.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC;;GAEG;AACH,SAAgB,cAAc,CAAC,YAAoB,EAAE,OAA0B,EAAE,OAA2B;IAC1G,MAAM,eAAe,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC1E,IAAI,aAAa,GAAG,eAAe,CAAC,MAAM,CACxC,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,QAAQ,IAAI,mBAAS,CAAC,YAAY,EAAE,OAAO,CAAC,EACnE,KAAK,CACN,CAAC;IAEF,IAAI,OAAO,EAAE;QACX,MAAM,eAAe,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1E,aAAa,GAAG,eAAe,CAAC,MAAM,CACpC,CAAC,QAAiB,EAAE,OAAe,EAAE,EAAE,CAAC,QAAQ,IAAI,mBAAS,CAAC,YAAY,EAAE,OAAO,CAAC,EACpF,aAAa,CACd,CAAC;KACH;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAhBD,wCAgBC"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import execa from 'execa';
|
|
2
2
|
import { AuthType } from '../types/Auth';
|
|
3
|
-
export declare function npm(args: string[], options?: execa.SyncOptions):
|
|
4
|
-
|
|
3
|
+
export declare function npm(args: string[], options?: execa.SyncOptions): execa.ExecaSyncReturnValue & {
|
|
4
|
+
success: boolean;
|
|
5
|
+
};
|
|
6
|
+
export declare function npmAsync(args: string[], options?: execa.Options): Promise<execa.ExecaReturnValue & {
|
|
7
|
+
success: boolean;
|
|
8
|
+
}>;
|
|
5
9
|
export declare function getNpmAuthArgs(registry: string, token?: string, authType?: AuthType): string[];
|
|
6
10
|
//# sourceMappingURL=npm.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,wBAAgB,GAAG,
|
|
1
|
+
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,wBAAgB,GAAG,CACjB,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE,KAAK,CAAC,WAAgB,GAC9B,KAAK,CAAC,oBAAoB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAanD;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE,KAAK,CAAC,OAAY,GAC1B,OAAO,CAAC,KAAK,CAAC,gBAAgB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAaxD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,CAS9F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAG1B,SAAgB,GAAG,
|
|
1
|
+
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/packageManager/npm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAG1B,SAAgB,GAAG,CACjB,IAAc,EACd,UAA6B,EAAE;IAE/B,IAAI;QACF,MAAM,MAAM,GAAG,eAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,oBAAO,OAAO,EAAG,CAAC;QACvD,uCACK,MAAM,KACT,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,IACvB;KACH;IAAC,OAAO,CAAC,EAAE;QACV,uCACM,CAA0B,KAC9B,OAAO,EAAE,KAAK,IACd;KACH;AACH,CAAC;AAhBD,kBAgBC;AAED,SAAsB,QAAQ,CAC5B,IAAc,EACd,UAAyB,EAAE;;QAE3B,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,KAAK,EAAE,IAAI,oBAAO,OAAO,EAAG,CAAC;YACxD,uCACK,MAAM,KACT,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,IACvB;SACH;QAAC,OAAO,CAAC,EAAE;YACV,uCACM,CAAsB,KAC1B,OAAO,EAAE,KAAK,IACd;SACH;IACH,CAAC;CAAA;AAhBD,4BAgBC;AAED,SAAgB,cAAc,CAAC,QAAgB,EAAE,KAAc,EAAE,QAAmB;IAClF,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,IAAI,KAAK,EAAE;QACT,MAAM,UAAU,GAAG,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;QACxE,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC,CAAC;KACxD;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AATD,wCASC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { PackageInfo } from '../types/PackageInfo';
|
|
2
2
|
import { AuthType } from '../types/Auth';
|
|
3
|
-
export declare function packagePublish(packageInfo: PackageInfo, registry: string, token: string, access: string, authType?: AuthType, timeout?: number | undefined):
|
|
3
|
+
export declare function packagePublish(packageInfo: PackageInfo, registry: string, token: string, access: string, authType?: AuthType, timeout?: number | undefined): Promise<import("execa").ExecaReturnValue<string> & {
|
|
4
|
+
success: boolean;
|
|
5
|
+
}>;
|
|
4
6
|
//# sourceMappingURL=packagePublish.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packagePublish.d.ts","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS
|
|
1
|
+
{"version":3,"file":"packagePublish.d.ts","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;;GAqB7B"}
|
|
@@ -24,7 +24,7 @@ function packagePublish(packageInfo, registry, token, access, authType, timeout)
|
|
|
24
24
|
args.push(access);
|
|
25
25
|
}
|
|
26
26
|
console.log(`publish command: ${args.join(' ')}`);
|
|
27
|
-
return npm_1.
|
|
27
|
+
return npm_1.npmAsync(args, { cwd: packagePath, timeout, all: true });
|
|
28
28
|
}
|
|
29
29
|
exports.packagePublish = packagePublish;
|
|
30
30
|
//# sourceMappingURL=packagePublish.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packagePublish.js","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,+
|
|
1
|
+
{"version":3,"file":"packagePublish.js","sourceRoot":"","sources":["../../src/packageManager/packagePublish.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,+BAAiD;AAGjD,SAAgB,cAAc,CAC5B,WAAwB,EACxB,QAAgB,EAChB,KAAa,EACb,MAAc,EACd,QAAmB,EACnB,OAA4B;IAE5B,MAAM,cAAc,GAAG,WAAW,CAAC,eAAe,CAAC;IACnD,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG;QACX,SAAS;QACT,YAAY;QACZ,QAAQ;QACR,OAAO;QACP,cAAc,CAAC,GAAG,IAAI,cAAc,CAAC,aAAa;QAClD,YAAY;QACZ,MAAM;QACN,GAAG,oBAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC;KAC7C,CAAC;IAEF,IAAI,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACnB;IACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClD,OAAO,cAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC;AA3BD,wCA2BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayManualRecovery.d.ts","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,GAAE,GAAG,CAAC,MAAM,CAAqB,
|
|
1
|
+
{"version":3,"file":"displayManualRecovery.d.ts","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,GAAE,GAAG,CAAC,MAAM,CAAqB,QAyB3G"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.displayManualRecovery = void 0;
|
|
4
4
|
function displayManualRecovery(bumpInfo, succeededPackages = new Set()) {
|
|
5
|
-
|
|
5
|
+
const errorLines = ['Something went wrong with publishing! Manually update these package and versions:'];
|
|
6
6
|
const succeededLines = [];
|
|
7
7
|
bumpInfo.modifiedPackages.forEach(pkg => {
|
|
8
8
|
const packageInfo = bumpInfo.packageInfos[pkg];
|
|
@@ -11,16 +11,16 @@ function displayManualRecovery(bumpInfo, succeededPackages = new Set()) {
|
|
|
11
11
|
succeededLines.push(entry);
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
|
-
|
|
14
|
+
errorLines.push(entry);
|
|
15
15
|
}
|
|
16
16
|
});
|
|
17
|
+
console.error(errorLines.join('\n') + '\n');
|
|
17
18
|
if (succeededLines.length) {
|
|
18
|
-
console.warn('These packages and versions were successfully published, but may be invalid
|
|
19
|
-
'package versions for which publishing failed
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
'
|
|
23
|
-
'list after "beachball sync".');
|
|
19
|
+
console.warn('These packages and versions were successfully published, but may be invalid if they depend on ' +
|
|
20
|
+
'package versions for which publishing failed:\n' +
|
|
21
|
+
succeededLines.join('\n') +
|
|
22
|
+
'\n\nTo recover from this, run "beachball sync" to synchronize local package.json files with the registry. ' +
|
|
23
|
+
'If necessary, unpublish or deprecate any invalid packages from the above list after "beachball sync".');
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
exports.displayManualRecovery = displayManualRecovery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayManualRecovery.js","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":";;;AAEA,SAAgB,qBAAqB,CAAC,QAAkB,EAAE,oBAAiC,IAAI,GAAG,EAAU;IAC1G,
|
|
1
|
+
{"version":3,"file":"displayManualRecovery.js","sourceRoot":"","sources":["../../src/publish/displayManualRecovery.ts"],"names":[],"mappings":";;;AAEA,SAAgB,qBAAqB,CAAC,QAAkB,EAAE,oBAAiC,IAAI,GAAG,EAAU;IAC1G,MAAM,UAAU,GAAG,CAAC,mFAAmF,CAAC,CAAC;IACzG,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtC,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,KAAK,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QAC7D,IAAI,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC3C,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC5B;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAE5C,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,OAAO,CAAC,IAAI,CACV,gGAAgG;YAC9F,iDAAiD;YACjD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;YACzB,4GAA4G;YAC5G,uGAAuG,CAC1G,CAAC;KACH;AACH,CAAC;AAzBD,sDAyBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishToRegistry.d.ts","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"publishToRegistry.d.ts","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAW7D,wBAAsB,iBAAiB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,iBA+G5F"}
|
|
@@ -67,31 +67,42 @@ function publishToRegistry(originalBumpInfo, options) {
|
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
// finally pass through doing the actual npm publish command
|
|
70
|
+
let hasAuthError = false;
|
|
70
71
|
for (const pkg of packagesToPublish) {
|
|
72
|
+
if (hasAuthError) {
|
|
73
|
+
console.log(`Skipping attempt to publish ${pkg} due to previous auth error`);
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
71
76
|
const packageInfo = bumpInfo.packageInfos[pkg];
|
|
72
77
|
console.log(`Publishing - ${packageInfo.name}@${packageInfo.version} with tag ${packageInfo.combinedOptions.tag}.`);
|
|
73
78
|
let result;
|
|
74
79
|
let retries = 0;
|
|
75
80
|
do {
|
|
76
|
-
result = packagePublish_1.packagePublish(packageInfo, registry, token, access, authType, timeout);
|
|
81
|
+
result = yield packagePublish_1.packagePublish(packageInfo, registry, token, access, authType, timeout);
|
|
77
82
|
if (result.success) {
|
|
78
83
|
console.log('Published!');
|
|
79
84
|
succeededPackages.add(pkg);
|
|
80
|
-
break;
|
|
81
85
|
}
|
|
82
86
|
else {
|
|
83
87
|
retries++;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
if (
|
|
87
|
-
console.
|
|
88
|
+
hasAuthError = result.all.includes('ENEEDAUTH');
|
|
89
|
+
const failedMessage = `Publishing "${pkg}" failed${hasAuthError ? ' due to auth error' : ''}:\n\n` + result.all;
|
|
90
|
+
if (hasAuthError) {
|
|
91
|
+
console.error(failedMessage);
|
|
92
|
+
}
|
|
93
|
+
else if (retries <= options.retries) {
|
|
94
|
+
// has retries left (not a fatal error)
|
|
95
|
+
console.log(failedMessage + `\n\nRetrying... (${retries}/${options.retries})`);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
// out of retries
|
|
99
|
+
console.error(failedMessage);
|
|
88
100
|
}
|
|
89
101
|
}
|
|
90
|
-
} while (retries <= options.retries);
|
|
102
|
+
} while (!result.success && retries <= options.retries && !hasAuthError);
|
|
91
103
|
if (!result.success) {
|
|
92
104
|
displayManualRecovery_1.displayManualRecovery(bumpInfo, succeededPackages);
|
|
93
|
-
|
|
94
|
-
throw new Error('Error publishing, refer to the previous error messages for recovery instructions');
|
|
105
|
+
throw new Error('Error publishing! Refer to the previous logs for recovery instructions.');
|
|
95
106
|
}
|
|
96
107
|
}
|
|
97
108
|
// if there is a postpublish hook perform a postpublish pass, calling the routine on each package
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishToRegistry.js","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,gDAAwB;AACxB,qDAAkD;AAGlD,qEAAkE;AAClE,uEAAoE;AACpE,mEAAgE;AAChE,yDAAsD;AACtD,iEAA8D;AAC9D,+EAA4E;AAC5E,uEAAoE;
|
|
1
|
+
{"version":3,"file":"publishToRegistry.js","sourceRoot":"","sources":["../../src/publish/publishToRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,13 +29,13 @@ function validatePackageVersions(bumpInfo, registry) {
|
|
|
29
29
|
const publishedVersions = yield listPackageVersions_1.listPackageVersions(packages, registry);
|
|
30
30
|
for (const pkg of packages) {
|
|
31
31
|
const packageInfo = bumpInfo.packageInfos[pkg];
|
|
32
|
-
|
|
32
|
+
console.log(`Validating package version - ${packageInfo.name}@${packageInfo.version}`);
|
|
33
33
|
if (publishedVersions[pkg].includes(packageInfo.version)) {
|
|
34
34
|
console.error(`\nERROR: Attempting to bump to a version that already exists in the registry: ${packageInfo.name}@${packageInfo.version}`);
|
|
35
35
|
hasErrors = true;
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
|
-
|
|
38
|
+
console.log(' OK!\n');
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
return !hasErrors;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validatePackageVersions.js","sourceRoot":"","sources":["../../src/publish/validatePackageVersions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+EAA4E;AAC5E,iEAA8D;AAE9D;;GAEG;AACH,SAAsB,uBAAuB,CAAC,QAAkB,EAAE,QAAgB;;QAChF,IAAI,SAAS,GAAY,KAAK,CAAC;QAE/B,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC3D,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,2CAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACtE,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,CAAC,GAAG,CAAC,yCAAyC,YAAY,EAAE,CAAC,CAAC;gBACrE,OAAO,KAAK,CAAC;aACd;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,MAAM,yCAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAExE,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;YAC1B,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC/C,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"validatePackageVersions.js","sourceRoot":"","sources":["../../src/publish/validatePackageVersions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+EAA4E;AAC5E,iEAA8D;AAE9D;;GAEG;AACH,SAAsB,uBAAuB,CAAC,QAAkB,EAAE,QAAgB;;QAChF,IAAI,SAAS,GAAY,KAAK,CAAC;QAE/B,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC3D,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,2CAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YACtE,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,CAAC,GAAG,CAAC,yCAAyC,YAAY,EAAE,CAAC,CAAC;gBACrE,OAAO,KAAK,CAAC;aACd;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,MAAM,yCAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAExE,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;YAC1B,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC/C,OAAO,CAAC,GAAG,CAAC,gCAAgC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;YACvF,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;gBACxD,OAAO,CAAC,KAAK,CACX,iFAAiF,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,EAAE,CAC3H,CAAC;gBACF,SAAS,GAAG,IAAI,CAAC;aAClB;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aACvB;SACF;QAED,OAAO,CAAC,SAAS,CAAC;IACpB,CAAC;CAAA;AA7BD,0DA6BC"}
|
|
@@ -82,6 +82,11 @@ export interface PackageOptions {
|
|
|
82
82
|
tag: string | null;
|
|
83
83
|
defaultNpmTag: string;
|
|
84
84
|
changeFilePrompt?: ChangeFilePromptOptions;
|
|
85
|
+
/**
|
|
86
|
+
* Disable publishing a particular package.
|
|
87
|
+
* (Does NOT work to enable publishing a package that wouldn't otherwise be published.)
|
|
88
|
+
*/
|
|
89
|
+
shouldPublish?: false | undefined;
|
|
85
90
|
}
|
|
86
91
|
export interface VersionGroupOptions {
|
|
87
92
|
/** minimatch pattern (or array of minimatch) to detect which packages should be included in this group */
|