Skip to content

Commit

Permalink
Merge pull request #1814 from authts/chore-2
Browse files Browse the repository at this point in the history
bump eslint to v9
  • Loading branch information
pamapa authored Jan 17, 2025
2 parents 729f955 + 1b635ba commit 31ea799
Show file tree
Hide file tree
Showing 18 changed files with 603 additions and 887 deletions.
7 changes: 0 additions & 7 deletions .eslintignore

This file was deleted.

69 changes: 0 additions & 69 deletions .eslintrc.yml

This file was deleted.

4 changes: 2 additions & 2 deletions docs/oidc-client-ts.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ export class AccessTokenEvents {
addAccessTokenExpired(cb: AccessTokenCallback): () => void;
addAccessTokenExpiring(cb: AccessTokenCallback): () => void;
// (undocumented)
load(container: User): void;
load(container: User): Promise<void>;
// (undocumented)
protected readonly _logger: Logger;
removeAccessTokenExpired(cb: AccessTokenCallback): void;
removeAccessTokenExpiring(cb: AccessTokenCallback): void;
// (undocumented)
unload(): void;
unload(): Promise<void>;
}

// @public (undocumented)
Expand Down
120 changes: 120 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
import stylistic from "@stylistic/eslint-plugin";
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import testingLibrary from "eslint-plugin-testing-library";
import globals from "globals";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [{
ignores: [
".yarn/",
".pnp.*",
"**/node_modules/",
"**/dist/",
"docs/pages/",
"**/lib/",
"**/samples/",
],
}, ...compat.extends("eslint:recommended", "plugin:testing-library/dom"), {
plugins: {
"@typescript-eslint": typescriptEslint,
"@stylistic": stylistic,
"testing-library": testingLibrary,
},

languageOptions: {
globals: {
...globals.browser,
...globals.node,
},

ecmaVersion: 2020,
sourceType: "module",
},

rules: {
"comma-dangle": ["error", "always-multiline"],
"consistent-return": "error",

indent: ["error", 4, {
SwitchCase: 1,
}],

quotes: "error",
semi: "error",
"keyword-spacing": "error",
"space-before-blocks": "error",

"no-multiple-empty-lines": ["error", {
max: 1,
maxBOF: 0,
maxEOF: 0,
}],

"no-multi-spaces": "error",
},
}, ...compat.extends(
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
).map(config => ({
...config,
files: ["**/*.ts", "**/*.tsx"],
})), {
files: ["**/*.ts", "**/*.tsx"],

languageOptions: {
parserOptions: {
project: ["./tsconfig.json"],
},
},

rules: {
indent: "off",
semi: "off",
"no-return-await": "off",

"@stylistic/indent": ["error", 4, {
SwitchCase: 1,
}],

"@stylistic/member-delimiter-style": "error",
"@stylistic/object-curly-spacing": ["error", "always"],
"@stylistic/semi": "error",

"@typescript-eslint/return-await": ["error", "always"],
"@typescript-eslint/require-await": "off",
"@typescript-eslint/no-unsafe-argument": "off",
"@typescript-eslint/no-unsafe-assignment": "off",
},
}, {
files: ["src/**/*"],

languageOptions: {
globals: {
...Object.fromEntries(Object.entries(globals.node).map(([key]) => [key, "off"])),
},
},
}, {
files: ["src/**/*.test.*", "test/**/*"],

languageOptions: {
globals: {
...globals.jest,
},
},

rules: {
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/unbound-method": "off",
},
}];
10 changes: 5 additions & 5 deletions jest-environment-jsdom.cjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';
"use strict";

const { TextEncoder, TextDecoder } = require('util');
const { default: $JSDOMEnvironment, TestEnvironment } = require('jest-environment-jsdom');
const { TextEncoder, TextDecoder } = require("util");
const { default: $JSDOMEnvironment, TestEnvironment } = require("jest-environment-jsdom");
const crypto = require("crypto");

Object.defineProperty(exports, '__esModule', {
value: true
Object.defineProperty(exports, "__esModule", {
value: true,
});

class JSDOMEnvironment extends $JSDOMEnvironment {
Expand Down
2 changes: 1 addition & 1 deletion jest.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default {
collectCoverage,
coverageReporters: collectCoverage ? ["lcov"] : ["lcov", "text"],
moduleNameMapper: {
"^jose": "jose", // map to jose cjs module otherwise jest breaks
"^jose": "jose", // map to jose cjs module otherwise jest breaks
},
transform: {
"^.+\\.tsx?$": [
Expand Down
Loading

0 comments on commit 31ea799

Please sign in to comment.