@eclipse-glsp/cli 2.1.0-next.e32e40e.153 → 2.2.0-next.161

package/src/app.ts

@@ -16,7 +16,9 @@
  ********************************************************************************/
 import { CheckHeaderCommand } from './commands/check-header';
 import { CoverageReportCommand } from './commands/coverage-report';
+import { GenerateIndex } from './commands/generate-index';
 import { ReleaseCommand } from './commands/release/release';
+import { UpdateNextCommand } from './commands/update-next';
 import { baseCommand } from './util/command-util';
 
 export const COMMAND_VERSION = '1.1.0-next';
@@ -26,6 +28,8 @@ const app = baseCommand() //
     .name('glsp')
     .addCommand(CoverageReportCommand)
     .addCommand(ReleaseCommand)
-    .addCommand(CheckHeaderCommand);
+    .addCommand(CheckHeaderCommand)
+    .addCommand(UpdateNextCommand)
+    .addCommand(GenerateIndex);
 
 app.parse(process.argv);

package/src/commands/check-header.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -19,20 +19,14 @@ 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 sh from 'shelljs';
 import { baseCommand, configureShell, getShellConfig } from '../util/command-util';
-import {
-    getChangesOfLastCommit,
-    getFirstCommit,
-    getFirstModificationDate,
-    getInitialCommit,
-    getLastModificationDate,
-    getUncommittedChanges
-} from '../util/git-util';
+import { getChangesOfLastCommit, getLastModificationDate, getUncommittedChanges } from '../util/git-util';
 
+import * as path from 'path';
 import { LOGGER } from '../util/logger';
 import { validateGitDirectory } from '../util/validation-util';
-import path = require('path');
+
 export interface HeaderCheckOptions {
     type: CheckType;
     exclude: string[];
@@ -40,24 +34,19 @@ export interface HeaderCheckOptions {
     json: boolean;
     excludeDefaults: boolean;
     autoFix: boolean;
-    severity: Severity;
 }
 
 const checkTypes = ['full', 'changes', 'lastCommit'] as const;
-type CheckType = typeof checkTypes[number];
-
-const severityTypes = ['error', 'warn', 'ok'] as const;
-
-type Severity = typeof severityTypes[number];
+type CheckType = (typeof checkTypes)[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 YEAR_RANGE_REGEX = /\d{4}/g;
+const HEADER_PATTERN = 'Copyright \\([cC]\\) \\d{4}';
 const AUTO_FIX_MESSAGE = 'Fix copyright header violations';
 
 export const CheckHeaderCommand = baseCommand() //
     .name('checkHeaders')
-    .description('Validates the copyright year range of license header files')
+    .description('Validates the copyright year range (end year) of license header files')
     .argument('<rootDir>', 'The starting directory for the check', validateGitDirectory)
     .addOption(
         new Option(
@@ -80,11 +69,6 @@ export const CheckHeaderCommand = baseCommand() //
         'Disables the default excludes patterns. Only explicitly passed exclude patterns (-e, --exclude) are considered'
     )
     .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);
 
@@ -127,17 +111,11 @@ function getFiles(rootDir: string, options: HeaderCheckOptions): string[] {
 }
 
 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
+    // Derives all files with valid headers and all files with no or invalid headers
     const filesWithHeader = sh.grep('-l', HEADER_PATTERN, files).stdout.trim().split('\n');
-    const copyrightYears = sh
-        .grep(HEADER_PATTERN, files)
-        .stdout.trim()
-        .split('\n')
-        .map(line => line.match(YEAR_RANGE_REGEX)!.map(string => Number.parseInt(string, 10)));
     const noHeaders = files.filter(file => !filesWithHeader.includes(file));
 
     const results: ValidationResult[] = [];
-
     const allFilesLength = files.length;
 
     // Create validation results for all files with no or invalid headers
@@ -147,7 +125,7 @@ function validate(rootDir: string, files: string[], options: HeaderCheckOptions)
     }
     noHeaders.forEach((file, i) => {
         printFileProgress(i + 1, allFilesLength, `Validating ${file}`);
-        results.push({ file: path.resolve(rootDir, file), violation: 'noOrMissingHeader', severity: 'error' });
+        results.push({ file: path.resolve(rootDir, file), violation: 'noOrMissingHeader' });
     });
 
     // Performance optimization: avoid retrieving the dates for each individual file by precalculating the endYear if possible.
@@ -161,23 +139,24 @@ function validate(rootDir: string, files: string[], options: HeaderCheckOptions)
     // Create validation results for all files with valid headers
     filesWithHeader.forEach((file, i) => {
         printFileProgress(i + 1 + noHeadersLength, allFilesLength, `Validating ${file}`);
-
-        const result: DateValidationResult = {
-            currentStartYear: copyrightYears[i].shift()!,
-            expectedStartYear: getFirstModificationDate(file, rootDir, AUTO_FIX_MESSAGE)!.getFullYear(),
-            currentEndYear: copyrightYears[i].shift(),
-            expectedEndYear: defaultEndYear ?? getLastModificationDate(file, rootDir, AUTO_FIX_MESSAGE)!.getFullYear(),
-            file,
-            severity: 'ok',
-            violation: 'none'
-        };
-
-        if (result.expectedStartYear === result.expectedEndYear) {
-            validateSingleYear(result);
+        const copyrightLine = sh.head({ '-n': 2 }, file).stdout.trim().split('\n')[1];
+        const copyRightYears = copyrightLine.match(YEAR_RANGE_REGEX)!;
+        if (!copyRightYears) {
+            const result: ValidationResult = { file, violation: 'noYear', line: copyrightLine };
+            results.push(result);
         } else {
-            validateTimePeriod(result);
+            const currentStartYear = Number.parseInt(copyRightYears[0], 10);
+            const currentEndYear = copyRightYears[1] ? Number.parseInt(copyRightYears[1], 10) : undefined;
+            const result: DateValidationResult = {
+                currentStartYear,
+                currentEndYear,
+                expectedEndYear: defaultEndYear ?? getLastModificationDate(file, rootDir, AUTO_FIX_MESSAGE)!.getFullYear(),
+                file,
+                violation: 'none'
+            };
+            validateEndYear(result);
+            results.push(result);
         }
-        results.push(result);
     });
 
     results.sort((a, b) => a.file.localeCompare(b.file));
@@ -186,57 +165,16 @@ function validate(rootDir: string, files: string[], options: HeaderCheckOptions)
     return results;
 }
 
-function validateSingleYear(result: DateValidationResult): void {
-    const { currentStartYear, expectedStartYear, currentEndYear } = result;
-    result.violation = 'invalidCopyrightYear';
-    result.severity = 'error';
-
-    if (!currentEndYear) {
-        if (currentStartYear === expectedStartYear) {
-            result.violation = 'none';
-            result.severity = 'ok';
-        }
-        return;
-    }
-
-    // Cornercase: For files of the initial contribution the copyright header predates the first git modification date.
-    // => declare as warning if not part of the initial contribution.
-    if (expectedStartYear === currentEndYear && currentStartYear < expectedStartYear) {
-        if (getFirstCommit(result.file) === getInitialCommit()) {
-            result.violation = 'none';
-            result.severity = 'ok';
-        } else {
-            result.severity = 'warn';
-        }
-    }
-}
+function validateEndYear(result: DateValidationResult): void {
+    const { currentStartYear, expectedEndYear, currentEndYear } = result;
+    result.violation = 'invalidEndYear';
 
-function validateTimePeriod(result: DateValidationResult): void {
-    const { currentStartYear, expectedStartYear, expectedEndYear, currentEndYear } = result;
+    const valid = currentEndYear ? currentEndYear === expectedEndYear : currentStartYear === expectedEndYear;
 
-    result.violation = 'incorrectCopyrightPeriod';
-    result.severity = 'error';
-    if (!currentEndYear) {
-        result.severity = 'error';
-        return;
-    }
-
-    if (currentStartYear === expectedStartYear && currentEndYear === expectedEndYear) {
+    if (valid) {
         result.violation = 'none';
-        result.severity = 'ok';
         return;
     }
-
-    // Cornercase: For files of the initial contribution the copyright header predates the first git modification date.
-    // => declare as warning if not part of the initial contribution.
-    if (currentEndYear === expectedEndYear && currentStartYear < expectedEndYear) {
-        if (getFirstCommit(result.file) === getInitialCommit()) {
-            result.violation = 'none';
-            result.severity = 'ok';
-        } else {
-            result.severity = 'warn';
-        }
-    }
 }
 
 function printFileProgress(currentFileCount: number, maxFileCount: number, message: string, clear = true): void {
@@ -253,14 +191,9 @@ function printFileProgress(currentFileCount: number, maxFileCount: number, messa
 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');
+    const violations = results.filter(result => result.violation !== 'none');
     // Adjust results to print based on configured severity level
-    let toPrint = results;
-    if (options.severity === 'error') {
-        toPrint = violations;
-    } else if (options.severity === 'warn') {
-        toPrint = results.filter(result => result.severity !== 'ok');
-    }
+    const toPrint = violations;
 
     LOGGER.info(`Found ${toPrint.length} copyright header violations:`);
     LOGGER.newLine();
@@ -273,10 +206,11 @@ export function handleValidationResults(rootDir: string, results: ValidationResu
         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[];
+    if (
+        violations.length > 0 &&
+        (options.autoFix || readline.keyInYN('Do you want to automatically fix copyright year range violations?'))
+    ) {
+        const toFix = violations.filter(violation => isDateValidationResult(violation)) as DateValidationResult[];
         fixViolations(rootDir, toFix, options);
     }
 
@@ -284,43 +218,35 @@ export function handleValidationResults(rootDir: string, results: ValidationResu
 }
 
 function toPrintMessage(result: ValidationResult): string {
-    const colors: Record<Severity, string> = {
-        error: '\x1b[31m',
-        warn: '\x1b[33m',
-        ok: '\x1b[32m'
-    } as const;
-
-    if (
-        isDateValidationResult(result) &&
-        (result.violation === 'incorrectCopyrightPeriod' || result.violation === 'invalidCopyrightYear')
-    ) {
-        const expected =
-            result.expectedStartYear !== result.expectedEndYear
-                ? `${result.expectedStartYear}-${result.expectedEndYear}`
-                : result.expectedStartYear.toString();
-        const actual = result.currentEndYear ? `${result.currentStartYear}-${result.currentEndYear}` : result.currentStartYear.toString();
-        const message = result.violation === 'incorrectCopyrightPeriod' ? 'Invalid copyright period' : 'Invalid copyright year';
-        return `${colors[result.severity]} ${message}! Expected '${expected}' but is '${actual}'`;
+    const error = '\x1b[31m';
+    const info = '\x1b[32m';
+
+    if (isDateValidationResult(result) && result.violation === 'invalidEndYear') {
+        const expected = result.expectedEndYear.toString();
+        const actual = result.currentEndYear
+            ? `${result.currentEndYear} (${result.currentStartYear}-${result.currentEndYear})`
+            : result.currentStartYear.toString();
+        const message = 'Invalid copyright end year';
+        return `${error} ${message}! Expected end year '${expected}' but is '${actual}'`;
     } else if (result.violation === 'noOrMissingHeader') {
-        return `${colors[result.severity]} No or invalid copyright header!`;
+        return `${error} No or invalid copyright header!`;
+    } else if (result.violation === 'noYear') {
+        return `${error} No year found!${result.line ? ' (line: ' + result.line + ')' : ''}`;
     }
 
-    return `${colors[result.severity]} OK`;
+    return `${info} 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}`;
-        }
+        const fixedRange =
+            violation.currentEndYear || violation.currentStartYear < violation.expectedEndYear
+                ? `${violation.currentStartYear}-${violation.expectedEndYear}`
+                : `${violation.expectedEndYear}`;
 
         sh.sed('-i', RegExp('Copyright \\([cC]\\) ' + currentRange), `Copyright (c) ${fixedRange}`, violation.file);
     });
@@ -337,19 +263,18 @@ function fixViolations(rootDir: string, violations: DateValidationResult[], opti
 // Helper types
 interface ValidationResult {
     file: string;
-    severity: Severity;
     violation: Violation;
+    line?: string;
 }
 
 interface DateValidationResult extends ValidationResult {
     currentStartYear: number;
-    expectedStartYear: number;
     currentEndYear?: number;
     expectedEndYear: number;
 }
 
 function isDateValidationResult(object: ValidationResult): object is DateValidationResult {
-    return 'currentStartYear' in object && 'expectedStartYear' in object && 'expectedEndYear' in object;
+    return 'currentStartYear' in object && 'expectedEndYear' in object;
 }
 
-type Violation = 'none' | 'noOrMissingHeader' | 'incorrectCopyrightPeriod' | 'invalidCopyrightYear';
+type Violation = 'none' | 'noOrMissingHeader' | 'invalidEndYear' | 'noYear';

package/src/commands/coverage-report.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -16,7 +16,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import * as sh from 'shelljs';
+import sh from 'shelljs';
 import { baseCommand, fatalExec, getShellConfig } from '../util/command-util';
 import { LOGGER } from '../util/logger';
 import { validateDirectory } from '../util/validation-util';

package/src/commands/generate-index.ts

@@ -0,0 +1,169 @@
+/********************************************************************************
+ * Copyright (c) 2023-2024 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { createOption } from 'commander';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import sh from 'shelljs';
+import { baseCommand } from '../util/command-util';
+import { LOGGER, configureLogger } from '../util/logger';
+import { validateDirectory } from '../util/validation-util';
+
+export interface GenerateIndexCmdOptions {
+    singleIndex: boolean;
+    forceOverwrite: boolean;
+    match: string[] | boolean;
+    ignore: string[] | boolean;
+    ignoreFile: string;
+    style: 'commonjs' | 'esm';
+    verbose: boolean;
+}
+
+// Partial type of the globby imports since we can not use the esm type directly
+interface GlobbyOptions {
+    ignore: string[];
+    cwd: string;
+    onlyFiles: boolean;
+    markDirectories: true;
+    ignoreFiles: string;
+}
+
+export const GenerateIndex = baseCommand() //
+    .name('generateIndex')
+    .description('Generate index files in a given source directory.')
+    .argument('<rootDir...>', 'The source directory for index generation.')
+    .option('-s, --singleIndex', 'Generate a single index file in the source directory instead of indices in each sub-directory', false)
+    .option('-f, --forceOverwrite', 'Overwrite existing index files and remove them if there are no entries', false)
+    .option('-m, --match [match patterns...]', 'File patterns to consider during indexing', ['**/*.ts', '**/*.tsx'])
+    .option('-i, --ignore [ignore patterns...]', 'File patterns to ignore during indexing', ['**/*.spec.ts', '**/*.spec.tsx', '**/*.d.ts'])
+    .addOption(createOption('-s, --style <importStyle>', 'Import Style').choices(['commonjs', 'esm']).default('commonjs'))
+    .option('--ignoreFile <ignoreFile>', 'The file that is used to specify patterns that should be ignored during indexing', '.indexignore')
+    .option('-v, --verbose', 'Generate verbose output during generation', false)
+    .action(generateIndices);
+
+export async function generateIndices(rootDirs: string[], options: GenerateIndexCmdOptions): Promise<void> {
+    const dirs = rootDirs.map(rootDir => validateDirectory(path.resolve(rootDir)));
+    const globby = await import('globby');
+    const ignoreFilter: (pattern: string[], options: GlobbyOptions) => string[] = (pattern, globbyOptions) =>
+        globby.globbySync(pattern, globbyOptions);
+    dirs.forEach(dir => generateIndex(dir, ignoreFilter, options));
+}
+
+export async function generateIndex(
+    rootDir: string,
+    ignoreFilter: (pattern: string[], options: GlobbyOptions) => string[],
+    options: GenerateIndexCmdOptions
+): Promise<void> {
+    configureLogger(options.verbose);
+    LOGGER.debug('Run generateIndex for', rootDir, 'with the following options:', options);
+    sh.cd(rootDir);
+    const cwd = process.cwd();
+
+    // we want to match all given patterns and subdirectories and ignore all given patterns and (generated) index files
+    const pattern = typeof options.match === 'boolean' ? ['**/'] : [...options.match, '**/'];
+    const ignore = typeof options.ignore === 'boolean' ? ['**/index.ts'] : [...options.ignore, '**/index.ts'];
+    const globbyOptions: GlobbyOptions = {
+        ignore,
+        cwd,
+        onlyFiles: options.singleIndex,
+        markDirectories: true, // directories have '/' at the end
+        ignoreFiles: '**/' + options.ignoreFile // users can add this file in their directories to ignore files for indexing
+    };
+    LOGGER.debug('Search for children using the following globby options', globbyOptions);
+    const files = ignoreFilter(pattern, globbyOptions);
+    LOGGER.debug('All children considered in the input directory', files);
+
+    const relativeRootDirectory = '';
+    if (options.singleIndex) {
+        writeIndex(relativeRootDirectory, files.filter(isFile), options);
+    } else {
+        // sort by length so we deal with sub-directories before we deal with their parents to determine whether they are empty
+        const directories = [...files.filter(isDirectory), relativeRootDirectory].sort((left, right) => right.length - left.length);
+        const directoryChildren = new Map<string, string[]>();
+        for (const directory of directories) {
+            const children = files.filter(file => isDirectChild(directory, file, () => !!directoryChildren.get(file)?.length));
+            directoryChildren.set(directory, children);
+            writeIndex(directory, children, options);
+        }
+    }
+}
+
+export function isDirectChild(parent: string, child: string, childHasChildren: () => boolean): boolean {
+    return isChildFile(parent, child) || (isChildDirectory(parent, child) && childHasChildren());
+}
+
+export function isDirectory(file: string): boolean {
+    return file.endsWith('/');
+}
+
+export function isFile(file: string): boolean {
+    return !isDirectory(file);
+}
+
+export function getLevel(file: string): number {
+    return file.split('/').length;
+}
+
+export function isChild(parent: string, child: string): boolean {
+    return child.startsWith(parent);
+}
+
+export function isChildDirectory(parent: string, child: string): boolean {
+    return isDirectory(child) && isChild(parent, child) && getLevel(child) === getLevel(parent) + 1;
+}
+
+export function isChildFile(parent: string, child: string): boolean {
+    return isFile(child) && isChild(parent, child) && getLevel(child) === getLevel(parent);
+}
+
+export function writeIndex(directory: string, exports: string[], options: GenerateIndexCmdOptions): void {
+    const indexFile = path.join(process.cwd(), directory, 'index.ts');
+    if (exports.length === 0) {
+        if (options.forceOverwrite && fs.existsSync(indexFile)) {
+            LOGGER.info('Remove index file', indexFile);
+            fs.rmSync(indexFile);
+        }
+        return;
+    }
+    const exists = fs.existsSync(indexFile);
+    if (exists && !options.forceOverwrite) {
+        LOGGER.info("Do not overwrite existing index file. Use '-f' to force an overwrite.", indexFile);
+        return;
+    }
+
+    const headerContent = exists ? extractReusableContent(fs.readFileSync(indexFile, { encoding: 'utf-8' })) : '';
+    const exportContent = exports.map(exported => createExport(directory, exported, options)).sort();
+    const content = headerContent + exportContent.join(os.EOL) + os.EOL; // end with an empty line
+    LOGGER.info((exists ? 'Overwrite' : 'Write') + ' index file', indexFile);
+    LOGGER.debug('  ' + content.split(os.EOL).join(os.EOL + '  '));
+    fs.writeFileSync(indexFile, content, { flag: 'w' });
+}
+
+export function createExport(directory: string, relativePath: string, options: GenerateIndexCmdOptions): string {
+    // remove directory prefix, file extension and directory ending '/'
+    const parentPrefix = directory.length;
+    const suffix = isFile(relativePath) ? path.extname(relativePath).length : 1;
+    const relativeName = relativePath.substring(parentPrefix, relativePath.length - suffix);
+    const exportName = options.style === 'esm' && isFile(relativePath) ? relativeName + '.js' : relativeName;
+    const exportLine = `export * from './${exportName}';`;
+    return exportLine;
+}
+
+export function extractReusableContent(fileContent: string): string {
+    // all code before any actual export lines are considered re-usable
+    return fileContent.match(/^(.*?)(?=^export)/ms)?.[0] ?? '';
+}

package/src/commands/release/common.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -19,7 +19,7 @@ import fetch from 'node-fetch';
 import { resolve } from 'path';
 import * as readline from 'readline-sync';
 import * as semver from 'semver';
-import * as sh from 'shelljs';
+import sh from 'shelljs';
 import { fatalExec, getShellConfig } from '../../util/command-util';
 import { getLatestGithubRelease, getLatestTag, hasGitChanges, isGitRepository } from '../../util/git-util';
 import { LOGGER } from '../../util/logger';

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import * as sh from 'shelljs';
+import sh from 'shelljs';
 import { getShellConfig } from '../../util/command-util';
 import { LOGGER } from '../../util/logger';
 import { checkoutAndCd, commitAndTag, lernaSetVersion, publish, ReleaseOptions, updateLernaForDryRun, yarnInstall } from './common';

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -14,22 +14,22 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import * as sh from 'shelljs';
+import sh from 'shelljs';
 import { fatalExec, getShellConfig } from '../../util/command-util';
 import { LOGGER } from '../../util/logger';
 import {
+    ReleaseOptions,
+    ReleaseType,
     asMvnVersion,
     checkJavaServerVersion,
     checkoutAndCd,
     commitAndTag,
     lernaSetVersion,
     publish,
-    ReleaseOptions,
-    ReleaseType,
     updateLernaForDryRun,
     updateVersion,
     yarnInstall
-} from './common';
+} from './common.js';
 
 let REPO_ROOT: string;
 

package/src/commands/release/release-java-server.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -13,10 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import * as sh from 'shelljs';
+import sh from 'shelljs';
 import { fatalExec, getShellConfig } from '../../util/command-util';
 import { LOGGER } from '../../util/logger';
-import { asMvnVersion, checkoutAndCd, commitAndTag, publish, ReleaseOptions } from './common';
+import { ReleaseOptions, asMvnVersion, checkoutAndCd, commitAndTag, publish } from './common';
 
 let REPO_ROOT: string;
 

package/src/commands/release/release-server-node.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import * as sh from 'shelljs';
+import sh from 'shelljs';
 import { LOGGER } from '../../util/logger';
 import {
     checkoutAndCd,
@@ -25,7 +25,7 @@ import {
     updateLernaForDryRun,
     updateVersion,
     yarnInstall
-} from './common';
+} from './common.js';
 
 let REPO_ROOT: string;
 

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2024 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import * as sh from 'shelljs';
+import sh from 'shelljs';
 import { LOGGER } from '../../util/logger';
 import {
     checkoutAndCd,
@@ -25,7 +25,7 @@ import {
     updateLernaForDryRun,
     updateVersion,
     yarnInstall
-} from './common';
+} from './common.js';
 
 let REPO_ROOT: string;