merge

.cargo/config.toml

@@ -1,7 +1,7 @@
 [alias]
 # Neon defines mutually exclusive feature flags which prevents using `cargo clippy --all-features`
 # The following aliases simplify linting the entire workspace
-neon-check = " check  --all --all-targets --features napi-experimental,futures,external-buffers"
-neon-clippy = "clippy --all --all-targets --features napi-experimental,futures,external-buffers -- -A clippy::missing_safety_doc"
-neon-test = "  test   --all               --features=doc-dependencies,doc-comment,napi-experimental,futures,external-buffers"
-neon-doc = "   rustdoc -p neon            --features=doc-dependencies,napi-experimental,futures,external-buffers -- --cfg docsrs"
+neon-check = " check  --all --all-targets --features napi-experimental,external-buffers,serde,tokio"
+neon-clippy = "clippy --all --all-targets --features napi-experimental,external-buffers,serde,tokio -- -A clippy::missing_safety_doc"
+neon-test = "  test   --all               --features=doc-dependencies,doc-comment,napi-experimental,external-buffers,serde,tokio"
+neon-doc = "   rustdoc -p neon            --features=doc-dependencies,napi-experimental,external-buffers,sys,serde,tokio -- --cfg docsrs"

.github/workflows/bench.yml

@@ -0,0 +1,61 @@
+name: Benchmarks
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  bench:
+    name: regression
+    permissions:
+      checks: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: bencherdev/bencher@main
+      - name: Use Rust Stable
+        uses: dtolnay/rust-toolchain@stable
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: npm
+      - name: npm install
+        run: npm ci --prefer-offline --no-audit --no-fund
+      - name: Install Benchmark Dependencies
+        working-directory: ./bench
+        run: npm install
+      - name: Build Benchmark
+        working-directory: ./bench
+        run: npm run build
+      - name: Track base branch benchmarks with Bencher
+        if: github.ref_name == 'main'
+        run: bencher run
+          --project neon
+          --token '${{ secrets.BENCHER_API_TOKEN }}'
+          --branch main
+          --testbed ubuntu-latest
+          --adapter json
+          --github-actions '${{ secrets.GITHUB_TOKEN }}'
+          npm run --silent benchmark
+        working-directory: ./bench
+      - name: Track pull request benchmarks with Bencher
+        if: github.ref_name != 'main'
+        run: bencher run
+          --project neon
+          --token '${{ secrets.BENCHER_API_TOKEN }}'
+          --branch "$GITHUB_HEAD_REF"
+          --start-point "$GITHUB_BASE_REF"
+          --start-point-hash '${{ github.event.pull_request.base.sha }}'
+          --start-point-clone-thresholds
+          --start-point-reset
+          --testbed ubuntu-latest
+          --adapter json
+          --github-actions '${{ secrets.GITHUB_TOKEN }}'
+          npm run --silent benchmark
+        working-directory: ./bench

.github/workflows/ci.yml

@@ -25,19 +25,19 @@ jobs:
       - name: Set Matrix
         id: set_matrix
         env:
-          FULL_NODE_VERSIONS: '["14.x", "16.x", "18.x"]'
+          FULL_NODE_VERSIONS: '["18.x", "20.x"]'
           FULL_RUST_TOOLCHAINS: '["stable", "nightly"]'
-          PARTIAL_NODE_VERSIONS: '["16.x"]'
+          PARTIAL_NODE_VERSIONS: '["20.x"]'
           PARTIAL_RUST_TOOLCHAINS: '["stable"]'
           HAS_FULL_MATRIX_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'full matrix') }}
           IS_PUSHED: ${{ github.event_name == 'push' }}
         run: |
           if [[ "$HAS_FULL_MATRIX_LABEL" == "true" ]] || [[ "$IS_PUSHED" == "true" ]]; then
-            echo "::set-output name=node_version::$FULL_NODE_VERSIONS"
-            echo "::set-output name=rust_toolchain::$FULL_RUST_TOOLCHAINS"
+            echo "node_version=$FULL_NODE_VERSIONS" >> $GITHUB_OUTPUT
+            echo "rust_toolchain=$FULL_RUST_TOOLCHAINS" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=node_version::$PARTIAL_NODE_VERSIONS"
-            echo "::set-output name=rust_toolchain::$PARTIAL_RUST_TOOLCHAINS"
+            echo "node_version=$PARTIAL_NODE_VERSIONS" >> $GITHUB_OUTPUT
+            echo "rust_toolchain=$PARTIAL_RUST_TOOLCHAINS" >> $GITHUB_OUTPUT
           fi
 
   build:
@@ -51,55 +51,78 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Rust ${{ matrix.rust-toolchain }}
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: ${{ matrix.rust-toolchain }}
+          components: clippy,rustfmt
+
+      - name: Linkme nightly workaround
+        if: matrix.rust-toolchain == 'nightly' && matrix.os == 'ubuntu-latest'
+        # Workaround for linkme with `rust-lld`
+        # https://blog.rust-lang.org/2024/05/17/enabling-rust-lld-on-linux.html#possible-drawbacks
+        run: echo RUSTFLAGS=${RUSTFLAGS}\ -Clink-arg=-Wl,-z,nostart-stop-gc >> $GITHUB_ENV
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: npm
 
-      - name: Electron Cache Variables
-        id: electron_cache_vars
-        run: |
-          echo "::set-output name=key::${{ runner.os }}-electron-${{ hashFiles('./package-lock.json') }}"
       - name: Cache Electron (Linux)
         if: matrix.os == 'ubuntu-latest'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          key: ${{ steps.electron_cache_vars.outputs.key }}
+          key: ${{ runner.os }}-electron-${{ hashFiles('./package-lock.json') }}
           path: ~/.cache/electron
       - name: Cache Electron (Windows)
         if: matrix.os == 'windows-latest'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          key: ${{ steps.electron_cache_vars.outputs.key }}
+          key: ${{ runner.os }}-electron-${{ hashFiles('./package-lock.json') }}
           path: "%LOCALAPPDATA%\\electron\\Cache"
       - name: Cache Electron (macOS)
         if: matrix.os == 'macos-latest'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-electron-${{ hashFiles('./package-lock.json') }}
           path: ~/Library/Caches/electron
 
-      - name: Use npm v8
-        # https://github.com/npm/cli/issues/4552
-        run: npm -g i npm@~8.3
+      - name: Install cargo-llvm-cov
+        if: matrix.os == 'ubuntu-latest' && matrix.rust-toolchain == 'stable'
+        uses: taiki-e/install-action@cargo-llvm-cov
+
+      - name: Set coverage environment variables
+        if: matrix.os == 'ubuntu-latest' && matrix.rust-toolchain == 'stable'
+        run: cargo llvm-cov show-env | tr -d "'" >> $GITHUB_ENV
 
       - name: npm install
         run: npm ci --prefer-offline --no-audit --no-fund
 
+      - name: Allow unprivileged X server
+        if: matrix.os == 'ubuntu-latest'
+        run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+
       - name: Test (Linux)
         if: matrix.os == 'ubuntu-latest'
         run: xvfb-run --auto-servernum npm test -- --nocapture
       - name: Test
         if: matrix.os != 'ubuntu-latest'
         run: npm test
+
+      - name: Generate coverage report
+        if: matrix.os == 'ubuntu-latest' && matrix.rust-toolchain == 'stable'
+        run: cargo llvm-cov report --codecov --output-path target/codecov.json
+
+      - name: Upload coverage to Codecov
+        if: matrix.os == 'ubuntu-latest' && matrix.rust-toolchain == 'stable'
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: neon-bindings/neon
+          files: target/codecov.json

.github/workflows/lint.yml

@@ -20,24 +20,26 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
         rust-toolchain: [nightly]
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout Code
+        uses: actions/checkout@v4
       - name: Use Rust ${{ matrix.rust-toolchain }}
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: ${{ matrix.rust-toolchain }}
+          components: clippy,rustfmt
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: "npm"
       - name: Cache Electron
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/electron
           key: ${{ runner.os }}-electron-${{ hashFiles('./package-lock.json') }}

.gitignore

@@ -1,14 +1,26 @@
+# Rust
 target
+rls*.log
+
+# Created by `trybuild` ui tests
+wip
 **/*~
+
+# Node
 **/node_modules
-**/.DS_Store
+npm-debug.log
+
+# JS build
 **/build
+**/dist
+cli/lib
+test/cli/lib
+
+# Neon build
 **/index.node
 **/artifacts.json
-cli/lib
-**/dist
 pkgs/create-neon/create-neon-test-project
 pkgs/create-neon/create-neon-manual-test-project
-test/cli/lib
-npm-debug.log
-rls*.log
+
+# System
+**/.DS_Store

AUTHORS.md

@@ -19,6 +19,7 @@ Neon owes its existence to the contributions of these fine people.
 * [ComplexSpaces](https://github.com/complexspaces)
 * [Nathaniel Daniel](https://github.com/adumbidiot)
 * [John Darrington](https://github.com/DnOberon)
+* [erics118](https://github.com/erics118)
 * [Joey Ezechiëls](https://github.com/jjpe)
 * [Ryan Fitzgerald](https://github.com/rf-)
 * [Cory Forsyth](https://github.com/bantic)
@@ -39,6 +40,7 @@ Neon owes its existence to the contributions of these fine people.
 * [Laz](https://github.com/lazops)
 * [Anton Lazarev](https://github.com/antonok-edm)
 * [Simon Liang](https://github.com/lhr0909)
+* [Matthew Little](https://github.com/zone117x)
 * [Terence Lee](https://github.com/hone)
 * [Milan Loveless](https://github.com/MilanLoveless)
 * [Mikuroさいな](https://github.com/MikuroXina)
@@ -73,4 +75,5 @@ Neon owes its existence to the contributions of these fine people.
 * [Chi Wang](https://github.com/patr0nus)
 * [wangcong](https://github.com/king6cong)
 * [Amila Welihinda](https://github.com/amilajack)
+* [xyloflake](https://github.com/xyloflake)
 * [Felix Yan](https://github.com/felixonmars)