Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"es6": true
},
"parserOptions": {
"ecmaVersion": 2019
"ecmaVersion": 2023
},
"plugins": [
"@typescript-eslint",
Expand Down Expand Up @@ -82,4 +82,4 @@
}
}
]
}
}
3 changes: 0 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ updates:
# sinon-chai 4.x+ supports chai 5.x+.
- dependency-name: "sinon-chai"
versions: [">=4.0.0"]
# nyc is Node18+ only starting on [email protected].
- dependency-name: "nyc"
versions: [">=16.0.0"]
# we ignore TS as a part of quarterly dependency updates.
- dependency-name: "typescript"
# node-gyp now depends on python 3.10, we install 3.6 in our dockerfile
Expand Down
5 changes: 2 additions & 3 deletions .github/docker/Dockerfile.glibc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ARG UBUNTU_VERSION=bionic
FROM ubuntu:${UBUNTU_VERSION} AS build
FROM ubuntu:noble AS build

ARG NODE_VERSION=16.20.1
ARG NODE_VERSION=20.19.0
# Possible values: s390x, arm64, x64
ARG NODE_ARCH
ADD https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.gz /
Expand Down
2 changes: 1 addition & 1 deletion .github/docker/Dockerfile.musl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG PLATFORM=arm64
ARG NODE_VERSION=16.20.1
ARG NODE_VERSION=20.19.0

FROM ${PLATFORM}/node:${NODE_VERSION}-alpine AS build

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Get Full Node.js Version
id: get_nodejs_version
shell: bash
run: |
echo "version=$(node --print 'process.version.slice(1)')" >> "$GITHUB_OUTPUT"

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [macos-latest, windows-2022]
node: [16.x, 18.x, 20.x, 22.x]
node: [20.19.0, 22.x]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -37,7 +37,7 @@ jobs:
strategy:
matrix:
linux_arch: [s390x, arm64, amd64]
node: [16.x, 18.x, 20.x, 22.x]
node: [20.19.0, 22.x]
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand All @@ -51,7 +51,6 @@ jobs:
shell: bash
run: |
echo "version=$(node --print 'process.version.slice(1)')" >> "$GITHUB_OUTPUT"
echo "ubuntu_version=$(node --print '(+process.version.slice(1).split(`.`).at(0)) > 16 ? `noble` : `bionic`')" >> "$GITHUB_OUTPUT"

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand All @@ -66,19 +65,17 @@ jobs:
--platform linux/${{ matrix.linux_arch }} \
--build-arg="NODE_ARCH=${{ matrix.linux_arch == 'amd64' && 'x64' || matrix.linux_arch }}" \
--build-arg="NODE_VERSION=${{ steps.get_nodejs_version.outputs.version }}" \
--build-arg="UBUNTU_VERSION=${{ steps.get_nodejs_version.outputs.ubuntu_version }}" \
--build-arg="RUN_TEST=true" \
--output type=local,dest=./prebuilds,platform-split=false \
-f ./.github/docker/Dockerfile.glibc \
.


container_tests_musl:
runs-on: ubuntu-latest
strategy:
matrix:
linux_arch: [amd64, arm64]
node: [16.20.1, 18.x, 20.x, 22.x]
node: [20.19.0, 22.x]
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 2 additions & 5 deletions etc/docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# amd64 or arm64v8 for alpine
LINUX_ARCH=amd64

# 16.20.1+, default 16.20.1
NODE_VERSION=20.0.0
# 20.19.0+, default 20.19.0
NODE_VERSION=20.19.0

SCRIPT_DIR=$(dirname ${BASH_SOURCE:-$0})
PROJECT_DIR=$SCRIPT_DIR/..
Expand All @@ -28,14 +28,11 @@ build_and_test_musl() {
build_and_test_glibc() {
docker buildx create --name builder --bootstrap --use

UBUNTU_VERSION=$(node --print 'Number(process.argv[1].split(`.`).at(0)) > 16 ? `noble` : `bionic`' $NODE_VERSION)
NODE_ARCH=$(node -p 'process.argv[1] === `amd64` && `x64` || process.argv[1]' $LINUX_ARCH)
echo $UBUNTU_VERSION
docker buildx build --progress=plain --no-cache \
--platform linux/$LINUX_ARCH \
--build-arg="NODE_ARCH=$NODE_ARCH" \
--build-arg="NODE_VERSION=$NODE_VERSION" \
--build-arg="UBUNTU_VERSION=$UBUNTU_VERSION" \
--build-arg="RUN_TEST=true" \
--output type=local,dest=./prebuilds,platform-split=false \
-f ./.github/docker/Dockerfile.glibc \
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
}
},
"engines": {
"node": ">=16.20.1"
"node": ">=20.19.0"
},
"binary": {
"napi_versions": [
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"checkJs": false,
"strict": true,
"alwaysStrict": true,
"target": "ES2020",
"target": "ES2023",
"module": "commonJS",
"moduleResolution": "node",
"skipLibCheck": true,
"erasableSyntaxOnly": true,
"lib": [
"es2020", "es2021.WeakRef"
"es2023"
],
// We don't make use of tslib helpers, all syntax used is supported by target engine
"importHelpers": false,
Expand Down Expand Up @@ -43,4 +43,4 @@
"include": [
"src/**/*"
]
}
}