@eclipse-glsp/cli 1.1.0-next.28fb493.121 → 1.1.0-next.3b7f01d.144

package/lib/util/validation-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation-util.js","sourceRoot":"","sources":["../../src/util/validation-util.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAiD;AACjD,yBAAyB;AACzB,+BAA+B;AAC/B,iCAAiC;AACjC,yCAAyD;AACzD,qCAAkC;AACrB,QAAA,eAAe,GAAG,YAAY,CAAC;AAE5C,SAAgB,iBAAiB,CAAC,OAAe;IAC7C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,gCAAoB,CAAC,wBAAwB,CAAC,CAAC;KAC5D;IAED,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;QAClC,MAAM,IAAI,gCAAoB,CAAC,kBAAkB,CAAC,CAAC;KACtD;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAVD,8CAUC;AAED,SAAgB,YAAY,CAAC,QAAgB,EAAE,UAAU,GAAG,KAAK;IAC7D,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAE/B,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACpC,MAAM,IAAI,gCAAoB,CAAC,wBAAwB,CAAC,CAAC;KAC5D;IACD,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,IAAI,gCAAoB,CAAC,aAAa,CAAC,CAAC;KACjD;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAVD,oCAUC;AAED,SAAgB,eAAe,CAAC,OAAe;IAC3C,eAAM,CAAC,KAAK,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACxB,MAAM,IAAI,gCAAoB,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;KACrE;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAND,0CAMC;AAED,SAAgB,oBAAoB,CAAC,UAAkB;IACnD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAC/C,IAAI,CAAC,IAAA,0BAAe,EAAC,QAAQ,CAAC,EAAE;QAC5B,MAAM,IAAI,gCAAoB,CAAC,4BAA4B,CAAC,CAAC;KAChE;IAED,OAAO,IAAA,qBAAU,EAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AAPD,oDAOC"}
+{"version":3,"file":"validation-util.js","sourceRoot":"","sources":["../../src/util/validation-util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAiD;AACjD,uCAAyB;AACzB,+BAA+B;AAC/B,+CAAiC;AACjC,yCAAyD;AACzD,qCAAkC;AACrB,QAAA,eAAe,GAAG,YAAY,CAAC;AAE5C,SAAgB,iBAAiB,CAAC,OAAe;IAC7C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,gCAAoB,CAAC,wBAAwB,CAAC,CAAC;KAC5D;IAED,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;QAClC,MAAM,IAAI,gCAAoB,CAAC,kBAAkB,CAAC,CAAC;KACtD;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAVD,8CAUC;AAED,SAAgB,YAAY,CAAC,QAAgB,EAAE,UAAU,GAAG,KAAK;IAC7D,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAE/B,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACpC,MAAM,IAAI,gCAAoB,CAAC,wBAAwB,CAAC,CAAC;KAC5D;IACD,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,IAAI,gCAAoB,CAAC,aAAa,CAAC,CAAC;KACjD;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAVD,oCAUC;AAED,SAAgB,eAAe,CAAC,OAAe;IAC3C,eAAM,CAAC,KAAK,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACxB,MAAM,IAAI,gCAAoB,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;KACrE;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAND,0CAMC;AAED,SAAgB,oBAAoB,CAAC,UAAkB;IACnD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAC/C,IAAI,CAAC,IAAA,0BAAe,EAAC,QAAQ,CAAC,EAAE;QAC5B,MAAM,IAAI,gCAAoB,CAAC,4BAA4B,CAAC,CAAC;KAChE;IAED,OAAO,IAAA,qBAAU,EAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AAPD,oDAOC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/cli",
-  "version": "1.1.0-next.28fb493.121+28fb493",
+  "version": "1.1.0-next.3b7f01d.144+3b7f01d",
   "description": "CLI Tooling & scripts for GLSP components",
   "keywords": [
     "eclipse",
@@ -41,24 +41,23 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "commander": "^9.4.0",
+    "commander": "^10.0.1",
     "glob": "^8.0.3",
-    "node-fetch": "2.6.7",
+    "node-fetch": "^2.6.11",
     "readline-sync": "^1.4.10",
-    "semver": "^7.3.7",
-    "shelljs": "0.8.5"
+    "semver": "^7.5.1",
+    "shelljs": "^0.8.5"
   },
   "devDependencies": {
-    "@eclipse-glsp/config": "1.1.0-next.28fb493.121+28fb493",
+    "@eclipse-glsp/config": "1.1.0-next.3b7f01d.144+3b7f01d",
     "@types/glob": "^8.0.0",
     "@types/node-fetch": "2.6.2",
     "@types/readline-sync": "1.4.4",
     "@types/semver": "7.3.12",
-    "@types/shelljs": "0.8.11",
-    "ts-node": "^10.9.1"
+    "@types/shelljs": "0.8.11"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "28fb4937509ef26d95a20996b342a8344f116238"
+  "gitHead": "3b7f01d088c3dc4048b5428b6660aafe9783dde9"
 }

package/src/app.ts

@@ -18,6 +18,7 @@ import { CheckHeaderCommand } from './commands/check-header';
 import { CoverageReportCommand } from './commands/coverage-report';
 import { ReleaseCommand } from './commands/release/release';
 import { baseCommand } from './util/command-util';
+
 export const COMMAND_VERSION = '1.1.0-next';
 
 const app = baseCommand() //

package/src/commands/check-header.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,8 +18,9 @@ import { Option } from 'commander';
 import * as fs from 'fs';
 import { glob } from 'glob';
 import * as minimatch from 'minimatch';
+import * as readline from 'readline-sync';
 import * as sh from 'shelljs';
-import { baseCommand, configureShell } from '../util/command-util';
+import { baseCommand, configureShell, getShellConfig } from '../util/command-util';
 import {
     getChangesOfLastCommit,
     getFirstCommit,
@@ -28,6 +29,7 @@ import {
     getLastModificationDate,
     getUncommittedChanges
 } from '../util/git-util';
+
 import { LOGGER } from '../util/logger';
 import { validateGitDirectory } from '../util/validation-util';
 import path = require('path');
@@ -35,9 +37,9 @@ export interface HeaderCheckOptions {
     type: CheckType;
     exclude: string[];
     fileExtensions: string[];
-    headerPattern: string;
     json: boolean;
     excludeDefaults: boolean;
+    autoFix: boolean;
     severity: Severity;
 }
 
@@ -50,6 +52,8 @@ type Severity = typeof severityTypes[number];
 
 const DEFAULT_EXCLUDES = ['**/@(node_modules|lib|dist|bundle)/**'];
 const YEAR_RANGE_REGEX = /\d{4}(?:-d{4})?/g;
+const HEADER_PATTERN = 'Copyright \\([cC]\\) \\d{4}(-d{4})?';
+const AUTO_FIX_MESSAGE = 'Fix copyright header violations';
 
 export const CheckHeaderCommand = baseCommand() //
     .name('checkHeaders')
@@ -75,17 +79,13 @@ export const CheckHeaderCommand = baseCommand() //
         '--no-exclude-defaults',
         'Disables the default excludes patterns. Only explicitly passed exclude patterns (-e, --exclude) are considered'
     )
-    .option(
-        '-p, --headerPattern <pattern>',
-        'Regex pattern to extract the copyright year (range) from the header',
-        'Copyright \\([cC]\\) \\d{4}(-d{4})?'
-    )
     .option('-j, --json', 'Also persist validation results as json file', false)
     .addOption(
         new Option('-s, --severity <severity>', 'The severity of validation results that should be printed.')
             .choices(severityTypes)
             .default('error', '"error" (only)')
     )
+    .option('-a, --autoFix', 'Auto apply & commit fixes without prompting the user', false)
     .action(checkHeaders);
 
 export function checkHeaders(rootDir: string, options: HeaderCheckOptions): void {
@@ -102,8 +102,8 @@ export function checkHeaders(rootDir: string, options: HeaderCheckOptions): void
         LOGGER.info('Check completed');
         return;
     }
-    const result = validate(rootDir, files, options);
-    displayValidationResult(rootDir, result, options);
+    const results = validate(rootDir, files, options);
+    handleValidationResults(rootDir, results, options);
 }
 
 function getFiles(rootDir: string, options: HeaderCheckOptions): string[] {
@@ -123,14 +123,14 @@ function getFiles(rootDir: string, options: HeaderCheckOptions): string[] {
     excludePattern.forEach(pattern => {
         changedFiles = changedFiles.filter(minimatch.filter(`!${pattern}`));
     });
-    return changedFiles;
+    return changedFiles.filter(file => fs.existsSync(file));
 }
 
 function validate(rootDir: string, files: string[], options: HeaderCheckOptions): ValidationResult[] {
     // Derives all files with valid headers, their copyright years and all files with no or invalid headers
-    const filesWithHeader = sh.grep('-l', options.headerPattern, files).stdout.trim().split('\n');
+    const filesWithHeader = sh.grep('-l', HEADER_PATTERN, files).stdout.trim().split('\n');
     const copyrightYears = sh
-        .grep(options.headerPattern, files)
+        .grep(HEADER_PATTERN, files)
         .stdout.trim()
         .split('\n')
         .map(line => line.match(YEAR_RANGE_REGEX)!.map(string => Number.parseInt(string, 10)));
@@ -146,7 +146,7 @@ function validate(rootDir: string, files: string[], options: HeaderCheckOptions)
         LOGGER.info(`Found ${noHeadersLength} files with no (or an invalid) copyright header`);
     }
     noHeaders.forEach((file, i) => {
-        printValidationProgress(i + 1, allFilesLength, file);
+        printFileProgress(i + 1, allFilesLength, `Validating ${file}`);
         results.push({ file: path.resolve(rootDir, file), violation: 'noOrMissingHeader', severity: 'error' });
     });
 
@@ -160,13 +160,13 @@ function validate(rootDir: string, files: string[], options: HeaderCheckOptions)
 
     // Create validation results for all files with valid headers
     filesWithHeader.forEach((file, i) => {
-        printValidationProgress(i + 1 + noHeadersLength, allFilesLength, file);
+        printFileProgress(i + 1 + noHeadersLength, allFilesLength, `Validating ${file}`);
 
         const result: DateValidationResult = {
             currentStartYear: copyrightYears[i].shift()!,
-            expectedStartYear: getFirstModificationDate(file)!.getFullYear(),
+            expectedStartYear: getFirstModificationDate(file, rootDir, AUTO_FIX_MESSAGE)!.getFullYear(),
             currentEndYear: copyrightYears[i].shift(),
-            expectedEndYear: defaultEndYear ?? getLastModificationDate(file)!.getFullYear(),
+            expectedEndYear: defaultEndYear ?? getLastModificationDate(file, rootDir, AUTO_FIX_MESSAGE)!.getFullYear(),
             file,
             severity: 'ok',
             violation: 'none'
@@ -239,19 +239,21 @@ function validateTimePeriod(result: DateValidationResult): void {
     }
 }
 
-function printValidationProgress(currentFileCount: number, maxFileCount: number, file: string): void {
-    process.stdout.clearLine(0);
-    process.stdout.cursorTo(0);
-    process.stdout.write(`[${currentFileCount} of ${maxFileCount}] Validating ${file}`);
+function printFileProgress(currentFileCount: number, maxFileCount: number, message: string, clear = true): void {
+    if (clear) {
+        process.stdout.clearLine(0);
+        process.stdout.cursorTo(0);
+    }
+    process.stdout.write(`[${currentFileCount} of ${maxFileCount}] ${message}`);
+    if (!clear) {
+        process.stdout.write('\n');
+    }
 }
 
-export function displayValidationResult(rootDir: string, results: ValidationResult[], options: HeaderCheckOptions): void {
+export function handleValidationResults(rootDir: string, results: ValidationResult[], options: HeaderCheckOptions): void {
     LOGGER.newLine();
     LOGGER.info(`Header validation for ${results.length} files completed`);
     const violations = results.filter(result => result.severity === 'error');
-    LOGGER.info(`Found ${violations.length} copyright header violations:`);
-    LOGGER.newLine();
-
     // Adjust results to print based on configured severity level
     let toPrint = results;
     if (options.severity === 'error') {
@@ -259,6 +261,10 @@ export function displayValidationResult(rootDir: string, results: ValidationResu
     } else if (options.severity === 'warn') {
         toPrint = results.filter(result => result.severity !== 'ok');
     }
+
+    LOGGER.info(`Found ${toPrint.length} copyright header violations:`);
+    LOGGER.newLine();
+
     toPrint.forEach((result, i) => LOGGER.info(`${i + 1}. `, result.file, ':', toPrintMessage(result)));
 
     LOGGER.newLine();
@@ -266,6 +272,14 @@ export function displayValidationResult(rootDir: string, results: ValidationResu
     if (options.json) {
         fs.writeFileSync(path.join(rootDir, 'headerCheck.json'), JSON.stringify(results, undefined, 2));
     }
+
+    if (violations.length > 0 && (options.autoFix || readline.keyInYN('Do you want automatically fix copyright year range violations?'))) {
+        const toFix = violations.filter(
+            violation => violation.severity === 'error' && isDateValidationResult(violation)
+        ) as DateValidationResult[];
+        fixViolations(rootDir, toFix, options);
+    }
+
     LOGGER.info('Check completed');
 }
 
@@ -294,6 +308,32 @@ function toPrintMessage(result: ValidationResult): string {
     return `${colors[result.severity]} OK`;
 }
 
+function fixViolations(rootDir: string, violations: DateValidationResult[], options: HeaderCheckOptions): void {
+    LOGGER.newLine();
+    violations.forEach((violation, i) => {
+        printFileProgress(i + 1, violations.length, `Fix ${violation.file}`, false);
+        const fixedStartYear =
+            violation.currentStartYear < violation.expectedStartYear ? violation.currentStartYear : violation.expectedStartYear;
+
+        const currentRange = `${violation.currentStartYear}${violation.currentEndYear ? '-' + violation.currentEndYear : ''}`;
+
+        let fixedRange = `${fixedStartYear}`;
+        if (violation.expectedEndYear !== violation.expectedStartYear || fixedStartYear !== violation.expectedStartYear) {
+            fixedRange = `${fixedStartYear}-${violation.expectedEndYear}`;
+        }
+
+        sh.sed('-i', RegExp('Copyright \\([cC]\\) ' + currentRange), `Copyright (c) ${fixedRange}`, violation.file);
+    });
+    LOGGER.newLine();
+    if (options.autoFix || readline.keyInYN('Do you want to create a commit for the fixed files?')) {
+        LOGGER.newLine();
+        const files = violations.map(violation => violation.file).join(' ');
+        sh.exec(`git add ${files}`, getShellConfig());
+        sh.exec(`git commit -m "${AUTO_FIX_MESSAGE}"`);
+        LOGGER.newLine();
+    }
+}
+
 // Helper types
 interface ValidationResult {
     file: string;

package/src/commands/release/common.ts

@@ -134,8 +134,8 @@ export function checkoutAndCd(options: ReleaseOptions): string {
     sh.exec(`gh repo clone ${ghUrl}`, getShellConfig());
     LOGGER.debug(`Successfully cloned to ${directory}`);
     sh.cd(directory);
-    if (options.checkoutDir !== 'master') {
-        sh.exec(`git switch ${options.branch} `);
+    if (options.branch !== 'master' && options.branch !== 'main') {
+        sh.exec(`git checkout ${options.branch} `);
     }
     return sh.pwd();
 }
@@ -186,7 +186,7 @@ function doPublish(tag: string, preRelease: boolean, latestRelease: string, draf
     fatalExec(`git push origin HEAD:${tag}`, 'Could not push release branch to Github', getShellConfig({ silent: false }));
     fatalExec(`git push origin tag ${tag}`, 'Could not push tag to Github', getShellConfig({ silent: false }));
     const version = tagToVersion(tag);
-    const titleSuffix = preRelease ? ` Candiate ${version.substring(version.length - 1)}` : '';
+    const titleSuffix = preRelease ? ` Candidate ${version.substring(version.lastIndexOf('-RC') + 3)}` : '';
     const title = `${version.replace(/-.*/, '')} Release${titleSuffix} `;
     sh.exec(
         `gh release create ${tag} -t "${title}" --notes-start-tag ${latestRelease} --generate-notes ${draft ? '-d' : ''} ${
@@ -257,8 +257,8 @@ export function asMvnVersion(version: string): string {
     return mavenVersion;
 }
 
-export async function checkIfNpmVersionExists(pckgName: string, newVersion: string): Promise<void> {
-    LOGGER.debug(`Check if version exists on npm: ${newVersion}`);
+export async function checkIfNpmVersionIsNew(pckgName: string, newVersion: string): Promise<void> {
+    LOGGER.debug(`Check that the release version is new i.e. does not exist on npm: ${newVersion}`);
 
     const response = await fetch(`https://registry.npmjs.org/${pckgName}/${newVersion}`);
     const data = await response.json();

package/src/commands/release/release-client.ts

@@ -16,15 +16,13 @@
 import * as sh from 'shelljs';
 import { LOGGER } from '../../util/logger';
 import {
-    asMvnVersion,
-    checkJavaServerVersion,
     checkoutAndCd,
     commitAndTag,
     lernaSetVersion,
     publish,
     ReleaseOptions,
     updateLernaForDryRun,
-    updateServerConfig,
+    updateVersion,
     yarnInstall
 } from './common';
 
@@ -34,7 +32,7 @@ export async function releaseClient(options: ReleaseOptions): Promise<void> {
     LOGGER.info('Prepare glsp-client release');
     LOGGER.debug('Release options: ', options.version);
     REPO_ROOT = checkoutAndCd(options);
-    await updateDownloadServerScript(options.version, options.force);
+    updateExternalGLSPDependencies(options.version);
     generateChangeLog();
     lernaSetVersion(REPO_ROOT, options.version);
     build();
@@ -45,12 +43,10 @@ export async function releaseClient(options: ReleaseOptions): Promise<void> {
     publish(REPO_ROOT, options);
 }
 
-async function updateDownloadServerScript(version: string, force: boolean): Promise<void> {
-    LOGGER.info('Update example server download config');
-    const mvnVersion = asMvnVersion(version);
-    checkJavaServerVersion(version, force);
-    sh.cd(`${REPO_ROOT}/examples/workflow-glsp/scripts`);
-    updateServerConfig('config.json', mvnVersion, false);
+function updateExternalGLSPDependencies(version: string): void {
+    LOGGER.info('Update external GLSP dependencies (workflow example server)');
+    sh.cd(REPO_ROOT);
+    updateVersion({ name: '@eclipse-glsp-examples/workflow-server-bundled', version });
 }
 
 function generateChangeLog(): void {

package/src/commands/release/release-theia-integration.ts

@@ -17,15 +17,12 @@
 import * as sh from 'shelljs';
 import { LOGGER } from '../../util/logger';
 import {
-    asMvnVersion,
     checkoutAndCd,
     commitAndTag,
-    isExistingMavenVersion,
     lernaSetVersion,
     publish,
     ReleaseOptions,
     updateLernaForDryRun,
-    updateServerConfig,
     updateVersion,
     yarnInstall
 } from './common';
@@ -37,7 +34,6 @@ export async function releaseTheiaIntegration(options: ReleaseOptions): Promise<
     LOGGER.debug('Release options: ', options);
     REPO_ROOT = checkoutAndCd(options);
     updateExternalGLSPDependencies(options.version);
-    await updateDownloadServerScript(options.version);
     generateChangeLog();
     lernaSetVersion(REPO_ROOT, options.version);
     build();
@@ -49,21 +45,13 @@ export async function releaseTheiaIntegration(options: ReleaseOptions): Promise<
 }
 
 function updateExternalGLSPDependencies(version: string): void {
-    LOGGER.info('Update external GLSP dependencies (Client and workflow example)');
+    LOGGER.info('Update external GLSP dependencies (Client and workflow example & server)');
     sh.cd(REPO_ROOT);
-    updateVersion({ name: '@eclipse-glsp/client', version }, { name: '@eclipse-glsp-examples/workflow-glsp', version });
-}
-
-async function updateDownloadServerScript(version: string): Promise<void> {
-    LOGGER.info('Update example server download config');
-    const mvnVersion = asMvnVersion(version);
-    if (!isExistingMavenVersion('org.eclipse.glsp', 'org.eclipse.glsp.server', mvnVersion)) {
-        LOGGER.warn(`No Java GLSP server with version ${mvnVersion} found on maven central!. Please release a new Java GLSP Server version
-        before publishing this release!`);
-    }
-
-    sh.cd(`${REPO_ROOT}/examples/workflow-theia/src/node`);
-    updateServerConfig('server-config.json', mvnVersion, false);
+    updateVersion(
+        { name: '@eclipse-glsp/client', version },
+        { name: '@eclipse-glsp-examples/workflow-glsp', version },
+        { name: '@eclipse-glsp-examples/workflow-server', version }
+    );
 }
 
 function build(): void {

package/src/commands/release/release-vscode-integration.ts

@@ -50,7 +50,8 @@ function updateExternalGLSPDependencies(version: string): void {
     updateVersion(
         { name: '@eclipse-glsp/protocol', version },
         { name: '@eclipse-glsp/client', version },
-        { name: '@eclipse-glsp-examples/workflow-glsp', version }
+        { name: '@eclipse-glsp-examples/workflow-glsp', version },
+        { name: '@eclipse-glsp-examples/workflow-server', version }
     );
 }
 

package/src/commands/release/release.ts

@@ -21,16 +21,16 @@ import * as readline from 'readline-sync';
 import * as semver from 'semver';
 import * as sh from 'shelljs';
 import { baseCommand, configureShell, fatalExec, getShellConfig } from '../../util/command-util';
-import { configureLogger, LOGGER } from '../../util/logger';
+import { LOGGER, configureLogger } from '../../util/logger';
 import { validateDirectory, validateVersion } from '../../util/validation-util';
 import {
-    asMvnVersion,
-    checkIfMavenVersionExists,
-    checkIfNpmVersionExists,
     Component,
     ReleaseOptions,
     ReleaseType,
-    VERDACCIO_REGISTRY
+    VERDACCIO_REGISTRY,
+    asMvnVersion,
+    checkIfMavenVersionExists,
+    checkIfNpmVersionIsNew
 } from './common';
 import { releaseClient } from './release-client';
 import { releaseEclipseIntegration } from './release-eclipse-integration';
@@ -91,19 +91,19 @@ export async function release(
                 checkIfMavenVersionExists('org.eclipse.glsp', 'org.eclipse.glsp.server', asMvnVersion(version));
                 return releaseJavaServer(options);
             case 'server-node':
-                await checkIfNpmVersionExists('@eclipse-glsp/server-node', version);
+                await checkIfNpmVersionIsNew('@eclipse-glsp/server-node', version);
                 return releaseServerNode(options);
             case 'client':
-                await checkIfNpmVersionExists('@eclipse-glsp/client', version);
+                await checkIfNpmVersionIsNew('@eclipse-glsp/client', version);
                 return releaseClient(options);
             case 'theia-integration':
-                await checkIfNpmVersionExists('@eclipse-glsp/theia-integration', version);
+                await checkIfNpmVersionIsNew('@eclipse-glsp/theia-integration', version);
                 return releaseTheiaIntegration(options);
             case 'vscode-integration':
-                await checkIfNpmVersionExists('@eclipse-glsp/vscode-integration', version);
+                await checkIfNpmVersionIsNew('@eclipse-glsp/vscode-integration', version);
                 return releaseVscodeIntegration(options);
             case 'eclipse-integration':
-                await checkIfNpmVersionExists('@eclipse-glsp/ide', version);
+                await checkIfNpmVersionIsNew('@eclipse-glsp/ide', version);
                 return releaseEclipseIntegration(options);
         }
     } catch (err) {
@@ -134,7 +134,7 @@ function isGithubCLIAuthenticated(): boolean {
         }
         throw new Error(status.stderr);
     }
-    if (!status.stderr.trim().includes('Logged in to github.com')) {
+    if (!status.stdout.trim().includes('Logged in to github.com')) {
         LOGGER.debug("No user is logged in for host 'github.com'");
         return false;
     }

package/src/util/git-util.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2022 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@ export function getUncommittedChanges(path?: string): string[] {
         .exec('git status --porcelain', getShellConfig())
         .stdout.trim()
         .split('\n')
+        .filter(value => value.trim().length !== 0)
         .map(fileInfo =>
             // Extract relative file path from the info string and convert to absolute path
             resolve(path ?? process.cwd(), fileInfo.trim().split(' ').pop() ?? '')
@@ -71,11 +72,13 @@ export function getChangesOfLastCommit(path?: string): string[] {
  * Returns the last modification date of a file (or the last commit) in a git repo.
  * @param filePath The file. If undefined the modification date of the last commit will be returned
  * @param repoRoot The path to the repo root. If undefined the current working directory is used.
+ * @param excludeMessage Only consider commits that don`t match the excludeMessage
  * @returns The date or undefined if the file is outside of the git repo.
  */
-export function getLastModificationDate(filePath?: string, repoRoot?: string): Date | undefined {
+export function getLastModificationDate(filePath?: string, repoRoot?: string, excludeMessage?: string): Date | undefined {
     cdIfPresent(repoRoot);
-    const result = sh.exec(`git log -1 --pretty="format:%ci" ${filePath ?? ''}`, getShellConfig());
+    const additionalArgs = excludeMessage ? `--grep="${excludeMessage}" --invert-grep` : '';
+    const result = sh.exec(`git log -1 ${additionalArgs} --pretty="format:%ci" ${filePath ?? ''}`, getShellConfig());
     if (result.code !== 0) {
         return undefined;
     }
@@ -85,11 +88,13 @@ export function getLastModificationDate(filePath?: string, repoRoot?: string): D
  * Returns the last modification date of a file in a git repo.
  * @param filePath The file
  * @param repoRoot The path to the repo root. If undefined the current working directory is used.
+ * @param excludeMessage Only consider commits that don`t match the excludeMessage
  * @returns The date or undefined if the file is outside of the git repo.
  */
-export function getFirstModificationDate(filePath: string, repoRoot?: string): Date | undefined {
+export function getFirstModificationDate(filePath: string, repoRoot?: string, excludeMessage?: string): Date | undefined {
     cdIfPresent(repoRoot);
-    const result = sh.exec(`git log --pretty="format:%ci" --follow ${filePath}`, getShellConfig());
+    const additionalArgs = excludeMessage ? `--grep="${excludeMessage}" --invert-grep` : '';
+    const result = sh.exec(`git log ${additionalArgs} --pretty="format:%ci" --follow ${filePath}`, getShellConfig());
     if (result.code !== 0) {
         return undefined;
     }