Skip to content

Commit fd54c52

Browse files
authored
Merge pull request #1972 from gitgitgadget/some-fixes
Some fixes
2 parents fcb47de + 9e58e92 commit fd54c52

File tree

4 files changed

+12
-42
lines changed

4 files changed

+12
-42
lines changed

eslint.config.mjs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,8 @@ export default tseslint.config(
3333

3434
rules: {
3535
...eslintConfigPrettier.rules,
36-
"@stylistic/function-call-argument-newline": [
37-
"warn",
38-
"consistent",
39-
],
40-
"@stylistic/function-paren-newline": [
41-
"error",
42-
"consistent",
43-
],
36+
"@stylistic/function-call-argument-newline": ["warn", "consistent"],
37+
"@stylistic/function-paren-newline": ["error", "consistent"],
4438
"@stylistic/max-len": [
4539
"error",
4640
{
@@ -98,10 +92,7 @@ export default tseslint.config(
9892
},
9993
],
10094

101-
"max-classes-per-file": [
102-
"error",
103-
2,
104-
],
95+
"max-classes-per-file": ["error", 2],
10596

10697
"no-bitwise": "error",
10798
"no-caller": "error",
@@ -133,6 +124,7 @@ export default tseslint.config(
133124
"prettier/prettier": "warn",
134125
radix: "error",
135126
"use-isnan": "error",
127+
"security/detect-object-injection": "off",
136128
},
137129
},
138130
{

lib/git-notes.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable security/detect-object-injection */
21
import { emptyBlobName, git, revParse } from "./git.js";
32
import { fromJSON, toJSON } from "./json-util.js";
43
import { sleep } from "./sleep.js";

package-lock.json

Lines changed: 0 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626
},
2727
"homepage": "https://gitgitgadget.github.io/",
2828
"files": [
29-
"lib/*.ts"
29+
"lib/*.ts"
3030
],
3131
"jest": {
32-
"extensionsToTreatAsEsm": [".ts"],
32+
"extensionsToTreatAsEsm": [
33+
".ts"
34+
],
3335
"moduleFileExtensions": [
3436
"ts",
3537
"tsx",
@@ -38,9 +40,10 @@
3840
"preset": "ts-jest/presets/default-esm",
3941
"resolver": "ts-jest-resolver",
4042
"transform": {
41-
"\\.(ts|tsx)$": ["ts-jest",
43+
"\\.(ts|tsx)$": [
44+
"ts-jest",
4245
{
43-
"useESM": true
46+
"useESM": true
4447
}
4548
]
4649
},
@@ -51,18 +54,16 @@
5154
"@types/html-to-text": "^9.0.4",
5255
"@types/imap-simple": "^4.2.10",
5356
"@types/jest": "^30.0.0",
54-
"@types/json-stable-stringify": "^1.2.0",
5557
"@types/jsonwebtoken": "^9.0.10",
5658
"@types/mailparser": "^3.4.6",
57-
"@types/marked": "^6.0.0",
5859
"@types/node": "^24.2.1",
5960
"@types/nodemailer": "^6.4.17",
6061
"@types/rfc2047": "^2.0.3",
6162
"eslint": "^9.33.0",
6263
"eslint-config-prettier": "^10.1.8",
63-
"eslint-plugin-prettier": "^5.5.4",
6464
"eslint-plugin-jest": "^29.0.1",
6565
"eslint-plugin-jsdoc": "^52.0.4",
66+
"eslint-plugin-prettier": "^5.5.4",
6667
"eslint-plugin-security": "^3.0.1",
6768
"jest": "^30.0.5",
6869
"jest-junit": "^16.0.0",

0 commit comments

Comments
 (0)