Skip to content
Draft
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
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ updates:
versions: ["10.2.1"]
- dependency-name: "debug"
versions: ["4.4.2"]
- dependency-name: "eslint"
versions: [">=10.0.0"]
- package-ecosystem: github-actions
directory: /
schedule:
Expand Down
10 changes: 0 additions & 10 deletions .grype.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,3 @@ ignore:
- vulnerability: GHSA-83g3-92jg-28cx
- vulnerability: GHSA-7r86-cg39-jmmj
- vulnerability: GHSA-23c5-xmqv-rm74
- vulnerability: GHSA-qffp-2rhf-9h96
- vulnerability: GHSA-9ppj-qmqm-q256
- vulnerability: CVE-2026-2673
- vulnerability: GHSA-c2c7-rcm5-vvqj
- vulnerability: GHSA-j3q9-mxjg-w52f
- vulnerability: CVE-2026-31790
- vulnerability: CVE-2026-28388
- vulnerability: CVE-2026-28389
- vulnerability: CVE-2026-28390
- vulnerability: CVE-2026-40200
27 changes: 5 additions & 22 deletions config/eslint.integration.config.mjs
Original file line number Diff line number Diff line change
@@ -1,45 +1,28 @@
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import tsPlugin from "@typescript-eslint/eslint-plugin";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";
import globals from "globals";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

const tsconfigPath = path.resolve(__dirname, "./tsconfig.integration.json");

const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});
const tsconfigPath = path.resolve(import.meta.dirname, "./tsconfig.integration.json");

export default [
{
ignores: ["integration/testroot", "**/node_modules", "**/dist"],
},

...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),

js.configs.recommended,
...tsPlugin.configs["flat/recommended"],
{
files: ["**/*.ts"],
languageOptions: {
parser: tsParser,
parserOptions: {
project: tsconfigPath,
tsconfigRootDir: path.resolve(__dirname, "./"),
tsconfigRootDir: path.resolve(import.meta.dirname, "./"),
sourceType: "module",
},
globals: {
...globals.node,
},
},
plugins: {
"@typescript-eslint": typescriptEslint,
},
rules: {
"@typescript-eslint/no-floating-promises": "error",
"class-methods-use-this": "error",
Expand Down
25 changes: 5 additions & 20 deletions config/eslint.root.config.mjs
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import tsPlugin from "@typescript-eslint/eslint-plugin";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";
import globals from "globals";

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: [
Expand All @@ -29,17 +18,13 @@ export default [
"eslint.test.config.mjs",
],
},
...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),
js.configs.recommended,
...tsPlugin.configs["flat/recommended"],
{
plugins: {
"@typescript-eslint": typescriptEslint,
},

languageOptions: {
parser: tsParser,
parserOptions: {
project: path.resolve(__dirname, "tsconfig.root.json"),
tsconfigRootDir: path.resolve(__dirname, "../"),
project: path.resolve(import.meta.dirname, "tsconfig.root.json"),
tsconfigRootDir: path.resolve(import.meta.dirname, "../"),
sourceType: "module",
},
globals: {
Expand Down
23 changes: 4 additions & 19 deletions config/eslint.test.config.mjs
Original file line number Diff line number Diff line change
@@ -1,34 +1,19 @@
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import path from "node:path";
import { fileURLToPath } from "node:url";
import tsPlugin from "@typescript-eslint/eslint-plugin";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";
import globals from "globals";

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: ["../integration/testroot"],
},
...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),
js.configs.recommended,
...tsPlugin.configs["flat/recommended"],
{
files: ["../src/**/*.test.ts"],
plugins: {
"@typescript-eslint": typescriptEslint,
},
languageOptions: {
parser: tsParser,
parserOptions: {
project: "./tsconfig.test.json",
tsconfigRootDir: __dirname,
tsconfigRootDir: import.meta.dirname,
sourceType: "module",
},
globals: {
Expand Down
17 changes: 7 additions & 10 deletions integration/helpers/time.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,13 @@ function reduceBy(unit: number, ms: number): [number, number] {
}

export function toHuman(ms: number): string {
let [y, mo, w, d, h, m, s] = Array(7).fill(0);
let remain = ms;

[y, remain] = reduceBy(UNITS.y, remain);
[mo, remain] = reduceBy(UNITS.mo, remain);
[w, remain] = reduceBy(UNITS.w, remain);
[d, remain] = reduceBy(UNITS.d, remain);
[h, remain] = reduceBy(UNITS.h, remain);
[m, remain] = reduceBy(UNITS.m, remain);
[s, remain] = reduceBy(UNITS.s, remain);
const [y, r1] = reduceBy(UNITS.y, ms);
const [mo, r2] = reduceBy(UNITS.mo, r1);
const [w, r3] = reduceBy(UNITS.w, r2);
const [d, r4] = reduceBy(UNITS.d, r3);
const [h, r5] = reduceBy(UNITS.h, r4);
const [m, r6] = reduceBy(UNITS.m, r5);
const [s, remain] = reduceBy(UNITS.s, r6);

let result = "";
result = y > 0 ? `${result}${y}y` : result;
Expand Down
Loading
Loading