Prerelease v0.33.1-rc.3

npm 10 seems to be opening thousands of network connections,
leading to resource starvation in Node.js 18. This does not
appear to impact Node.js 20.

.cirrus.yml

@@ -1,5 +1,5 @@
 freebsd_instance:
-  image_family: freebsd-13-2
+  image_family: freebsd-14-0-snap
 
 task:
   name: FreeBSD
@@ -10,7 +10,8 @@ task:
     - pkg update -f
     - pkg upgrade -y
     - pkg install -y devel/git devel/pkgconf graphics/vips www/node20 www/npm
+    - pkg-config --modversion vips-cpp
   install_script:
     - npm install --build-from-source
   test_script:
-    - npm test
+    - npx mocha --no-config --spec=test/unit/io.js --timeout=30000

.github/ISSUE_TEMPLATE/installation.md

@@ -11,7 +11,10 @@ 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 read and understood all of the [documentation relating to installation](https://sharp.pixelplumbing.com/install).
+- [ ] I have searched for known bugs relating to this problem in my choice of package manager.
+
+You must confirm both of these before continuing.
 
 ### Are you using the latest version of sharp?
 
@@ -27,21 +30,28 @@ If you are using another package which depends on a version of `sharp` that is n
 
 <!-- Please place an [x] in the relevant box to confirm. -->
 
-- [ ] I am using Node.js 18 with a version >= 18.17.0
+- [ ] I am using Node.js with a version that satisfies `^18.17.0 || ^20.3.0 || >=21.0.0`
-- [ ] I am using Node.js 20 with a version >= 20.3.0
+- [ ] I am using Deno
-- [ ] I am using Node.js 21 or later
+- [ ] I am using Bun
 
-If you cannot confirm any of these, please upgrade to the latest version and try again before opening an issue.
+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?
+### Are you using a supported package manager and installing optional dependencies?
 
 <!-- Please place an [x] in the relevant box to confirm. -->
 
-- [ ] I am using npm >= 9.6.5
+- [ ] I am using npm >= 9.6.5 with `--include=optional`
-- [ ] I am using yarn >= 3.2.0
+- [ ] I am using yarn >= 3.2.0 and I am not using the "Plug'n'Play" linker
-- [ ] I am using pnpm >= 7.1.0
+- [ ] I am using pnpm >= 7.1.0 with `--no-optional=false`
+- [ ] I am using Deno
+- [ ] I am using Bun
 
-If you cannot confirm any of these, please upgrade to the latest version and try again before opening an issue.
+If you cannot confirm any of these,
+please upgrade to the latest version of your chosen package manager
+and ensure you are allowing the installation of optional or multi-platform dependencies
+before opening an issue.
 
 ### What is the complete output of running `npm install --verbose --foreground-scripts sharp` in an empty directory?
 

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
             platform: darwin-x64
           - os: windows-2019
             nodejs_arch: x86
-            nodejs_version: "^18.17.0"
+            nodejs_version: "18.18.2" # pinned to avoid 18.19.0 and npm 10
             nodejs_version_major: 18
             platform: win32-ia32
             prebuild: true

.github/workflows/npm.yml

@@ -27,6 +27,10 @@ jobs:
             runs-on: ubuntu-22.04
             runtime: node
             package-manager: yarn
+          - name: linux-x64-node-yarn-pnp
+            runs-on: ubuntu-22.04
+            runtime: node
+            package-manager: yarn-pnp
           - name: linux-x64-deno
             runs-on: ubuntu-22.04
             runtime: deno
@@ -46,6 +50,10 @@ jobs:
             runs-on: macos-11
             runtime: node
             package-manager: yarn
+          - name: darwin-x64-node-yarn-pnp
+            runs-on: macos-11
+            runtime: node
+            package-manager: yarn-pnp
           - name: darwin-x64-deno
             runs-on: macos-11
             runtime: deno
@@ -65,6 +73,10 @@ jobs:
             runs-on: windows-2019
             runtime: node
             package-manager: yarn
+          - name: win32-x64-node-yarn-pnp
+            runs-on: windows-2019
+            runtime: node
+            package-manager: yarn-pnp
           - name: win32-x64-deno
             runs-on: windows-2019
             runtime: deno
@@ -105,7 +117,8 @@ jobs:
             {
               "dependencies": {
                 "sharp": "${{ steps.version.outputs.semver }}"
-              }
+              },
+              "type": "module"
             }
       - name: Create release.mjs
         uses: DamianReeves/write-file-action@v1.2
@@ -117,19 +130,19 @@ jobs:
             deepStrictEqual(['.jpg', '.jpeg', '.jpe'], sharp.format.jpeg.input.fileSuffix);
 
       - name: Run with Node.js + npm
-        if: ${{ matrix.runtime == 'node' && matrix.package-manager == 'npm' }}
+        if: ${{ matrix.package-manager == 'npm' }}
         run: |
           npm install --ignore-scripts
           node release.mjs
 
       - name: Run with Node.js + pnpm
-        if: ${{ matrix.runtime == 'node' && matrix.package-manager == 'pnpm' }}
+        if: ${{ matrix.package-manager == 'pnpm' }}
         run: |
           pnpm install --ignore-scripts
           node release.mjs
 
       - name: Run with Node.js + yarn
-        if: ${{ matrix.runtime == 'node' && matrix.package-manager == 'yarn' }}
+        if: ${{ matrix.package-manager == 'yarn' }}
         run: |
           corepack enable
           yarn set version stable
@@ -139,6 +152,17 @@ jobs:
           yarn install
           node release.mjs
 
+      - name: Run with Node.js + yarn pnp
+        if: ${{ matrix.package-manager == 'yarn-pnp' }}
+        run: |
+          corepack enable
+          yarn set version stable
+          yarn config set enableImmutableInstalls false
+          yarn config set enableScripts false
+          yarn config set nodeLinker pnp
+          yarn install
+          yarn node release.mjs
+
       - name: Run with Deno
         if: ${{ matrix.runtime == 'deno' }}
         run: deno run --allow-read --allow-ffi release.mjs

docs/api-utility.md

@@ -151,7 +151,7 @@ const counters = sharp.counters(); // { queue: 2, process: 4 }
 > simd([simd]) ⇒ <code>boolean</code>
 
 Get and set use of SIMD vector unit instructions.
-Requires libvips to have been compiled with liborc support.
+Requires libvips to have been compiled with highway support.
 
 Improves the performance of `resize`, `blur` and `sharpen` operations
 by taking advantage of the SIMD vector unit of the CPU, e.g. Intel SSE and ARM NEON.
@@ -165,12 +165,12 @@ by taking advantage of the SIMD vector unit of the CPU, e.g. Intel SSE and ARM N
 **Example**  
 ```js
 const simd = sharp.simd();
-// simd is `true` if the runtime use of liborc is currently enabled
+// simd is `true` if the runtime use of highway is currently enabled
 ```
 **Example**  
 ```js
 const simd = sharp.simd(false);
-// prevent libvips from using liborc at runtime
+// prevent libvips from using highway at runtime
 ```
 
 

docs/changelog.md

@@ -4,6 +4,18 @@
 
 Requires libvips v8.15.0
 
+### v0.33.1 - TBD
+
+* Add support for Yarn Plug'n'Play filesystem layout.
+  [#3888](https://github.com/lovell/sharp/issues/3888)
+
+* Emit warning when attempting to use invalid ICC profiles.
+  [#3895](https://github.com/lovell/sharp/issues/3895)
+
+* Ensure `VIPS_NOVECTOR` environment variable is respected.
+  [#3897](https://github.com/lovell/sharp/pull/3897)
+  [@icetee](https://github.com/icetee)
+
 ### v0.33.0 - 29th November 2023
 
 * Drop support for Node.js 14 and 16, now requires Node.js >= 18.17.0

docs/humans.txt

@@ -281,3 +281,6 @@ GitHub: https://github.com/dnsbty
 
 Name: Ingvar Stepanyan
 GitHub: https://github.com/RReverser
+
+Name: Tamás András Horváth
+GitHub: https://github.com/icetee

docs/install.md

@@ -2,6 +2,12 @@
 
 Works with your choice of JavaScript package manager.
 
+> ⚠️  **Please ensure your package manager is configured to install optional dependencies**
+
+If a package manager lockfile must support multiple platforms,
+please see the [cross-platform](#cross-platform) section
+to help decide which package manager is appropriate.
+
 ```sh
 npm install sharp
 ```
@@ -11,7 +17,12 @@ pnpm add sharp
 ```
 
 ```sh
-yarn add sharp # v3 recommended, Plug'n'Play unsupported
+yarn add sharp
+```
+
+```sh
+# yarn v1 (maintenance mode)
+yarn add sharp --ignore-engines
 ```
 
 ```sh
@@ -44,17 +55,21 @@ JPEG, PNG, WebP, AVIF (limited to 8-bit depth), TIFF, GIF and SVG (input) image
 
 ## Cross-platform
 
-At install time, package managers will automatically select prebuilt binaries for the current OS platform and CPU architecture, where available.
+At install time, package managers will automatically select prebuilt binaries
+for the current OS platform and CPU architecture, where available.
 
-Some package managers support multiple platforms and architectures within the same installation tree.
+Some package managers support multiple platforms and architectures
+within the same installation tree and/or using the same lockfile.
 
 ### npm
 
-Use the `--os`, `--cpu` and `--libc` flags:
+> ⚠️ **npm `package-lock.json` files can cause installation problems due to [npm bug #4828](https://github.com/npm/cli/issues/4828)**
+
+Provides limited support via `--os`, `--cpu` and `--libc` flags.
 
 Example to support both Intel and ARM CPUs on macOS:
 ```sh
-npm install --cpu=x64 --os=darwin  sharp
+npm install --cpu=x64 --os=darwin sharp
 npm install --cpu=arm64 --os=darwin sharp
 ```
 

install/check.js

@@ -3,34 +3,39 @@
 
 'use strict';
 
-const { useGlobalLibvips, globalLibvipsVersion, log, spawnRebuild } = require('../lib/libvips');
+try {
+  const { useGlobalLibvips, globalLibvipsVersion, log, spawnRebuild } = require('../lib/libvips');
 
-const buildFromSource = (msg) => {
+  const buildFromSource = (msg) => {
-  log(msg);
+    log(msg);
-  log('Attempting to build from source via node-gyp');
+    log('Attempting to build from source via node-gyp');
-  try {
+    try {
-    require('node-addon-api');
+      require('node-addon-api');
-    log('Found node-addon-api');
+      log('Found node-addon-api');
-  } catch (err) {
+    } catch (err) {
-    log('Please add node-addon-api to your dependencies');
+      log('Please add node-addon-api to your dependencies');
-    return;
+      return;
-  }
+    }
-  try {
+    try {
-    const gyp = require('node-gyp');
+      const gyp = require('node-gyp');
-    log(`Found node-gyp version ${gyp().version}`);
+      log(`Found node-gyp version ${gyp().version}`);
-  } catch (err) {
+    } catch (err) {
-    log('Please add node-gyp to your dependencies');
+      log('Please add node-gyp to your dependencies');
-    return;
+      return;
-  }
+    }
-  log('See https://sharp.pixelplumbing.com/install#building-from-source');
+    log('See https://sharp.pixelplumbing.com/install#building-from-source');
-  const status = spawnRebuild();
+    const status = spawnRebuild();
-  if (status !== 0) {
+    if (status !== 0) {
-    process.exit(status);
+      process.exit(status);
-  }
+    }
-};
+  };
 
-if (useGlobalLibvips()) {
+  if (useGlobalLibvips()) {
-  buildFromSource(`Detected globally-installed libvips v${globalLibvipsVersion()}`);
+    buildFromSource(`Detected globally-installed libvips v${globalLibvipsVersion()}`);
-} else if (process.env.npm_config_build_from_source) {
+  } else if (process.env.npm_config_build_from_source) {
-  buildFromSource('Detected --build-from-source flag');
+    buildFromSource('Detected --build-from-source flag');
+  }
+} catch (err) {
+  const summary = err.message.split(/\n/).slice(0, 1);
+  console.log(`sharp: skipping install check: ${summary}`);
 }

lib/index.d.ts

@@ -126,7 +126,7 @@ declare namespace sharp {
     function counters(): SharpCounters;
 
     /**
-     * Get and set use of SIMD vector unit instructions. Requires libvips to have been compiled with liborc support.
+     * Get and set use of SIMD vector unit instructions. Requires libvips to have been compiled with highway support.
      * Improves the performance of resize, blur and sharpen operations by taking advantage of the SIMD vector unit of the CPU, e.g. Intel SSE and ARM NEON.
      * @param enable enable or disable use of SIMD vector unit instructions
      * @returns true if usage of SIMD vector unit instructions is enabled

lib/libvips.js

@@ -4,11 +4,12 @@
 'use strict';
 
 const { spawnSync } = require('node:child_process');
+const { createHash } = require('node:crypto');
 const semverCoerce = require('semver/functions/coerce');
 const semverGreaterThanOrEqualTo = require('semver/functions/gte');
 const detectLibc = require('detect-libc');
 
-const { engines } = require('../package.json');
+const { engines, optionalDependencies } = require('../package.json');
 
 const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || /* istanbul ignore next */
   engines.libvips;
@@ -97,6 +98,17 @@ const isRosetta = () => {
   return false;
 };
 
+const sha512 = (s) => createHash('sha512').update(s).digest('hex');
+
+const yarnLocator = () => {
+  try {
+    const identHash = sha512(`imgsharp-libvips-${buildPlatformArch()}`);
+    const npmVersion = semverCoerce(optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`]).version;
+    return sha512(`${identHash}npm:${npmVersion}`).slice(0, 10);
+  } catch {}
+  return '';
+};
+
 /* istanbul ignore next */
 const spawnRebuild = () =>
   spawnSync(`node-gyp rebuild --directory=src ${isEmscripten() ? '--nodedir=emscripten' : ''}`, {
@@ -164,6 +176,7 @@ module.exports = {
   buildSharpLibvipsLibDir,
   runtimePlatformArch,
   log,
+  yarnLocator,
   spawnRebuild,
   globalLibvipsVersion,
   pkgConfigPath,

lib/sharp.js

@@ -46,41 +46,63 @@ if (sharp) {
   // Common error messages
   if (prebuiltPlatforms.includes(runtimePlatform)) {
     const [os, cpu] = runtimePlatform.split('-');
-    help.push('- Add platform-specific dependencies:');
+    help.push(
-    help.push(`    npm install --os=${os} --cpu=${cpu} sharp`);
+      '- Ensure optional dependencies can be installed:',
-    help.push('  or');
+      '    npm install --include=optional sharp',
-    help.push(`    npm install --force @img/sharp-${runtimePlatform}`);
+      '    yarn add sharp --ignore-engines',
+      '- Ensure your package manager supports multi-platform installation:',
+      '    See https://sharp.pixelplumbing.com/install#cross-platform',
+      '- Add platform-specific dependencies:',
+      `    npm install --os=${os} --cpu=${cpu} sharp`,
+      `    npm install --force @img/sharp-${runtimePlatform}`
+    );
   } else {
-    help.push(`- Manually install libvips >= ${minimumLibvipsVersion}`);
+    help.push(
-    help.push('- Add experimental WebAssembly-based dependencies:');
+      `- Manually install libvips >= ${minimumLibvipsVersion}`,
-    help.push('    npm install --cpu=wasm32 sharp');
+      '- Add experimental WebAssembly-based dependencies:',
+      '    npm install --cpu=wasm32 sharp',
+      '    npm install --force @img/sharp-wasm32'
+    );
   }
-  if (isLinux && /symbol not found/i.test(messages)) {
+  if (isLinux && /(symbol not found|CXXABI_)/i.test(messages)) {
     try {
       const { engines } = require(`@img/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(
-      help.push(`    Found ${libcFound}`);
+        '- Update your OS:',
-      help.push(`    Requires ${libcRequires}`);
+        `    Found ${libcFound}`,
+        `    Requires ${libcRequires}`
+      );
     } catch (errEngines) {}
   }
+  if (isLinux && /\/snap\/core[0-9]{2}/.test(messages)) {
+    help.push(
+      '- Remove the Node.js Snap, which does not support native modules',
+      '    snap remove node'
+    );
+  }
   if (isMacOs && /Incompatible library version/.test(messages)) {
-    help.push('- Update Homebrew:');
+    help.push(
-    help.push('    brew update && brew upgrade vips');
+      '- Update Homebrew:',
+      '    brew update && brew upgrade vips'
+    );
   }
   if (errors.some(err => err.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 (isWindows && /The specified procedure could not be found/.test(messages)) {
-    help.push('- Using the canvas package on Windows? See https://sharp.pixelplumbing.com/install#canvas-and-windows');
+    help.push(
-  } else {
+      '- Using the canvas package on Windows?',
-    help.push('- Consult the installation documentation: https://sharp.pixelplumbing.com/install');
+      '    See https://sharp.pixelplumbing.com/install#canvas-and-windows',
+      '- Check for outdated versions of sharp in the dependency tree:',
+      '    npm ls sharp'
+    );
   }
+  help.push(
+    '- Consult the installation documentation:',
+    '    See https://sharp.pixelplumbing.com/install'
+  );
   throw new Error(help.join('\n'));
 }

lib/utility.js

@@ -183,17 +183,17 @@ function counters () {
 
 /**
  * Get and set use of SIMD vector unit instructions.
- * Requires libvips to have been compiled with liborc support.
+ * Requires libvips to have been compiled with highway support.
  *
  * Improves the performance of `resize`, `blur` and `sharpen` operations
  * by taking advantage of the SIMD vector unit of the CPU, e.g. Intel SSE and ARM NEON.
  *
  * @example
  * const simd = sharp.simd();
- * // simd is `true` if the runtime use of liborc is currently enabled
+ * // simd is `true` if the runtime use of highway is currently enabled
  * @example
  * const simd = sharp.simd(false);
- * // prevent libvips from using liborc at runtime
+ * // prevent libvips from using highway at runtime
  *
  * @param {boolean} [simd=true]
  * @returns {boolean}
@@ -201,7 +201,6 @@ function counters () {
 function simd (simd) {
   return sharp.simd(is.bool(simd) ? simd : null);
 }
-simd(true);
 
 /**
  * Block libvips operations at runtime.

npm/darwin-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-darwin-arm64",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with macOS 64-bit ARM",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-darwin-x64",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with macOS x64",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/linux-arm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linux-arm",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with Linux (glibc) ARM (32-bit)",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/linux-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linux-arm64",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with Linux (glibc) 64-bit ARM",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/linux-s390x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linux-s390x",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with Linux (glibc) s390x",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/linux-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linux-x64",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with Linux (glibc) x64",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/linuxmusl-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linuxmusl-arm64",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with Linux (musl) 64-bit ARM",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/linuxmusl-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linuxmusl-x64",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with Linux (musl) x64",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "private": "true",
   "workspaces": [
     "darwin-arm64",

npm/wasm32/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-wasm32",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with wasm32",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/win32-ia32/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-win32-ia32",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with Windows x86 (32-bit)",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/win32-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-win32-x64",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "description": "Prebuilt sharp for use with Windows x64",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

package.json

@@ -1,9 +1,9 @@
 {
   "name": "sharp",
   "description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
-  "version": "0.33.0",
+  "version": "0.33.1-rc.3",
   "author": "Lovell Fuller <npm@lovell.info>",
-  "homepage": "https://github.com/lovell/sharp",
+  "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
     "Pierre Inglebert <pierre.inglebert@gmail.com>",
     "Jonathan Ong <jonathanrichardong@gmail.com>",
@@ -141,8 +141,8 @@
     "semver": "^7.5.4"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.33.0",
+    "@img/sharp-darwin-arm64": "0.33.1-rc.3",
-    "@img/sharp-darwin-x64": "0.33.0",
+    "@img/sharp-darwin-x64": "0.33.1-rc.3",
     "@img/sharp-libvips-darwin-arm64": "1.0.0",
     "@img/sharp-libvips-darwin-x64": "1.0.0",
     "@img/sharp-libvips-linux-arm": "1.0.0",
@@ -151,15 +151,15 @@
     "@img/sharp-libvips-linux-x64": "1.0.0",
     "@img/sharp-libvips-linuxmusl-arm64": "1.0.0",
     "@img/sharp-libvips-linuxmusl-x64": "1.0.0",
-    "@img/sharp-linux-arm": "0.33.0",
+    "@img/sharp-linux-arm": "0.33.1-rc.3",
-    "@img/sharp-linux-arm64": "0.33.0",
+    "@img/sharp-linux-arm64": "0.33.1-rc.3",
-    "@img/sharp-linux-s390x": "0.33.0",
+    "@img/sharp-linux-s390x": "0.33.1-rc.3",
-    "@img/sharp-linux-x64": "0.33.0",
+    "@img/sharp-linux-x64": "0.33.1-rc.3",
-    "@img/sharp-linuxmusl-arm64": "0.33.0",
+    "@img/sharp-linuxmusl-arm64": "0.33.1-rc.3",
-    "@img/sharp-linuxmusl-x64": "0.33.0",
+    "@img/sharp-linuxmusl-x64": "0.33.1-rc.3",
-    "@img/sharp-wasm32": "0.33.0",
+    "@img/sharp-wasm32": "0.33.1-rc.3",
-    "@img/sharp-win32-ia32": "0.33.0",
+    "@img/sharp-win32-ia32": "0.33.1-rc.3",
-    "@img/sharp-win32-x64": "0.33.0"
+    "@img/sharp-win32-x64": "0.33.1-rc.3"
   },
   "devDependencies": {
     "@emnapi/runtime": "^0.44.0",

src/binding.gyp

@@ -6,6 +6,7 @@
     'vips_version': '<!(node -p "require(\'../lib/libvips\').minimumLibvipsVersion")',
     'platform_and_arch': '<!(node -p "require(\'../lib/libvips\').buildPlatformArch()")',
     'sharp_libvips_version': '<!(node -p "require(\'../package.json\').optionalDependencies[\'@img/sharp-libvips-<(platform_and_arch)\']")',
+    'sharp_libvips_yarn_locator': '<!(node -p "require(\'../lib/libvips\').yarnLocator()")',
     '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()")'
@@ -157,7 +158,8 @@
                 '-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../../sharp-libvips-<(platform_and_arch)/<(sharp_libvips_version)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath,\'@loader_path/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
+                '-Wl,-rpath,\'@loader_path/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath,\'@loader_path/../../../../../@img-sharp-libvips-<(platform_and_arch)-npm-<(sharp_libvips_version)-<(sharp_libvips_yarn_locator)/node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
               ]
             }
           }],
@@ -176,7 +178,8 @@
                 '-Wl,-rpath=\'$$ORIGIN/../../sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath=\'$$ORIGIN/../../../sharp-libvips-<(platform_and_arch)/<(sharp_libvips_version)/lib\'',
                 '-Wl,-rpath=\'$$ORIGIN/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
+                '-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath,\'$$ORIGIN/../../../../../@img-sharp-libvips-<(platform_and_arch)-npm-<(sharp_libvips_version)-<(sharp_libvips_yarn_locator)/node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
               ]
             }
           }],

src/pipeline.cc

@@ -794,11 +794,15 @@ class PipelineWorker : public Napi::AsyncWorker {
 
       // Apply output ICC profile
       if (!baton->withIccProfile.empty()) {
-        image = image.icc_transform(const_cast<char*>(baton->withIccProfile.data()), VImage::option()
+        try {
-          ->set("input_profile", processingProfile)
+          image = image.icc_transform(const_cast<char*>(baton->withIccProfile.data()), VImage::option()
-          ->set("embedded", TRUE)
+            ->set("input_profile", processingProfile)
-          ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
+            ->set("embedded", TRUE)
-          ->set("intent", VIPS_INTENT_PERCEPTUAL));
+            ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
+            ->set("intent", VIPS_INTENT_PERCEPTUAL));
+        } catch(...) {
+          sharp::VipsWarningCallback(nullptr, G_LOG_LEVEL_WARNING, "Invalid profile", nullptr);
+        }
       } else if (baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) {
         image = sharp::SetProfile(image, inputProfile);
       }

test/unit/libvips.js

@@ -96,22 +96,28 @@ describe('libvips binaries', function () {
   describe('Build time directories', () => {
     it('sharp-libvips include', () => {
       const dir = libvips.buildSharpLibvipsIncludeDir();
-      assert.strictEqual(fs.statSync(dir).isDirectory(), true);
+      if (dir) {
+        assert.strictEqual(fs.statSync(dir).isDirectory(), true);
+      }
     });
     it('sharp-libvips cplusplus', () => {
       const dir = libvips.buildSharpLibvipsCPlusPlusDir();
-      assert.strictEqual(fs.statSync(dir).isDirectory(), true);
+      if (dir) {
+        assert.strictEqual(fs.statSync(dir).isDirectory(), true);
+      }
     });
     it('sharp-libvips lib', () => {
       const dir = libvips.buildSharpLibvipsLibDir();
-      assert.strictEqual(fs.statSync(dir).isDirectory(), true);
+      if (dir) {
+        assert.strictEqual(fs.statSync(dir).isDirectory(), true);
+      }
     });
   });
 
   describe('Runtime detection', () => {
     it('platform', () => {
       const [platform] = libvips.runtimePlatformArch().split('-');
-      assert.strict(['darwin', 'linux', 'linuxmusl', 'win32'].includes(platform));
+      assert.strict(['darwin', 'freebsd', 'linux', 'linuxmusl', 'win32'].includes(platform));
     });
     it('arch', () => {
       const [, arch] = libvips.runtimePlatformArch().split('-');
@@ -144,4 +150,26 @@ describe('libvips binaries', function () {
       libvips.log(new Error('problem'));
     });
   });
+
+  describe('yarn locator hash', () => {
+    it('known platform', () => {
+      const cc = process.env.CC;
+      delete process.env.CC;
+      process.env.npm_config_platform = 'linux';
+      process.env.npm_config_arch = 's390x';
+      process.env.npm_config_libc = '';
+      const locatorHash = libvips.yarnLocator();
+      assert.strictEqual(locatorHash, '86cc8ee6e4');
+      delete process.env.npm_config_platform;
+      delete process.env.npm_config_arch;
+      delete process.env.npm_config_libc;
+      process.env.CC = cc;
+    });
+    it('unknown platform', () => {
+      process.env.npm_config_platform = 'unknown-platform';
+      const locatorHash = libvips.yarnLocator();
+      assert.strictEqual(locatorHash, '');
+      delete process.env.npm_config_platform;
+    });
+  });
 });

test/unit/metadata.js

@@ -598,6 +598,24 @@ describe('Image metadata', function () {
     assert.strictEqual(undefined, metadata.icc);
   });
 
+  it('transform to invalid ICC profile emits warning', async () => {
+    const img = sharp({ create })
+      .png()
+      .withIccProfile(fixtures.path('invalid-illuminant.icc'));
+
+    let warningEmitted = '';
+    img.on('warning', (warning) => {
+      warningEmitted = warning;
+    });
+
+    const data = await img.toBuffer();
+    assert.strictEqual('Invalid profile', warningEmitted);
+
+    const metadata = await sharp(data).metadata();
+    assert.strictEqual(3, metadata.channels);
+    assert.strictEqual(undefined, metadata.icc);
+  });
+
   it('Apply CMYK output ICC profile', function (done) {
     const output = fixtures.path('output.icc-cmyk.jpg');
     sharp(fixtures.inputJpg)

test/unit/util.js

@@ -9,16 +9,19 @@ const sharp = require('../../');
 
 describe('Utilities', function () {
   describe('Cache', function () {
-    it('Can be disabled', function () {
+    it('Can be disabled', function (done) {
-      sharp.cache(false);
+      queueMicrotask(() => {
-      const cache = sharp.cache(false);
+        sharp.cache(false);
-      assert.strictEqual(cache.memory.current, 0);
+        const cache = sharp.cache(false);
-      assert.strictEqual(cache.memory.max, 0);
+        assert.strictEqual(cache.memory.current, 0);
-      assert.strictEqual(typeof cache.memory.high, 'number');
+        assert.strictEqual(cache.memory.max, 0);
-      assert.strictEqual(cache.files.current, 0);
+        assert.strictEqual(typeof cache.memory.high, 'number');
-      assert.strictEqual(cache.files.max, 0);
+        assert.strictEqual(cache.files.current, 0);
-      assert.strictEqual(cache.items.current, 0);
+        assert.strictEqual(cache.files.max, 0);
-      assert.strictEqual(cache.items.max, 0);
+        assert.strictEqual(cache.items.current, 0);
+        assert.strictEqual(cache.items.max, 0);
+        done();
+      });
     });
     it('Can be enabled with defaults', function () {
       const cache = sharp.cache(true);