Prerelease 0.33.0-alpha.8

This partially reverts commit 51e56f994c.

Ignoring plug'n'play, it looks like yarn and pnpm do get the
filesystem layout right for this scenario, which is good news.

It also looks like npm 10 will get it right too.

.circleci/config.yml

@@ -3,14 +3,6 @@ version: 2.1
 workflows:
   build:
     jobs:
-      - linux-arm64-glibc-node-14:
-          filters:
-            tags:
-              only: /^v.*/
-      - linux-arm64-musl-node-14:
-          filters:
-            tags:
-              only: /^v.*/
       - linux-arm64-glibc-node-18:
           filters:
             tags:
@@ -19,9 +11,17 @@ workflows:
           filters:
             tags:
               only: /^v.*/
+      - linux-arm64-glibc-node-20:
+          filters:
+            tags:
+              only: /^v.*/
+      - linux-arm64-musl-node-20:
+          filters:
+            tags:
+              only: /^v.*/
 
 jobs:
-  linux-arm64-glibc-node-14:
+  linux-arm64-glibc-node-18:
     resource_class: arm.medium
     machine:
       image: ubuntu-2004:current
@@ -30,13 +30,20 @@ jobs:
       - run: |
           sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp arm64v8/debian:bullseye
           sudo docker exec sharp sh -c "apt-get update && apt-get install -y build-essential git python3 curl fonts-noto-core"
-          sudo docker exec sharp sh -c "curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -"
-          sudo docker exec sharp sh -c "echo 'deb https://deb.nodesource.com/node_14.x sid main' >/etc/apt/sources.list.d/nodesource.list"
+          sudo docker exec sharp sh -c "mkdir -p /etc/apt/keyrings"
+          sudo docker exec sharp sh -c "curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg"
+          sudo docker exec sharp sh -c "echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main' | tee /etc/apt/sources.list.d/nodesource.list"
           sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs"
-      - run: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
+      - run: sudo docker exec sharp sh -c "npm install --build-from-source"
       - run: sudo docker exec sharp sh -c "npm test"
-      - run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --runtime napi --target 7 --upload=$prebuild_upload\" || true"
-  linux-arm64-glibc-node-18:
+      - run: |
+          sudo docker exec sharp sh -c "npm run package-from-local-build"
+          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@sharpen/sharp-linux-arm64=file:./npm/linux-arm64\""
+          sudo docker exec sharp sh -c "npm run clean"
+          sudo docker exec sharp sh -c "npm install --ignore-scripts"
+          sudo docker exec sharp sh -c "npm test"
+      - run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"cd src && ln -s ../package.json && npx prebuild --upload=$prebuild_upload\" || true"
+  linux-arm64-glibc-node-20:
     resource_class: arm.medium
     machine:
       image: ubuntu-2004:current
@@ -45,25 +52,20 @@ jobs:
       - run: |
           sudo docker run -dit --name sharp --workdir /mnt/sharp arm64v8/debian:bullseye
           sudo docker exec sharp sh -c "apt-get update && apt-get install -y build-essential git python3 curl fonts-noto-core"
-          sudo docker exec sharp sh -c "curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -"
-          sudo docker exec sharp sh -c "echo 'deb https://deb.nodesource.com/node_18.x sid main' >/etc/apt/sources.list.d/nodesource.list"
+          sudo docker exec sharp sh -c "mkdir -p /etc/apt/keyrings"
+          sudo docker exec sharp sh -c "curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg"
+          sudo docker exec sharp sh -c "echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' | tee /etc/apt/sources.list.d/nodesource.list"
           sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs"
           sudo docker exec sharp sh -c "mkdir -p /mnt/sharp"
           sudo docker cp . sharp:/mnt/sharp/.
       - run: sudo docker exec sharp sh -c "npm install --build-from-source"
       - run: sudo docker exec sharp sh -c "npm test"
-  linux-arm64-musl-node-14:
-    resource_class: arm.medium
-    machine:
-      image: ubuntu-2004:current
-    steps:
-      - checkout
       - run: |
-          sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:14-alpine3.12
-          sudo docker exec sharp sh -c "apk add build-base git python3 font-noto --update-cache"
-      - run: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
-      - run: sudo docker exec sharp sh -c "npm test"
-      - run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --runtime napi --target 7 --upload=$prebuild_upload\" || true"
+          sudo docker exec sharp sh -c "npm run package-from-local-build"
+          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@sharpen/sharp-linux-arm64=file:./npm/linux-arm64\""
+          sudo docker exec sharp sh -c "npm run clean"
+          sudo docker exec sharp sh -c "npm install --ignore-scripts"
+          sudo docker exec sharp sh -c "npm test"
   linux-arm64-musl-node-18:
     resource_class: arm.medium
     machine:
@@ -71,9 +73,33 @@ jobs:
     steps:
       - checkout
       - run: |
-          sudo docker run -dit --name sharp --workdir /mnt/sharp node:18-alpine3.14
+          sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:18-alpine3.17
+          sudo docker exec sharp sh -c "apk add build-base git python3 font-noto --update-cache"
+      - run: sudo docker exec sharp sh -c "npm install --build-from-source"
+      - run: sudo docker exec sharp sh -c "npm test"
+      - run: |
+          sudo docker exec sharp sh -c "npm run package-from-local-build"
+          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@sharpen/sharp-linuxmusl-arm64=file:./npm/linuxmusl-arm64\""
+          sudo docker exec sharp sh -c "npm run clean"
+          sudo docker exec sharp sh -c "npm install --ignore-scripts"
+          sudo docker exec sharp sh -c "npm test"
+      - run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"cd src && ln -s ../package.json && npx prebuild --upload=$prebuild_upload\" || true"
+  linux-arm64-musl-node-20:
+    resource_class: arm.medium
+    machine:
+      image: ubuntu-2004:current
+    steps:
+      - checkout
+      - run: |
+          sudo docker run -dit --name sharp --workdir /mnt/sharp node:20-alpine3.18
           sudo docker exec sharp sh -c "apk add build-base git python3 font-noto --update-cache"
           sudo docker exec sharp sh -c "mkdir -p /mnt/sharp"
           sudo docker cp . sharp:/mnt/sharp/.
       - run: sudo docker exec sharp sh -c "npm install --build-from-source"
       - run: sudo docker exec sharp sh -c "npm test"
+      - run: |
+          sudo docker exec sharp sh -c "npm run package-from-local-build"
+          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@sharpen/sharp-linuxmusl-arm64=file:./npm/linuxmusl-arm64\""
+          sudo docker exec sharp sh -c "npm run clean"
+          sudo docker exec sharp sh -c "npm install --ignore-scripts"
+          sudo docker exec sharp sh -c "npm test"

.cirrus.yml

@@ -11,6 +11,6 @@ task:
     - pkg upgrade -y
     - pkg install -y devel/git devel/pkgconf graphics/vips www/node20 www/npm
   install_script:
-    - npm install --build-from-source --unsafe-perm
+    - npm install --build-from-source
   test_script:
     - npm test

.github/ISSUE_TEMPLATE/installation.md

@@ -12,7 +12,6 @@ labels: installation
 <!-- Please place an [x] in the box to confirm. -->
 
 - [ ] I have read the [documentation relating to installation](https://sharp.pixelplumbing.com/install).
-- [ ] I have ensured that the architecture and platform of Node.js used for `npm install` is the same as the architecture and platform of Node.js used at runtime.
 
 ### Are you using the latest version of sharp?
 
@@ -24,13 +23,25 @@ If you cannot confirm this, please upgrade to the latest version and try again b
 
 If you are using another package which depends on a version of `sharp` that is not the latest, please open an issue against that package instead.
 
-### Is this a problem with filesystem permissions?
+### Are you using a supported runtime?
 
-If you are using npm v6 or earlier and installing as a `root` or `sudo` user, have you tried with the `npm install --unsafe-perm` flag?
+<!-- Please place an [x] in the relevant box to confirm. -->
 
-If you are using npm v7 or later, does the user running `npm install` own the directory it is run in?
+- [ ] I am using Node.js 18 with a version >= 18.17.0
+- [ ] I am using Node.js 20 with a version >= 20.3.0
+- [ ] I am using Node.js 21 or later
 
-If you are using the `ignore-scripts` feature of `npm`, have you tried with the `npm install --ignore-scripts=false` flag?
+If you cannot confirm any of these, please upgrade to the latest version and try again before opening an issue.
+
+### Are you using a supported package manager?
+
+<!-- Please place an [x] in the relevant box to confirm. -->
+
+- [ ] I am using npm >= 9.6.5
+- [ ] I am using yarn >= 3.2.0
+- [ ] I am using pnpm >= 7.1.0
+
+If you cannot confirm any of these, please upgrade to the latest version and try again before opening an issue.
 
 ### What is the complete output of running `npm install --verbose --foreground-scripts sharp` in an empty directory?
 

.github/workflows/ci-darwin-arm64v8.yml

@@ -1,40 +0,0 @@
-name: CI (MacStadium)
-on:
-  - push
-  - pull_request
-permissions: {}
-jobs:
-  CI:
-    permissions:
-      contents: write # for npx prebuild to make release
-    name: Node.js ${{ matrix.nodejs_version }} ${{ matrix.nodejs_arch }} ${{ matrix.prebuild && '- prebuild' }}
-    runs-on: macos-m1
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - nodejs_version: 14
-            nodejs_arch: x64
-          - nodejs_version: 18
-            nodejs_arch: arm64
-            prebuild: true
-    defaults:
-      run:
-        shell: /usr/bin/arch -arch arm64e /bin/bash -l {0}
-    steps:
-      - name: Dependencies (Node.js)
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.nodejs_version }}
-          architecture: ${{ matrix.nodejs_arch }}
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install
-        run: npm install --build-from-source --unsafe-perm
-      - name: Test
-        run: npm test
-      - name: Prebuild
-        if: matrix.prebuild && startsWith(github.ref, 'refs/tags/')
-        env:
-          prebuild_upload: ${{ secrets.GITHUB_TOKEN }}
-        run: npx prebuild --runtime napi --target 7

.github/workflows/ci.yml

@@ -1,13 +1,13 @@
-name: CI (GitHub)
+name: CI
 on:
   - push
   - pull_request
 permissions: {}
 jobs:
-  CI:
+  github-runner:
     permissions:
-      contents: write # for npx prebuild to make release
-    name: ${{ matrix.container || matrix.os }} - Node.js ${{ matrix.nodejs_version }} ${{ matrix.nodejs_arch }} ${{ matrix.prebuild && '- prebuild' }}
+      contents: write
+    name: ${{ matrix.platform }} - Node.js ${{ matrix.nodejs_version_major }} ${{ matrix.prebuild && '- prebuild' }}
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}
     strategy:
@@ -15,57 +15,63 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            container: centos:7
-            nodejs_version: 14
+            container: rockylinux:8
+            nodejs_version: "^18.17.0"
+            nodejs_version_major: 18
+            platform: linux-x64
             prebuild: true
-          - os: ubuntu-22.04
-            container: centos:7
-            nodejs_version: 16
           - os: ubuntu-22.04
             container: rockylinux:8
-            nodejs_version: 18
+            nodejs_version: "^20.3.0"
+            nodejs_version_major: 20
+            platform: linux-x64
           - os: ubuntu-22.04
-            container: node:14-alpine3.12
+            container: node:18-alpine3.17
+            nodejs_version_major: 18
+            platform: linuxmusl-x64
             prebuild: true
           - os: ubuntu-22.04
-            container: node:16-alpine3.12
-          - os: ubuntu-22.04
-            container: node:18-alpine3.14
+            container: node:20-alpine3.18
+            nodejs_version_major: 20
+            platform: linuxmusl-x64
           - os: macos-11
-            nodejs_version: 14
+            nodejs_arch: x64
+            nodejs_version: "^18.17.0"
+            nodejs_version_major: 18
+            platform: darwin-x64
             prebuild: true
-            nodejs_arch: x64
           - os: macos-11
-            nodejs_version: 16
-            nodejs_arch: x64
-          - os: macos-11
-            nodejs_version: 18
             nodejs_arch: x64
+            nodejs_version: "^20.3.0"
+            nodejs_version_major: 20
+            platform: darwin-x64
           - os: windows-2019
-            nodejs_version: 14
             nodejs_arch: x86
+            nodejs_version: "^18.17.0"
+            nodejs_version_major: 18
+            platform: win32-ia32
             prebuild: true
           - os: windows-2019
-            nodejs_version: 16
             nodejs_arch: x86
+            nodejs_version: "^20.3.0"
+            nodejs_version_major: 20
+            platform: win32-ia32
           - os: windows-2019
-            nodejs_version: 18
-            nodejs_arch: x86
-          - os: windows-2019
-            nodejs_version: 14
             nodejs_arch: x64
+            nodejs_version: "^18.17.0"
+            nodejs_version_major: 18
+            platform: win32-x64
             prebuild: true
           - os: windows-2019
-            nodejs_version: 16
-            nodejs_arch: x64
-          - os: windows-2019
-            nodejs_version: 18
             nodejs_arch: x64
+            nodejs_version: "^20.3.0"
+            nodejs_version_major: 20
+            platform: win32-x64
     steps:
       - name: Dependencies (Linux glibc)
         if: contains(matrix.container, 'centos')
         run: |
-          curl -sL https://rpm.nodesource.com/setup_${{ matrix.nodejs_version }}.x | bash -
+          yum install -y https://rpm.nodesource.com/pub_${{ matrix.nodejs_version_major }}.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm
           yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
           yum install -y centos-release-scl
           yum install -y devtoolset-11-gcc-c++ make git python3 nodejs fontconfig google-noto-sans-fonts
@@ -73,17 +79,18 @@ jobs:
       - name: Dependencies (Rocky Linux glibc)
         if: contains(matrix.container, 'rockylinux')
         run: |
-          curl -sL https://rpm.nodesource.com/setup_${{ matrix.nodejs_version }}.x | bash -
-          dnf install -y gcc-toolset-11-gcc-c++ make git python3 nodejs fontconfig google-noto-sans-fonts
+          dnf install -y https://rpm.nodesource.com/pub_${{ matrix.nodejs_version_major }}.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm
+          dnf install -y --setopt=nodesource-nodejs.module_hotfixes=1 nodejs
+          dnf install -y gcc-toolset-11-gcc-c++ make git python3 fontconfig google-noto-sans-fonts
           echo "/opt/rh/gcc-toolset-11/root/usr/bin" >> $GITHUB_PATH
       - name: Dependencies (Linux musl)
         if: contains(matrix.container, 'alpine')
         run: apk add build-base git python3 font-noto --update-cache
-      - name: Dependencies (Python 3.10 - macOS, Windows)
+      - name: Dependencies (Python 3.11 - macOS, Windows)
         if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows')
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       - name: Dependencies (Node.js - macOS, Windows)
         if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows')
         uses: actions/setup-node@v3
@@ -91,16 +98,96 @@ jobs:
           node-version: ${{ matrix.nodejs_version }}
           architecture: ${{ matrix.nodejs_arch }}
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Fix working directory ownership
-        if: matrix.container
-        run: chown root.root .
+        uses: actions/checkout@v4
       - name: Install
-        run: npm install --build-from-source --unsafe-perm
+        run: npm install --build-from-source
       - name: Test
         run: npm test
+      - name: Test packaging
+        run: |
+          npm run package-from-local-build
+          npm pkg set "optionalDependencies.@sharpen/sharp-${{ matrix.platform }}=file:./npm/${{ matrix.platform }}"
+          npm run clean
+          npm install --ignore-scripts
+          npm test
       - name: Prebuild
         if: matrix.prebuild && startsWith(github.ref, 'refs/tags/')
         env:
           prebuild_upload: ${{ secrets.GITHUB_TOKEN }}
-        run: npx prebuild --runtime napi --target 7
+        run: |
+          node -e "require('fs').cpSync('package.json', 'src/package.json')"
+          cd src
+          npx prebuild
+  github-runner-qemu:
+    permissions:
+      contents: write
+    name: linux-arm - Node.js 18 - prebuild
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: uraimo/run-on-arch-action@v2
+        with:
+          arch: armv6
+          distro: buster
+          env: |
+            nodejs_version: "18.17.0"
+            prebuild_upload: "${{ startsWith(github.ref, 'refs/tags/') && secrets.GITHUB_TOKEN || '' }}"
+          run: |
+            apt-get update
+            apt-get install -y fontconfig fonts-noto-core g++ git libatomic1 make python3 xz-utils
+            mkdir /opt/nodejs
+            curl --silent https://unofficial-builds.nodejs.org/download/release/v${nodejs_version}/node-v${nodejs_version}-linux-armv6l.tar.xz | tar xJC /opt/nodejs --strip-components=1
+            export PATH=$PATH:/opt/nodejs/bin
+            npm install --build-from-source
+            npx mocha --no-config --spec=test/unit/io.js
+            npm run package-from-local-build
+            npm pkg set "optionalDependencies.@sharpen/sharp-linux-arm=file:./npm/linux-arm"
+            npm run clean
+            npm install --ignore-scripts
+            npx mocha --no-config --spec=test/unit/io.js --timeout=30000
+            [[ -n $prebuild_upload ]] && cd src && ln -s ../package.json && npx prebuild || true
+  macstadium-runner:
+    permissions:
+      contents: write
+    name: ${{ matrix.platform }} - Node.js ${{ matrix.nodejs_version_major }} ${{ matrix.prebuild && '- prebuild' }}
+    runs-on: macos-m1
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - nodejs_arch: x64
+            nodejs_version: "^18.17.0"
+            nodejs_version_major: 18
+            platform: darwin-x64
+          - nodejs_arch: arm64
+            nodejs_version: "^18.17.0"
+            nodejs_version_major: 18
+            platform: darwin-arm64
+            prebuild: true
+    defaults:
+      run:
+        shell: /usr/bin/arch -arch arm64e /bin/bash -l {0}
+    steps:
+      - name: Dependencies (Node.js)
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.nodejs_version }}
+          architecture: ${{ matrix.nodejs_arch }}
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install
+        run: npm install --build-from-source
+      - name: Test
+        run: npm test
+      - name: Test packaging
+        run: |
+          npm run package-from-local-build
+          npm pkg set "optionalDependencies.@sharpen/sharp-${{ matrix.platform }}=file:./npm/${{ matrix.platform }}"
+          npm run clean
+          npm install --ignore-scripts
+          npm test
+      - name: Prebuild
+        if: matrix.prebuild && startsWith(github.ref, 'refs/tags/')
+        env:
+          prebuild_upload: ${{ secrets.GITHUB_TOKEN }}
+        run: cd src && ln -s ../package.json && npx prebuild

.github/workflows/npm.yml

@@ -0,0 +1,100 @@
+name: "CI: npm smoke test"
+
+on:
+  push:
+    tags:
+      - "v**"
+
+permissions: {}
+
+jobs:
+  release-smoke-test:
+    name: "${{ github.ref }} ${{ matrix.name }}"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: linux-x64
+            os: ubuntu-22.04
+          - name: darwin-x64
+            os: macos-11
+          - name: win32-x64
+            os: windows-2019
+    steps:
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Install Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+      - name: Install Bun
+        if: ${{ !contains(matrix.os, 'windows') }}
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
+      - name: Version
+        id: version
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.setOutput('semver', context.ref.replace('refs/tags/v',''))
+      - name: Create package.json
+        uses: DamianReeves/write-file-action@v1.2
+        with:
+          path: package.json
+          contents: |
+            {
+              "dependencies": {
+                "sharp": "${{ steps.version.outputs.semver }}"
+              }
+            }
+      - name: Create release.mjs
+        uses: DamianReeves/write-file-action@v1.2
+        with:
+          path: release.mjs
+          contents: |
+            import { createRequire } from 'node:module';
+            import { deepStrictEqual } from 'node:assert';
+            const require = createRequire(import.meta.url);
+            const sharp = require('sharp');
+            deepStrictEqual(['.jpg', '.jpeg', '.jpe'], sharp.format.jpeg.input.fileSuffix);
+
+      - name: Run with Node.js + npm
+        run: |
+          npm install --ignore-scripts
+          node release.mjs
+          rm -r node_modules/ package-lock.json
+
+      - name: Run with Node.js + pnpm
+        run: |
+          pnpm install --ignore-scripts
+          node release.mjs
+          rm -r node_modules/ pnpm-lock.yaml
+
+      - name: Run with Node.js + yarn
+        run: |
+          corepack enable
+          yarn set version stable
+          yarn config set enableScripts false
+          yarn config set nodeLinker node-modules
+          yarn install
+          node release.mjs
+          rm -r node_modules/ .yarn/ yarn.lock .yarnrc.yml
+          corepack disable
+
+      - name: Run with Deno
+        run: deno run --allow-read --allow-ffi release.mjs
+
+      - name: Run with Bun
+        if: ${{ !contains(matrix.os, 'windows') }}
+        run: |
+          bun install --ignore-scripts
+          bun release.mjs

.gitignore

@@ -1,6 +1,9 @@
-build
+src/build
+src/node_modules
 node_modules
 /coverage
+npm/*/*
+!npm/*/package.json
 test/bench/node_modules
 test/fixtures/output*
 test/fixtures/vips-properties.xml
@@ -9,7 +12,6 @@ test/saliency/report.json
 test/saliency/Image*
 test/saliency/[Uu]serData*
 !test/saliency/userData.js
-vendor
 .gitattributes
 .DS_Store
 .nyc_output

.prebuildrc

@@ -1,4 +1,6 @@
 {
-  "include-regex": "(sharp-.+\\.node|libvips-cpp\\.dll)",
+  "runtime": "napi",
+  "include-regex": "(sharp-.+\\.node|libvips-.+\\.dll|libglib-.+\\.dll|libgobject-.+\\.dll)",
+  "prerelease": true,
   "strip": true
 }

README.md

@@ -16,7 +16,7 @@ Lanczos resampling ensures quality is not sacrificed for speed.
 As well as image resizing, operations such as
 rotation, extraction, compositing and gamma correction are available.
 
-Most modern macOS, Windows and Linux systems running Node.js >= 14.15.0
+Most modern macOS, Windows and Linux systems running Node.js >= 18.17.0
 do not require any additional install or runtime dependencies.
 
 ## Documentation

docs/api-channel.md

@@ -1,4 +1,6 @@
 ## removeAlpha
+> removeAlpha() ⇒ <code>Sharp</code>
+
 Remove alpha channel, if any. This is a no-op if the image does not have an alpha channel.
 
 See also [flatten](/api-operation#flatten).
@@ -15,6 +17,8 @@ sharp('rgba.png')
 
 
 ## ensureAlpha
+> ensureAlpha([alpha]) ⇒ <code>Sharp</code>
+
 Ensure the output image has an alpha transparency channel.
 If missing, the added alpha channel will have the specified
 transparency level, defaulting to fully-opaque (1).
@@ -48,6 +52,8 @@ const rgba = await sharp(rgb)
 
 
 ## extractChannel
+> extractChannel(channel) ⇒ <code>Sharp</code>
+
 Extract a single channel from a multi-channel image.
 
 
@@ -78,6 +84,8 @@ const [red1, red2, ...] = await sharp(input)
 
 
 ## joinChannel
+> joinChannel(images, options) ⇒ <code>Sharp</code>
+
 Join one or more channels to the image.
 The meaning of the added channels depends on the output colourspace, set with `toColourspace()`.
 By default the output image will be web-friendly sRGB, with additional channels interpreted as alpha channels.
@@ -102,6 +110,8 @@ For raw pixel input, the `options` object should contain a `raw` attribute, whic
 
 
 ## bandbool
+> bandbool(boolOp) ⇒ <code>Sharp</code>
+
 Perform a bitwise boolean operation on all input image channels (bands) to produce a single channel output image.
 
 

docs/api-colour.md

@@ -1,4 +1,6 @@
 ## tint
+> tint(rgb) ⇒ <code>Sharp</code>
+
 Tint the image using the provided chroma while preserving the image luminance.
 An alpha channel may be present and will be unchanged by the operation.
 
@@ -21,6 +23,8 @@ const output = await sharp(input)
 
 
 ## greyscale
+> greyscale([greyscale]) ⇒ <code>Sharp</code>
+
 Convert to 8-bit greyscale; 256 shades of grey.
 This is a linear operation. If the input image is in a non-linear colour space such as sRGB, use `gamma()` with `greyscale()` for the best results.
 By default the output image will be web-friendly sRGB and contain three (identical) color channels.
@@ -41,6 +45,8 @@ const output = await sharp(input).greyscale().toBuffer();
 
 
 ## grayscale
+> grayscale([grayscale]) ⇒ <code>Sharp</code>
+
 Alternative spelling of `greyscale`.
 
 
@@ -52,6 +58,8 @@ Alternative spelling of `greyscale`.
 
 
 ## pipelineColourspace
+> pipelineColourspace([colourspace]) ⇒ <code>Sharp</code>
+
 Set the pipeline colourspace.
 
 The input image will be converted to the provided colourspace at the start of the pipeline.
@@ -82,6 +90,8 @@ await sharp(input)
 
 
 ## pipelineColorspace
+> pipelineColorspace([colorspace]) ⇒ <code>Sharp</code>
+
 Alternative spelling of `pipelineColourspace`.
 
 
@@ -97,6 +107,8 @@ Alternative spelling of `pipelineColourspace`.
 
 
 ## toColourspace
+> toColourspace([colourspace]) ⇒ <code>Sharp</code>
+
 Set the output colourspace.
 By default output image will be web-friendly sRGB, with additional channels interpreted as alpha channels.
 
@@ -120,6 +132,8 @@ await sharp(input)
 
 
 ## toColorspace
+> toColorspace([colorspace]) ⇒ <code>Sharp</code>
+
 Alternative spelling of `toColourspace`.
 
 

docs/api-composite.md

@@ -1,4 +1,6 @@
 ## composite
+> composite(images) ⇒ <code>Sharp</code>
+
 Composite image(s) over the processed (resized, extracted etc.) image.
 
 The images to composite must be the same size or smaller than the processed image.

docs/api-constructor.md

@@ -1,9 +1,13 @@
 ## Sharp
+> Sharp
+
 
 **Emits**: <code>Sharp#event:info</code>, <code>Sharp#event:warning</code>  
 <a name="new_Sharp_new"></a>
 
 ### new
+> new Sharp([input], [options])
+
 Constructor factory to create an instance of `sharp`, to which further methods are chained.
 
 JPEG, PNG, WebP, GIF, AVIF or TIFF format image data can be streamed out from this object.
@@ -159,6 +163,8 @@ await sharp({
 
 
 ## clone
+> clone() ⇒ [<code>Sharp</code>](#Sharp)
+
 Take a "snapshot" of the Sharp instance, returning a new instance.
 Cloned instances inherit the input of their parent instance.
 This allows multiple output Streams and therefore multiple processing pipelines to share a single input Stream.

docs/api-input.md

@@ -1,4 +1,6 @@
 ## metadata
+> metadata([callback]) ⇒ <code>Promise.&lt;Object&gt;</code> \| <code>Sharp</code>
+
 Fast access to (uncached) image metadata without decoding any compressed pixel data.
 
 This is read from the header of the input image.
@@ -81,6 +83,8 @@ function getNormalSize({ width, height, orientation }) {
 
 
 ## stats
+> stats([callback]) ⇒ <code>Promise.&lt;Object&gt;</code>
+
 Access to pixel-derived image statistics for every channel in the image.
 A `Promise` is returned when `callback` is not provided.
 

docs/api-operation.md

@@ -1,4 +1,6 @@
 ## rotate
+> rotate([angle], [options]) ⇒ <code>Sharp</code>
+
 Rotate the output image by either an explicit angle
 or auto-orient based on the EXIF `Orientation` tag.
 
@@ -11,7 +13,7 @@ the background colour can be provided with the `background` option.
 If no angle is provided, it is determined from the EXIF data.
 Mirroring is supported and may infer the use of a flip operation.
 
-The use of `rotate` implies the removal of the EXIF `Orientation` tag, if any.
+The use of `rotate` without an angle will remove the EXIF `Orientation` tag, if any.
 
 Only one rotation can occur per pipeline.
 Previous calls to `rotate` in the same pipeline will be ignored.
@@ -57,11 +59,11 @@ const resizeThenRotate = await sharp(input)
 
 
 ## flip
+> flip([flip]) ⇒ <code>Sharp</code>
+
 Mirror the image vertically (up-down) about the x-axis.
 This always occurs before rotation, if any.
 
-The use of `flip` implies the removal of the EXIF `Orientation` tag, if any.
-
 This operation does not work correctly with multi-page images.
 
 
@@ -77,11 +79,11 @@ const output = await sharp(input).flip().toBuffer();
 
 
 ## flop
+> flop([flop]) ⇒ <code>Sharp</code>
+
 Mirror the image horizontally (left-right) about the y-axis.
 This always occurs before rotation, if any.
 
-The use of `flop` implies the removal of the EXIF `Orientation` tag, if any.
-
 
 
 | Param | Type | Default |
@@ -95,6 +97,8 @@ const output = await sharp(input).flop().toBuffer();
 
 
 ## affine
+> affine(matrix, [options]) ⇒ <code>Sharp</code>
+
 Perform an affine transform on an image. This operation will always occur after resizing, extraction and rotation, if any.
 
 You must provide an array of length 4 or a 2x2 affine transformation matrix.
@@ -146,6 +150,8 @@ inputStream
 
 
 ## sharpen
+> sharpen([options], [flat], [jagged]) ⇒ <code>Sharp</code>
+
 Sharpen the image.
 
 When used without parameters, performs a fast, mild sharpen of the output image.
@@ -197,6 +203,8 @@ const data = await sharp(input)
 
 
 ## median
+> median([size]) ⇒ <code>Sharp</code>
+
 Apply median filter.
 When used without parameters the default window is 3x3.
 
@@ -221,6 +229,8 @@ const output = await sharp(input).median(5).toBuffer();
 
 
 ## blur
+> blur([sigma]) ⇒ <code>Sharp</code>
+
 Blur the image.
 
 When used without parameters, performs a fast 3x3 box blur (equivalent to a box linear filter).
@@ -252,6 +262,8 @@ const gaussianBlurred = await sharp(input)
 
 
 ## flatten
+> flatten([options]) ⇒ <code>Sharp</code>
+
 Merge alpha transparency channel, if any, with a background, then remove the alpha channel.
 
 See also [removeAlpha](/api-channel#removealpha).
@@ -272,6 +284,8 @@ await sharp(rgbaInput)
 
 
 ## unflatten
+> unflatten()
+
 Ensure the image has an alpha channel
 with all white pixel values made fully transparent.
 
@@ -297,6 +311,8 @@ await sharp(rgbInput)
 
 
 ## gamma
+> gamma([gamma], [gammaOut]) ⇒ <code>Sharp</code>
+
 Apply a gamma correction by reducing the encoding (darken) pre-resize at a factor of `1/gamma`
 then increasing the encoding (brighten) post-resize at a factor of `gamma`.
 This can improve the perceived brightness of a resized image in non-linear colour spaces.
@@ -319,6 +335,8 @@ Supply a second argument to use a different output gamma value, otherwise the fi
 
 
 ## negate
+> negate([options]) ⇒ <code>Sharp</code>
+
 Produce the "negative" of the image.
 
 
@@ -343,6 +361,8 @@ const output = await sharp(input)
 
 
 ## normalise
+> normalise([options]) ⇒ <code>Sharp</code>
+
 Enhance output image contrast by stretching its luminance to cover a full dynamic range.
 
 Uses a histogram-based approach, taking a default range of 1% to 99% to reduce sensitivity to noise at the extremes.
@@ -373,6 +393,8 @@ const output = await sharp(input)
 
 
 ## normalize
+> normalize([options]) ⇒ <code>Sharp</code>
+
 Alternative spelling of normalise.
 
 
@@ -392,6 +414,8 @@ const output = await sharp(input)
 
 
 ## clahe
+> clahe(options) ⇒ <code>Sharp</code>
+
 Perform contrast limiting adaptive histogram equalization
 [CLAHE](https://en.wikipedia.org/wiki/Adaptive_histogram_equalization#Contrast_Limited_AHE).
 
@@ -423,6 +447,8 @@ const output = await sharp(input)
 
 
 ## convolve
+> convolve(kernel) ⇒ <code>Sharp</code>
+
 Convolve the image with the specified kernel.
 
 
@@ -457,6 +483,8 @@ sharp(input)
 
 
 ## threshold
+> threshold([threshold], [options]) ⇒ <code>Sharp</code>
+
 Any pixel value greater than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
 
 
@@ -475,6 +503,8 @@ Any pixel value greater than or equal to the threshold value will be set to 255,
 
 
 ## boolean
+> boolean(operand, operator, [options]) ⇒ <code>Sharp</code>
+
 Perform a bitwise boolean operation with operand image.
 
 This operation creates an output image where each pixel is the result of
@@ -499,6 +529,8 @@ the selected bitwise boolean `operation` between the corresponding pixels of the
 
 
 ## linear
+> linear([a], [b]) ⇒ <code>Sharp</code>
+
 Apply the linear formula `a` * input + `b` to the image to adjust image levels.
 
 When a single number is provided, it will be used for all image channels.
@@ -533,6 +565,8 @@ await sharp(rgbInput)
 
 
 ## recomb
+> recomb(inputMatrix) ⇒ <code>Sharp</code>
+
 Recombine the image with the specified matrix.
 
 
@@ -563,6 +597,8 @@ sharp(input)
 
 
 ## modulate
+> modulate([options]) ⇒ <code>Sharp</code>
+
 Transforms the image using brightness, saturation, hue rotation, and lightness.
 Brightness and lightness both operate on luminance, with the difference being that
 brightness is multiplicative whereas lightness is additive.

docs/api-output.md

@@ -1,4 +1,6 @@
 ## toFile
+> toFile(fileOut, [callback]) ⇒ <code>Promise.&lt;Object&gt;</code>
+
 Write output image data to a file.
 
 If an explicit output format is not selected, it will be inferred from the extension,
@@ -39,6 +41,8 @@ sharp(input)
 
 
 ## toBuffer
+> toBuffer([options], [callback]) ⇒ <code>Promise.&lt;Buffer&gt;</code>
+
 Write output to a Buffer.
 JPEG, PNG, WebP, AVIF, TIFF, GIF and raw pixel data output are supported.
 
@@ -108,9 +112,11 @@ await sharp(pixelArray, { raw: { width, height, channels } })
 
 
 ## withMetadata
+> withMetadata([options]) ⇒ <code>Sharp</code>
+
 Include all metadata (EXIF, XMP, IPTC) from the input image in the output image.
-This will also convert to and add a web-friendly sRGB ICC profile unless a custom
-output profile is provided.
+This will also convert to and add a web-friendly sRGB ICC profile if appropriate,
+unless a custom output profile is provided.
 
 The default behaviour, when `withMetadata` is not used, is to convert to the device-independent
 sRGB colour space and strip all metadata, including the removal of any ICC profile.
@@ -167,6 +173,8 @@ const data = await sharp(input)
 
 
 ## toFormat
+> toFormat(format, options) ⇒ <code>Sharp</code>
+
 Force output to a given format.
 
 
@@ -190,6 +198,8 @@ const data = await sharp(input)
 
 
 ## jpeg
+> jpeg([options]) ⇒ <code>Sharp</code>
+
 Use these JPEG options for output image.
 
 
@@ -235,6 +245,8 @@ const data = await sharp(input)
 
 
 ## png
+> png([options]) ⇒ <code>Sharp</code>
+
 Use these PNG options for output image.
 
 By default, PNG output is full colour at 8 or 16 bits per pixel.
@@ -278,6 +290,8 @@ const data = await sharp(input)
 
 
 ## webp
+> webp([options]) ⇒ <code>Sharp</code>
+
 Use these WebP options for output image.
 
 
@@ -319,6 +333,8 @@ const outputWebp = await sharp(inputWebp, { animated: true })
 
 
 ## gif
+> gif([options]) ⇒ <code>Sharp</code>
+
 Use these GIF options for the output image.
 
 The first entry in the palette is reserved for transparency.
@@ -378,6 +394,8 @@ await sharp('in.gif', { animated: true })
 
 
 ## jp2
+> jp2([options]) ⇒ <code>Sharp</code>
+
 Use these JP2 options for output image.
 
 Requires libvips compiled with support for OpenJPEG.
@@ -420,6 +438,8 @@ const data = await sharp(input)
 
 
 ## tiff
+> tiff([options]) ⇒ <code>Sharp</code>
+
 Use these TIFF options for output image.
 
 The `density` can be set in pixels/inch via [withMetadata](#withmetadata)
@@ -461,10 +481,9 @@ sharp('input.svg')
 
 
 ## avif
-Use these AVIF options for output image.
+> avif([options]) ⇒ <code>Sharp</code>
 
-Whilst it is possible to create AVIF images smaller than 16x16 pixels,
-most web browsers do not display these properly.
+Use these AVIF options for output image.
 
 AVIF image sequences are not supported.
 
@@ -498,6 +517,8 @@ const data = await sharp(input)
 
 
 ## heif
+> heif(options) ⇒ <code>Sharp</code>
+
 Use these HEIF options for output image.
 
 Support for patent-encumbered HEIC images using `hevc` compression requires the use of a
@@ -512,9 +533,9 @@ globally-installed libvips compiled with support for libheif, libde265 and x265.
 
 | Param | Type | Default | Description |
 | --- | --- | --- | --- |
-| [options] | <code>Object</code> |  | output options |
+| options | <code>Object</code> |  | output options |
+| options.compression | <code>string</code> |  | compression format: av1, hevc |
 | [options.quality] | <code>number</code> | <code>50</code> | quality, integer 1-100 |
-| [options.compression] | <code>string</code> | <code>&quot;&#x27;av1&#x27;&quot;</code> | compression format: av1, hevc |
 | [options.lossless] | <code>boolean</code> | <code>false</code> | use lossless compression |
 | [options.effort] | <code>number</code> | <code>4</code> | CPU effort, between 0 (fastest) and 9 (slowest) |
 | [options.chromaSubsampling] | <code>string</code> | <code>&quot;&#x27;4:4:4&#x27;&quot;</code> | set to '4:2:0' to use chroma subsampling |
@@ -528,6 +549,8 @@ const data = await sharp(input)
 
 
 ## jxl
+> jxl([options]) ⇒ <code>Sharp</code>
+
 Use these JPEG-XL (JXL) options for output image.
 
 This feature is experimental, please do not use in production systems.
@@ -557,6 +580,8 @@ Image metadata (EXIF, XMP) is unsupported.
 
 
 ## raw
+> raw([options]) ⇒ <code>Sharp</code>
+
 Force output to be raw, uncompressed pixel data.
 Pixel ordering is left-to-right, top-to-bottom, without padding.
 Channel ordering will be RGB or RGBA for non-greyscale colourspaces.
@@ -592,6 +617,8 @@ const data = await sharp('input.png')
 
 
 ## tile
+> tile([options]) ⇒ <code>Sharp</code>
+
 Use tile-based deep zoom (image pyramid) output.
 
 Set the format and options for tile images via the `toFormat`, `jpeg`, `png` or `webp` functions.
@@ -653,6 +680,8 @@ readableStream
 
 
 ## timeout
+> timeout(options) ⇒ <code>Sharp</code>
+
 Set a timeout for processing, in seconds.
 Use a value of zero to continue processing indefinitely, the default behaviour.
 

docs/api-resize.md

@@ -1,4 +1,6 @@
 ## resize
+> resize([width], [height], [options]) ⇒ <code>Sharp</code>
+
 Resize image to `width`, `height` or `width x height`.
 
 When both a `width` and `height` are provided, the possible methods by which the image should **fit** these are:
@@ -146,6 +148,8 @@ const scaleByHalf = await sharp(input)
 
 
 ## extend
+> extend(extend) ⇒ <code>Sharp</code>
+
 Extend / pad / extrude one or more edges of the image with either
 the provided background colour or pixels derived from the image.
 This operation will always occur after resizing and extraction, if any.
@@ -204,11 +208,13 @@ sharp(input)
 
 
 ## extract
+> extract(options) ⇒ <code>Sharp</code>
+
 Extract/crop a region of the image.
 
 - Use `extract` before `resize` for pre-resize extraction.
 - Use `extract` after `resize` for post-resize extraction.
-- Use `extract` before and after for both.
+- Use `extract` twice and `resize` once for extract-then-resize-then-extract in a fixed operation order.
 
 
 **Throws**:
@@ -245,6 +251,8 @@ sharp(input)
 
 
 ## trim
+> trim(trim) ⇒ <code>Sharp</code>
+
 Trim pixels from all edges that contain values similar to the given background colour, which defaults to that of the top-left pixel.
 
 Images with an alpha channel will use the combined bounding box of alpha and non-alpha channels.

docs/api-utility.md

@@ -1,5 +1,8 @@
 ## versions
-An Object containing the version numbers of sharp, libvips and its dependencies.
+> versions
+
+An Object containing the version numbers of sharp, libvips
+and (when using prebuilt binaries) its dependencies.
 
 
 **Example**  
@@ -9,6 +12,8 @@ console.log(sharp.versions);
 
 
 ## interpolators
+> interpolators : <code>enum</code>
+
 An Object containing the available interpolators and their proper values
 
 
@@ -27,6 +32,8 @@ An Object containing the available interpolators and their proper values
 
 
 ## format
+> format ⇒ <code>Object</code>
+
 An Object containing nested boolean values representing the available input and output formats/methods.
 
 
@@ -36,18 +43,9 @@ console.log(sharp.format);
 ```
 
 
-## vendor
-An Object containing the platform and architecture
-of the current and installed vendored binaries.
-
-
-**Example**  
-```js
-console.log(sharp.vendor);
-```
-
-
 ## queue
+> queue
+
 An EventEmitter that emits a `change` event when a task is either:
 - queued, waiting for _libuv_ to provide a worker thread
 - complete
@@ -62,6 +60,8 @@ sharp.queue.on('change', function(queueLength) {
 
 
 ## cache
+> cache([options]) ⇒ <code>Object</code>
+
 Gets or, when options are provided, sets the limits of _libvips'_ operation cache.
 Existing entries in the cache will be trimmed after any change in limits.
 This method always returns cache statistics,
@@ -89,6 +89,8 @@ sharp.cache(false);
 
 
 ## concurrency
+> concurrency([concurrency]) ⇒ <code>number</code>
+
 Gets or, when a concurrency is provided, sets
 the maximum number of threads _libvips_ should use to process _each image_.
 These are from a thread pool managed by glib,
@@ -132,6 +134,8 @@ sharp.concurrency(0); // 4
 
 
 ## counters
+> counters() ⇒ <code>Object</code>
+
 Provides access to internal task counters.
 - queue is the number of tasks this module has queued waiting for _libuv_ to provide a worker thread from its pool.
 - process is the number of resize tasks currently being processed.
@@ -144,6 +148,8 @@ const counters = sharp.counters(); // { queue: 2, process: 4 }
 
 
 ## simd
+> simd([simd]) ⇒ <code>boolean</code>
+
 Get and set use of SIMD vector unit instructions.
 Requires libvips to have been compiled with liborc support.
 
@@ -169,6 +175,8 @@ const simd = sharp.simd(false);
 
 
 ## block
+> block(options)
+
 Block libvips operations at runtime.
 
 This is in addition to the `VIPS_BLOCK_UNTRUSTED` environment variable,
@@ -191,6 +199,8 @@ sharp.block({
 
 
 ## unblock
+> unblock(options)
+
 Unblock libvips operations at runtime.
 
 This is useful for defining a list of allowed operations.

docs/build.js

@@ -29,7 +29,7 @@ const jsdoc2md = require('jsdoc-to-markdown');
   });
 
   const cleanMarkdown = markdown
-    .replace(/(## [A-Za-z0-9]+)[^\n]*/g, '$1') // simplify headings to match those of documentationjs, ensures existing URLs work
+    .replace(/(## )([A-Za-z0-9]+)([^\n]*)/g, '$1$2\n> $2$3\n') // simplify headings to match those of documentationjs, ensures existing URLs work
     .replace(/<a name="[A-Za-z0-9+]+"><\/a>/g, '') // remove anchors, let docute add these (at markdown to HTML render time)
     .replace(/\*\*Kind\*\*: global[^\n]+/g, '') // remove all "global" Kind labels (requires JSDoc refactoring)
     .trim();

docs/changelog.md

@@ -1,8 +1,45 @@
 # Changelog
 
+## v0.33 - *gauge*
+
+Requires libvips v8.14.5
+
+### v0.33.0 - TBD
+
+* Drop support for Node.js 14 and 16, now requires Node.js >= 18.17.0
+
+* Prebuilt binaries distributed via npm registry and installed via package manager.
+
+* Building from source requires dependency on `node-addon-api`.
+
+* Remove `sharp.vendor`.
+
+* Make `compression` option of `heif` mandatory to help reduce HEIF vs HEIC confusion.
+  [#3740](https://github.com/lovell/sharp/issues/3740)
+
+* Ensure correct interpretation of 16-bit raw input.
+  [#3808](https://github.com/lovell/sharp/issues/3808)
+
 ## v0.32 - *flow*
 
-Requires libvips v8.14.4
+Requires libvips v8.14.5
+
+### v0.32.6 - 18th September 2023
+
+* Upgrade to libvips v8.14.5 for upstream bug fixes.
+
+* Ensure composite tile images are fully decoded (regression in 0.32.0).
+  [#3767](https://github.com/lovell/sharp/issues/3767)
+
+* Ensure `withMetadata` can add ICC profiles to RGB16 output.
+  [#3773](https://github.com/lovell/sharp/issues/3773)
+
+* Ensure `withMetadata` does not reduce 16-bit images to 8-bit (regression in 0.32.5).
+  [#3773](https://github.com/lovell/sharp/issues/3773)
+
+* TypeScript: Add definitions for block and unblock.
+  [#3799](https://github.com/lovell/sharp/pull/3799)
+  [@ldrick](https://github.com/ldrick)
 
 ### v0.32.5 - 15th August 2023
 

docs/install.md

@@ -4,13 +4,19 @@
 npm install sharp
 ```
 
+```sh
+pnpm add sharp
+```
+
 ```sh
 yarn add sharp
 ```
 
+Yarn Plug'n'Play is unsupported.
+
 ## Prerequisites
 
-* Node.js >= 14.15.0
+* Node.js >= 18.17.0
 
 ## Prebuilt binaries
 
@@ -18,98 +24,19 @@ Ready-compiled sharp and libvips binaries are provided for use on the most commo
 
 * macOS x64 (>= 10.13)
 * macOS ARM64
-* Linux x64 (glibc >= 2.17, musl >= 1.1.24, CPU with SSE4.2)
-* Linux ARM64 (glibc >= 2.17, musl >= 1.1.24)
+* Linux x64 (glibc >= 2.26, musl >= 1.2.2, CPU with SSE4.2)
+* Linux ARM64 (glibc >= 2.26, musl >= 1.2.2)
+* Linux ARM (glibc >= 2.28)
 * Windows x64
 * Windows x86
 
-A ~7MB tarball containing libvips and its most commonly used dependencies
-is downloaded via HTTPS, verified via Subresource Integrity
-and decompressed into `node_modules/sharp/vendor` during `npm install`.
-
 This provides support for the
 JPEG, PNG, WebP, AVIF (limited to 8-bit depth), TIFF, GIF and SVG (input) image formats.
 
-The following platforms have prebuilt libvips but not sharp:
-
-* Linux ARMv7 (glibc >= 2.28)
-* Linux ARMv6 (glibc >= 2.28)
-* Windows ARM64
-
-The following platforms require compilation of both libvips and sharp from source:
-
-* Linux x86
-* Linux ARMv7 (glibc <= 2.27, musl)
-* Linux ARMv6 (glibc <= 2.27, musl)
-* Linux PowerPC
-* FreeBSD
-* OpenBSD
-
-## Common problems
-
-The architecture and platform of Node.js used for `npm install`
-must be the same as the architecture and platform of Node.js used at runtime.
-See the [cross-platform](#cross-platform) section if this is not the case.
-
-When using npm v6 or earlier, the `npm install --unsafe-perm` flag must be used when installing as `root` or a `sudo` user.
-
-When using npm v7 or later, the user running `npm install` must own the directory it is run in.
-
-The `npm install --ignore-scripts=false` flag must be used when `npm` has been configured to ignore installation scripts.
-
-Check the output of running `npm install --verbose --foreground-scripts sharp` for useful error messages.
-
-## Apple M1
-
-Prebuilt sharp and libvips binaries have been provided for macOS on ARM64 since sharp v0.29.0.
-
-## Cross-platform
-
-At `npm install` time, prebuilt binaries are automatically selected for the
-current OS platform and CPU architecture, where available.
-
-The target platform and/or architecture can be manually selected using the following flags.
-
-```sh
-npm install --platform=... --arch=... --arm-version=... sharp
-```
-
-* `--platform`: one of `linux`, `darwin` or `win32`.
-* `--arch`: one of `x64`, `ia32`, `arm` or `arm64`.
-* `--arm-version`: one of `6`, `7` or `8` (`arm` defaults to `6`, `arm64` defaults to `8`).
-* `--libc`: one of `glibc` or `musl`. This option only works with platform `linux`, defaults to `glibc`
-* `--sharp-install-force`: skip version compatibility and Subresource Integrity checks.
-
-These values can also be set via environment variables,
-`npm_config_platform`, `npm_config_arch`, `npm_config_arm_version`, `npm_config_libc`
-and `SHARP_INSTALL_FORCE` respectively.
-
-For example, if the target machine has a 64-bit ARM CPU and is running Alpine Linux,
-use the following flags:
-
-```sh
-npm install --arch=arm64 --platform=linux --libc=musl sharp
-```
-
-If the current machine is Alpine Linux and the target machine is Debian Linux on x64 cpu,
-use the following flags:
-
-```sh
-npm install --arch=x64 --platform=linux --libc=glibc sharp
-```
-
-Multiple platforms and architectures can be supported within the same installation tree.
-The following example for macOS installs x64 binaries then adds (via a rebuild) arm64 binaries:
-
-```sh
-npm install --platform=darwin --arch=x64 sharp
-npm rebuild --platform=darwin --arch=arm64 sharp
-```
-
 ## Custom libvips
 
 To use a custom, globally-installed version of libvips instead of the provided binaries,
-make sure it is at least the version listed under `config.libvips` in the `package.json` file
+make sure it is at least the version listed under `engines.libvips` in the `package.json` file
 and that it can be located using `pkg-config --modversion vips-cpp`.
 
 For help compiling libvips and its dependencies, please see
@@ -122,92 +49,25 @@ and on macOS when running Node.js under Rosetta.
 
 This module will be compiled from source at `npm install` time when:
 
-* a globally-installed libvips is detected (set the `SHARP_IGNORE_GLOBAL_LIBVIPS` environment variable to skip this),
-* prebuilt sharp binaries do not exist for the current platform, or
+* a globally-installed libvips is detected (set the `SHARP_IGNORE_GLOBAL_LIBVIPS` environment variable to skip this), or
 * when the `npm install --build-from-source` flag is used.
 
 Building from source requires:
 
 * C++11 compiler
+* [node-addon-api](https://www.npmjs.com/package/node-addon-api)
 * [node-gyp](https://github.com/nodejs/node-gyp#installation) and its dependencies
 
-## Custom prebuilt binaries
-
-This is an advanced approach that most people will not require.
-
-### Prebuilt sharp binaries
-
-To install the prebuilt sharp binaries from a custom URL,
-set the `sharp_binary_host` npm config option
-or the `npm_config_sharp_binary_host` environment variable.
-
-To install the prebuilt sharp binaries from a directory on the local filesystem,
-set the `sharp_local_prebuilds` npm config option
-or the `npm_config_sharp_local_prebuilds` environment variable.
-
-URL example:
-if `sharp_binary_host` is set to `https://hostname/path`
-and the sharp version is `1.2.3` then the resultant URL will be
-`https://hostname/path/v1.2.3/sharp-v1.2.3-napi-v5-platform-arch.tar.gz`.
-
-Filename example:
-if `sharp_local_prebuilds` is set to `/path`
-and the sharp version is `1.2.3` then the resultant filename will be
-`/path/sharp-v1.2.3-napi-v5-platform-arch.tar.gz`.
-
-### Prebuilt libvips binaries
-
-To install the prebuilt libvips binaries from a custom URL,
-set the `sharp_libvips_binary_host` npm config option
-or the `npm_config_sharp_libvips_binary_host` environment variable.
-
-To install the prebuilt libvips binaries from a directory on the local filesystem,
-set the `sharp_libvips_local_prebuilds` npm config option
-or the `npm_config_sharp_libvips_local_prebuilds` environment variable.
-
-The version subpath and filename are appended to these.
-
-URL example:
-if `sharp_libvips_binary_host` is set to `https://hostname/path`
-and the libvips version is `4.5.6` then the resultant URL will be
-`https://hostname/path/v4.5.6/libvips-4.5.6-platform-arch.tar.br`.
-
-Filename example:
-if `sharp_libvips_local_prebuilds` is set to `/path`
-and the libvips version is `4.5.6` then the resultant filename will be
-`/path/v4.5.6/libvips-4.5.6-platform-arch.tar.br`.
-
-See the Chinese mirror below for a further example.
-
-If these binaries are modified, new integrity hashes can be provided
-at install time via `npm_package_config_integrity_platform_arch`
-environment variables, for example set
-`npm_package_config_integrity_linux_x64` to `sha512-abc...`.
-
-The integrity hash of a file can be generated via:
-```sh
-sha512sum libvips-x.y.z-platform-arch.tar.br | cut -f1 -d' ' | xxd -r -p | base64 -w 0
-```
-
-## Chinese mirror
-
-A mirror site based in China, provided by Alibaba, contains binaries for both sharp and libvips.
-
-To use this either set the following configuration:
+There is an install-time check for these dependencies.
+If `node-addon-api` or `node-gyp` cannot be found, try adding them via:
 
 ```sh
-npm config set sharp_binary_host "https://npmmirror.com/mirrors/sharp"
-npm config set sharp_libvips_binary_host "https://npmmirror.com/mirrors/sharp-libvips"
-npm install sharp
+npm install --save node-addon-api node-gyp
 ```
 
-or set the following environment variables:
-
-```sh
-npm_config_sharp_binary_host="https://npmmirror.com/mirrors/sharp" \
-  npm_config_sharp_libvips_binary_host="https://npmmirror.com/mirrors/sharp-libvips" \
-  npm install sharp
-```
+For cross-compiling, the `--platform`, `--arch` and `--libc` npm flags
+(or the `npm_config_platform`, `npm_config_arch` and `npm_config_libc` environment variables)
+can be used to configure the target environment.
 
 ## FreeBSD
 
@@ -242,15 +102,18 @@ unaffected.
 
 The `node_modules` directory of the
 [deployment package](https://docs.aws.amazon.com/lambda/latest/dg/nodejs-package.html)
-must include binaries for the Linux x64 platform.
+must include binaries for either the linux-x64 or linux-arm64 platforms
+depending on the chosen architecture.
 
-When building your deployment package on machines other than Linux x64 (glibc),
-run the following additional command after `npm install`:
+When building your deployment package on a machine that differs from the target architecture,
+you will need to install either `@sharpen/sharp-linux-x64` or `@sharpen/sharp-linux-arm64` package.
 
 ```sh
-npm install
-rm -rf node_modules/sharp
-SHARP_IGNORE_GLOBAL_LIBVIPS=1 npm install --arch=x64 --platform=linux --libc=glibc sharp
+npm install --force @sharpen/sharp-linux-x64
+```
+
+```sh
+npm install --force @sharpen/sharp-linux-arm64
 ```
 
 To get the best performance select the largest memory available.
@@ -302,7 +165,7 @@ custom:
       - sharp
     packagerOptions:
       scripts:
-        - npm install --arch=x64 --platform=linux sharp
+        - npm install --force @sharpen/sharp-linux-x64
 ```
 
 ## TypeScript
@@ -358,14 +221,7 @@ Module did not self-register
 
 ### Canvas and Windows
 
-The prebuilt binaries provided by `canvas` for Windows
-from v2.7.0 onwards depend on the Visual C++ Runtime (MSVCRT).
-These conflict with the binaries provided by sharp,
-which depend on the more modern Universal C Runtime (UCRT).
-
-See [Automattic/node-canvas#2155](https://github.com/Automattic/node-canvas/issues/2155).
-
-If both modules are used in the same Windows process, the following error will occur:
+If both `canvas` and `sharp` modules are used in the same Windows process, the following error may occur:
 ```
 The specified procedure could not be found.
 ```

docs/search-index/build.js

@@ -40,7 +40,7 @@ for (const match of matches) {
 ].forEach((section) => {
   const contents = fs.readFileSync(path.join(__dirname, '..', `api-${section}.md`), 'utf8');
   const matches = contents.matchAll(
-    /## (?<title>[A-Za-z]+)\n(?<firstparagraph>.+?)\n\n.+?(?<parameters>\| Param .+?\n\n)?\*\*Example/gs
+    /## (?<title>[A-Za-z]+)\n[^\n]+\n(?<firstparagraph>.+?)\n\n.+?(?<parameters>\| Param .+?\n\n)?\*\*Example/gs
   );
   for (const match of matches) {
     const { title, firstparagraph, parameters } = match.groups;

install/can-compile.js

@@ -1,14 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const libvips = require('../lib/libvips');
-
-try {
-  if (!(libvips.useGlobalLibvips() || libvips.hasVendoredLibvips())) {
-    process.exitCode = 1;
-  }
-} catch (err) {
-  process.exitCode = 1;
-}

install/check.js

@@ -0,0 +1,36 @@
+// Copyright 2013 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
+'use strict';
+
+const { useGlobalLibvips, globalLibvipsVersion, log, spawnRebuild } = require('../lib/libvips');
+
+const buildFromSource = (msg) => {
+  log(msg);
+  log('Attempting to build from source via node-gyp');
+  try {
+    require('node-addon-api');
+    log('Found node-addon-api');
+  } catch (err) {
+    log('Please add node-addon-api to your dependencies');
+    return;
+  }
+  try {
+    const gyp = require('node-gyp');
+    log(`Found node-gyp version ${gyp().version}`);
+  } catch (err) {
+    log('Please add node-gyp to your dependencies');
+    return;
+  }
+  log('See https://sharp.pixelplumbing.com/install#building-from-source');
+  const status = spawnRebuild();
+  if (status !== 0) {
+    process.exit(status);
+  }
+};
+
+if (useGlobalLibvips()) {
+  buildFromSource(`Detected globally-installed libvips v${globalLibvipsVersion()}`);
+} else if (process.env.npm_config_build_from_source) {
+  buildFromSource('Detected --build-from-source flag');
+}

install/dll-copy.js

@@ -1,40 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const libvips = require('../lib/libvips');
-const platform = require('../lib/platform');
-
-const minimumLibvipsVersion = libvips.minimumLibvipsVersion;
-
-const platformAndArch = platform();
-
-if (platformAndArch.startsWith('win32')) {
-  const buildReleaseDir = path.join(__dirname, '..', 'build', 'Release');
-  libvips.log(`Creating ${buildReleaseDir}`);
-  try {
-    libvips.mkdirSync(buildReleaseDir);
-  } catch (err) {}
-  const vendorLibDir = path.join(__dirname, '..', 'vendor', minimumLibvipsVersion, platformAndArch, 'lib');
-  libvips.log(`Copying DLLs from ${vendorLibDir} to ${buildReleaseDir}`);
-  try {
-    fs
-      .readdirSync(vendorLibDir)
-      .filter(function (filename) {
-        return /\.dll$/.test(filename);
-      })
-      .forEach(function (filename) {
-        fs.copyFileSync(
-          path.join(vendorLibDir, filename),
-          path.join(buildReleaseDir, filename)
-        );
-      });
-  } catch (err) {
-    libvips.log(err);
-    process.exit(1);
-  }
-}

install/libvips.js

@@ -1,222 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const stream = require('stream');
-const zlib = require('zlib');
-const { createHash } = require('crypto');
-
-const detectLibc = require('detect-libc');
-const semverCoerce = require('semver/functions/coerce');
-const semverLessThan = require('semver/functions/lt');
-const semverSatisfies = require('semver/functions/satisfies');
-const simpleGet = require('simple-get');
-const tarFs = require('tar-fs');
-
-const agent = require('../lib/agent');
-const libvips = require('../lib/libvips');
-const platform = require('../lib/platform');
-
-const minimumGlibcVersionByArch = {
-  arm: '2.28',
-  arm64: '2.17',
-  x64: '2.17'
-};
-
-const hasSharpPrebuild = [
-  'darwin-x64',
-  'darwin-arm64',
-  'linux-arm64',
-  'linux-x64',
-  'linuxmusl-x64',
-  'linuxmusl-arm64',
-  'win32-ia32',
-  'win32-x64'
-];
-
-const { minimumLibvipsVersion, minimumLibvipsVersionLabelled } = libvips;
-const localLibvipsDir = process.env.npm_config_sharp_libvips_local_prebuilds || '';
-const distHost = process.env.npm_config_sharp_libvips_binary_host || 'https://github.com/lovell/sharp-libvips/releases/download';
-const distBaseUrl = process.env.npm_config_sharp_dist_base_url || process.env.SHARP_DIST_BASE_URL || `${distHost}/v${minimumLibvipsVersionLabelled}/`;
-const installationForced = !!(process.env.npm_config_sharp_install_force || process.env.SHARP_INSTALL_FORCE);
-
-const fail = function (err) {
-  libvips.log(err);
-  if (err.code === 'EACCES') {
-    libvips.log('Are you trying to install as a root or sudo user?');
-    libvips.log('- For npm <= v6, try again with the "--unsafe-perm" flag');
-    libvips.log('- For npm >= v8, the user must own the directory "npm install" is run in');
-  }
-  libvips.log('Please see https://sharp.pixelplumbing.com/install for required dependencies');
-  process.exit(1);
-};
-
-const handleError = function (err) {
-  if (installationForced) {
-    libvips.log(`Installation warning: ${err.message}`);
-  } else {
-    throw err;
-  }
-};
-
-const verifyIntegrity = function (platformAndArch) {
-  const expected = libvips.integrity(platformAndArch);
-  if (installationForced || !expected) {
-    libvips.log(`Integrity check skipped for ${platformAndArch}`);
-    return new stream.PassThrough();
-  }
-  const hash = createHash('sha512');
-  return new stream.Transform({
-    transform: function (chunk, _encoding, done) {
-      hash.update(chunk);
-      done(null, chunk);
-    },
-    flush: function (done) {
-      const digest = `sha512-${hash.digest('base64')}`;
-      if (expected !== digest) {
-        try {
-          libvips.removeVendoredLibvips();
-        } catch (err) {
-          libvips.log(err.message);
-        }
-        libvips.log(`Integrity expected: ${expected}`);
-        libvips.log(`Integrity received: ${digest}`);
-        done(new Error(`Integrity check failed for ${platformAndArch}`));
-      } else {
-        libvips.log(`Integrity check passed for ${platformAndArch}`);
-        done();
-      }
-    }
-  });
-};
-
-const extractTarball = function (tarPath, platformAndArch) {
-  const versionedVendorPath = path.join(__dirname, '..', 'vendor', minimumLibvipsVersion, platformAndArch);
-  libvips.mkdirSync(versionedVendorPath);
-
-  const ignoreVendorInclude = hasSharpPrebuild.includes(platformAndArch) && !process.env.npm_config_build_from_source;
-  const ignore = function (name) {
-    return ignoreVendorInclude && name.includes('include/');
-  };
-
-  stream.pipeline(
-    fs.createReadStream(tarPath),
-    verifyIntegrity(platformAndArch),
-    new zlib.BrotliDecompress(),
-    tarFs.extract(versionedVendorPath, { ignore }),
-    function (err) {
-      if (err) {
-        if (/unexpected end of file/.test(err.message)) {
-          fail(new Error(`Please delete ${tarPath} as it is not a valid tarball`));
-        }
-        fail(err);
-      }
-    }
-  );
-};
-
-try {
-  const useGlobalLibvips = libvips.useGlobalLibvips();
-
-  if (useGlobalLibvips) {
-    const globalLibvipsVersion = libvips.globalLibvipsVersion();
-    libvips.log(`Detected globally-installed libvips v${globalLibvipsVersion}`);
-    libvips.log('Building from source via node-gyp');
-    process.exit(1);
-  } else if (libvips.hasVendoredLibvips()) {
-    libvips.log(`Using existing vendored libvips v${minimumLibvipsVersion}`);
-  } else {
-    // Is this arch/platform supported?
-    const arch = process.env.npm_config_arch || process.arch;
-    const platformAndArch = platform();
-    if (arch === 'ia32' && !platformAndArch.startsWith('win32')) {
-      throw new Error(`Intel Architecture 32-bit systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
-    }
-    if (platformAndArch === 'freebsd-x64' || platformAndArch === 'openbsd-x64' || platformAndArch === 'sunos-x64') {
-      throw new Error(`BSD/SunOS systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
-    }
-    // Linux libc version check
-    const libcVersionRaw = detectLibc.versionSync();
-    if (libcVersionRaw) {
-      const libcFamily = detectLibc.familySync();
-      const libcVersion = semverCoerce(libcVersionRaw).version;
-      if (libcFamily === detectLibc.GLIBC && minimumGlibcVersionByArch[arch]) {
-        if (semverLessThan(libcVersion, semverCoerce(minimumGlibcVersionByArch[arch]).version)) {
-          handleError(new Error(`Use with glibc ${libcVersionRaw} requires manual installation of libvips >= ${minimumLibvipsVersion}`));
-        }
-      }
-      if (libcFamily === detectLibc.MUSL) {
-        if (semverLessThan(libcVersion, '1.1.24')) {
-          handleError(new Error(`Use with musl ${libcVersionRaw} requires manual installation of libvips >= ${minimumLibvipsVersion}`));
-        }
-      }
-    }
-    // Node.js minimum version check
-    const supportedNodeVersion = process.env.npm_package_engines_node || require('../package.json').engines.node;
-    if (!semverSatisfies(process.versions.node, supportedNodeVersion)) {
-      handleError(new Error(`Expected Node.js version ${supportedNodeVersion} but found ${process.versions.node}`));
-    }
-    // Download to per-process temporary file
-    const tarFilename = ['libvips', minimumLibvipsVersionLabelled, platformAndArch].join('-') + '.tar.br';
-    const tarPathCache = path.join(libvips.cachePath(), tarFilename);
-    if (fs.existsSync(tarPathCache)) {
-      libvips.log(`Using cached ${tarPathCache}`);
-      extractTarball(tarPathCache, platformAndArch);
-    } else if (localLibvipsDir) {
-      // If localLibvipsDir is given try to use binaries from local directory
-      const tarPathLocal = path.join(path.resolve(localLibvipsDir), `v${minimumLibvipsVersionLabelled}`, tarFilename);
-      libvips.log(`Using local libvips from ${tarPathLocal}`);
-      extractTarball(tarPathLocal, platformAndArch);
-    } else {
-      const url = distBaseUrl + tarFilename;
-      libvips.log(`Downloading ${url}`);
-      simpleGet({ url: url, agent: agent(libvips.log) }, function (err, response) {
-        if (err) {
-          fail(err);
-        } else if (response.statusCode === 404) {
-          fail(new Error(`Prebuilt libvips ${minimumLibvipsVersion} binaries are not yet available for ${platformAndArch}`));
-        } else if (response.statusCode !== 200) {
-          fail(new Error(`Status ${response.statusCode} ${response.statusMessage}`));
-        } else {
-          const tarPathTemp = path.join(os.tmpdir(), `${process.pid}-${tarFilename}`);
-          const tmpFileStream = fs.createWriteStream(tarPathTemp);
-          response
-            .on('error', function (err) {
-              tmpFileStream.destroy(err);
-            })
-            .on('close', function () {
-              if (!response.complete) {
-                tmpFileStream.destroy(new Error('Download incomplete (connection was terminated)'));
-              }
-            })
-            .pipe(tmpFileStream);
-          tmpFileStream
-            .on('error', function (err) {
-              // Clean up temporary file
-              try {
-                fs.unlinkSync(tarPathTemp);
-              } catch (e) {}
-              fail(err);
-            })
-            .on('close', function () {
-              try {
-                // Attempt to rename
-                fs.renameSync(tarPathTemp, tarPathCache);
-              } catch (err) {
-                // Fall back to copy and unlink
-                fs.copyFileSync(tarPathTemp, tarPathCache);
-                fs.unlinkSync(tarPathTemp);
-              }
-              extractTarball(tarPathCache, platformAndArch);
-            });
-        }
-      });
-    }
-  }
-} catch (err) {
-  fail(err);
-}

lib/agent.js

@@ -1,44 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const url = require('url');
-const tunnelAgent = require('tunnel-agent');
-
-const is = require('./is');
-
-const proxies = [
-  'HTTPS_PROXY',
-  'https_proxy',
-  'HTTP_PROXY',
-  'http_proxy',
-  'npm_config_https_proxy',
-  'npm_config_proxy'
-];
-
-function env (key) {
-  return process.env[key];
-}
-
-module.exports = function (log) {
-  try {
-    const proxy = new url.URL(proxies.map(env).find(is.string));
-    const tunnel = proxy.protocol === 'https:'
-      ? tunnelAgent.httpsOverHttps
-      : tunnelAgent.httpsOverHttp;
-    const proxyAuth = proxy.username && proxy.password
-      ? `${decodeURIComponent(proxy.username)}:${decodeURIComponent(proxy.password)}`
-      : null;
-    log(`Via proxy ${proxy.protocol}//${proxy.hostname}:${proxy.port} ${proxyAuth ? 'with' : 'no'} credentials`);
-    return tunnel({
-      proxy: {
-        port: Number(proxy.port),
-        host: proxy.hostname,
-        proxyAuth
-      }
-    });
-  } catch (err) {
-    return null;
-  }
-};

lib/constructor.js

@@ -3,11 +3,10 @@
 
 'use strict';
 
-const util = require('util');
-const stream = require('stream');
+const util = require('node:util');
+const stream = require('node:stream');
 const is = require('./is');
 
-require('./libvips').hasVendoredLibvips();
 require('./sharp');
 
 // Use NODE_DEBUG=sharp to enable libvips warnings

lib/index.d.ts

@@ -91,12 +91,6 @@ declare namespace sharp {
         zlib?: string | undefined;
     };
 
-    /** An Object containing the platform and architecture of the current and installed vendored binaries. */
-    const vendor: {
-        current: string;
-        installed: string[];
-    };
-
     /** An Object containing the available interpolators and their proper values */
     const interpolators: Interpolators;
 
@@ -139,6 +133,52 @@ declare namespace sharp {
      */
     function simd(enable?: boolean): boolean;
 
+    /**
+     * Block libvips operations at runtime.
+     *
+     * This is in addition to the `VIPS_BLOCK_UNTRUSTED` environment variable,
+     * which when set will block all "untrusted" operations.
+     *
+     * @since 0.32.4
+     *
+     * @example <caption>Block all TIFF input.</caption>
+     * sharp.block({
+     *   operation: ['VipsForeignLoadTiff']
+     * });
+     *
+     * @param {Object} options
+     * @param {Array<string>} options.operation - List of libvips low-level operation names to block.
+     */
+    function block(options: { operation: string[] }): void;
+
+    /**
+     * Unblock libvips operations at runtime.
+     *
+     * This is useful for defining a list of allowed operations.
+     *
+     * @since 0.32.4
+     *
+     * @example <caption>Block all input except WebP from the filesystem.</caption>
+     * sharp.block({
+     *   operation: ['VipsForeignLoad']
+     * });
+     * sharp.unblock({
+     *   operation: ['VipsForeignLoadWebpFile']
+     * });
+     *
+     * @example <caption>Block all input except JPEG and PNG from a Buffer or Stream.</caption>
+     * sharp.block({
+     *   operation: ['VipsForeignLoad']
+     * });
+     * sharp.unblock({
+     *   operation: ['VipsForeignLoadJpegBuffer', 'VipsForeignLoadPngBuffer']
+     * });
+     *
+     * @param {Object} options
+     * @param {Array<string>} options.operation - List of libvips low-level operation names to unblock.
+     */
+    function unblock(options: { operation: string[] }): void;
+
     //#endregion
 
     const gravity: GravityEnum;
@@ -659,7 +699,6 @@ declare namespace sharp {
 
         /**
          * Use these AVIF options for output image.
-         * Whilst it is possible to create AVIF images smaller than 16x16 pixels, most web browsers do not display these properly.
          * @param options Output options.
          * @throws {Error} Invalid options
          * @returns A sharp instance that can be used to chain operations

lib/is.js

@@ -138,18 +138,18 @@ const invalidParameterError = function (name, expected, actual) {
 };
 
 module.exports = {
-  defined: defined,
-  object: object,
-  plainObject: plainObject,
-  fn: fn,
-  bool: bool,
-  buffer: buffer,
-  typedArray: typedArray,
-  arrayBuffer: arrayBuffer,
-  string: string,
-  number: number,
-  integer: integer,
-  inRange: inRange,
-  inArray: inArray,
-  invalidParameterError: invalidParameterError
+  defined,
+  object,
+  plainObject,
+  fn,
+  bool,
+  buffer,
+  typedArray,
+  arrayBuffer,
+  string,
+  number,
+  integer,
+  inRange,
+  inArray,
+  invalidParameterError
 };

lib/libvips.js

@@ -3,53 +3,30 @@
 
 'use strict';
 
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const spawnSync = require('child_process').spawnSync;
+const { spawnSync } = require('node:child_process');
 const semverCoerce = require('semver/functions/coerce');
 const semverGreaterThanOrEqualTo = require('semver/functions/gte');
+const detectLibc = require('detect-libc');
 
-const platform = require('./platform');
-const { config } = require('../package.json');
+const { engines } = require('../package.json');
 
-const env = process.env;
-const minimumLibvipsVersionLabelled = env.npm_package_config_libvips || /* istanbul ignore next */
-  config.libvips;
+const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || /* istanbul ignore next */
+  engines.libvips;
 const minimumLibvipsVersion = semverCoerce(minimumLibvipsVersionLabelled).version;
 
+const prebuiltPlatforms = [
+  'darwin-arm64', 'darwin-x64',
+  'linux-arm', 'linux-arm64', 'linux-x64',
+  'linuxmusl-arm64', 'linuxmusl-x64',
+  'win32-ia32', 'win32-x64'
+];
+
 const spawnSyncOptions = {
   encoding: 'utf8',
   shell: true
 };
 
-const vendorPath = path.join(__dirname, '..', 'vendor', minimumLibvipsVersion, platform());
-
-const mkdirSync = function (dirPath) {
-  try {
-    fs.mkdirSync(dirPath, { recursive: true });
-  } catch (err) {
-    /* istanbul ignore next */
-    if (err.code !== 'EEXIST') {
-      throw err;
-    }
-  }
-};
-
-const cachePath = function () {
-  const npmCachePath = env.npm_config_cache || /* istanbul ignore next */
-    (env.APPDATA ? path.join(env.APPDATA, 'npm-cache') : path.join(os.homedir(), '.npm'));
-  mkdirSync(npmCachePath);
-  const libvipsCachePath = path.join(npmCachePath, '_libvips');
-  mkdirSync(libvipsCachePath);
-  return libvipsCachePath;
-};
-
-const integrity = function (platformAndArch) {
-  return env[`npm_package_config_integrity_${platformAndArch.replace('-', '_')}`] || config.integrity[platformAndArch];
-};
-
-const log = function (item) {
+const log = (item) => {
   if (item instanceof Error) {
     console.error(`sharp: Installation error: ${item.message}`);
   } else {
@@ -57,7 +34,43 @@ const log = function (item) {
   }
 };
 
-const isRosetta = function () {
+/* istanbul ignore next */
+const runtimeLibc = () => detectLibc.isNonGlibcLinuxSync() ? detectLibc.familySync() : '';
+
+const runtimePlatformArch = () => `${process.platform}${runtimeLibc()}-${process.arch}`;
+
+/* istanbul ignore next */
+const buildPlatformArch = () => {
+  /* eslint camelcase: ["error", { allow: ["^npm_config_"] }] */
+  const { npm_config_arch, npm_config_platform, npm_config_libc } = process.env;
+  return `${npm_config_platform || process.platform}${npm_config_libc || runtimeLibc()}-${npm_config_arch || process.arch}`;
+};
+
+const buildSharpLibvipsIncludeDir = () => {
+  try {
+    return require('@sharpen/sharp-libvips-dev/include');
+  } catch {}
+  /* istanbul ignore next */
+  return '';
+};
+
+const buildSharpLibvipsCPlusPlusDir = () => {
+  try {
+    return require('@sharpen/sharp-libvips-dev/cplusplus');
+  } catch {}
+  /* istanbul ignore next */
+  return '';
+};
+
+const buildSharpLibvipsLibDir = () => {
+  try {
+    return require(`@sharpen/sharp-libvips-${buildPlatformArch()}/lib`);
+  } catch {}
+  /* istanbul ignore next */
+  return '';
+};
+
+const isRosetta = () => {
   /* istanbul ignore next */
   if (process.platform === 'darwin' && process.arch === 'x64') {
     const translated = spawnSync('sysctl sysctl.proc_translated', spawnSyncOptions).stdout;
@@ -66,12 +79,19 @@ const isRosetta = function () {
   return false;
 };
 
-const globalLibvipsVersion = function () {
+/* istanbul ignore next */
+const spawnRebuild = () =>
+  spawnSync('node-gyp rebuild --directory=src', {
+    ...spawnSyncOptions,
+    stdio: 'inherit'
+  }).status;
+
+const globalLibvipsVersion = () => {
   if (process.platform !== 'win32') {
     const globalLibvipsVersion = spawnSync('pkg-config --modversion vips-cpp', {
       ...spawnSyncOptions,
       env: {
-        ...env,
+        ...process.env,
         PKG_CONFIG_PATH: pkgConfigPath()
       }
     }).stdout;
@@ -82,17 +102,8 @@ const globalLibvipsVersion = function () {
   }
 };
 
-const hasVendoredLibvips = function () {
-  return fs.existsSync(vendorPath);
-};
-
 /* istanbul ignore next */
-const removeVendoredLibvips = function () {
-  fs.rmSync(vendorPath, { recursive: true, maxRetries: 3, force: true });
-};
-
-/* istanbul ignore next */
-const pkgConfigPath = function () {
+const pkgConfigPath = () => {
   if (process.platform !== 'win32') {
     const brewPkgConfigPath = spawnSync(
       'which brew >/dev/null 2>&1 && brew environment --plain | grep PKG_CONFIG_LIBDIR | cut -d" " -f2',
@@ -100,7 +111,7 @@ const pkgConfigPath = function () {
     ).stdout || '';
     return [
       brewPkgConfigPath.trim(),
-      env.PKG_CONFIG_PATH,
+      process.env.PKG_CONFIG_PATH,
       '/usr/local/lib/pkgconfig',
       '/usr/lib/pkgconfig',
       '/usr/local/libdata/pkgconfig',
@@ -111,8 +122,9 @@ const pkgConfigPath = function () {
   }
 };
 
-const useGlobalLibvips = function () {
-  if (Boolean(env.SHARP_IGNORE_GLOBAL_LIBVIPS) === true) {
+const useGlobalLibvips = () => {
+  if (Boolean(process.env.SHARP_IGNORE_GLOBAL_LIBVIPS) === true) {
+    log('Detected SHARP_IGNORE_GLOBAL_LIBVIPS, skipping search for globally-installed libvips');
     return false;
   }
   /* istanbul ignore next */
@@ -127,14 +139,15 @@ const useGlobalLibvips = function () {
 
 module.exports = {
   minimumLibvipsVersion,
-  minimumLibvipsVersionLabelled,
-  cachePath,
-  integrity,
+  prebuiltPlatforms,
+  buildPlatformArch,
+  buildSharpLibvipsIncludeDir,
+  buildSharpLibvipsCPlusPlusDir,
+  buildSharpLibvipsLibDir,
+  runtimePlatformArch,
   log,
+  spawnRebuild,
   globalLibvipsVersion,
-  hasVendoredLibvips,
-  removeVendoredLibvips,
   pkgConfigPath,
-  useGlobalLibvips,
-  mkdirSync
+  useGlobalLibvips
 };

lib/operation.js

@@ -19,7 +19,7 @@ const is = require('./is');
  * If no angle is provided, it is determined from the EXIF data.
  * Mirroring is supported and may infer the use of a flip operation.
  *
- * The use of `rotate` implies the removal of the EXIF `Orientation` tag, if any.
+ * The use of `rotate` without an angle will remove the EXIF `Orientation` tag, if any.
  *
  * Only one rotation can occur per pipeline.
  * Previous calls to `rotate` in the same pipeline will be ignored.
@@ -83,8 +83,6 @@ function rotate (angle, options) {
  * Mirror the image vertically (up-down) about the x-axis.
  * This always occurs before rotation, if any.
  *
- * The use of `flip` implies the removal of the EXIF `Orientation` tag, if any.
- *
  * This operation does not work correctly with multi-page images.
  *
  * @example
@@ -102,8 +100,6 @@ function flip (flip) {
  * Mirror the image horizontally (left-right) about the y-axis.
  * This always occurs before rotation, if any.
  *
- * The use of `flop` implies the removal of the EXIF `Orientation` tag, if any.
- *
  * @example
  * const output = await sharp(input).flop().toBuffer();
  *

lib/output.js

@@ -3,7 +3,7 @@
 
 'use strict';
 
-const path = require('path');
+const path = require('node:path');
 const is = require('./is');
 const sharp = require('./sharp');
 
@@ -162,8 +162,8 @@ function toBuffer (options, callback) {
 
 /**
  * Include all metadata (EXIF, XMP, IPTC) from the input image in the output image.
- * This will also convert to and add a web-friendly sRGB ICC profile unless a custom
- * output profile is provided.
+ * This will also convert to and add a web-friendly sRGB ICC profile if appropriate,
+ * unless a custom output profile is provided.
  *
  * The default behaviour, when `withMetadata` is not used, is to convert to the device-independent
  * sRGB colour space and strip all metadata, including the removal of any ICC profile.
@@ -867,9 +867,6 @@ function tiff (options) {
 /**
  * Use these AVIF options for output image.
  *
- * Whilst it is possible to create AVIF images smaller than 16x16 pixels,
- * most web browsers do not display these properly.
- *
  * AVIF image sequences are not supported.
  *
  * @example
@@ -909,9 +906,9 @@ function avif (options) {
  *
  * @since 0.23.0
  *
- * @param {Object} [options] - output options
+ * @param {Object} options - output options
+ * @param {string} options.compression - compression format: av1, hevc
  * @param {number} [options.quality=50] - quality, integer 1-100
- * @param {string} [options.compression='av1'] - compression format: av1, hevc
  * @param {boolean} [options.lossless=false] - use lossless compression
  * @param {number} [options.effort=4] - CPU effort, between 0 (fastest) and 9 (slowest)
  * @param {string} [options.chromaSubsampling='4:4:4'] - set to '4:2:0' to use chroma subsampling
@@ -920,6 +917,11 @@ function avif (options) {
  */
 function heif (options) {
   if (is.object(options)) {
+    if (is.string(options.compression) && is.inArray(options.compression, ['av1', 'hevc'])) {
+      this.options.heifCompression = options.compression;
+    } else {
+      throw is.invalidParameterError('compression', 'one of: av1, hevc', options.compression);
+    }
     if (is.defined(options.quality)) {
       if (is.integer(options.quality) && is.inRange(options.quality, 1, 100)) {
         this.options.heifQuality = options.quality;
@@ -934,13 +936,6 @@ function heif (options) {
         throw is.invalidParameterError('lossless', 'boolean', options.lossless);
       }
     }
-    if (is.defined(options.compression)) {
-      if (is.string(options.compression) && is.inArray(options.compression, ['av1', 'hevc'])) {
-        this.options.heifCompression = options.compression;
-      } else {
-        throw is.invalidParameterError('compression', 'one of: av1, hevc', options.compression);
-      }
-    }
     if (is.defined(options.effort)) {
       if (is.integer(options.effort) && is.inRange(options.effort, 0, 9)) {
         this.options.heifEffort = options.effort;
@@ -955,6 +950,8 @@ function heif (options) {
         throw is.invalidParameterError('chromaSubsampling', 'one of: 4:2:0, 4:4:4', options.chromaSubsampling);
       }
     }
+  } else {
+    throw is.invalidParameterError('options', 'Object', options);
   }
   return this._updateFormatOut('heif', options);
 }
@@ -1046,6 +1043,7 @@ function jxl (options) {
  *
  * @param {Object} [options] - output options
  * @param {string} [options.depth='uchar'] - bit depth, one of: char, uchar (default), short, ushort, int, uint, float, complex, double, dpcomplex
+ * @returns {Sharp}
  * @throws {Error} Invalid options
  */
 function raw (options) {
@@ -1369,7 +1367,7 @@ function _pipeline (callback) {
             reject(err);
           } else {
             if (this.options.resolveWithObject) {
-              resolve({ data: data, info: info });
+              resolve({ data, info });
             } else {
               resolve(data);
             }

lib/platform.js

@@ -1,30 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const detectLibc = require('detect-libc');
-
-const env = process.env;
-
-module.exports = function () {
-  const arch = env.npm_config_arch || process.arch;
-  const platform = env.npm_config_platform || process.platform;
-  const libc = process.env.npm_config_libc ||
-    /* istanbul ignore next */
-    (detectLibc.isNonGlibcLinuxSync() ? detectLibc.familySync() : '');
-  const libcId = platform !== 'linux' || libc === detectLibc.GLIBC ? '' : libc;
-
-  const platformId = [`${platform}${libcId}`];
-
-  if (arch === 'arm') {
-    const fallback = process.versions.electron ? '7' : '6';
-    platformId.push(`armv${env.npm_config_arm_version || process.config.variables.arm_version || fallback}`);
-  } else if (arch === 'arm64') {
-    platformId.push(`arm64v${env.npm_config_arm_version || '8'}`);
-  } else {
-    platformId.push(arch);
-  }
-
-  return platformId.join('-');
-};

lib/resize.js

@@ -250,6 +250,9 @@ function resize (widthOrOptions, height, options) {
   if (isResizeExpected(this.options)) {
     this.options.debuglog('ignoring previous resize options');
   }
+  if (this.options.widthPost !== -1) {
+    this.options.debuglog('operation order will be: extract, resize, extract');
+  }
   if (is.defined(widthOrOptions)) {
     if (is.object(widthOrOptions) && !is.defined(options)) {
       options = widthOrOptions;
@@ -437,7 +440,7 @@ function extend (extend) {
  *
  * - Use `extract` before `resize` for pre-resize extraction.
  * - Use `extract` after `resize` for post-resize extraction.
- * - Use `extract` before and after for both.
+ * - Use `extract` twice and `resize` once for extract-then-resize-then-extract in a fixed operation order.
  *
  * @example
  * sharp(input)

lib/sharp.js

@@ -3,36 +3,67 @@
 
 'use strict';
 
-const platformAndArch = require('./platform')();
+// Inspects the runtime environment and exports the relevant sharp.node binary
+
+const { familySync, versionSync } = require('detect-libc');
+
+const { runtimePlatformArch, prebuiltPlatforms, minimumLibvipsVersion } = require('./libvips');
+const runtimePlatform = runtimePlatformArch();
+const [isLinux, isMacOs, isWindows] = ['linux', 'darwin', 'win32'].map(os => runtimePlatform.startsWith(os));
 
 /* istanbul ignore next */
 try {
-  module.exports = require(`../build/Release/sharp-${platformAndArch}.node`);
-} catch (err) {
-  // Bail early if bindings aren't available
-  const help = ['', 'Something went wrong installing the "sharp" module', '', err.message, '', 'Possible solutions:'];
-  if (/dylib/.test(err.message) && /Incompatible library version/.test(err.message)) {
-    help.push('- Update Homebrew: "brew update && brew upgrade vips"');
-  } else {
-    const [platform, arch] = platformAndArch.split('-');
-    if (platform === 'linux' && /Module did not self-register/.test(err.message)) {
-      help.push('- Using worker threads? See https://sharp.pixelplumbing.com/install#worker-threads');
+  // Check for local build
+  module.exports = require(`../src/build/Release/sharp-${runtimePlatform}.node`);
+} catch (errLocal) {
+  try {
+    // Check for runtime package
+    module.exports = require(`@sharpen/sharp-${runtimePlatform}/sharp.node`);
+  } catch (errPackage) {
+    const help = ['Could not load the "sharp" module at runtime'];
+    if (errLocal.code !== 'MODULE_NOT_FOUND') {
+      help.push(`${errLocal.code}: ${errLocal.message}`);
     }
-    help.push(
-      '- Install with verbose logging and look for errors: "npm install --ignore-scripts=false --foreground-scripts --verbose sharp"',
-      `- Install for the current ${platformAndArch} runtime: "npm install --platform=${platform} --arch=${arch} sharp"`
-    );
-  }
-  help.push(
-    '- Consult the installation documentation: https://sharp.pixelplumbing.com/install'
-  );
-  // Check loaded
-  if (process.platform === 'win32' || /symbol/.test(err.message)) {
-    const loadedModule = Object.keys(require.cache).find((i) => /[\\/]build[\\/]Release[\\/]sharp(.*)\.node$/.test(i));
-    if (loadedModule) {
-      const [, loadedPackage] = loadedModule.match(/node_modules[\\/]([^\\/]+)[\\/]/);
-      help.push(`- Ensure the version of sharp aligns with the ${loadedPackage} package: "npm ls sharp"`);
+    if (errPackage.code !== 'MODULE_NOT_FOUND') {
+      help.push(`${errPackage.code}: ${errPackage.message}`);
     }
+    help.push('Possible solutions:');
+    // Common error messages
+    if (prebuiltPlatforms.includes(runtimePlatform)) {
+      help.push('- Add an explicit dependency for the runtime platform:');
+      help.push(`    npm install --force @sharpen/sharp-${runtimePlatform}"`);
+    } else {
+      help.push(`- The ${runtimePlatform} platform requires manual installation of libvips >= ${minimumLibvipsVersion}`);
+    }
+    if (isLinux && /symbol not found/i.test(errPackage)) {
+      try {
+        const { engines } = require(`@sharpen/sharp-libvips-${runtimePlatform}/package`);
+        const libcFound = `${familySync()} ${versionSync()}`;
+        const libcRequires = `${engines.musl ? 'musl' : 'glibc'} ${engines.musl || engines.glibc}`;
+        help.push('- Update your OS:');
+        help.push(`    Found ${libcFound}`);
+        help.push(`    Requires ${libcRequires}`);
+      } catch (errEngines) {}
+    }
+    if (isMacOs && /Incompatible library version/.test(errLocal.message)) {
+      help.push('- Update Homebrew:');
+      help.push('    brew update && brew upgrade vips');
+    }
+    if (errPackage.code === 'ERR_DLOPEN_DISABLED') {
+      help.push('- Run Node.js without using the --no-addons flag');
+    }
+    if (process.versions.pnp) {
+      help.push('- Use a supported yarn linker, either pnpm or node-modules:');
+      help.push('    yarn config set nodeLinker node-modules');
+    }
+    // Link to installation docs
+    if (isLinux && /Module did not self-register/.test(errLocal.message + errPackage.message)) {
+      help.push('- Using worker threads on Linux? See https://sharp.pixelplumbing.com/install#worker-threads');
+    } else if (isWindows && /The specified procedure could not be found/.test(errPackage.message)) {
+      help.push('- Using the canvas package on Windows? See https://sharp.pixelplumbing.com/install#canvas-and-windows');
+    } else {
+      help.push('- Consult the installation documentation: https://sharp.pixelplumbing.com/install');
+    }
+    throw new Error(help.join('\n'));
   }
-  throw new Error(help.join('\n'));
 }

lib/utility.js

@@ -3,15 +3,16 @@
 
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const events = require('events');
+const events = require('node:events');
 const detectLibc = require('detect-libc');
 
 const is = require('./is');
-const platformAndArch = require('./platform')();
+const { runtimePlatformArch } = require('./libvips');
 const sharp = require('./sharp');
 
+const runtimePlatform = runtimePlatformArch();
+const libvipsVersion = sharp.libvipsVersion();
+
 /**
  * An Object containing nested boolean values representing the available input and output formats/methods.
  * @member
@@ -46,34 +47,28 @@ const interpolators = {
 };
 
 /**
- * An Object containing the version numbers of sharp, libvips and its dependencies.
+ * An Object containing the version numbers of sharp, libvips
+ * and (when using prebuilt binaries) its dependencies.
+ *
  * @member
  * @example
  * console.log(sharp.versions);
  */
 let versions = {
-  vips: sharp.libvipsVersion()
+  vips: libvipsVersion.semver
 };
-try {
-  versions = require(`../vendor/${versions.vips}/${platformAndArch}/versions.json`);
-} catch (_err) { /* ignore */ }
+/* istanbul ignore next */
+if (!libvipsVersion.isGlobal) {
+  try {
+    versions = require(`@sharpen/sharp-${runtimePlatform}/versions`);
+  } catch (_) {
+    try {
+      versions = require(`@sharpen/sharp-libvips-${runtimePlatform}/versions`);
+    } catch (_) {}
+  }
+}
 versions.sharp = require('../package.json').version;
 
-/**
- * An Object containing the platform and architecture
- * of the current and installed vendored binaries.
- * @member
- * @example
- * console.log(sharp.vendor);
- */
-const vendor = {
-  current: platformAndArch,
-  installed: []
-};
-try {
-  vendor.installed = fs.readdirSync(path.join(__dirname, `../vendor/${versions.vips}`));
-} catch (_err) { /* ignore */ }
-
 /**
  * Gets or, when options are provided, sets the limits of _libvips'_ operation cache.
  * Existing entries in the cache will be trimmed after any change in limits.
@@ -280,7 +275,6 @@ module.exports = function (Sharp) {
   Sharp.format = format;
   Sharp.interpolators = interpolators;
   Sharp.versions = versions;
-  Sharp.vendor = vendor;
   Sharp.queue = queue;
   Sharp.block = block;
   Sharp.unblock = unblock;

npm/darwin-arm64/package.json

@@ -0,0 +1,43 @@
+{
+  "name": "@sharpen/sharp-darwin-arm64",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with macOS ARM64",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/darwin-arm64"
+  },
+  "license": "Apache-2.0",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "optionalDependencies": {
+    "@sharpen/sharp-libvips-darwin-arm64": "0.0.1-alpha.2"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-darwin-arm64.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0",
+    "glibc": ">=2.26"
+  },
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "arm64"
+  ]
+}

npm/darwin-x64/package.json

@@ -0,0 +1,43 @@
+{
+  "name": "@sharpen/sharp-darwin-x64",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with macOS x64",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/darwin-x64"
+  },
+  "license": "Apache-2.0",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "optionalDependencies": {
+    "@sharpen/sharp-libvips-darwin-x64": "0.0.1-alpha.2"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-darwin-x64.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0",
+    "glibc": ">=2.26"
+  },
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "x64"
+  ]
+}

npm/from-github-release.js

@@ -0,0 +1,70 @@
+// Copyright 2013 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
+'use strict';
+
+// Populate contents of all packages with the current GitHub release
+
+const { writeFile, copyFile, rm } = require('node:fs/promises');
+const path = require('node:path');
+const { Readable } = require('node:stream');
+const { pipeline } = require('node:stream/promises');
+const { createGunzip } = require('node:zlib');
+const { extract } = require('tar-fs');
+
+const { workspaces } = require('./package.json');
+const { version } = require('../package.json');
+
+const mapTarballEntry = (header) => {
+  header.name = path.basename(header.name);
+  return header;
+};
+
+const licensing = `
+## Licensing
+
+Copyright 2013 Lovell Fuller and others.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+[https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+`;
+
+workspaces.map(async platform => {
+  const url = `https://github.com/lovell/sharp/releases/download/v${version}/sharp-v${version}-napi-v9-${platform}.tar.gz`;
+  const dir = path.join(__dirname, platform);
+  const response = await fetch(url);
+  if (!response.ok) {
+    console.log(`Skipping ${platform}: ${response.statusText}`);
+    return;
+  }
+  // Extract prebuild tarball
+  const lib = path.join(dir, 'lib');
+  await rm(lib, { recursive: true });
+  await pipeline(
+    Readable.fromWeb(response.body),
+    createGunzip(),
+    extract(lib, { map: mapTarballEntry })
+  );
+  // Generate README
+  const { name, description } = require(`./${platform}/package.json`);
+  await writeFile(path.join(dir, 'README.md'), `# \`${name}\`\n\n${description}.\n${licensing}`);
+  // Copy Apache-2.0 LICENSE
+  await copyFile(path.join(__dirname, '..', 'LICENSE'), path.join(dir, 'LICENSE'));
+  // Copy Windows-specific files
+  if (platform.startsWith('win32-')) {
+    const sharpLibvipsDir = path.join(require(`@sharpen/sharp-libvips-${platform}/lib`), '..');
+    await Promise.all(
+      ['versions.json', 'THIRD-PARTY-NOTICES.md'].map(
+        filename => copyFile(path.join(sharpLibvipsDir, filename), path.join(dir, filename))
+      )
+    );
+  }
+});

npm/from-local-build.js

@@ -0,0 +1,26 @@
+// Copyright 2013 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
+'use strict';
+
+// Populate contents of a single npm/sharpen-sharp-<build-platform> package
+// with the local/CI build directory for local/CI prebuild testing
+
+const fs = require('node:fs');
+const path = require('node:path');
+
+const { buildPlatformArch } = require('../lib/libvips');
+const platform = buildPlatformArch();
+const dest = path.join(__dirname, platform);
+
+// Use same config as prebuild to copy binary files
+const release = path.join(__dirname, '..', 'src', 'build', 'Release');
+const prebuildrc = JSON.parse(fs.readFileSync(path.join(__dirname, '..', '.prebuildrc'), 'utf8'));
+const include = new RegExp(prebuildrc['include-regex'], 'i');
+fs.cpSync(release, path.join(dest, 'lib'), {
+  recursive: true,
+  filter: (file) => {
+    const name = path.basename(file);
+    return name === 'Release' || include.test(name);
+  }
+});

npm/linux-arm/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@sharpen/sharp-linux-arm",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with Linux (glibc) ARM (32-bit)",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/linux-arm"
+  },
+  "license": "Apache-2.0",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "optionalDependencies": {
+    "@sharpen/sharp-libvips-linux-arm": "0.0.1-alpha.2"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-linux-arm.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0",
+    "glibc": ">=2.28"
+  },
+  "os": [
+    "linux"
+  ],
+  "libc": [
+    "glibc"
+  ],
+  "cpu": [
+    "arm"
+  ]
+}

npm/linux-arm64/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@sharpen/sharp-linux-arm64",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with Linux (glibc) ARM64",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/linux-arm64"
+  },
+  "license": "Apache-2.0",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "optionalDependencies": {
+    "@sharpen/sharp-libvips-linux-arm64": "0.0.1-alpha.2"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-linux-arm64.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0",
+    "glibc": ">=2.26"
+  },
+  "os": [
+    "linux"
+  ],
+  "libc": [
+    "glibc"
+  ],
+  "cpu": [
+    "arm64"
+  ]
+}

npm/linux-x64/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@sharpen/sharp-linux-x64",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with Linux (glibc) x64",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/linux-x64"
+  },
+  "license": "Apache-2.0",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "optionalDependencies": {
+    "@sharpen/sharp-libvips-linux-x64": "0.0.1-alpha.2"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-linux-x64.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0",
+    "glibc": ">=2.26"
+  },
+  "os": [
+    "linux"
+  ],
+  "libc": [
+    "glibc"
+  ],
+  "cpu": [
+    "x64"
+  ]
+}

npm/linuxmusl-arm64/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@sharpen/sharp-linuxmusl-arm64",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with Linux (musl) ARM64",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/linuxmusl-arm64"
+  },
+  "license": "Apache-2.0",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "optionalDependencies": {
+    "@sharpen/sharp-libvips-linuxmusl-arm64": "0.0.1-alpha.2"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-linuxmusl-arm64.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0",
+    "musl": ">=1.2.2"
+  },
+  "os": [
+    "linux"
+  ],
+  "libc": [
+    "musl"
+  ],
+  "cpu": [
+    "arm64"
+  ]
+}

npm/linuxmusl-x64/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@sharpen/sharp-linuxmusl-x64",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with Linux (musl) x64",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/linuxmusl-x64"
+  },
+  "license": "Apache-2.0",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "optionalDependencies": {
+    "@sharpen/sharp-libvips-linuxmusl-x64": "0.0.1-alpha.2"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-linuxmusl-x64.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0",
+    "musl": ">=1.2.2"
+  },
+  "os": [
+    "linux"
+  ],
+  "libc": [
+    "musl"
+  ],
+  "cpu": [
+    "x64"
+  ]
+}

npm/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "@sharpen/sharp",
+  "version": "0.0.1-alpha.8",
+  "private": "true",
+  "workspaces": [
+    "darwin-x64",
+    "darwin-arm64",
+    "linux-arm",
+    "linux-arm64",
+    "linuxmusl-arm64",
+    "linuxmusl-x64",
+    "linux-x64",
+    "win32-ia32",
+    "win32-x64"
+  ]
+}

npm/win32-ia32/package.json

@@ -0,0 +1,42 @@
+{
+  "name": "@sharpen/sharp-win32-ia32",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with Windows x86 (32-bit)",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/win32-ia32"
+  },
+  "license": "Apache-2.0 AND LGPL-3.0-or-later",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "files": [
+    "lib",
+    "versions.json",
+    "THIRD-PARTY-NOTICES.md"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-win32-ia32.node",
+    "./package": "./package.json",
+    "./versions": "./versions.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0"
+  },
+  "os": [
+    "win32"
+  ],
+  "cpu": [
+    "ia32"
+  ]
+}

npm/win32-x64/package.json

@@ -0,0 +1,41 @@
+{
+  "name": "@sharpen/sharp-win32-x64",
+  "version": "0.0.1-alpha.8",
+  "description": "Prebuilt sharp for use with Windows x64",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/win32-x64"
+  },
+  "license": "Apache-2.0 AND LGPL-3.0-or-later",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "files": [
+    "lib",
+    "versions.json",
+    "THIRD-PARTY-NOTICES.md"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-win32-x64.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0"
+  },
+  "os": [
+    "win32"
+  ],
+  "cpu": [
+    "x64"
+  ]
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sharp",
   "description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
-  "version": "0.32.5",
+  "version": "0.33.0-alpha.8",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://github.com/lovell/sharp",
   "contributors": [
@@ -89,29 +89,31 @@
     "Lachlan Newman <lachnewman007@gmail.com>"
   ],
   "scripts": {
-    "install": "(node install/libvips && node install/dll-copy && prebuild-install) || (node install/can-compile && node-gyp rebuild && node install/dll-copy)",
-    "clean": "rm -rf node_modules/ build/ vendor/ .nyc_output/ coverage/ test/fixtures/output.*",
+    "install": "node install/check",
+    "clean": "rm -rf src/build/ .nyc_output/ coverage/ test/fixtures/output.*",
     "test": "npm run test-lint && npm run test-unit && npm run test-licensing && npm run test-types",
     "test-lint": "semistandard && cpplint",
     "test-unit": "nyc --reporter=lcov --reporter=text --check-coverage --branches=100 mocha",
-    "test-licensing": "license-checker --production --summary --onlyAllow=\"Apache-2.0;BSD;ISC;MIT\"",
+    "test-licensing": "license-checker --production --summary --onlyAllow=\"Apache-2.0;BSD;ISC;LGPL-3.0-or-later;MIT\"",
     "test-leak": "./test/leak/leak.sh",
     "test-types": "tsd",
+    "package-from-local-build": "node npm/from-local-build",
+    "package-from-github-release": "node npm/from-github-release",
     "docs-build": "node docs/build && node docs/search-index/build",
     "docs-serve": "cd docs && npx serve",
     "docs-publish": "cd docs && npx firebase-tools deploy --project pixelplumbing --only hosting:pixelplumbing-sharp"
   },
+  "type": "commonjs",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
-    "binding.gyp",
-    "install/**",
-    "lib/**",
-    "src/**"
+    "install",
+    "lib",
+    "src/*.{cc,h,gyp}"
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/lovell/sharp"
+    "url": "git://github.com/lovell/sharp.git"
   },
   "keywords": [
     "jpeg",
@@ -134,57 +136,57 @@
   "dependencies": {
     "color": "^4.2.3",
     "detect-libc": "^2.0.2",
-    "node-addon-api": "^6.1.0",
-    "prebuild-install": "^7.1.1",
-    "semver": "^7.5.4",
-    "simple-get": "^4.0.1",
-    "tar-fs": "^3.0.4",
-    "tunnel-agent": "^0.6.0"
+    "semver": "^7.5.4"
+  },
+  "optionalDependencies": {
+    "@sharpen/sharp-darwin-arm64": "0.0.1-alpha.8",
+    "@sharpen/sharp-darwin-x64": "0.0.1-alpha.8",
+    "@sharpen/sharp-libvips-darwin-arm64": "0.0.1-alpha.2",
+    "@sharpen/sharp-libvips-darwin-x64": "0.0.1-alpha.2",
+    "@sharpen/sharp-libvips-linux-arm": "0.0.1-alpha.2",
+    "@sharpen/sharp-libvips-linux-arm64": "0.0.1-alpha.2",
+    "@sharpen/sharp-libvips-linux-x64": "0.0.1-alpha.2",
+    "@sharpen/sharp-libvips-linuxmusl-arm64": "0.0.1-alpha.2",
+    "@sharpen/sharp-libvips-linuxmusl-x64": "0.0.1-alpha.2",
+    "@sharpen/sharp-linux-arm": "0.0.1-alpha.8",
+    "@sharpen/sharp-linux-arm64": "0.0.1-alpha.8",
+    "@sharpen/sharp-linux-x64": "0.0.1-alpha.8",
+    "@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.8",
+    "@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.8",
+    "@sharpen/sharp-win32-ia32": "0.0.1-alpha.8",
+    "@sharpen/sharp-win32-x64": "0.0.1-alpha.8"
   },
   "devDependencies": {
+    "@sharpen/sharp-libvips-dev": "0.0.1-alpha.2",
+    "@sharpen/sharp-libvips-win32-ia32": "0.0.1-alpha.2",
+    "@sharpen/sharp-libvips-win32-x64": "0.0.1-alpha.2",
     "@types/node": "*",
     "async": "^3.2.4",
     "cc": "^3.0.1",
-    "exif-reader": "^1.2.0",
+    "exif-reader": "^2.0.0",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
     "jsdoc-to-markdown": "^8.0.0",
     "license-checker": "^25.0.1",
     "mocha": "^10.2.0",
-    "mock-fs": "^5.2.0",
+    "node-addon-api": "^7.0.0",
     "nyc": "^15.1.0",
-    "prebuild": "lovell/prebuild#add-nodejs-20-drop-nodejs-10-and-12",
-    "semistandard": "^16.0.1",
-    "tsd": "^0.28.1"
+    "prebuild": "^12.1.0",
+    "semistandard": "^17.0.0",
+    "tar-fs": "^3.0.4",
+    "tsd": "^0.29.0"
   },
   "license": "Apache-2.0",
-  "config": {
-    "libvips": "8.14.4",
-    "integrity": {
-      "darwin-arm64v8": "sha512-jZt5+ZBQzdloop9z/XlOAy8jHxD+ZGt3J8YUm1g3njjjKmZ/RmM9r6QAeLLILe67ATHaaAtmCil37fDc400OrQ==",
-      "darwin-x64": "sha512-Mhpr8n8CjrU+u5K9YLucmkCgwtJGexECLOZejPfqM8CiOMerowR0wJTuSt9WTOtb9qGOL/ndybfrymsw+YH8PA==",
-      "linux-arm64v8": "sha512-k2PiOOv8amzS4m5jc4Vceozv8h041IoyHL/1s0Rj290jg3w6BUJL3V+TLwKUPM35i7rV5rm14gtnGZ7qKENdmA==",
-      "linux-armv6": "sha512-CuPTo50owR8P+BCCcWk1tF4qB3XSAaHeaIzSanJM/v9zBZfUfMGI0OLv+ByyHCL3BE2CbGXaSXhuEVw2JQ08Sw==",
-      "linux-armv7": "sha512-CvD6fMy9PkZk1m2UPTWDcFfcD4qFA3RALyAWIih8ftOY9ksI3Y4uz6c0ML+ixBl0hqQK3WEg6+ac5TGDjZbbYA==",
-      "linux-x64": "sha512-vqoV61ka2hBYQ5582nQlyUcVPtItu927mng9RUU9nyO4Wt50z9nNT/pfcYEfF2jkBNW9JaiMaj6bENHgxA6mMg==",
-      "linuxmusl-arm64v8": "sha512-iCyl0y/qxdvgGidsYn11R8d4TEcU92uYHtYI8FSHyUobZw/9i2y3189PUTQ/fw44oqaBzTR3p9NF2eP6aLT9gQ==",
-      "linuxmusl-x64": "sha512-qj7IUqWUqCtxECpgNp4E1NcIbsNe1ujzBuJcnnQot7GZOuPUhI5N6ZUhozmh6LfbGFdBZpPc/JFh1eDZ0IEpbQ==",
-      "win32-arm64v8": "sha512-VRi7fpE9Kb3xQGcNmPPTJnWGAEUMq+YOq9abpaIIB2r3Ax327/7wHS7o2ezD6zQKdxIX6gODC5io/hReIJ9Jnw==",
-      "win32-ia32": "sha512-EnvtU7Q6+pjl5/Y1/UngCFDM2CSqpYWVDwY03ilUKSuqTeDKTJYyus0rJ+n6p4nmdjJlVdhYlkvpy8kkEAtDHg==",
-      "win32-x64": "sha512-fCl/KQuSijVYC8hULWbff8Mfuh3vjjdz4j5p73VgdLP6aZUrHctbhBvEIe0aQ8HpmcGdBnATX5pXUQ4GDl3mwQ=="
-    },
-    "runtime": "napi",
-    "target": 7
-  },
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "libvips": ">=8.14.5"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"
   },
   "binary": {
     "napi_versions": [
-      7
+      9
     ]
   },
   "semistandard": {

src/binding.gyp

@@ -1,8 +1,13 @@
+# Copyright 2013 Lovell Fuller and others.
+# SPDX-License-Identifier: Apache-2.0
+
 {
   'variables': {
-    'vips_version': '<!(node -p "require(\'./lib/libvips\').minimumLibvipsVersion")',
-    'platform_and_arch': '<!(node -p "require(\'./lib/platform\')()")',
-    'sharp_vendor_dir': './vendor/<(vips_version)/<(platform_and_arch)'
+    'vips_version': '<!(node -p "require(\'../lib/libvips\').minimumLibvipsVersion")',
+    'platform_and_arch': '<!(node -p "require(\'../lib/libvips\').buildPlatformArch()")',
+    'sharp_libvips_include_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsIncludeDir()")',
+    'sharp_libvips_cplusplus_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsCPlusPlusDir()")',
+    'sharp_libvips_lib_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsLibDir()")'
   },
   'targets': [{
     'target_name': 'libvips-cpp',
@@ -15,19 +20,19 @@
           '_ALLOW_KEYWORD_MACROS'
         ],
         'sources': [
-          'src/libvips/cplusplus/VConnection.cpp',
-          'src/libvips/cplusplus/VError.cpp',
-          'src/libvips/cplusplus/VImage.cpp',
-          'src/libvips/cplusplus/VInterpolate.cpp',
-          'src/libvips/cplusplus/VRegion.cpp'
+          '<(sharp_libvips_cplusplus_dir)/VConnection.cpp',
+          '<(sharp_libvips_cplusplus_dir)/VError.cpp',
+          '<(sharp_libvips_cplusplus_dir)/VImage.cpp',
+          '<(sharp_libvips_cplusplus_dir)/VInterpolate.cpp',
+          '<(sharp_libvips_cplusplus_dir)/VRegion.cpp'
         ],
         'include_dirs': [
-          '<(sharp_vendor_dir)/include',
-          '<(sharp_vendor_dir)/include/glib-2.0',
-          '<(sharp_vendor_dir)/lib/glib-2.0/include'
+          '<(sharp_libvips_include_dir)',
+          '<(sharp_libvips_include_dir)/glib-2.0',
+          '<(sharp_libvips_lib_dir)/glib-2.0/include'
         ],
         'link_settings': {
-          'library_dirs': ['<(sharp_vendor_dir)/lib'],
+          'library_dirs': ['<(sharp_libvips_lib_dir)'],
           'libraries': [
             'libvips.lib',
             'libglib-2.0.lib',
@@ -70,7 +75,7 @@
   }, {
     'target_name': 'sharp-<(platform_and_arch)',
     'defines': [
-      'NAPI_VERSION=7',
+      'NAPI_VERSION=9',
       'NODE_ADDON_API_DISABLE_DEPRECATED',
       'NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS'
     ],
@@ -79,11 +84,10 @@
       'libvips-cpp'
     ],
     'variables': {
-      'runtime_link%': 'shared',
       'conditions': [
         ['OS != "win"', {
-          'pkg_config_path': '<!(node -p "require(\'./lib/libvips\').pkgConfigPath()")',
-          'use_global_libvips': '<!(node -p "Boolean(require(\'./lib/libvips\').useGlobalLibvips()).toString()")'
+          'pkg_config_path': '<!(node -p "require(\'../lib/libvips\').pkgConfigPath()")',
+          'use_global_libvips': '<!(node -p "Boolean(require(\'../lib/libvips\').useGlobalLibvips()).toString()")'
         }, {
           'pkg_config_path': '',
           'use_global_libvips': ''
@@ -91,13 +95,13 @@
       ]
     },
     'sources': [
-      'src/common.cc',
-      'src/metadata.cc',
-      'src/stats.cc',
-      'src/operations.cc',
-      'src/pipeline.cc',
-      'src/utilities.cc',
-      'src/sharp.cc'
+      'common.cc',
+      'metadata.cc',
+      'stats.cc',
+      'operations.cc',
+      'pipeline.cc',
+      'utilities.cc',
+      'sharp.cc'
     ],
     'include_dirs': [
       '<!(node -p "require(\'node-addon-api\').include_dir")',
@@ -106,12 +110,11 @@
       ['use_global_libvips == "true"', {
         # Use pkg-config for include and lib
         'include_dirs': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --cflags-only-I vips-cpp vips glib-2.0 | sed s\/-I//g)'],
+        'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs vips-cpp)'],
+        'defines': [
+          'SHARP_USE_GLOBAL_LIBVIPS'
+        ],
         'conditions': [
-          ['runtime_link == "static"', {
-            'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs --static vips-cpp)']
-          }, {
-            'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs vips-cpp)']
-          }],
           ['OS == "linux"', {
             'defines': [
               # Inspect libvips-cpp.so to determine which C++11 ABI version was used and set _GLIBCXX_USE_CXX11_ABI accordingly. This is quite horrible.
@@ -122,9 +125,9 @@
       }, {
         # Use pre-built libvips stored locally within node_modules
         'include_dirs': [
-          '<(sharp_vendor_dir)/include',
-          '<(sharp_vendor_dir)/include/glib-2.0',
-          '<(sharp_vendor_dir)/lib/glib-2.0/include'
+          '<(sharp_libvips_include_dir)',
+          '<(sharp_libvips_include_dir)/glib-2.0',
+          '<(sharp_libvips_lib_dir)/glib-2.0/include'
         ],
         'conditions': [
           ['OS == "win"', {
@@ -133,7 +136,7 @@
               '_FILE_OFFSET_BITS=64'
             ],
             'link_settings': {
-              'library_dirs': ['<(sharp_vendor_dir)/lib'],
+              'library_dirs': ['<(sharp_libvips_lib_dir)'],
               'libraries': [
                 'libvips.lib',
                 'libglib-2.0.lib',
@@ -143,7 +146,9 @@
           }],
           ['OS == "mac"', {
             'link_settings': {
-              'library_dirs': ['../<(sharp_vendor_dir)/lib'],
+              'library_dirs': [
+                '<(sharp_libvips_lib_dir)'
+              ],
               'libraries': [
                 'libvips-cpp.42.dylib'
               ]
@@ -151,7 +156,9 @@
             'xcode_settings': {
               'OTHER_LDFLAGS': [
                 # Ensure runtime linking is relative to sharp.node
-                '-Wl,-rpath,\'@loader_path/../../<(sharp_vendor_dir)/lib\''
+                '-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath,\'@loader_path/../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath,\'@loader_path/../../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\''
               ]
             }
           }],
@@ -160,13 +167,19 @@
               '_GLIBCXX_USE_CXX11_ABI=1'
             ],
             'link_settings': {
-              'library_dirs': ['../<(sharp_vendor_dir)/lib'],
+              'library_dirs': [
+                '<(sharp_libvips_lib_dir)'
+              ],
               'libraries': [
                 '-l:libvips-cpp.so.42'
               ],
               'ldflags': [
                 # Ensure runtime linking is relative to sharp.node
-                '-Wl,-s -Wl,--disable-new-dtags -Wl,-rpath=\'$$ORIGIN/../../<(sharp_vendor_dir)/lib\''
+                '-Wl,-s',
+                '-Wl,--disable-new-dtags',
+                '-Wl,-rpath=\'$$ORIGIN/../../sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath=\'$$ORIGIN/../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\''
               ]
             }
           }]
@@ -232,5 +245,23 @@
         ]
       }
     },
+  }, {
+    'target_name': 'copy-dll',
+    'type': 'none',
+    'dependencies': [
+      'sharp-<(platform_and_arch)'
+    ],
+    'conditions': [
+      ['OS == "win"', {
+        'copies': [{
+          'destination': 'build/Release',
+          'files': [
+            '<(sharp_libvips_lib_dir)/libvips-42.dll',
+            '<(sharp_libvips_lib_dir)/libglib-2.0-0.dll',
+            '<(sharp_libvips_lib_dir)/libgobject-2.0-0.dll'
+          ]
+        }]
+      }]
+    ]
   }]
 }

src/common.cc

@@ -166,10 +166,10 @@ namespace sharp {
   }
 
   // How many tasks are in the queue?
-  volatile int counterQueue = 0;
+  std::atomic<int> counterQueue{0};
 
   // How many tasks are being processed?
-  volatile int counterProcess = 0;
+  std::atomic<int> counterProcess{0};
 
   // Filename extension checkers
   static bool EndsWith(std::string const &str, std::string const &end) {
@@ -363,12 +363,13 @@ namespace sharp {
     if (descriptor->isBuffer) {
       if (descriptor->rawChannels > 0) {
         // Raw, uncompressed pixel data
+        bool const is8bit = vips_band_format_is8bit(descriptor->rawDepth);
         image = VImage::new_from_memory(descriptor->buffer, descriptor->bufferLength,
           descriptor->rawWidth, descriptor->rawHeight, descriptor->rawChannels, descriptor->rawDepth);
         if (descriptor->rawChannels < 3) {
-          image.get_image()->Type = VIPS_INTERPRETATION_B_W;
+          image.get_image()->Type = is8bit ? VIPS_INTERPRETATION_B_W : VIPS_INTERPRETATION_GREY16;
         } else {
-          image.get_image()->Type = VIPS_INTERPRETATION_sRGB;
+          image.get_image()->Type = is8bit ? VIPS_INTERPRETATION_sRGB : VIPS_INTERPRETATION_RGB16;
         }
         if (descriptor->rawPremultiplied) {
           image = image.unpremultiply();

src/common.h

@@ -7,6 +7,7 @@
 #include <string>
 #include <tuple>
 #include <vector>
+#include <atomic>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -15,8 +16,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 14) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 14 && VIPS_MICRO_VERSION < 4)
-#error "libvips version 8.14.4+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 14 && VIPS_MICRO_VERSION < 5)
+#error "libvips version 8.14.5+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))
@@ -161,10 +162,10 @@ namespace sharp {
   };
 
   // How many tasks are in the queue?
-  extern volatile int counterQueue;
+  extern std::atomic<int> counterQueue;
 
   // How many tasks are being processed?
-  extern volatile int counterProcess;
+  extern std::atomic<int> counterProcess;
 
   // Filename extension checkers
   bool IsJpeg(std::string const &str);

src/libvips/cplusplus/VConnection.cpp

@@ -1,151 +0,0 @@
-/* Object part of the VSource and VTarget class
- */
-
-/*
-
-    Copyright (C) 1991-2001 The National Gallery
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
-
- */
-
-/*
-
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
-
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#include <vips/vips8>
-
-#include <vips/debug.h>
-
-/*
-#define VIPS_DEBUG
-#define VIPS_DEBUG_VERBOSE
- */
-
-VIPS_NAMESPACE_START
-
-VSource 
-VSource::new_from_descriptor( int descriptor )
-{
-	VipsSource *input;
-
-	if( !(input = vips_source_new_from_descriptor( descriptor )) )
-		throw VError();
-
-	VSource out( input ); 
-
-	return( out ); 
-}
-
-VSource 
-VSource::new_from_file( const char *filename )
-{
-	VipsSource *input;
-
-	if( !(input = vips_source_new_from_file( filename )) )
-		throw VError();
-
-	VSource out( input ); 
-
-	return( out ); 
-}
-
-VSource 
-VSource::new_from_blob( VipsBlob *blob )
-{
-	VipsSource *input;
-
-	if( !(input = vips_source_new_from_blob( blob )) )
-		throw VError();
-
-	VSource out( input ); 
-
-	return( out ); 
-}
-
-VSource 
-VSource::new_from_memory( const void *data, 
-	size_t size )
-{
-	VipsSource *input;
-
-	if( !(input = vips_source_new_from_memory( data, size )) )
-		throw VError();
-
-	VSource out( input ); 
-
-	return( out ); 
-}
-
-VSource 
-VSource::new_from_options( const char *options )
-{
-	VipsSource *input;
-
-	if( !(input = vips_source_new_from_options( options )) )
-		throw VError();
-
-	VSource out( input ); 
-
-	return( out ); 
-}
-
-VTarget 
-VTarget::new_to_descriptor( int descriptor )
-{
-	VipsTarget *output;
-
-	if( !(output = vips_target_new_to_descriptor( descriptor )) )
-		throw VError();
-
-	VTarget out( output ); 
-
-	return( out ); 
-}
-
-VTarget 
-VTarget::new_to_file( const char *filename )
-{
-	VipsTarget *output;
-
-	if( !(output = vips_target_new_to_file( filename )) )
-		throw VError();
-
-	VTarget out( output ); 
-
-	return( out ); 
-}
-
-VTarget 
-VTarget::new_to_memory()
-{
-	VipsTarget *output;
-
-	if( !(output = vips_target_new_to_memory()) )
-		throw VError();
-
-	VTarget out( output ); 
-
-	return( out ); 
-}
-
-VIPS_NAMESPACE_END

src/libvips/cplusplus/VError.cpp

@@ -1,49 +0,0 @@
-// Code for error type
-
-/*
-
-    Copyright (C) 1991-2001 The National Gallery
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
-
- */
-
-/*
-
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
-
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#include <vips/vips8>
-
-VIPS_NAMESPACE_START
-
-std::ostream &operator<<( std::ostream &file, const VError &err )
-{
-	err.ostream_print( file );
-	return( file );
-}
-
-void VError::ostream_print( std::ostream &file ) const
-{
-	file << _what;
-}
-
-VIPS_NAMESPACE_END

src/libvips/cplusplus/VInterpolate.cpp

@@ -1,62 +0,0 @@
-/* Object part of VInterpolate class
- */
-
-/*
-
-    Copyright (C) 1991-2001 The National Gallery
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
-
- */
-
-/*
-
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
-
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#include <vips/vips8>
-
-#include <vips/debug.h>
-
-/*
-#define VIPS_DEBUG
-#define VIPS_DEBUG_VERBOSE
- */
-
-VIPS_NAMESPACE_START
-
-VInterpolate 
-VInterpolate::new_from_name( const char *name, VOption *options )
-{
-	VipsInterpolate *interp;
-
-	if( !(interp = vips_interpolate_new( name )) ) {
-		delete options; 
-		throw VError(); 
-	}
-	delete options; 
-
-	VInterpolate out( interp ); 
-
-	return( out ); 
-}
-
-VIPS_NAMESPACE_END

src/libvips/cplusplus/VRegion.cpp

@@ -1,27 +0,0 @@
-// Object part of VRegion class
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#include <vips/vips8>
-
-#include <vips/debug.h>
-
-VIPS_NAMESPACE_START
-
-VRegion
-VRegion::new_from_image( VImage image )
-{
-	VipsRegion *region;
-
-	if( !(region = vips_region_new( image.get_image() )) ) {
-		throw VError();
-	}
-
-	VRegion out( region );
-
-	return( out );
-}
-
-VIPS_NAMESPACE_END

src/metadata.cc

@@ -18,7 +18,7 @@ class MetadataWorker : public Napi::AsyncWorker {
 
   void Execute() {
     // Decrement queued task counter
-    g_atomic_int_dec_and_test(&sharp::counterQueue);
+    sharp::counterQueue--;
 
     vips::VImage image;
     sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
@@ -281,7 +281,7 @@ Napi::Value metadata(const Napi::CallbackInfo& info) {
   worker->Queue();
 
   // Increment queued task counter
-  g_atomic_int_inc(&sharp::counterQueue);
+  sharp::counterQueue++;
 
   return info.Env().Undefined();
 }

src/pipeline.cc

@@ -44,9 +44,9 @@ class PipelineWorker : public Napi::AsyncWorker {
   // libuv worker
   void Execute() {
     // Decrement queued task counter
-    g_atomic_int_dec_and_test(&sharp::counterQueue);
+    sharp::counterQueue--;
     // Increment processing task counter
-    g_atomic_int_inc(&sharp::counterProcess);
+    sharp::counterProcess++;
 
     try {
       // Open input
@@ -326,7 +326,7 @@ class PipelineWorker : public Napi::AsyncWorker {
         try {
           image = image.icc_transform(processingProfile, VImage::option()
             ->set("embedded", TRUE)
-            ->set("depth", image.interpretation() == VIPS_INTERPRETATION_RGB16 ? 16 : 8)
+            ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
             ->set("intent", VIPS_INTENT_PERCEPTUAL));
         } catch(...) {
           sharp::VipsWarningCallback(nullptr, G_LOG_LEVEL_WARNING, "Invalid embedded profile", nullptr);
@@ -653,7 +653,7 @@ class PipelineWorker : public Napi::AsyncWorker {
             if (across != 0 || down != 0) {
               int left;
               int top;
-              compositeImage = compositeImage.replicate(across, down);
+              compositeImage = sharp::StaySequential(compositeImage, access).replicate(across, down);
               if (composite->hasOffset) {
                 std::tie(left, top) = sharp::CalculateCrop(
                   compositeImage.width(), compositeImage.height(), image.width(), image.height(),
@@ -763,6 +763,7 @@ class PipelineWorker : public Napi::AsyncWorker {
         if (baton->withMetadata && sharp::HasProfile(image) && baton->withMetadataIcc.empty()) {
           image = image.icc_transform("srgb", VImage::option()
             ->set("embedded", TRUE)
+            ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
             ->set("intent", VIPS_INTENT_PERCEPTUAL));
         }
       }
@@ -794,6 +795,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           VImage::option()
             ->set("input_profile", processingProfile)
             ->set("embedded", TRUE)
+            ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
             ->set("intent", VIPS_INTENT_PERCEPTUAL));
       }
       // Override EXIF Orientation tag
@@ -1287,8 +1289,8 @@ class PipelineWorker : public Napi::AsyncWorker {
     delete baton;
 
     // Decrement processing task counter
-    g_atomic_int_dec_and_test(&sharp::counterProcess);
-    Napi::Number queueLength = Napi::Number::New(env, static_cast<double>(sharp::counterQueue));
+    sharp::counterProcess--;
+    Napi::Number queueLength = Napi::Number::New(env, static_cast<int>(sharp::counterQueue));
     queueListener.MakeCallback(Receiver().Value(), { queueLength });
   }
 
@@ -1705,8 +1707,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   worker->Queue();
 
   // Increment queued task counter
-  g_atomic_int_inc(&sharp::counterQueue);
-  Napi::Number queueLength = Napi::Number::New(info.Env(), static_cast<double>(sharp::counterQueue));
+  Napi::Number queueLength = Napi::Number::New(info.Env(), static_cast<int>(++sharp::counterQueue));
   queueListener.MakeCallback(info.This(), { queueLength });
 
   return info.Env().Undefined();

src/sharp.cc

@@ -1,6 +1,8 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
+#include <mutex>  // NOLINT(build/c++11)
+
 #include <napi.h>
 #include <vips/vips8>
 
@@ -10,14 +12,11 @@
 #include "utilities.h"
 #include "stats.h"
 
-static void* sharp_vips_init(void*) {
-  vips_init("sharp");
-  return nullptr;
-}
-
 Napi::Object init(Napi::Env env, Napi::Object exports) {
-  static GOnce sharp_vips_init_once = G_ONCE_INIT;
-  g_once(&sharp_vips_init_once, static_cast<GThreadFunc>(sharp_vips_init), nullptr);
+  static std::once_flag sharp_vips_init_once;
+  std::call_once(sharp_vips_init_once, []() {
+    vips_init("sharp");
+  });
 
   g_log_set_handler("VIPS", static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING),
     static_cast<GLogFunc>(sharp::VipsWarningCallback), nullptr);

src/stats.cc

@@ -30,7 +30,7 @@ class StatsWorker : public Napi::AsyncWorker {
 
   void Execute() {
     // Decrement queued task counter
-    g_atomic_int_dec_and_test(&sharp::counterQueue);
+    sharp::counterQueue--;
 
     vips::VImage image;
     sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
@@ -177,7 +177,7 @@ Napi::Value stats(const Napi::CallbackInfo& info) {
   worker->Queue();
 
   // Increment queued task counter
-  g_atomic_int_inc(&sharp::counterQueue);
+  sharp::counterQueue++;
 
   return info.Env().Undefined();
 }

src/utilities.cc

@@ -3,6 +3,7 @@
 
 #include <cmath>
 #include <string>
+#include <cstdio>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -70,8 +71,8 @@ Napi::Value concurrency(const Napi::CallbackInfo& info) {
 */
 Napi::Value counters(const Napi::CallbackInfo& info) {
   Napi::Object counters = Napi::Object::New(info.Env());
-  counters.Set("queue", sharp::counterQueue);
-  counters.Set("process", sharp::counterProcess);
+  counters.Set("queue", static_cast<int>(sharp::counterQueue));
+  counters.Set("process", static_cast<int>(sharp::counterProcess));
   return counters;
 }
 
@@ -91,9 +92,18 @@ Napi::Value simd(const Napi::CallbackInfo& info) {
   Get libvips version
 */
 Napi::Value libvipsVersion(const Napi::CallbackInfo& info) {
-  char version[9];
-  g_snprintf(version, sizeof(version), "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
-  return Napi::String::New(info.Env(), version);
+  Napi::Env env = info.Env();
+  Napi::Object version = Napi::Object::New(env);
+
+  char semver[9];
+  std::snprintf(semver, sizeof(semver), "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
+  version.Set("semver", Napi::String::New(env, semver));
+#ifdef SHARP_USE_GLOBAL_LIBVIPS
+  version.Set("isGlobal", Napi::Boolean::New(env, true));
+#else
+  version.Set("isGlobal", Napi::Boolean::New(env, false));
+#endif
+  return version;
 }
 
 /*

test/bench/package.json

@@ -17,11 +17,8 @@
     "jimp": "0.22.10"
   },
   "optionalDependencies": {
-    "@tensorflow/tfjs-node": "4.9.0",
+    "@tensorflow/tfjs-node": "4.11.0",
     "mapnik": "4.5.9"
   },
-  "license": "Apache-2.0",
-  "engines": {
-    "node": "16"
-  }
+  "license": "Apache-2.0"
 }

test/bench/perf.js

@@ -5,7 +5,7 @@
 
 const os = require('os');
 const fs = require('fs');
-const { exec } = require('child_process');
+const { exec, execSync } = require('child_process');
 
 const async = require('async');
 const Benchmark = require('benchmark');
@@ -40,8 +40,10 @@ const heightPng = 540;
 // Disable libvips cache to ensure tests are as fair as they can be
 sharp.cache(false);
 
-// Spawn one thread per CPU
-sharp.concurrency(os.cpus().length);
+// Spawn one thread per physical CPU core
+const physicalCores = Number(execSync('lscpu -p | egrep -v "^#" | sort -u -t, -k 2,4 | wc -l', { encoding: 'utf-8' }).trim());
+console.log(`Detected ${physicalCores} physical cores`);
+sharp.concurrency(physicalCores);
 
 async.series({
   jpeg: function (callback) {
@@ -188,8 +190,8 @@ async.series({
           srcPath: fixtures.inputJpg,
           dstPath: outputJpg,
           quality: 0.8,
-          width: width,
-          height: height,
+          width,
+          height,
           format: 'jpg',
           filter: 'Lanczos'
         }, function (err) {
@@ -793,7 +795,7 @@ async.series({
         imagemagick.resize({
           srcPath: fixtures.inputPngAlphaPremultiplicationLarge,
           dstPath: outputPng,
-          width: width,
+          width,
           height: heightPng,
           filter: 'Lanczos',
           customArgs: [

test/saliency/README.md

@@ -1,16 +0,0 @@
-# Crop strategy accuracy
-
-1. Download the [MSRA Salient Object Database](http://research.microsoft.com/en-us/um/people/jiansun/SalientObject/salient_object.htm) (101MB).
-2. Extract each image and its median human-labelled salient region.
-3. Generate a test report of percentage deviance of top and left edges for each crop strategy, plus a naive centre gravity crop as "control".
-
-```sh
-git clone https://github.com/lovell/sharp.git
-cd sharp/test/saliency
-./download.sh
-node report.js
-python -m SimpleHTTPServer
-```
-
-The test report will then be available at
-http://localhost:8000/report.html

test/saliency/download.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Fetch and parse the MSRA Salient Object Database 'Image set B'
-# http://research.microsoft.com/en-us/um/people/jiansun/salientobject/salient_object.htm
-
-if [ ! -d Image ]; then
-  if [ ! -f ImageB.zip ]; then
-    echo "Downloading 5000 images (101MB)"
-    curl -O http://research.microsoft.com/en-us/um/people/jiansun/salientobject/ImageSetB/ImageB.zip
-  fi
-  unzip ImageB.zip
-fi
-
-if [ ! -d UserData ]; then
-  if [ ! -f UserDataB.zip ]; then
-    echo "Downloading human-labelled regions"
-    curl -O http://research.microsoft.com/en-us/um/people/jiansun/salientobject/ImageSetB/UserDataB.zip
-  fi
-  unzip UserDataB.zip
-fi
-
-if [ ! -f userData.json ]; then
-  echo "Processing human-labelled regions"
-  node userData.js
-fi

test/saliency/humanae/download.js

@@ -1,40 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const fs = require('fs');
-const request = require('request');
-const tumblr = require('tumblr.js');
-
-const client = tumblr.createClient({
-  consumer_key: '***',
-  consumer_secret: '***'
-});
-
-const fetchImages = function (offset) {
-  console.log(`Fetching offset ${offset}`);
-  client.posts('humanae', {
-    type: 'photo',
-    offset: offset
-  }, function (err, response) {
-    if (err) throw err;
-    if (response.posts.length > 0) {
-      response.posts.forEach((post) => {
-        const url = post.photos[0].alt_sizes
-          .filter((image) => image.width === 100)
-          .map((image) => image.url)[0];
-        const filename = `./images/${post.id}.jpg`;
-        try {
-          fs.statSync(filename);
-        } catch (err) {
-          if (err.code === 'ENOENT') {
-            request(url).pipe(fs.createWriteStream(filename));
-          }
-        }
-      });
-      fetchImages(offset + 20);
-    }
-  });
-};
-fetchImages(0);

test/saliency/humanae/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "sharp-crop-strategy-attention-model-humanae",
-  "version": "0.0.1",
-  "private": true,
-  "dependencies": {
-    "request": "^2.75.0",
-    "tumblr.js": "^1.1.1"
-  }
-}

test/saliency/humanae/tone.js

@@ -1,36 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const fs = require('fs');
-const childProcess = require('child_process');
-
-const a = [];
-const b = [];
-
-fs.readdirSync('./images')
-  .filter((file) => file.endsWith('.jpg'))
-  .forEach((file) => {
-    // Extract one pixel, avoiding first DCT block, and return value of A and B channels
-    const command = `convert ./images/${file}[1x1+8+8] -colorspace lab -format "%[fx:u.g] %[fx:u.b]" info:`;
-    const result = childProcess.execSync(command, { encoding: 'utf8' });
-    const ab = result.split(' ');
-    a.push(ab[0]);
-    b.push(ab[1]);
-  });
-
-a.sort((v1, v2) => v1 - v2);
-b.sort((v1, v2) => v1 - v2);
-
-// Convert from 0..1 to -128..128
-const convert = function (v) {
-  return Math.round(256 * (v - 0.5));
-};
-
-const threshold = Math.round(a.length / 100);
-console.log(`Trimming lowest/highest ${threshold} for 98th percentile`);
-
-// Ignore ~2% outliers
-console.log(`a ${convert(a[threshold])} - ${convert(a[a.length - threshold])}`);
-console.log(`b ${convert(b[threshold])} - ${convert(b[b.length - threshold])}`);

test/saliency/report.html

@@ -1,25 +0,0 @@
-<html>
-  <head>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/metrics-graphics/2.10.1/metricsgraphics.min.css" rel="stylesheet" type="text/css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/4.2.6/d3.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/metrics-graphics/2.10.1/metricsgraphics.min.js"></script>
-  </head>
-  <body>
-    <div id="accuracy"></div>
-    <script>
-    d3.json('report.json', function(err, data) {
-      MG.data_graphic({
-        title: 'Crop accuracy',
-        data: data,
-        target: '#accuracy',
-        width: 960,
-        height: 600,
-        x_accessor: 'accuracy',
-        x_label: '% Accuracy',
-        y_accessor: ['centre', 'entropy', 'attention'],
-        legend: ['Centre', 'Entropy', 'Attention']
-      });
-    });
-    </script>
-  </body>
-</html>

test/saliency/report.js

@@ -1,82 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const os = require('os');
-const fs = require('fs');
-const path = require('path');
-const async = require('async');
-const sharp = require('../../');
-
-const crops = {
-  entropy: sharp.strategy.entropy,
-  attention: sharp.strategy.attention
-};
-const concurrency = os.cpus().length;
-
-const scores = {};
-
-const incrementScore = function (accuracy, crop) {
-  if (typeof scores[accuracy] === 'undefined') {
-    scores[accuracy] = {};
-  }
-  if (typeof scores[accuracy][crop] === 'undefined') {
-    scores[accuracy][crop] = 0;
-  }
-  scores[accuracy][crop]++;
-};
-
-const userData = require('./userData.json');
-const files = Object.keys(userData);
-
-async.eachLimit(files, concurrency, function (file, done) {
-  const filename = path.join(__dirname, 'Image', file);
-  const salientWidth = userData[file].right - userData[file].left;
-  const salientHeight = userData[file].bottom - userData[file].top;
-  sharp(filename).metadata(function (err, metadata) {
-    if (err) console.log(err);
-    const marginWidth = metadata.width - salientWidth;
-    const marginHeight = metadata.height - salientHeight;
-    async.each(Object.keys(crops), function (crop, done) {
-      async.parallel([
-        // Left edge accuracy
-        function (done) {
-          if (marginWidth) {
-            sharp(filename).resize(salientWidth, metadata.height).crop(crops[crop]).toBuffer(function (err, data, info) {
-              const delta = Math.abs(userData[file].left + info.cropOffsetLeft);
-              const accuracy = Math.round(marginWidth / (marginWidth + delta) * 100);
-              incrementScore(accuracy, crop);
-              done(err);
-            });
-          } else {
-            done();
-          }
-        },
-        // Top edge accuracy
-        function (done) {
-          if (marginHeight) {
-            sharp(filename).resize(metadata.width, salientHeight).crop(crops[crop]).toBuffer(function (err, data, info) {
-              const delta = Math.abs(userData[file].top + info.cropOffsetTop);
-              const accuracy = Math.round(marginHeight / (marginHeight + delta) * 100);
-              incrementScore(accuracy, crop);
-              done(err);
-            });
-          } else {
-            done();
-          }
-        }
-      ], done);
-    }, done);
-  });
-}, function () {
-  const report = [];
-  Object.keys(scores).forEach(function (accuracy) {
-    report.push(
-      Object.assign({
-        accuracy: Number(accuracy)
-      }, scores[accuracy])
-    );
-  });
-  fs.writeFileSync('report.json', JSON.stringify(report, null, 2));
-});

test/saliency/userData.js

@@ -1,74 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const userDataDir = 'UserData';
-
-const images = {};
-
-const median = function (values) {
-  values.sort(function (a, b) {
-    return a - b;
-  });
-  const half = Math.floor(values.length / 2);
-  if (values.length % 2) {
-    return values[half];
-  } else {
-    return Math.floor((values[half - 1] + values[half]) / 2);
-  }
-};
-
-// List of files
-fs.readdirSync(userDataDir).forEach(function (file) {
-  // Contents of file
-  const lines = fs.readFileSync(path.join(userDataDir, file), { encoding: 'utf-8' }).split(/\r\n/);
-  // First line = number of entries
-  const entries = parseInt(lines[0], 10);
-  // Verify number of entries
-  if (entries !== 500) {
-    throw new Error('Expecting 500 images in ' + file + ', found ' + entries);
-  }
-  // Keep track of which line we're on
-  let linePos = 2;
-  for (let i = 0; i < entries; i++) {
-    // Get data for current image
-    const filename = lines[linePos].replace(/\\/, path.sep);
-    linePos = linePos + 2;
-    const regions = lines[linePos].split('; ');
-    linePos = linePos + 2;
-    // Parse human-labelled regions for min/max coords
-    const lefts = [];
-    const tops = [];
-    const rights = [];
-    const bottoms = [];
-    regions.forEach(function (region) {
-      if (region.indexOf(' ') !== -1) {
-        const coords = region.split(' ');
-        lefts.push(parseInt(coords[0], 10));
-        tops.push(parseInt(coords[1], 10));
-        rights.push(parseInt(coords[2], 10));
-        bottoms.push(parseInt(coords[3], 10));
-      }
-    });
-    // Add image
-    images[filename] = {
-      left: median(lefts),
-      top: median(tops),
-      right: median(rights),
-      bottom: median(bottoms)
-    };
-  }
-});
-
-// Verify number of images found
-const imageCount = Object.keys(images).length;
-if (imageCount === 5000) {
-  // Write output
-  fs.writeFileSync('userData.json', JSON.stringify(images, null, 2));
-} else {
-  throw new Error('Expecting 5000 images, found ' + imageCount);
-}

test/types/sharp.test-d.ts

@@ -73,8 +73,6 @@ readableStream.pipe(transformer).pipe(writableStream);
 
 console.log(sharp.format);
 console.log(sharp.versions);
-console.log(sharp.vendor.current);
-console.log(sharp.vendor.installed.join(', '));
 
 sharp.queue.on('change', (queueLength: number) => {
   console.log(`Queue contains ${queueLength} task(s)`);

test/unit/agent.js

@@ -1,52 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const assert = require('assert');
-const agent = require('../../lib/agent');
-
-describe('HTTP agent', function () {
-  it('Without proxy', function () {
-    assert.strictEqual(null, agent());
-  });
-
-  it('HTTPS proxy with auth from HTTPS_PROXY', function () {
-    process.env.HTTPS_PROXY = 'https://user:pass@secure:123';
-    let logMsg = '';
-    const proxy = agent(msg => { logMsg = msg; });
-    delete process.env.HTTPS_PROXY;
-    assert.strictEqual('object', typeof proxy);
-    assert.strictEqual('secure', proxy.options.proxy.host);
-    assert.strictEqual(123, proxy.options.proxy.port);
-    assert.strictEqual('user:pass', proxy.options.proxy.proxyAuth);
-    assert.strictEqual(443, proxy.defaultPort);
-    assert.strictEqual(logMsg, 'Via proxy https://secure:123 with credentials');
-  });
-
-  it('HTTPS proxy with auth from HTTPS_PROXY using credentials containing special characters', function () {
-    process.env.HTTPS_PROXY = 'https://user,:pass=@secure:789';
-    let logMsg = '';
-    const proxy = agent(msg => { logMsg = msg; });
-    delete process.env.HTTPS_PROXY;
-    assert.strictEqual('object', typeof proxy);
-    assert.strictEqual('secure', proxy.options.proxy.host);
-    assert.strictEqual(789, proxy.options.proxy.port);
-    assert.strictEqual('user,:pass=', proxy.options.proxy.proxyAuth);
-    assert.strictEqual(443, proxy.defaultPort);
-    assert.strictEqual(logMsg, 'Via proxy https://secure:789 with credentials');
-  });
-
-  it('HTTP proxy without auth from npm_config_proxy', function () {
-    process.env.npm_config_proxy = 'http://plaintext:456';
-    let logMsg = '';
-    const proxy = agent(msg => { logMsg = msg; });
-    delete process.env.npm_config_proxy;
-    assert.strictEqual('object', typeof proxy);
-    assert.strictEqual('plaintext', proxy.options.proxy.host);
-    assert.strictEqual(456, proxy.options.proxy.port);
-    assert.strictEqual(null, proxy.options.proxy.proxyAuth);
-    assert.strictEqual(443, proxy.defaultPort);
-    assert.strictEqual(logMsg, 'Via proxy http://plaintext:456 no credentials');
-  });
-});

test/unit/composite.js

@@ -269,7 +269,7 @@ describe('composite', () => {
           .resize(80)
           .composite([{
             input: fixtures.inputPngWithTransparency16bit,
-            gravity: gravity
+            gravity
           }])
           .toBuffer((err, data, info) => {
             if (err) throw err;
@@ -314,7 +314,7 @@ describe('composite', () => {
           .composite([{
             input: fixtures.inputPngWithTransparency16bit,
             tile: true,
-            gravity: gravity
+            gravity
           }])
           .toBuffer((err, data, info) => {
             if (err) throw err;
@@ -472,4 +472,28 @@ describe('composite', () => {
     assert.strictEqual(b, 19);
     assert.strictEqual(a, 128);
   });
+
+  it('Ensure tiled overlay is fully decoded', async () => {
+    const tile = await sharp({
+      create: {
+        width: 8, height: 513, channels: 3, background: 'red'
+      }
+    })
+      .png({ compressionLevel: 0 })
+      .toBuffer();
+
+    const { info } = await sharp({
+      create: {
+        width: 8, height: 514, channels: 3, background: 'green'
+      }
+    })
+      .composite([{
+        input: tile,
+        tile: true
+      }])
+      .toBuffer({ resolveWithObject: true });
+
+    assert.strictEqual(info.width, 8);
+    assert.strictEqual(info.height, 514);
+  });
 });

test/unit/extend.js

@@ -40,7 +40,7 @@ describe('Extend', function () {
       sharp(fixtures.inputWebPAnimated, { pages: -1 })
         .resize(120)
         .extend({
-          extendWith: extendWith,
+          extendWith,
           top: 40,
           bottom: 40,
           left: 40,
@@ -58,7 +58,7 @@ describe('Extend', function () {
       sharp(fixtures.inputJpg)
         .resize(120)
         .extend({
-          extendWith: extendWith,
+          extendWith,
           top: 10,
           bottom: 10,
           left: 10,
@@ -77,7 +77,7 @@ describe('Extend', function () {
       sharp(fixtures.inputPngWithTransparency16bit)
         .resize(120)
         .extend({
-          extendWith: extendWith,
+          extendWith,
           top: 50,
           left: 10,
           right: 35,
@@ -94,7 +94,7 @@ describe('Extend', function () {
     it(`PNG with 2 channels (${extendWith})`, function (done) {
       sharp(fixtures.inputPngWithGreyAlpha)
         .extend({
-          extendWith: extendWith,
+          extendWith,
           top: 50,
           bottom: 50,
           left: 80,

test/unit/extract.js

@@ -319,5 +319,16 @@ describe('Partial image extraction', function () {
       s.extract(options);
       assert.strictEqual(warningMessage, 'ignoring previous extract options');
     });
+
+    it('Multiple extract+resize emits warning', () => {
+      let warningMessage = '';
+      const s = sharp();
+      s.on('warning', function (msg) { warningMessage = msg; });
+      const options = { top: 0, left: 0, width: 1, height: 1 };
+      s.extract(options).extract(options);
+      assert.strictEqual(warningMessage, '');
+      s.resize(1);
+      assert.strictEqual(warningMessage, 'operation order will be: extract, resize, extract');
+    });
   });
 });

test/unit/heif.js

@@ -8,34 +8,34 @@ const assert = require('assert');
 const sharp = require('../../');
 
 describe('HEIF', () => {
-  it('called without options does not throw an error', () => {
-    assert.doesNotThrow(() => {
+  it('called without options throws an error', () => {
+    assert.throws(() => {
       sharp().heif();
     });
   });
   it('valid quality does not throw an error', () => {
     assert.doesNotThrow(() => {
-      sharp().heif({ quality: 80 });
+      sharp().heif({ compression: 'av1', quality: 80 });
     });
   });
   it('invalid quality should throw an error', () => {
     assert.throws(() => {
-      sharp().heif({ quality: 101 });
+      sharp().heif({ compression: 'av1', quality: 101 });
     });
   });
   it('non-numeric quality should throw an error', () => {
     assert.throws(() => {
-      sharp().heif({ quality: 'fail' });
+      sharp().heif({ compression: 'av1', quality: 'fail' });
     });
   });
   it('valid lossless does not throw an error', () => {
     assert.doesNotThrow(() => {
-      sharp().heif({ lossless: true });
+      sharp().heif({ compression: 'av1', lossless: true });
     });
   });
   it('non-boolean lossless should throw an error', () => {
     assert.throws(() => {
-      sharp().heif({ lossless: 'fail' });
+      sharp().heif({ compression: 'av1', lossless: 'fail' });
     });
   });
   it('valid compression does not throw an error', () => {
@@ -55,27 +55,27 @@ describe('HEIF', () => {
   });
   it('valid effort does not throw an error', () => {
     assert.doesNotThrow(() => {
-      sharp().heif({ effort: 6 });
+      sharp().heif({ compression: 'av1', effort: 6 });
     });
   });
   it('out of range effort should throw an error', () => {
     assert.throws(() => {
-      sharp().heif({ effort: 10 });
+      sharp().heif({ compression: 'av1', effort: 10 });
     });
   });
   it('invalid effort should throw an error', () => {
     assert.throws(() => {
-      sharp().heif({ effort: 'fail' });
+      sharp().heif({ compression: 'av1', effort: 'fail' });
     });
   });
   it('invalid chromaSubsampling should throw an error', () => {
     assert.throws(() => {
-      sharp().heif({ chromaSubsampling: 'fail' });
+      sharp().heif({ compression: 'av1', chromaSubsampling: 'fail' });
     });
   });
   it('valid chromaSubsampling does not throw an error', () => {
     assert.doesNotThrow(() => {
-      sharp().heif({ chromaSubsampling: '4:4:4' });
+      sharp().heif({ compression: 'av1', chromaSubsampling: '4:4:4' });
     });
   });
 });

test/unit/io.js

@@ -914,7 +914,7 @@ describe('Input/output', function () {
         channels: 3,
         background: { r: 0, g: 255, b: 0 }
       };
-      sharp({ create: create })
+      sharp({ create })
         .jpeg()
         .toBuffer(function (err, data, info) {
           if (err) throw err;
@@ -932,7 +932,7 @@ describe('Input/output', function () {
         channels: 4,
         background: { r: 255, g: 0, b: 0, alpha: 128 }
       };
-      sharp({ create: create })
+      sharp({ create })
         .png()
         .toBuffer(function (err, data, info) {
           if (err) throw err;
@@ -951,7 +951,7 @@ describe('Input/output', function () {
         background: { r: 0, g: 0, b: 0 }
       };
       assert.throws(function () {
-        sharp({ create: create });
+        sharp({ create });
       });
     });
     it('Missing background', function () {
@@ -961,7 +961,7 @@ describe('Input/output', function () {
         channels: 3
       };
       assert.throws(function () {
-        sharp({ create: create });
+        sharp({ create });
       });
     });
   });

test/unit/jpeg.js

@@ -36,7 +36,7 @@ describe('JPEG', function () {
     [-1, 88.2, 'test'].forEach(function (quality) {
       it(quality.toString(), function () {
         assert.throws(function () {
-          sharp().jpeg({ quality: quality });
+          sharp().jpeg({ quality });
         });
       });
     });

test/unit/libvips.js

@@ -7,7 +7,6 @@ const assert = require('assert');
 const fs = require('fs');
 const semver = require('semver');
 const libvips = require('../../lib/libvips');
-const mockFS = require('mock-fs');
 
 const originalPlatform = process.platform;
 
@@ -59,10 +58,6 @@ describe('libvips binaries', function () {
       assert.strictEqual('string', typeof minimumLibvipsVersion);
       assert.notStrictEqual(null, semver.valid(minimumLibvipsVersion));
     });
-    it('hasVendoredLibvips returns a boolean', function () {
-      const hasVendoredLibvips = libvips.hasVendoredLibvips();
-      assert.strictEqual('boolean', typeof hasVendoredLibvips);
-    });
     it('useGlobalLibvips can be ignored via an env var', function () {
       process.env.SHARP_IGNORE_GLOBAL_LIBVIPS = 1;
 
@@ -71,62 +66,48 @@ describe('libvips binaries', function () {
 
       delete process.env.SHARP_IGNORE_GLOBAL_LIBVIPS;
     });
-    it('cachePath returns a valid path ending with _libvips', function () {
-      const cachePath = libvips.cachePath();
-      assert.strictEqual('string', typeof cachePath);
-      assert.strictEqual('_libvips', cachePath.substr(-8));
-      assert.strictEqual(true, fs.existsSync(cachePath));
+  });
+
+  describe('Build time platform detection', () => {
+    it('Can override platform with npm_config_platform and npm_config_libc', () => {
+      process.env.npm_config_platform = 'testplatform';
+      process.env.npm_config_libc = 'testlibc';
+      const [platform] = libvips.buildPlatformArch().split('-');
+      assert.strictEqual(platform, 'testplatformtestlibc');
+      delete process.env.npm_config_platform;
+      delete process.env.npm_config_libc;
+    });
+    it('Can override arch with npm_config_arch', () => {
+      process.env.npm_config_arch = 'test';
+      const [, arch] = libvips.buildPlatformArch().split('-');
+      assert.strictEqual(arch, 'test');
+      delete process.env.npm_config_arch;
     });
   });
 
-  describe('integrity', function () {
-    it('reads value from environment variable', function () {
-      const prev = process.env.npm_package_config_integrity_platform_arch;
-      process.env.npm_package_config_integrity_platform_arch = 'sha512-test';
-
-      const integrity = libvips.integrity('platform-arch');
-      assert.strictEqual('sha512-test', integrity);
-
-      process.env.npm_package_config_integrity_platform_arch = prev;
+  describe('Build time directories', () => {
+    it('sharp-libvips include', () => {
+      const dir = libvips.buildSharpLibvipsIncludeDir();
+      assert.strictEqual(fs.statSync(dir).isDirectory(), true);
     });
-    it('reads value from package.json', function () {
-      const prev = process.env.npm_package_config_integrity_linux_x64;
-      delete process.env.npm_package_config_integrity_linux_x64;
-
-      const integrity = libvips.integrity('linux-x64');
-      assert.strictEqual('sha512-', integrity.substr(0, 7));
-
-      process.env.npm_package_config_integrity_linux_x64 = prev;
+    it('sharp-libvips cplusplus', () => {
+      const dir = libvips.buildSharpLibvipsCPlusPlusDir();
+      assert.strictEqual(fs.statSync(dir).isDirectory(), true);
+    });
+    it('sharp-libvips lib', () => {
+      const dir = libvips.buildSharpLibvipsLibDir();
+      assert.strictEqual(fs.statSync(dir).isDirectory(), true);
     });
   });
 
-  describe('safe directory creation', function () {
-    before(function () {
-      mockFS({
-        exampleDirA: {
-          exampleDirB: {
-            exampleFile: 'Example test file'
-          }
-        }
-      });
+  describe('Runtime detection', () => {
+    it('platform', () => {
+      const [platform] = libvips.runtimePlatformArch().split('-');
+      assert.strict(['darwin', 'linux', 'linuxmusl', 'win32'].includes(platform));
     });
-    after(function () { mockFS.restore(); });
-
-    it('mkdirSync creates a directory', function () {
-      const dirPath = 'createdDir';
-
-      libvips.mkdirSync(dirPath);
-      assert.strictEqual(true, fs.existsSync(dirPath));
-    });
-    it('mkdirSync does not throw error or overwrite an existing dir', function () {
-      const dirPath = 'exampleDirA';
-      const nestedDirPath = 'exampleDirA/exampleDirB';
-      assert.strictEqual(true, fs.existsSync(dirPath));
-
-      libvips.mkdirSync(dirPath);
-
-      assert.strictEqual(true, fs.existsSync(dirPath));
-      assert.strictEqual(true, fs.existsSync(nestedDirPath));
+    it('arch', () => {
+      const [, arch] = libvips.runtimePlatformArch().split('-');
+      assert.strict(['arm', 'arm64', 'ia32', 'x64'].includes(arch));
     });
   });
 

test/unit/metadata.js

@@ -55,8 +55,8 @@ describe('Image metadata', function () {
       assert.strictEqual(true, metadata.exif instanceof Buffer);
       const exif = exifReader(metadata.exif);
       assert.strictEqual('object', typeof exif);
-      assert.strictEqual('object', typeof exif.image);
-      assert.strictEqual('number', typeof exif.image.XResolution);
+      assert.strictEqual('object', typeof exif.Image);
+      assert.strictEqual('number', typeof exif.Image.XResolution);
       // ICC
       assert.strictEqual('object', typeof metadata.icc);
       assert.strictEqual(true, metadata.icc instanceof Buffer);
@@ -523,8 +523,8 @@ describe('Image metadata', function () {
           // EXIF
           const exif = exifReader(metadata.exif);
           assert.strictEqual('object', typeof exif);
-          assert.strictEqual('object', typeof exif.image);
-          assert.strictEqual('number', typeof exif.image.XResolution);
+          assert.strictEqual('object', typeof exif.Image);
+          assert.strictEqual('number', typeof exif.Image.XResolution);
           // ICC
           assert.strictEqual('object', typeof metadata.icc);
           assert.strictEqual(true, metadata.icc instanceof Buffer);
@@ -589,8 +589,8 @@ describe('Image metadata', function () {
           // EXIF
           const exif = exifReader(metadata.exif);
           assert.strictEqual('object', typeof exif);
-          assert.strictEqual('object', typeof exif.image);
-          assert.strictEqual('number', typeof exif.image.XResolution);
+          assert.strictEqual('object', typeof exif.Image);
+          assert.strictEqual('number', typeof exif.Image.XResolution);
           // ICC
           assert.strictEqual('object', typeof metadata.icc);
           assert.strictEqual(true, metadata.icc instanceof Buffer);
@@ -656,8 +656,8 @@ describe('Image metadata', function () {
 
     const { exif } = await sharp(data).metadata();
     const parsedExif = exifReader(exif);
-    assert.strictEqual(parsedExif.image.Software, 'sharp');
-    assert.strictEqual(parsedExif.exif.ExposureTime, 0.2);
+    assert.strictEqual(parsedExif.Image.Software, 'sharp');
+    assert.strictEqual(parsedExif.Photo.ExposureTime, 0.2);
   });
 
   it('Set density of JPEG', async () => {
@@ -794,6 +794,42 @@ describe('Image metadata', function () {
     assert.strictEqual(intent, 'Perceptual');
   });
 
+  it('withMetadata adds default sRGB profile to RGB16', async () => {
+    const data = await sharp({
+      create: {
+        width: 8, height: 8, channels: 4, background: 'orange'
+      }
+    })
+      .toColorspace('rgb16')
+      .png()
+      .withMetadata()
+      .toBuffer();
+
+    const metadata = await sharp(data).metadata();
+    assert.strictEqual(metadata.depth, 'ushort');
+
+    const { description } = icc.parse(metadata.icc);
+    assert.strictEqual(description, 'sRGB');
+  });
+
+  it('withMetadata adds P3 profile to 16-bit PNG', async () => {
+    const data = await sharp({
+      create: {
+        width: 8, height: 8, channels: 4, background: 'orange'
+      }
+    })
+      .toColorspace('rgb16')
+      .png()
+      .withMetadata({ icc: 'p3' })
+      .toBuffer();
+
+    const metadata = await sharp(data).metadata();
+    assert.strictEqual(metadata.depth, 'ushort');
+
+    const { description } = icc.parse(metadata.icc);
+    assert.strictEqual(description, 'sP3C');
+  });
+
   it('File input with corrupt header fails gracefully', function (done) {
     sharp(fixtures.inputJpgWithCorruptHeader)
       .metadata(function (err) {

test/unit/platform.js

@@ -1,91 +0,0 @@
-// Copyright 2013 Lovell Fuller and others.
-// SPDX-License-Identifier: Apache-2.0
-
-'use strict';
-
-const assert = require('assert');
-const platform = require('../../lib/platform');
-
-describe('Platform-detection', function () {
-  it('Can override arch with npm_config_arch', function () {
-    process.env.npm_config_arch = 'test';
-    assert.strictEqual('test', platform().split('-')[1]);
-    delete process.env.npm_config_arch;
-  });
-
-  it('Can override platform with npm_config_platform', function () {
-    process.env.npm_config_platform = 'test';
-    assert.strictEqual('test', platform().split('-')[0]);
-    delete process.env.npm_config_platform;
-  });
-
-  it('Can override ARM version via --arm-version', function () {
-    process.env.npm_config_arch = 'arm';
-    process.env.npm_config_arm_version = 'test';
-    assert.strictEqual('armvtest', platform().split('-')[1]);
-    delete process.env.npm_config_arm_version;
-    delete process.env.npm_config_arch;
-  });
-
-  it('Can override ARM64 version via --arm-version', function () {
-    process.env.npm_config_arch = 'arm64';
-    process.env.npm_config_arm_version = 'test';
-    assert.strictEqual('arm64vtest', platform().split('-')[1]);
-    delete process.env.npm_config_arm_version;
-    delete process.env.npm_config_arch;
-  });
-
-  if (process.config.variables.arm_version) {
-    it('Can detect ARM version via process.config', function () {
-      process.env.npm_config_arch = 'arm';
-      assert.strictEqual(`armv${process.config.variables.arm_version}`, platform().split('-')[1]);
-      delete process.env.npm_config_arch;
-    });
-  }
-
-  if (!process.config.variables.arm_version) {
-    it('Defaults to ARMv6 for 32-bit', function () {
-      process.env.npm_config_arch = 'arm';
-      assert.strictEqual('armv6', platform().split('-')[1]);
-      delete process.env.npm_config_arch;
-    });
-  }
-
-  it('Defaults to ARMv8 for 64-bit', function () {
-    process.env.npm_config_arch = 'arm64';
-    assert.strictEqual('arm64v8', platform().split('-')[1]);
-    delete process.env.npm_config_arch;
-  });
-
-  it('Can ensure version ARMv7 if electron version is present', function () {
-    process.env.npm_config_arch = 'arm';
-    process.versions.electron = 'test';
-    assert.strictEqual('armv7', platform().split('-')[1]);
-    delete process.env.npm_config_arch;
-    delete process.versions.electron;
-  });
-
-  it('Can override libc if platform is linux', function () {
-    process.env.npm_config_platform = 'linux';
-    process.env.npm_config_libc = 'test';
-    assert.strictEqual('linuxtest', platform().split('-')[0]);
-    delete process.env.npm_config_platform;
-    delete process.env.npm_config_libc;
-  });
-
-  it('Handles libc value "glibc" as default linux', function () {
-    process.env.npm_config_platform = 'linux';
-    process.env.npm_config_libc = 'glibc';
-    assert.strictEqual('linux', platform().split('-')[0]);
-    delete process.env.npm_config_platform;
-    delete process.env.npm_config_libc;
-  });
-
-  it('Discards libc value on non-linux platform', function () {
-    process.env.npm_config_platform = 'win32';
-    process.env.npm_config_libc = 'gnuwin32';
-    assert.strictEqual('win32', platform().split('-')[0]);
-    delete process.env.npm_config_platform;
-    delete process.env.npm_config_libc;
-  });
-});

test/unit/raw.js

@@ -284,4 +284,42 @@ describe('Raw pixel data', function () {
       );
     }
   });
+
+  describe('16-bit roundtrip', () => {
+    it('grey', async () => {
+      const grey = 42000;
+      const png = await sharp(
+        Uint16Array.from([grey]),
+        { raw: { width: 1, height: 1, channels: 1 } }
+      )
+        .toColourspace('grey16')
+        .png({ compressionLevel: 0 })
+        .toBuffer();
+      const raw = await sharp(png)
+        .toColourspace('grey16')
+        .raw({ depth: 'ushort' })
+        .toBuffer();
+
+      assert.strictEqual(raw.readUint16LE(0), grey);
+    });
+
+    it('RGB', async () => {
+      const rgb = [10946, 28657, 46368];
+      const png = await sharp(
+        Uint16Array.from(rgb),
+        { raw: { width: 1, height: 1, channels: 3 } }
+      )
+        .toColourspace('rgb16')
+        .png({ compressionLevel: 0 })
+        .toBuffer();
+      const raw = await sharp(png)
+        .toColourspace('rgb16')
+        .raw({ depth: 'ushort' })
+        .toBuffer();
+
+      assert.strictEqual(raw.readUint16LE(0), rgb[0]);
+      assert.strictEqual(raw.readUint16LE(2), rgb[1]);
+      assert.strictEqual(raw.readUint16LE(4), rgb[2]);
+    });
+  });
 });

test/unit/resize.js

@@ -646,7 +646,7 @@ describe('Resize dimensions', function () {
   ].forEach(function (kernel) {
     it(`kernel ${kernel}`, function (done) {
       sharp(fixtures.inputJpg)
-        .resize(320, null, { kernel: kernel })
+        .resize(320, null, { kernel })
         .toBuffer(function (err, data, info) {
           if (err) throw err;
           assert.strictEqual('jpeg', info.format);

test/unit/text.js

@@ -66,7 +66,7 @@ describe('Text to image', function () {
     const text = sharp({
       text: {
         text: 'Hello, world!',
-        dpi: dpi
+        dpi
       }
     });
     text.toFile(output, function (err, info) {
@@ -87,7 +87,7 @@ describe('Text to image', function () {
       text: {
         text: '<span foreground="red" font="100">red</span><span font="50" background="cyan">blue</span>',
         rgba: true,
-        dpi: dpi
+        dpi
       }
     });
     text.toFile(output, function (err, info) {
@@ -146,7 +146,7 @@ describe('Text to image', function () {
           text: {
             text: '<span background="cyan">cool</span>',
             font: 'sans 30',
-            dpi: dpi,
+            dpi,
             rgba: true
           }
         },

test/unit/tile.js

@@ -125,7 +125,7 @@ describe('Tile', function () {
     [1, 8192].forEach(function (size) {
       assert.doesNotThrow(function () {
         sharp().tile({
-          size: size
+          size
         });
       });
     });
@@ -135,7 +135,7 @@ describe('Tile', function () {
     ['zoinks', 1.1, -1, 0, 8193].forEach(function (size) {
       assert.throws(function () {
         sharp().tile({
-          size: size
+          size
         });
       });
     });
@@ -146,7 +146,7 @@ describe('Tile', function () {
       assert.doesNotThrow(function () {
         sharp().tile({
           size: 8192,
-          overlap: overlap
+          overlap
         });
       });
     });
@@ -156,7 +156,7 @@ describe('Tile', function () {
     ['zoinks', 1.1, -1, 8193].forEach(function (overlap) {
       assert.throws(function () {
         sharp().tile({
-          overlap: overlap
+          overlap
         });
       });
     });
@@ -166,7 +166,7 @@ describe('Tile', function () {
     ['fs', 'zip'].forEach(function (container) {
       assert.doesNotThrow(function () {
         sharp().tile({
-          container: container
+          container
         });
       });
     });
@@ -176,7 +176,7 @@ describe('Tile', function () {
     ['zoinks', 1].forEach(function (container) {
       assert.throws(function () {
         sharp().tile({
-          container: container
+          container
         });
       });
     });
@@ -186,7 +186,7 @@ describe('Tile', function () {
     ['dz', 'google', 'zoomify'].forEach(function (layout) {
       assert.doesNotThrow(function () {
         sharp().tile({
-          layout: layout
+          layout
         });
       });
     });
@@ -196,7 +196,7 @@ describe('Tile', function () {
     ['zoinks', 1].forEach(function (layout) {
       assert.throws(function () {
         sharp().tile({
-          layout: layout
+          layout
         });
       });
     });
@@ -254,7 +254,7 @@ describe('Tile', function () {
     [90, 270, -90].forEach(function (angle) {
       assert.doesNotThrow(function () {
         sharp().tile({
-          angle: angle
+          angle
         });
       });
     });
@@ -264,7 +264,7 @@ describe('Tile', function () {
     ['zoinks', 1.1, -1, 27].forEach(function (angle) {
       assert.throws(function () {
         sharp().tile({
-          angle: angle
+          angle
         });
       });
     });

test/unit/util.js

@@ -146,14 +146,6 @@ describe('Utilities', function () {
     });
   });
 
-  describe('Vendor', function () {
-    it('Contains expected attributes', function () {
-      assert.strictEqual('object', typeof sharp.vendor);
-      assert.strictEqual('string', typeof sharp.vendor.current);
-      assert.strictEqual(true, Array.isArray(sharp.vendor.installed));
-    });
-  });
-
   describe('Block', () => {
     it('Can block a named operation', () => {
       sharp.block({ operation: ['test'] });