Prerelease 0.33.0-alpha.7

This reverts commit 3f54ef7525.

The filesystem layout used by pnpm means that a nesting of 2
directories deep is used in the wild and must remain.

.github/workflows/npm.yml

@@ -1,4 +1,4 @@
-name: "npm release smoke test"
+name: "CI: npm smoke test"
 
 on:
   push:
@@ -26,6 +26,10 @@ jobs:
         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:
@@ -43,7 +47,7 @@ jobs:
           script: |
             core.setOutput('semver', context.ref.replace('refs/tags/v',''))
       - name: Create package.json
-        uses: DamianReeves/write-file-action@v1
+        uses: DamianReeves/write-file-action@v1.2
         with:
           path: package.json
           contents: |
@@ -53,7 +57,7 @@ jobs:
               }
             }
       - name: Create release.mjs
-        uses: DamianReeves/write-file-action@v1
+        uses: DamianReeves/write-file-action@v1.2
         with:
           path: release.mjs
           contents: |
@@ -63,10 +67,28 @@ jobs:
             const sharp = require('sharp');
             deepStrictEqual(['.jpg', '.jpeg', '.jpe'], sharp.format.jpeg.input.fileSuffix);
 
-      - name: Run with Node.js
+      - 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

docs/api-utility.md

@@ -1,7 +1,8 @@
 ## versions
 > versions
 
-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.
 
 
 **Example**  

docs/install.md

@@ -5,13 +5,15 @@ npm install sharp
 ```
 
 ```sh
-yarn add sharp
+pnpm add sharp
 ```
 
 ```sh
-pnpm add sharp
+yarn add sharp
 ```
 
+Yarn Plug'n'Play is unsupported.
+
 ## Prerequisites
 
 * Node.js >= 18.17.0

lib/sharp.js

@@ -53,6 +53,10 @@ try {
     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');

lib/utility.js

@@ -10,6 +10,9 @@ const is = require('./is');
 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
@@ -44,20 +47,25 @@ 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(`@sharpen/sharp-${runtimePlatformArch()}/versions`);
-} catch (_) {
+/* istanbul ignore next */
+if (!libvipsVersion.isGlobal) {
   try {
-    versions = require(`@sharpen/sharp-libvips-${runtimePlatformArch()}/versions`);
-  } catch (_) {}
+    versions = require(`@sharpen/sharp-${runtimePlatform}/versions`);
+  } catch (_) {
+    try {
+      versions = require(`@sharpen/sharp-libvips-${runtimePlatform}/versions`);
+    } catch (_) {}
+  }
 }
 versions.sharp = require('../package.json').version;
 

npm/darwin-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-darwin-arm64",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with macOS ARM64",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

npm/darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-darwin-x64",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with macOS x64",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

npm/linux-arm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-linux-arm",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with Linux (glibc) ARM (32-bit)",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

npm/linux-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-linux-arm64",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with Linux (glibc) ARM64",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

npm/linux-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-linux-x64",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with Linux (glibc) x64",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

npm/linuxmusl-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-linuxmusl-arm64",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with Linux (musl) ARM64",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

npm/linuxmusl-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-linuxmusl-x64",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with Linux (musl) x64",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

npm/win32-ia32/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-win32-ia32",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with Windows x86 (32-bit)",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

npm/win32-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpen/sharp-win32-x64",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "description": "Prebuilt sharp for use with Windows x64",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {

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.33.0-alpha.6",
+  "version": "0.33.0-alpha.7",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://github.com/lovell/sharp",
   "contributors": [
@@ -139,8 +139,8 @@
     "semver": "^7.5.4"
   },
   "optionalDependencies": {
-    "@sharpen/sharp-darwin-arm64": "0.0.1-alpha.6",
-    "@sharpen/sharp-darwin-x64": "0.0.1-alpha.6",
+    "@sharpen/sharp-darwin-arm64": "0.0.1-alpha.7",
+    "@sharpen/sharp-darwin-x64": "0.0.1-alpha.7",
     "@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",
@@ -148,13 +148,13 @@
     "@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.6",
-    "@sharpen/sharp-linux-arm64": "0.0.1-alpha.6",
-    "@sharpen/sharp-linux-x64": "0.0.1-alpha.6",
-    "@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.6",
-    "@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.6",
-    "@sharpen/sharp-win32-ia32": "0.0.1-alpha.6",
-    "@sharpen/sharp-win32-x64": "0.0.1-alpha.6"
+    "@sharpen/sharp-linux-arm": "0.0.1-alpha.7",
+    "@sharpen/sharp-linux-arm64": "0.0.1-alpha.7",
+    "@sharpen/sharp-linux-x64": "0.0.1-alpha.7",
+    "@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.7",
+    "@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.7",
+    "@sharpen/sharp-win32-ia32": "0.0.1-alpha.7",
+    "@sharpen/sharp-win32-x64": "0.0.1-alpha.7"
   },
   "devDependencies": {
     "@sharpen/sharp-libvips-dev": "0.0.1-alpha.2",

src/binding.gyp

@@ -111,6 +111,9 @@
         # 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': [
           ['OS == "linux"', {
             'defines': [
@@ -154,6 +157,7 @@
               'OTHER_LDFLAGS': [
                 # Ensure runtime linking is relative to sharp.node
                 '-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\''
               ]
             }
@@ -174,6 +178,7 @@
                 '-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\''
               ]
             }

src/utilities.cc

@@ -3,6 +3,7 @@
 
 #include <cmath>
 #include <string>
+#include <cstdio>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -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;
 }
 
 /*