@eclipse-glsp/cli 1.1.0-next.e31f2e5.119 → 2.0.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/README.md +30 -1
- package/lib/app.d.ts.map +1 -1
- package/lib/app.js +3 -1
- package/lib/app.js.map +1 -1
- package/lib/commands/check-header.d.ts +24 -0
- package/lib/commands/check-header.d.ts.map +1 -0
- package/lib/commands/check-header.js +290 -0
- package/lib/commands/check-header.js.map +1 -0
- package/lib/commands/coverage-report.js +26 -3
- package/lib/commands/coverage-report.js.map +1 -1
- package/lib/commands/release/common.d.ts +1 -1
- package/lib/commands/release/common.d.ts.map +1 -1
- package/lib/commands/release/common.js +41 -15
- package/lib/commands/release/common.js.map +1 -1
- package/lib/commands/release/release-client.d.ts.map +1 -1
- package/lib/commands/release/release-client.js +29 -8
- package/lib/commands/release/release-client.js.map +1 -1
- package/lib/commands/release/release-eclipse-integration.js +24 -1
- package/lib/commands/release/release-eclipse-integration.js.map +1 -1
- package/lib/commands/release/release-java-server.js +25 -2
- package/lib/commands/release/release-java-server.js.map +1 -1
- package/lib/commands/release/release-server-node.js +24 -1
- package/lib/commands/release/release-server-node.js.map +1 -1
- package/lib/commands/release/release-theia-integration.d.ts.map +1 -1
- package/lib/commands/release/release-theia-integration.js +26 -14
- package/lib/commands/release/release-theia-integration.js.map +1 -1
- package/lib/commands/release/release-vscode-integration.js +25 -2
- package/lib/commands/release/release-vscode-integration.js.map +1 -1
- package/lib/commands/release/release.d.ts +2 -2
- package/lib/commands/release/release.d.ts.map +1 -1
- package/lib/commands/release/release.js +51 -11
- package/lib/commands/release/release.js.map +1 -1
- package/lib/util/command-util.d.ts +5 -9
- package/lib/util/command-util.d.ts.map +1 -1
- package/lib/util/command-util.js +31 -7
- package/lib/util/command-util.js.map +1 -1
- package/lib/util/git-util.d.ts +43 -4
- package/lib/util/git-util.d.ts.map +1 -1
- package/lib/util/git-util.js +151 -39
- package/lib/util/git-util.js.map +1 -1
- package/lib/util/logger.d.ts +21 -7
- package/lib/util/logger.d.ts.map +1 -1
- package/lib/util/logger.js +29 -13
- package/lib/util/logger.js.map +1 -1
- package/lib/util/validation-util.d.ts +1 -0
- package/lib/util/validation-util.d.ts.map +1 -1
- package/lib/util/validation-util.js +40 -6
- package/lib/util/validation-util.js.map +1 -1
- package/package.json +28 -27
- package/src/app.ts +4 -1
- package/src/commands/check-header.ts +355 -0
- package/src/commands/release/common.ts +7 -7
- package/src/commands/release/release-client.ts +6 -10
- package/src/commands/release/release-java-server.ts +1 -1
- package/src/commands/release/release-theia-integration.ts +6 -18
- package/src/commands/release/release-vscode-integration.ts +2 -1
- package/src/commands/release/release.ts +34 -14
- package/src/util/command-util.ts +9 -16
- package/src/util/git-util.ts +128 -38
- package/src/util/logger.ts +36 -17
- package/src/util/validation-util.ts +17 -4
package/README.md
CHANGED
|
@@ -11,6 +11,35 @@ Install `@eclipse-glsp/cli` as a dev dependency in your application.
|
|
|
11
11
|
yarn add @eclipse-glsp/cli --dev
|
|
12
12
|
```
|
|
13
13
|
|
|
14
|
+
## checkHeaders
|
|
15
|
+
|
|
16
|
+
The `checkHeaders` command can be used to validate the copyright year (range) of license headers.
|
|
17
|
+
It checks for each file (matching the include pattern) whether the defined copyright range is in line with the first and last modification date in the git repository.
|
|
18
|
+
Found violations are printed to the console and can be fixed automatically.
|
|
19
|
+
The validation check can be restricted to pending changes and/or the last commit e.g. to validate a commit before creating a PR.
|
|
20
|
+
|
|
21
|
+
```console
|
|
22
|
+
$ glsp checkHeaders -h
|
|
23
|
+
|
|
24
|
+
Usage: glsp checkHeaders [options] <rootDir>
|
|
25
|
+
|
|
26
|
+
Validates the copyright year range of license header files
|
|
27
|
+
|
|
28
|
+
Arguments:
|
|
29
|
+
rootDir The starting directory for the check
|
|
30
|
+
|
|
31
|
+
Options:
|
|
32
|
+
-t, --type <type> The scope of the check. In addition to a full recursive check, is also possible to only consider pending changes or the last commit (choices: "full", "changes", "lastCommit", default:
|
|
33
|
+
"full")
|
|
34
|
+
-f, --fileExtensions <extensions...> File extensions that should be checked (default: ["ts","tsx"])
|
|
35
|
+
-e, --exclude <exclude...> File patterns that should be excluded from the check. New exclude patterns are added to the default patterns (default: [**/@(node_modules|lib|dist|bundle)/**])
|
|
36
|
+
--no-exclude-defaults Disables the default excludes patterns. Only explicitly passed exclude patterns (-e, --exclude) are considered
|
|
37
|
+
-j, --json Also persist validation results as json file (default: false)
|
|
38
|
+
-s, --severity <severity> The severity of validation results that should be printed. (choices: "error", "warn", "ok", default: "error" (only))
|
|
39
|
+
-a, --autoFix Auto apply & commit fixes without prompting the user (default: false)
|
|
40
|
+
-h, --help display help for command
|
|
41
|
+
```
|
|
42
|
+
|
|
14
43
|
## coverageReport
|
|
15
44
|
|
|
16
45
|
The `coverageReport` command can be used to create a full nyc test coverage report for a lerna/yarn mono repository.
|
|
@@ -32,7 +61,7 @@ Options:
|
|
|
32
61
|
|
|
33
62
|
Eclipse GLSP committers can use the `release` command to prepare & publish a new Github release for a specific GLSP component.
|
|
34
63
|
|
|
35
|
-
```
|
|
64
|
+
```console
|
|
36
65
|
$ glsp release -h
|
|
37
66
|
Usage: glsp release [options] <component> <releaseType> [customVersion]
|
|
38
67
|
|
package/lib/app.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";AAqBA,eAAO,MAAM,eAAe,eAAe,CAAC"}
|
package/lib/app.js
CHANGED
|
@@ -17,6 +17,7 @@ exports.COMMAND_VERSION = void 0;
|
|
|
17
17
|
*
|
|
18
18
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
19
19
|
********************************************************************************/
|
|
20
|
+
const check_header_1 = require("./commands/check-header");
|
|
20
21
|
const coverage_report_1 = require("./commands/coverage-report");
|
|
21
22
|
const release_1 = require("./commands/release/release");
|
|
22
23
|
const command_util_1 = require("./util/command-util");
|
|
@@ -24,7 +25,8 @@ exports.COMMAND_VERSION = '1.1.0-next';
|
|
|
24
25
|
const app = (0, command_util_1.baseCommand)() //
|
|
25
26
|
.version(exports.COMMAND_VERSION)
|
|
26
27
|
.name('glsp')
|
|
28
|
+
.addCommand(coverage_report_1.CoverageReportCommand)
|
|
27
29
|
.addCommand(release_1.ReleaseCommand)
|
|
28
|
-
.addCommand(
|
|
30
|
+
.addCommand(check_header_1.CheckHeaderCommand);
|
|
29
31
|
app.parse(process.argv);
|
|
30
32
|
//# sourceMappingURL=app.js.map
|
package/lib/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;AACA;;;;;;;;;;;;;;kFAckF;AAClF,gEAAmE;AACnE,wDAA4D;AAC5D,sDAAkD;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;AACA;;;;;;;;;;;;;;kFAckF;AAClF,0DAA6D;AAC7D,gEAAmE;AACnE,wDAA4D;AAC5D,sDAAkD;AAErC,QAAA,eAAe,GAAG,YAAY,CAAC;AAE5C,MAAM,GAAG,GAAG,IAAA,0BAAW,GAAE,CAAC,EAAE;KACvB,OAAO,CAAC,uBAAe,CAAC;KACxB,IAAI,CAAC,MAAM,CAAC;KACZ,UAAU,CAAC,uCAAqB,CAAC;KACjC,UAAU,CAAC,wBAAc,CAAC;KAC1B,UAAU,CAAC,iCAAkB,CAAC,CAAC;AAEpC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export interface HeaderCheckOptions {
|
|
2
|
+
type: CheckType;
|
|
3
|
+
exclude: string[];
|
|
4
|
+
fileExtensions: string[];
|
|
5
|
+
json: boolean;
|
|
6
|
+
excludeDefaults: boolean;
|
|
7
|
+
autoFix: boolean;
|
|
8
|
+
severity: Severity;
|
|
9
|
+
}
|
|
10
|
+
declare const checkTypes: readonly ["full", "changes", "lastCommit"];
|
|
11
|
+
type CheckType = typeof checkTypes[number];
|
|
12
|
+
declare const severityTypes: readonly ["error", "warn", "ok"];
|
|
13
|
+
type Severity = typeof severityTypes[number];
|
|
14
|
+
export declare const CheckHeaderCommand: import("commander").Command;
|
|
15
|
+
export declare function checkHeaders(rootDir: string, options: HeaderCheckOptions): void;
|
|
16
|
+
export declare function handleValidationResults(rootDir: string, results: ValidationResult[], options: HeaderCheckOptions): void;
|
|
17
|
+
interface ValidationResult {
|
|
18
|
+
file: string;
|
|
19
|
+
severity: Severity;
|
|
20
|
+
violation: Violation;
|
|
21
|
+
}
|
|
22
|
+
type Violation = 'none' | 'noOrMissingHeader' | 'incorrectCopyrightPeriod' | 'invalidCopyrightYear';
|
|
23
|
+
export {};
|
|
24
|
+
//# sourceMappingURL=check-header.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"check-header.d.ts","sourceRoot":"","sources":["../../src/commands/check-header.ts"],"names":[],"mappings":"AAmCA,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;CACtB;AAED,QAAA,MAAM,UAAU,4CAA6C,CAAC;AAC9D,KAAK,SAAS,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAE3C,QAAA,MAAM,aAAa,kCAAmC,CAAC;AAEvD,KAAK,QAAQ,GAAG,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAO7C,eAAO,MAAM,kBAAkB,6BA+BN,CAAC;AAE1B,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAgB/E;AAkJD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI,CA+BvH;AAsDD,UAAU,gBAAgB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;CACxB;AAaD,KAAK,SAAS,GAAG,MAAM,GAAG,mBAAmB,GAAG,0BAA0B,GAAG,sBAAsB,CAAC"}
|
|
@@ -0,0 +1,290 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.handleValidationResults = exports.checkHeaders = exports.CheckHeaderCommand = void 0;
|
|
27
|
+
/********************************************************************************
|
|
28
|
+
* Copyright (c) 2022-2023 EclipseSource and others.
|
|
29
|
+
*
|
|
30
|
+
* This program and the accompanying materials are made available under the
|
|
31
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
32
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
33
|
+
*
|
|
34
|
+
* This Source Code may also be made available under the following Secondary
|
|
35
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
36
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
37
|
+
* with the GNU Classpath Exception which is available at
|
|
38
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
39
|
+
*
|
|
40
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
41
|
+
********************************************************************************/
|
|
42
|
+
/* eslint-disable max-len */
|
|
43
|
+
const commander_1 = require("commander");
|
|
44
|
+
const fs = __importStar(require("fs"));
|
|
45
|
+
const glob_1 = require("glob");
|
|
46
|
+
const minimatch = __importStar(require("minimatch"));
|
|
47
|
+
const readline = __importStar(require("readline-sync"));
|
|
48
|
+
const sh = __importStar(require("shelljs"));
|
|
49
|
+
const command_util_1 = require("../util/command-util");
|
|
50
|
+
const git_util_1 = require("../util/git-util");
|
|
51
|
+
const logger_1 = require("../util/logger");
|
|
52
|
+
const validation_util_1 = require("../util/validation-util");
|
|
53
|
+
const path = require("path");
|
|
54
|
+
const checkTypes = ['full', 'changes', 'lastCommit'];
|
|
55
|
+
const severityTypes = ['error', 'warn', 'ok'];
|
|
56
|
+
const DEFAULT_EXCLUDES = ['**/@(node_modules|lib|dist|bundle)/**'];
|
|
57
|
+
const YEAR_RANGE_REGEX = /\d{4}(?:-d{4})?/g;
|
|
58
|
+
const HEADER_PATTERN = 'Copyright \\([cC]\\) \\d{4}(-d{4})?';
|
|
59
|
+
const AUTO_FIX_MESSAGE = 'Fix copyright header violations';
|
|
60
|
+
exports.CheckHeaderCommand = (0, command_util_1.baseCommand)() //
|
|
61
|
+
.name('checkHeaders')
|
|
62
|
+
.description('Validates the copyright year range of license header files')
|
|
63
|
+
.argument('<rootDir>', 'The starting directory for the check', validation_util_1.validateGitDirectory)
|
|
64
|
+
.addOption(new commander_1.Option('-t, --type <type>', 'The scope of the check. In addition to a full recursive check, is also possible to only' +
|
|
65
|
+
' consider pending changes or the last commit')
|
|
66
|
+
.choices(checkTypes)
|
|
67
|
+
.default('full'))
|
|
68
|
+
.option('-f, --fileExtensions <extensions...>', 'File extensions that should be checked', ['ts', 'tsx'])
|
|
69
|
+
.addOption(new commander_1.Option('-e, --exclude <exclude...>', 'File patterns that should be excluded from the check. New exclude patterns are added to the default patterns').default([], `[${DEFAULT_EXCLUDES}]`))
|
|
70
|
+
.option('--no-exclude-defaults', 'Disables the default excludes patterns. Only explicitly passed exclude patterns (-e, --exclude) are considered')
|
|
71
|
+
.option('-j, --json', 'Also persist validation results as json file', false)
|
|
72
|
+
.addOption(new commander_1.Option('-s, --severity <severity>', 'The severity of validation results that should be printed.')
|
|
73
|
+
.choices(severityTypes)
|
|
74
|
+
.default('error', '"error" (only)'))
|
|
75
|
+
.option('-a, --autoFix', 'Auto apply & commit fixes without prompting the user', false)
|
|
76
|
+
.action(checkHeaders);
|
|
77
|
+
function checkHeaders(rootDir, options) {
|
|
78
|
+
(0, command_util_1.configureShell)({ silent: true, fatal: true });
|
|
79
|
+
if (options.excludeDefaults) {
|
|
80
|
+
options.exclude.push(...DEFAULT_EXCLUDES);
|
|
81
|
+
}
|
|
82
|
+
sh.cd(rootDir);
|
|
83
|
+
const files = getFiles(rootDir, options);
|
|
84
|
+
logger_1.LOGGER.info(`Check copy right headers of ${files.length} files`);
|
|
85
|
+
if (files.length === 0) {
|
|
86
|
+
logger_1.LOGGER.info('Check completed');
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const results = validate(rootDir, files, options);
|
|
90
|
+
handleValidationResults(rootDir, results, options);
|
|
91
|
+
}
|
|
92
|
+
exports.checkHeaders = checkHeaders;
|
|
93
|
+
function getFiles(rootDir, options) {
|
|
94
|
+
const includePattern = `**/*.@(${options.fileExtensions.join('|')})`;
|
|
95
|
+
const excludePattern = options.exclude;
|
|
96
|
+
if (options.type === 'full') {
|
|
97
|
+
return glob_1.glob.sync(includePattern, {
|
|
98
|
+
cwd: rootDir,
|
|
99
|
+
ignore: excludePattern
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
let changedFiles = options.type === 'changes' ? (0, git_util_1.getUncommittedChanges)(rootDir) : (0, git_util_1.getChangesOfLastCommit)(rootDir);
|
|
103
|
+
changedFiles = changedFiles.filter(minimatch.filter(includePattern));
|
|
104
|
+
excludePattern.forEach(pattern => {
|
|
105
|
+
changedFiles = changedFiles.filter(minimatch.filter(`!${pattern}`));
|
|
106
|
+
});
|
|
107
|
+
return changedFiles.filter(file => fs.existsSync(file));
|
|
108
|
+
}
|
|
109
|
+
function validate(rootDir, files, options) {
|
|
110
|
+
var _a;
|
|
111
|
+
// Derives all files with valid headers, their copyright years and all files with no or invalid headers
|
|
112
|
+
const filesWithHeader = sh.grep('-l', HEADER_PATTERN, files).stdout.trim().split('\n');
|
|
113
|
+
const copyrightYears = sh
|
|
114
|
+
.grep(HEADER_PATTERN, files)
|
|
115
|
+
.stdout.trim()
|
|
116
|
+
.split('\n')
|
|
117
|
+
.map(line => line.match(YEAR_RANGE_REGEX).map(string => Number.parseInt(string, 10)));
|
|
118
|
+
const noHeaders = files.filter(file => !filesWithHeader.includes(file));
|
|
119
|
+
const results = [];
|
|
120
|
+
const allFilesLength = files.length;
|
|
121
|
+
// Create validation results for all files with no or invalid headers
|
|
122
|
+
const noHeadersLength = noHeaders.length;
|
|
123
|
+
if (noHeadersLength > 0) {
|
|
124
|
+
logger_1.LOGGER.info(`Found ${noHeadersLength} files with no (or an invalid) copyright header`);
|
|
125
|
+
}
|
|
126
|
+
noHeaders.forEach((file, i) => {
|
|
127
|
+
printFileProgress(i + 1, allFilesLength, `Validating ${file}`);
|
|
128
|
+
results.push({ file: path.resolve(rootDir, file), violation: 'noOrMissingHeader', severity: 'error' });
|
|
129
|
+
});
|
|
130
|
+
// Performance optimization: avoid retrieving the dates for each individual file by precalculating the endYear if possible.
|
|
131
|
+
let defaultEndYear;
|
|
132
|
+
if (options.type === 'changes') {
|
|
133
|
+
defaultEndYear = new Date().getFullYear();
|
|
134
|
+
}
|
|
135
|
+
else if (options.type === 'lastCommit') {
|
|
136
|
+
defaultEndYear = (_a = (0, git_util_1.getLastModificationDate)(undefined, rootDir)) === null || _a === void 0 ? void 0 : _a.getFullYear();
|
|
137
|
+
}
|
|
138
|
+
// Create validation results for all files with valid headers
|
|
139
|
+
filesWithHeader.forEach((file, i) => {
|
|
140
|
+
printFileProgress(i + 1 + noHeadersLength, allFilesLength, `Validating ${file}`);
|
|
141
|
+
const result = {
|
|
142
|
+
currentStartYear: copyrightYears[i].shift(),
|
|
143
|
+
expectedStartYear: (0, git_util_1.getFirstModificationDate)(file, rootDir, AUTO_FIX_MESSAGE).getFullYear(),
|
|
144
|
+
currentEndYear: copyrightYears[i].shift(),
|
|
145
|
+
expectedEndYear: defaultEndYear !== null && defaultEndYear !== void 0 ? defaultEndYear : (0, git_util_1.getLastModificationDate)(file, rootDir, AUTO_FIX_MESSAGE).getFullYear(),
|
|
146
|
+
file,
|
|
147
|
+
severity: 'ok',
|
|
148
|
+
violation: 'none'
|
|
149
|
+
};
|
|
150
|
+
if (result.expectedStartYear === result.expectedEndYear) {
|
|
151
|
+
validateSingleYear(result);
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
validateTimePeriod(result);
|
|
155
|
+
}
|
|
156
|
+
results.push(result);
|
|
157
|
+
});
|
|
158
|
+
results.sort((a, b) => a.file.localeCompare(b.file));
|
|
159
|
+
process.stdout.clearLine(0);
|
|
160
|
+
return results;
|
|
161
|
+
}
|
|
162
|
+
function validateSingleYear(result) {
|
|
163
|
+
const { currentStartYear, expectedStartYear, currentEndYear } = result;
|
|
164
|
+
result.violation = 'invalidCopyrightYear';
|
|
165
|
+
result.severity = 'error';
|
|
166
|
+
if (!currentEndYear) {
|
|
167
|
+
if (currentStartYear === expectedStartYear) {
|
|
168
|
+
result.violation = 'none';
|
|
169
|
+
result.severity = 'ok';
|
|
170
|
+
}
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
// Cornercase: For files of the initial contribution the copyright header predates the first git modification date.
|
|
174
|
+
// => declare as warning if not part of the initial contribution.
|
|
175
|
+
if (expectedStartYear === currentEndYear && currentStartYear < expectedStartYear) {
|
|
176
|
+
if ((0, git_util_1.getFirstCommit)(result.file) === (0, git_util_1.getInitialCommit)()) {
|
|
177
|
+
result.violation = 'none';
|
|
178
|
+
result.severity = 'ok';
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
result.severity = 'warn';
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
function validateTimePeriod(result) {
|
|
186
|
+
const { currentStartYear, expectedStartYear, expectedEndYear, currentEndYear } = result;
|
|
187
|
+
result.violation = 'incorrectCopyrightPeriod';
|
|
188
|
+
result.severity = 'error';
|
|
189
|
+
if (!currentEndYear) {
|
|
190
|
+
result.severity = 'error';
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
if (currentStartYear === expectedStartYear && currentEndYear === expectedEndYear) {
|
|
194
|
+
result.violation = 'none';
|
|
195
|
+
result.severity = 'ok';
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
// Cornercase: For files of the initial contribution the copyright header predates the first git modification date.
|
|
199
|
+
// => declare as warning if not part of the initial contribution.
|
|
200
|
+
if (currentEndYear === expectedEndYear && currentStartYear < expectedEndYear) {
|
|
201
|
+
if ((0, git_util_1.getFirstCommit)(result.file) === (0, git_util_1.getInitialCommit)()) {
|
|
202
|
+
result.violation = 'none';
|
|
203
|
+
result.severity = 'ok';
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
result.severity = 'warn';
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
function printFileProgress(currentFileCount, maxFileCount, message, clear = true) {
|
|
211
|
+
if (clear) {
|
|
212
|
+
process.stdout.clearLine(0);
|
|
213
|
+
process.stdout.cursorTo(0);
|
|
214
|
+
}
|
|
215
|
+
process.stdout.write(`[${currentFileCount} of ${maxFileCount}] ${message}`);
|
|
216
|
+
if (!clear) {
|
|
217
|
+
process.stdout.write('\n');
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
function handleValidationResults(rootDir, results, options) {
|
|
221
|
+
logger_1.LOGGER.newLine();
|
|
222
|
+
logger_1.LOGGER.info(`Header validation for ${results.length} files completed`);
|
|
223
|
+
const violations = results.filter(result => result.severity === 'error');
|
|
224
|
+
// Adjust results to print based on configured severity level
|
|
225
|
+
let toPrint = results;
|
|
226
|
+
if (options.severity === 'error') {
|
|
227
|
+
toPrint = violations;
|
|
228
|
+
}
|
|
229
|
+
else if (options.severity === 'warn') {
|
|
230
|
+
toPrint = results.filter(result => result.severity !== 'ok');
|
|
231
|
+
}
|
|
232
|
+
logger_1.LOGGER.info(`Found ${toPrint.length} copyright header violations:`);
|
|
233
|
+
logger_1.LOGGER.newLine();
|
|
234
|
+
toPrint.forEach((result, i) => logger_1.LOGGER.info(`${i + 1}. `, result.file, ':', toPrintMessage(result)));
|
|
235
|
+
logger_1.LOGGER.newLine();
|
|
236
|
+
if (options.json) {
|
|
237
|
+
fs.writeFileSync(path.join(rootDir, 'headerCheck.json'), JSON.stringify(results, undefined, 2));
|
|
238
|
+
}
|
|
239
|
+
if (violations.length > 0 && (options.autoFix || readline.keyInYN('Do you want automatically fix copyright year range violations?'))) {
|
|
240
|
+
const toFix = violations.filter(violation => violation.severity === 'error' && isDateValidationResult(violation));
|
|
241
|
+
fixViolations(rootDir, toFix, options);
|
|
242
|
+
}
|
|
243
|
+
logger_1.LOGGER.info('Check completed');
|
|
244
|
+
}
|
|
245
|
+
exports.handleValidationResults = handleValidationResults;
|
|
246
|
+
function toPrintMessage(result) {
|
|
247
|
+
const colors = {
|
|
248
|
+
error: '\x1b[31m',
|
|
249
|
+
warn: '\x1b[33m',
|
|
250
|
+
ok: '\x1b[32m'
|
|
251
|
+
};
|
|
252
|
+
if (isDateValidationResult(result) &&
|
|
253
|
+
(result.violation === 'incorrectCopyrightPeriod' || result.violation === 'invalidCopyrightYear')) {
|
|
254
|
+
const expected = result.expectedStartYear !== result.expectedEndYear
|
|
255
|
+
? `${result.expectedStartYear}-${result.expectedEndYear}`
|
|
256
|
+
: result.expectedStartYear.toString();
|
|
257
|
+
const actual = result.currentEndYear ? `${result.currentStartYear}-${result.currentEndYear}` : result.currentStartYear.toString();
|
|
258
|
+
const message = result.violation === 'incorrectCopyrightPeriod' ? 'Invalid copyright period' : 'Invalid copyright year';
|
|
259
|
+
return `${colors[result.severity]} ${message}! Expected '${expected}' but is '${actual}'`;
|
|
260
|
+
}
|
|
261
|
+
else if (result.violation === 'noOrMissingHeader') {
|
|
262
|
+
return `${colors[result.severity]} No or invalid copyright header!`;
|
|
263
|
+
}
|
|
264
|
+
return `${colors[result.severity]} OK`;
|
|
265
|
+
}
|
|
266
|
+
function fixViolations(rootDir, violations, options) {
|
|
267
|
+
logger_1.LOGGER.newLine();
|
|
268
|
+
violations.forEach((violation, i) => {
|
|
269
|
+
printFileProgress(i + 1, violations.length, `Fix ${violation.file}`, false);
|
|
270
|
+
const fixedStartYear = violation.currentStartYear < violation.expectedStartYear ? violation.currentStartYear : violation.expectedStartYear;
|
|
271
|
+
const currentRange = `${violation.currentStartYear}${violation.currentEndYear ? '-' + violation.currentEndYear : ''}`;
|
|
272
|
+
let fixedRange = `${fixedStartYear}`;
|
|
273
|
+
if (violation.expectedEndYear !== violation.expectedStartYear || fixedStartYear !== violation.expectedStartYear) {
|
|
274
|
+
fixedRange = `${fixedStartYear}-${violation.expectedEndYear}`;
|
|
275
|
+
}
|
|
276
|
+
sh.sed('-i', RegExp('Copyright \\([cC]\\) ' + currentRange), `Copyright (c) ${fixedRange}`, violation.file);
|
|
277
|
+
});
|
|
278
|
+
logger_1.LOGGER.newLine();
|
|
279
|
+
if (options.autoFix || readline.keyInYN('Do you want to create a commit for the fixed files?')) {
|
|
280
|
+
logger_1.LOGGER.newLine();
|
|
281
|
+
const files = violations.map(violation => violation.file).join(' ');
|
|
282
|
+
sh.exec(`git add ${files}`, (0, command_util_1.getShellConfig)());
|
|
283
|
+
sh.exec(`git commit -m "${AUTO_FIX_MESSAGE}"`);
|
|
284
|
+
logger_1.LOGGER.newLine();
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
function isDateValidationResult(object) {
|
|
288
|
+
return 'currentStartYear' in object && 'expectedStartYear' in object && 'expectedEndYear' in object;
|
|
289
|
+
}
|
|
290
|
+
//# sourceMappingURL=check-header.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"check-header.js","sourceRoot":"","sources":["../../src/commands/check-header.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,11 +14,34 @@
|
|
|
14
14
|
*
|
|
15
15
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
16
|
********************************************************************************/
|
|
17
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
18
|
+
if (k2 === undefined) k2 = k;
|
|
19
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
20
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
21
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
22
|
+
}
|
|
23
|
+
Object.defineProperty(o, k2, desc);
|
|
24
|
+
}) : (function(o, m, k, k2) {
|
|
25
|
+
if (k2 === undefined) k2 = k;
|
|
26
|
+
o[k2] = m[k];
|
|
27
|
+
}));
|
|
28
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
29
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
30
|
+
}) : function(o, v) {
|
|
31
|
+
o["default"] = v;
|
|
32
|
+
});
|
|
33
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
17
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
41
|
exports.collectPackageReportFiles = exports.validateAndRetrievePackages = exports.generateCoverageReport = exports.CoverageReportCommand = void 0;
|
|
19
|
-
const fs = require("fs");
|
|
20
|
-
const path = require("path");
|
|
21
|
-
const sh = require("shelljs");
|
|
42
|
+
const fs = __importStar(require("fs"));
|
|
43
|
+
const path = __importStar(require("path"));
|
|
44
|
+
const sh = __importStar(require("shelljs"));
|
|
22
45
|
const command_util_1 = require("../util/command-util");
|
|
23
46
|
const logger_1 = require("../util/logger");
|
|
24
47
|
const validation_util_1 = require("../util/validation-util");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coverage-report.js","sourceRoot":"","sources":["../../src/commands/coverage-report.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF
|
|
1
|
+
{"version":3,"file":"coverage-report.js","sourceRoot":"","sources":["../../src/commands/coverage-report.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ export declare function updateVersion(...packages: {
|
|
|
61
61
|
}[]): void;
|
|
62
62
|
export declare function updateServerConfig(configFile: string, version: string, isSnapShot: boolean): void;
|
|
63
63
|
export declare function asMvnVersion(version: string): string;
|
|
64
|
-
export declare function
|
|
64
|
+
export declare function checkIfNpmVersionIsNew(pckgName: string, newVersion: string): Promise<void>;
|
|
65
65
|
export declare function checkIfMavenVersionExists(groupId: string, artifactId: string, newVersion: string): void;
|
|
66
66
|
export declare function isExistingMavenVersion(groupId: string, artifactId: string, version: string): boolean;
|
|
67
67
|
export declare function checkJavaServerVersion(version: string, force?: boolean): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/commands/release/common.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAalF,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAE3D,MAAM,WAAW,cAAc;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC;AAE9D,MAAM,WAAW,SAAS;IACtB,IAAI,EAAE,OAAO,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACrB;AACD,yBAAiB,SAAS,CAAC;IAChB,MAAM,MAAM,EAAE,SAKpB,CAAC;IACK,MAAM,iBAAiB,EAAE,SAK/B,CAAC;IACK,MAAM,kBAAkB,EAAE,SAKhC,CAAC;IACK,MAAM,WAAW,EAAE,SAKzB,CAAC;IACK,MAAM,WAAW,EAAE,SAKzB,CAAC;IACK,MAAM,mBAAmB,EAAE,SAKjC,CAAC;IAEK,MAAM,GAAG,EAAE,SAAS,EAAmG,CAAC;IACxH,MAAM,WAAW,qHAOd,CAAC;IAEX,SAAgB,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAOlD;IAED,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,SAAS,CAEnD;CACJ;AAED,yBAAiB,WAAW,CAAC;IAClB,MAAM,WAAW,sDAAuD,CAAC;CACnF;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;AAEjE,wBAAgB,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAsB7D;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAe5E;AAED,wBAAgB,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAuB7E;AAgCD,wBAAgB,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAS7E;AAED,wBAAgB,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAIxD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAGvE;AAED,wBAAgB,aAAa,CAAC,GAAG,QAAQ,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,IAAI,CAQpF;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,IAAI,CAIjG;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKpD;AAED,wBAAsB,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/commands/release/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,40 @@
|
|
|
14
14
|
*
|
|
15
15
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
16
|
********************************************************************************/
|
|
17
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
18
|
+
if (k2 === undefined) k2 = k;
|
|
19
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
20
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
21
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
22
|
+
}
|
|
23
|
+
Object.defineProperty(o, k2, desc);
|
|
24
|
+
}) : (function(o, m, k, k2) {
|
|
25
|
+
if (k2 === undefined) k2 = k;
|
|
26
|
+
o[k2] = m[k];
|
|
27
|
+
}));
|
|
28
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
29
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
30
|
+
}) : function(o, v) {
|
|
31
|
+
o["default"] = v;
|
|
32
|
+
});
|
|
33
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
41
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
42
|
+
};
|
|
17
43
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.updateLernaForDryRun = exports.checkJavaServerVersion = exports.isExistingMavenVersion = exports.checkIfMavenVersionExists = exports.
|
|
19
|
-
const fs = require("fs");
|
|
20
|
-
const node_fetch_1 = require("node-fetch");
|
|
44
|
+
exports.updateLernaForDryRun = exports.checkJavaServerVersion = exports.isExistingMavenVersion = exports.checkIfMavenVersionExists = exports.checkIfNpmVersionIsNew = exports.asMvnVersion = exports.updateServerConfig = exports.updateVersion = exports.upgradeCommand = exports.yarnInstall = exports.lernaSetVersion = exports.publish = exports.commitAndTag = exports.checkoutAndCd = exports.ReleaseType = exports.Component = exports.VERDACCIO_REGISTRY = void 0;
|
|
45
|
+
const fs = __importStar(require("fs"));
|
|
46
|
+
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
21
47
|
const path_1 = require("path");
|
|
22
|
-
const readline = require("readline-sync");
|
|
23
|
-
const semver = require("semver");
|
|
24
|
-
const sh = require("shelljs");
|
|
48
|
+
const readline = __importStar(require("readline-sync"));
|
|
49
|
+
const semver = __importStar(require("semver"));
|
|
50
|
+
const sh = __importStar(require("shelljs"));
|
|
25
51
|
const command_util_1 = require("../../util/command-util");
|
|
26
52
|
const git_util_1 = require("../../util/git-util");
|
|
27
53
|
const logger_1 = require("../../util/logger");
|
|
@@ -87,11 +113,11 @@ var Component;
|
|
|
87
113
|
return typeof object === 'object' && typeof object.type === 'string';
|
|
88
114
|
}
|
|
89
115
|
Component.is = is;
|
|
90
|
-
})(Component
|
|
116
|
+
})(Component || (exports.Component = Component = {}));
|
|
91
117
|
var ReleaseType;
|
|
92
118
|
(function (ReleaseType) {
|
|
93
119
|
ReleaseType.CLI_CHOICES = ['major', 'minor', 'patch', 'rc', 'custom'];
|
|
94
|
-
})(ReleaseType
|
|
120
|
+
})(ReleaseType || (exports.ReleaseType = ReleaseType = {}));
|
|
95
121
|
function checkoutAndCd(options) {
|
|
96
122
|
const ghUrl = options.component.githubRepo;
|
|
97
123
|
logger_1.LOGGER.info(`Clone repository '${ghUrl}' to directory: ${options.checkoutDir}`);
|
|
@@ -111,8 +137,8 @@ function checkoutAndCd(options) {
|
|
|
111
137
|
sh.exec(`gh repo clone ${ghUrl}`, (0, command_util_1.getShellConfig)());
|
|
112
138
|
logger_1.LOGGER.debug(`Successfully cloned to ${directory}`);
|
|
113
139
|
sh.cd(directory);
|
|
114
|
-
if (options.
|
|
115
|
-
sh.exec(`git
|
|
140
|
+
if (options.branch !== 'master' && options.branch !== 'main') {
|
|
141
|
+
sh.exec(`git checkout ${options.branch} `);
|
|
116
142
|
}
|
|
117
143
|
return sh.pwd();
|
|
118
144
|
}
|
|
@@ -146,7 +172,7 @@ function publish(repositoryPath, options) {
|
|
|
146
172
|
if (!options.force && (0, git_util_1.hasGitChanges)()) {
|
|
147
173
|
throw new Error('Publish failed. The repository has pending changes');
|
|
148
174
|
}
|
|
149
|
-
const latestReleaseTag = (0, git_util_1.
|
|
175
|
+
const latestReleaseTag = (0, git_util_1.getLatestGithubRelease)();
|
|
150
176
|
const localTag = (0, git_util_1.getLatestTag)();
|
|
151
177
|
validateTag(latestReleaseTag, localTag);
|
|
152
178
|
const preRelease = options.releaseType === 'rc' || localTag.includes('-');
|
|
@@ -157,7 +183,7 @@ function doPublish(tag, preRelease, latestRelease, draft) {
|
|
|
157
183
|
(0, command_util_1.fatalExec)(`git push origin HEAD:${tag}`, 'Could not push release branch to Github', (0, command_util_1.getShellConfig)({ silent: false }));
|
|
158
184
|
(0, command_util_1.fatalExec)(`git push origin tag ${tag}`, 'Could not push tag to Github', (0, command_util_1.getShellConfig)({ silent: false }));
|
|
159
185
|
const version = tagToVersion(tag);
|
|
160
|
-
const titleSuffix = preRelease ? `
|
|
186
|
+
const titleSuffix = preRelease ? ` Candidate ${version.substring(version.lastIndexOf('-RC') + 3)}` : '';
|
|
161
187
|
const title = `${version.replace(/-.*/, '')} Release${titleSuffix} `;
|
|
162
188
|
sh.exec(`gh release create ${tag} -t "${title}" --notes-start-tag ${latestRelease} --generate-notes ${draft ? '-d' : ''} ${preRelease ? '-p' : ''}`, (0, command_util_1.getShellConfig)());
|
|
163
189
|
}
|
|
@@ -220,8 +246,8 @@ function asMvnVersion(version) {
|
|
|
220
246
|
return mavenVersion;
|
|
221
247
|
}
|
|
222
248
|
exports.asMvnVersion = asMvnVersion;
|
|
223
|
-
async function
|
|
224
|
-
logger_1.LOGGER.debug(`Check
|
|
249
|
+
async function checkIfNpmVersionIsNew(pckgName, newVersion) {
|
|
250
|
+
logger_1.LOGGER.debug(`Check that the release version is new i.e. does not exist on npm: ${newVersion}`);
|
|
225
251
|
const response = await (0, node_fetch_1.default)(`https://registry.npmjs.org/${pckgName}/${newVersion}`);
|
|
226
252
|
const data = await response.json();
|
|
227
253
|
if (typeof data === 'string' && data.includes('version not found:')) {
|
|
@@ -230,7 +256,7 @@ async function checkIfNpmVersionExists(pckgName, newVersion) {
|
|
|
230
256
|
}
|
|
231
257
|
throw new Error(`Version '${newVersion} is already present on NPM!}`);
|
|
232
258
|
}
|
|
233
|
-
exports.
|
|
259
|
+
exports.checkIfNpmVersionIsNew = checkIfNpmVersionIsNew;
|
|
234
260
|
function checkIfMavenVersionExists(groupId, artifactId, newVersion) {
|
|
235
261
|
logger_1.LOGGER.debug('Check if maven version exists');
|
|
236
262
|
if (isExistingMavenVersion(groupId, artifactId, newVersion)) {
|