@eclipse-scout/eslint-config 25.2.20 → 26.1.0-beta.4

package/README.md

@@ -3,8 +3,8 @@
 </p>
 
 <p align="center">
-  <a href="https://ci.eclipse.org/scout/job/scout-integration-25.2-RT-nightly_pipeline/" target="_blank" rel="noopener noreferrer"><img alt="Jenkins" src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fscout%2Fjob%2Fscout-integration-25.2-RT-nightly_pipeline%2F"></a>
-  <a href="https://ci.eclipse.org/scout/job/scout-integration-25.2-RT-nightly_pipeline/" target="_blank" rel="noopener noreferrer"><img alt="Jenkins tests" src="https://img.shields.io/jenkins/tests?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fscout%2Fjob%2Fscout-integration-25.2-RT-nightly_pipeline%2F"></a>
+  <a href="https://ci.eclipse.org/scout/job/scout-integration-26.1-RT-nightly_pipeline/" target="_blank" rel="noopener noreferrer"><img alt="Jenkins" src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fscout%2Fjob%2Fscout-integration-25.2-RT-nightly_pipeline%2F"></a>
+  <a href="https://ci.eclipse.org/scout/job/scout-integration-26.1-RT-nightly_pipeline/" target="_blank" rel="noopener noreferrer"><img alt="Jenkins tests" src="https://img.shields.io/jenkins/tests?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fscout%2Fjob%2Fscout-integration-25.2-RT-nightly_pipeline%2F"></a>
   <a href="https://www.npmjs.com/package/@eclipse-scout/eslint-config" target="_blank" rel="noopener noreferrer"><img alt="npm" src="https://img.shields.io/npm/dm/@eclipse-scout/eslint-config"></a>
   <a href="https://www.eclipse.org/legal/epl-2.0/" target="_blank" rel="noopener noreferrer"><img alt="NPM" src="https://img.shields.io/npm/l/@eclipse-scout/eslint-config"></a>
   <a href="https://www.npmjs.com/package/@eclipse-scout/eslint-config" target="_blank" rel="noopener noreferrer"><img alt="npm (scoped)" src="https://img.shields.io/npm/v/@eclipse-scout/eslint-config"></a>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/eslint-config",
-  "version": "25.2.20",
+  "version": "26.1.0-beta.4",
   "description": "ESLint shareable config for the Scout style",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://eclipse.dev/scout/",
@@ -10,9 +10,9 @@
   },
   "license": "EPL-2.0",
   "engines": {
-    "node": ">=22.12.0",
-    "npm": ">=10.9.0",
-    "pnpm": ">=9.15.0"
+    "node": ">=24.12.0",
+    "npm": ">=11.6.2",
+    "pnpm": ">=10.26.1"
   },
   "keywords": [
     "scout",
@@ -34,21 +34,23 @@
     "enforce",
     "hint"
   ],
-  "main": "src/index.js",
+  "main": "src/index.mjs",
   "files": [
     "src"
   ],
   "devDependencies": {
-    "@eclipse-scout/releng": "^25.1.0",
-    "eslint": "8.57.1"
+    "@eclipse-scout/releng": "^26.1.0",
+    "eslint": "9.39.2",
+    "@eslint/js": "9.39.2",
+    "globals": "16.5.0"
   },
   "dependencies": {
-    "typescript": "5.4.5",
-    "@typescript-eslint/parser": "7.18.0",
-    "@typescript-eslint/eslint-plugin": "7.18.0"
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.50.1",
+    "@stylistic/eslint-plugin": "5.6.1"
   },
   "peerDependencies": {
-    "eslint": ">=8.57.1"
+    "eslint": ">=9.39.2"
   },
   "scripts": {
     "cleanup:snapshots": "releng-scripts cleanup:snapshots",

package/src/common.mjs

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010, 2026 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {defineConfig} from 'eslint/config';
+import stylistic from '@stylistic/eslint-plugin';
+
+/**
+ * Contains additional rules that are not part of the eslint recommended config and adjusts some of the rules.
+ */
+export default defineConfig({
+  plugins: {
+    '@stylistic': stylistic
+  },
+  rules: {
+    'accessor-pairs': 'warn',
+    'array-callback-return': 'error',
+    'no-alert': 'warn',
+    'no-eval': 'error',
+    'no-extra-bind': 'error',
+    'no-extra-label': 'error',
+    'no-implied-eval': 'error',
+    'no-iterator': 'error',
+    'no-caller': 'warn',
+    'no-labels': 'error',
+    'no-undef': 'off',
+    'camelcase': ['error', {allow: ['^\\$', '_']}],
+    'no-lone-blocks': 'error',
+    'no-loop-func': 'error',
+    'no-proto': 'error',
+    'no-prototype-builtins': 'off',
+    'no-return-assign': 'error',
+    'no-self-compare': 'error',
+    'no-label-var': 'error',
+    'no-var': 'warn',
+    'no-sequences': 'error',
+    'no-unmodified-loop-condition': 'error',
+    'no-useless-return': 'error',
+    'no-else-return': 'error',
+    'arrow-parens': ['error', 'as-needed'],
+    'no-duplicate-imports': 'error',
+    'prefer-arrow-callback': 'warn',
+    'new-cap': ['error', {'capIsNewExceptions': ['Deferred', '$.Event'], 'capIsNewExceptionPattern': 'Model$'}],
+    'no-multi-assign': 'error',
+    'no-unused-vars': 'off',
+    'curly': ['error', 'all'],
+    'eqeqeq': ['error', 'always', {'null': 'ignore'}],
+    'prefer-rest-params': 'warn',
+    'prefer-spread': 'warn',
+    '@stylistic/no-multi-spaces': 'warn',
+    '@stylistic/eol-last': ['warn', 'always'],
+    '@stylistic/comma-spacing': ['warn', {'before': false, 'after': true}],
+    '@stylistic/array-bracket-spacing': ['warn', 'never'],
+    '@stylistic/brace-style': ['warn', '1tbs'],
+    '@stylistic/computed-property-spacing': ['warn', 'never'],
+    '@stylistic/max-len': ['warn', 240, 2, {ignoreUrls: true, ignorePattern: '^import .*'}],
+    '@stylistic/semi': ['warn', 'always'],
+    '@stylistic/quotes': ['warn', 'single'],
+    '@stylistic/comma-dangle': ['warn', 'never'],
+    '@stylistic/object-curly-spacing': ['warn', 'never'],
+    '@stylistic/arrow-spacing': 'warn',
+    '@stylistic/template-curly-spacing': ['warn', 'never'],
+    '@stylistic/linebreak-style': ['warn', 'unix'],
+    '@stylistic/no-trailing-spaces': 'warn',
+    '@stylistic/space-before-function-paren': ['warn', {
+      'anonymous': 'never',
+      'named': 'never',
+      'asyncArrow': 'always'
+    }],
+    '@stylistic/indent': ['warn', 2, {'SwitchCase': 1}],
+    '@stylistic/spaced-comment': ['warn', 'always', {'exceptions': ['*']}]
+  }
+});

package/src/index.mjs

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2026 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import globals from 'globals';
+import eslint from '@eslint/js';
+import {defineConfig} from 'eslint/config';
+import tseslint from 'typescript-eslint';
+import common from './common.mjs';
+
+export default defineConfig(
+  // Base config for JavaScript files
+  {
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.jquery,
+        ...globals.jasmine
+      },
+      parser: tseslint.parser,
+      ecmaVersion: 2022,
+      sourceType: 'module'
+    },
+    extends: [eslint.configs.recommended, common]
+  },
+  // Additional config for TypeScript files (extends the base config from above)
+  {
+    extends: [tseslint.configs.recommended],
+    plugins: {
+      '@typescript-eslint': tseslint.plugin
+    },
+    files: ['**/*.ts', '**/*.tsx'],
+    rules: {
+      'spaced-comment': ['error', 'always', {'exceptions': ['*'], 'markers': ['/']}], // Allow triple slash directives
+      'prefer-const': 'off', // Enabled by TS ESLint, but we do not want to enforce it for now
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-inferrable-types': 'warn', // Changed from error to warn
+      '@typescript-eslint/ban-ts-comment': 'off', // Allow ts-ignore
+      '@typescript-eslint/no-unused-vars': 'off', // Allow unused parameters
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-this-alias': 'off', // Allow assigment of this to a variable, e.g. for better readability. 'That' and 'self' are not used often anymore.
+      '@typescript-eslint/prefer-ts-expect-error': 'warn',
+      '@typescript-eslint/no-unused-expressions': 'off', // Disabled to make log pattern work that is commonly used in scout ($.log.isTraceEnabled() && $.log.trace(msg));
+      '@stylistic/member-delimiter-style': 'warn', // Enforce semicolon for interface members for consistency
+      '@stylistic/object-curly-spacing': ['warn', 'never', {'overrides': {TSTypeLiteral: 'always', TSMappedType: 'always'}}]
+    }
+  }
+);

package/src/common.js

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2010, 2024 BSI Business Systems Integration AG
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-module.exports = {
-  rules: {
-    'indent': ['warn', 2, {'SwitchCase': 1}],
-    'no-extra-parens': ['off'],
-    'accessor-pairs': 'warn',
-    'array-callback-return': 'error',
-    'guard-for-in': 'off',
-    'no-alert': 'warn',
-    'no-eval': 'error',
-    'no-extra-bind': 'error',
-    'no-extra-label': 'error',
-    'no-implicit-coercion': 'off',
-    'no-implied-eval': 'error',
-    'no-invalid-this': 'off',
-    'no-iterator': 'error',
-    'no-caller': 'warn',
-    'no-console': 'off',
-    'no-labels': 'error',
-    'no-undef': 'off',
-    'no-throw-literal': 'off',
-    'camelcase': ['error', {allow: ['^\\$', '_']}],
-    'no-lone-blocks': 'error',
-    'no-loop-func': 'error',
-    'no-multi-spaces': 'warn',
-    'no-proto': 'error',
-    'no-prototype-builtins': 'off',
-    'no-return-assign': 'error',
-    'eslint func-call-spacing': 'off',
-    'no-return-await': 'off',
-    'no-self-compare': 'error',
-    'no-label-var': 'error',
-    'no-shadow': 'off',
-    'no-var': 'warn',
-    'eol-last': ['warn', 'always'],
-    'comma-spacing': ['error', {'before': false, 'after': true}],
-    'array-bracket-spacing': ['warn', 'never'],
-    'brace-style': ['error', '1tbs'],
-    'require-unicode-regexp': 'off',
-    'no-sequences': 'error',
-    'no-unmodified-loop-condition': 'error',
-    'computed-property-spacing': ['warn', 'never'],
-    'no-useless-return': 'error',
-    'no-else-return': 'error',
-    'max-len': ['warn', 240, 2, {ignoreUrls: true, ignorePattern: '^import .*'}],
-    'semi': ['error', 'always'],
-    'quotes': ['warn', 'single'],
-    'comma-dangle': ['error', 'never'],
-    'object-curly-spacing': ['error', 'never'],
-    'operator-linebreak': 'off',
-    'arrow-parens': ['error', 'as-needed'],
-    'arrow-spacing': 'warn',
-    'no-duplicate-imports': 'error',
-    'one-var': 'off',
-    'padded-blocks': 'off',
-    'prefer-arrow-callback': 'warn',
-    'prefer-template': 'off',
-    'template-curly-spacing': ['error', 'never'],
-    'linebreak-style': ['error', 'unix'],
-    'newline-per-chained-call': 'off',
-    'no-lonely-if': 'off',
-    'new-cap': ['error', {'capIsNewExceptions': ['Deferred', '$.Event'], 'capIsNewExceptionPattern': 'Model$'}],
-    'no-multi-assign': 'error',
-    'no-unused-vars': 'off',
-    'require-jsdoc': 'off',
-    'no-plusplus': 'off',
-    'no-trailing-spaces': 'warn',
-    'space-before-function-paren': ['warn', {
-      'anonymous': 'never',
-      'named': 'never',
-      'asyncArrow': 'always'
-    }],
-    'curly': ['error', 'all'],
-    'eqeqeq': ['error', 'always', {'null': 'ignore'}],
-    'spaced-comment': ['warn', 'always', {'exceptions': ['*']}],
-    'valid-jsdoc': 'off',
-    'prefer-const': 'off',
-    'prefer-rest-params': 'warn',
-    'prefer-spread': 'warn',
-    'max-classes-per-file': 'off'
-  }
-};

package/src/index.js

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-'use strict';
-
-module.exports = {
-  env: {
-    es6: true,
-    browser: true,
-    jquery: true,
-    jasmine: true
-  },
-  extends: ['eslint:recommended', './common'],
-  // Use typescript parser for js files as well so babel parser is not necessary
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    ecmaVersion: 6,
-    sourceType: 'module'
-  },
-  overrides: [{
-    extends: ['plugin:@typescript-eslint/recommended', './common'],
-    plugins: ['@typescript-eslint'],
-    files: ['*.ts', '*.tsx'],
-    rules: {
-      '@typescript-eslint/ban-types': 'warn', // Change from error to warn
-      '@typescript-eslint/no-inferrable-types': 'warn', // Change from error to warn
-      '@typescript-eslint/ban-ts-comment': 'off', // Allow ts-ignore
-      '@typescript-eslint/no-unused-vars': 'off', // Allow unused parameters
-      'spaced-comment': ['error', 'always', {'exceptions': ['*'], 'markers': ['/']}], // Allow triple slash directives
-      'semi': 'off', // Disable because it will be replaced by typescript rule below to avoid conflicting rules with semicolon in interfaces
-      '@typescript-eslint/semi': ['error'],
-      '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/member-delimiter-style': 'warn', // Enforce semicolon for interface members for consistency,
-      '@typescript-eslint/no-this-alias': 'off', // Allow assigment of this to a variable, e.g. for better readability. 'That' and 'self' are not used often anymore.
-      'indent': 'off', // Disable because it will be replaced by the following ts rule
-      '@typescript-eslint/indent': ['warn', 2, {'SwitchCase': 1, 'ignoredNodes': ['PropertyDefinition[decorators]']}], // Workarounds bug https://github.com/typescript-eslint/typescript-eslint/issues/1824. See also https://github.com/eslint/eslint/issues/15299#issuecomment-967762181. Also change to warn because indent errors are not critical.
-      'linebreak-style': 'off',
-      '@typescript-eslint/prefer-ts-expect-error': 'warn',
-      '@typescript-eslint/no-empty-function': 'off'
-    }
-  }]
-};