Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/large-paths-dance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@sap-cloud-sdk/eslint-config': minor
---

[Compatibility Note] Replaced `eslint-plugin-import` with `eslint-plugin-import-x`.
Please ensure that you have `eslint-plugin-import-x` installed.
2 changes: 1 addition & 1 deletion .github/actions/check-license/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/actions/check-public-api/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build-packages/changesets-fixed-version-bump/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@sap-cloud-sdk/test-util-build-internal": "workspace:^",
"@vercel/ncc": "^0.38.4",
"depcheck": "^1.4.7",
"eslint": "^9.39.2",
"eslint": "^10.2.1",
"memfs": "^4.57.2",
"prettier": "^3.8.1",
"typescript": "~5.9.3"
Expand Down
2 changes: 1 addition & 1 deletion build-packages/check-license/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { execFileSync } from 'node:child_process';
import { info, setFailed } from '@actions/core';
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
import bloakList from '@blueoak/list/index.json' with { type: 'json' };

// Permissive FLOSS licenses are ok, see https://blueoakcouncil.org/list for details.
Expand Down
2 changes: 1 addition & 1 deletion build-packages/check-license/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"devDependencies": {
"@vercel/ncc": "^0.38.4",
"depcheck": "^1.4.7",
"eslint": "^9.39.2",
"eslint": "^10.2.1",
"prettier": "^3.8.1",
"typescript": "~5.9.3"
}
Expand Down
2 changes: 1 addition & 1 deletion build-packages/check-pr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@sap-cloud-sdk/test-util-build-internal": "workspace:^",
"@vercel/ncc": "^0.38.4",
"depcheck": "^1.4.7",
"eslint": "^9.39.2",
"eslint": "^10.2.1",
"memfs": "^4.57.2",
"prettier": "^3.8.1",
"typescript": "~5.9.3"
Expand Down
2 changes: 1 addition & 1 deletion build-packages/check-public-api/check-public-api.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const {
parseExportedObjectsInFile,
regexExportedIndex,
typeDescriptorPaths
// eslint-disable-next-line import/no-useless-path-segments
// eslint-disable-next-line import-x/no-useless-path-segments
} = await import('./index.js');

describe('check-public-api', () => {
Expand Down
4 changes: 2 additions & 2 deletions build-packages/check-public-api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {
readCompilerOptions,
readIncludeExcludeWithDefaults,
transpileDirectory
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
} from '@sap-cloud-sdk/generator-common/dist/compiler.js';
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
import { defaultPrettierConfig } from '@sap-cloud-sdk/generator-common/dist/file-writer/create-file.js';
import { getPackages } from '@manypkg/get-packages';
import type { CompilerOptions } from 'typescript';
Expand Down
2 changes: 1 addition & 1 deletion build-packages/check-public-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@sap-cloud-sdk/test-util-build-internal": "workspace:^",
"@vercel/ncc": "^0.38.4",
"depcheck": "^1.4.7",
"eslint": "^9.39.2",
"eslint": "^10.2.1",
"memfs": "^4.57.2",
"prettier": "^3.8.1",
"typescript": "~5.9.3"
Expand Down
2 changes: 1 addition & 1 deletion build-packages/get-changelog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"devDependencies": {
"@vercel/ncc": "^0.38.4",
"depcheck": "^1.4.7",
"eslint": "^9.39.2",
"eslint": "^10.2.1",
"prettier": "^3.8.1",
"typescript": "~5.9.3"
}
Expand Down
2 changes: 1 addition & 1 deletion build-packages/merge-and-write-changelogs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"devDependencies": {
"@vercel/ncc": "^0.38.4",
"depcheck": "^1.4.7",
"eslint": "^9.39.2",
"eslint": "^10.2.1",
"prettier": "^3.8.1",
"typescript": "~5.9.3"
}
Expand Down
2 changes: 1 addition & 1 deletion build-packages/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"devDependencies": {
"depcheck": "^1.4.7",
"eslint": "^9.39.2",
"eslint": "^10.2.1",
"prettier": "^3.8.1",
"typescript": "~5.9.3"
}
Expand Down
57 changes: 31 additions & 26 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,42 @@ const compat = new FlatCompat({
allConfig: js.configs.all
});

const localPlugin = {
rules: {
'no-uppercase-internal-tag': {
meta: { type: 'problem', schema: [] },
create(context) {
return {
Program() {
for (const comment of context.sourceCode.getAllComments()) {
if (comment.value.includes('@Internal')) {
context.report({
loc: comment.loc,
message:
'You are not allowed to use @Internal. Please use @internal.'
});
}
}
}
};
}
}
}
};

module.exports = defineConfig([
{
plugins: { local: localPlugin },
rules: { 'local/no-uppercase-internal-tag': 'error' }
},
{
languageOptions: {
globals: {
...globals.node,
...globals.jest
},
parser: tsParser,
sourceType: 'module',
parserOptions: {
project: {
extends: 'tsconfig.json',
include: ['**/*.ts'],

exclude: [
'**/*.d.ts',
'**/dist/**/*',
'**/node_modules/**/*',
'test-packages/test-services*/**/*',
'test-packages/test-services-e2e/**/*',
'test-packages/memory-tests/sdk-v1/test-service/*',
'test-packages/memory-tests/sdk-canary/test-service/*',
'build-packages/check-pr/lib/**',
'build-packages/get-changelog/lib/**',
'packages/rest-generator/test/test-services/**/*',
'test-resources/cli/**/*',
'**/test-output/**',
'**/README.md'
]
}
}
sourceType: 'module'
},
extends: compat.extends('@sap-cloud-sdk'),
rules: {
Expand All @@ -55,7 +60,7 @@ module.exports = defineConfig([
'Enums are weird in TypeScript. Prefer union types or const objects instead.'
}
],
'import/no-internal-modules': [
'import-x/no-internal-modules': [
'error',
{
allow: ['@sap-cloud-sdk/**/internal', '@sap-cloud-sdk/**/internal.js']
Expand Down Expand Up @@ -85,7 +90,7 @@ module.exports = defineConfig([
{
files: ['**/test/**/*', '**/*.spec.ts'],
rules: {
'import/no-internal-modules': 'off',
'import-x/no-internal-modules': 'off',
'no-unused-expressions': 'off',
'jsdoc/require-jsdoc': 'off'
}
Expand All @@ -102,7 +107,7 @@ module.exports = defineConfig([
'packages/connectivity/src/scp-cf/token-accessor.ts'
],
rules: {
'import/no-internal-modules': [
'import-x/no-internal-modules': [
'error',
{
allow: [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"axios": "^1.15.0",
"cross-env": "10.1.0",
"depcheck": "^1.4.7",
"eslint": "^9.39.2",
"eslint": "^10.2.1",
"execa": "^5.0.0",
"glob": "^13.0.6",
"globals": "^17.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/connectivity/internal.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
export * from './dist/internal';
// # sourceMappingURL=internal.d.ts.map
2 changes: 1 addition & 1 deletion packages/connectivity/src/http-agent/http-agent.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';

mockFsWithMemfs(jest);

// eslint-disable-next-line import/order
// eslint-disable-next-line import-x/order
import { X509Certificate } from 'node:crypto';
import { jest } from '@jest/globals';
import { vol } from 'memfs';
Expand Down
12 changes: 6 additions & 6 deletions packages/connectivity/src/http-agent/http-agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ import https from 'node:https';
import * as jks from 'jks-js';
import { createLogger, last } from '@sap-cloud-sdk/util';
/* Careful the proxy imports cause circular dependencies if imported from scp directly */
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
import { getProtocolOrDefault } from '../scp-cf/get-protocol';
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
import { Cache, hashCacheKey } from '../scp-cf/cache';
import {
addProxyConfigurationInternet,
getProxyConfig,
proxyStrategy
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
} from '../scp-cf/destination/http-proxy-util';
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
import { registerDestinationCache } from '../scp-cf/destination/register-destination-cache';
import type {
Destination,
DestinationCertificate,
HttpDestination
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
} from '../scp-cf/destination';
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
import type { BasicProxyConfiguration } from '../scp-cf/connectivity-service-types';
import type { HttpAgentConfig, HttpsAgentConfig } from './agent-config';

Expand Down
2 changes: 1 addition & 1 deletion packages/connectivity/src/scp-cf/authorization-header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
encodeBase64,
pickValueIgnoreCase
} from '@sap-cloud-sdk/util';
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
import { sanitizeDestination } from './destination/destination';
import type {
AuthenticationType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';

mockFsWithMemfs(jest);

// eslint-disable-next-line import/order
// eslint-disable-next-line import-x/order
import { X509Certificate } from 'node:crypto';
import { jest } from '@jest/globals';
import { vol } from 'memfs';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { mockFsWithMemfs } from '@sap-cloud-sdk/test-util-internal/fs-mocker';

mockFsWithMemfs(jest);

// eslint-disable-next-line import/order
// eslint-disable-next-line import-x/order
import { X509Certificate } from 'node:crypto';
import { jest } from '@jest/globals';
import { vol } from 'memfs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createLogger } from '@sap-cloud-sdk/util';
// eslint-disable-next-line import/no-internal-modules
// eslint-disable-next-line import-x/no-internal-modules
import { audiences, decodeJwt } from '../jwt/jwt';
import { getServiceBindings } from './service-bindings';
import type { JwtPayload } from '../jsonwebtoken-type';
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ or if you want to combine this configuration with others:
}
```

This configuration depends on plugins "eslint-plugin-import" and "eslint-plugin-unused-imports", which need to be installed in your project.
This configuration depends on plugins "eslint-plugin-import-x" and "eslint-plugin-unused-imports", which need to be installed in your project.

ESlint merges these shareable configs with your configuration.
Any rule configured in your `.eslintrc.js` will overwrite the setting for this rule in shareable configs.
Expand Down
Loading
Loading