From 58537d3f89a8b97d005e4dacf569c1a1b85868c7 Mon Sep 17 00:00:00 2001 From: Jiri Kapoun Date: Fri, 10 Jan 2025 13:25:09 +0100 Subject: [PATCH 1/3] feat: add support of Node ^20, ^22, ^23 --- .github/workflows/integration.yaml | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index ffe4cd2..1325c95 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -16,6 +16,8 @@ jobs: node: - 18 - 20 + - 22 + - 23 runs-on: ${{ matrix.os }} timeout-minutes: 10 diff --git a/package.json b/package.json index 46f5c06..0919f8b 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "typescript": "^5.3.3" }, "engines": { - "node": "^18 || >=20" + "node": "^18 || ^20 || ^22 || ^23" }, "homepage": "https://github.com/strvcom/heimdall", "keywords": [], From 9107044be2f59f629419dd0a5897fad20f7980fb Mon Sep 17 00:00:00 2001 From: Jiri Kapoun Date: Fri, 10 Jan 2025 13:56:48 +0100 Subject: [PATCH 2/3] chore: update package-lock.json --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 9c36066..cf8f90d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "typescript": "^5.3.3" }, "engines": { - "node": "^18 || >=20" + "node": "^18 || ^20 || ^22 || ^23" } }, "node_modules/@aashutoshrathi/word-wrap": { From 3e92ea4ff59ff4d9a4889a665a10a0627e4700c8 Mon Sep 17 00:00:00 2001 From: Jiri Kapoun Date: Fri, 10 Jan 2025 13:57:16 +0100 Subject: [PATCH 3/3] style: remove obsolete ESLint rule, ensure LF line endings --- .gitattributes | 1 + eslint.config.mjs | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6313b56 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/eslint.config.mjs b/eslint.config.mjs index 3e582e8..e55270d 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,4 +1,3 @@ -import * as os from 'os' import nodev20 from '@strv/eslint-config-node/v20' import nodeopt from '@strv/eslint-config-node/optional' import nodestyle from '@strv/eslint-config-node/style' @@ -7,7 +6,6 @@ import tsoptional from '@strv/eslint-config-typescript/optional' import tsstyle from '@strv/eslint-config-typescript/style' import mocha from '@strv/eslint-config-mocha' -const lbstyle = os.platform() === 'win32' ? 'windows' : 'unix' const globs = { mjs: '**/*.mjs', ts: '**/*.ts', @@ -34,12 +32,6 @@ const config = [ { files: [globs.ts], languageOptions: { parserOptions: { project: './tsconfig.json' }, - }, - rules: { - // This repository is configured so that upon checkout, git should convert line endings to platform-specific - // defaults and convert them back to LF when checking in. As such, we must enforce CRLF endings on Windows, - // otherwise the lint task would fail on Windows systems. - 'linebreak-style': ['error', lbstyle], } }, ]