sharp 0.33.0-alpha.3 → 0.33.0-alpha.6

package/install/check.js

@@ -3,18 +3,27 @@
 
 'use strict';
 
-const { useGlobalLibvips, globalLibvipsVersion, log, gypRebuild } = require('../lib/libvips');
+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-gyp');
+    require('node-addon-api');
+    log('Found node-addon-api');
   } catch (err) {
-    log('You might need to install node-gyp');
+    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 = gypRebuild();
+  const status = spawnRebuild();
   if (status !== 0) {
     process.exit(status);
   }

package/lib/libvips.js

@@ -80,8 +80,8 @@ const isRosetta = () => {
 };
 
 /* istanbul ignore next */
-const gypRebuild = () =>
-  spawnSync('node-gyp rebuild', {
+const spawnRebuild = () =>
+  spawnSync('node-gyp rebuild --directory=src', {
     ...spawnSyncOptions,
     stdio: 'inherit'
   }).status;
@@ -146,7 +146,7 @@ module.exports = {
   buildSharpLibvipsLibDir,
   runtimePlatformArch,
   log,
-  gypRebuild,
+  spawnRebuild,
   globalLibvipsVersion,
   pkgConfigPath,
   useGlobalLibvips

package/lib/sharp.js

@@ -9,11 +9,12 @@ 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 {
   // Check for local build
-  module.exports = require(`../build/Release/sharp-${runtimePlatform}.node`);
+  module.exports = require(`../src/build/Release/sharp-${runtimePlatform}.node`);
 } catch (errLocal) {
   try {
     // Check for runtime package
@@ -29,11 +30,15 @@ try {
     help.push('Possible solutions:');
     // Common error messages
     if (prebuiltPlatforms.includes(runtimePlatform)) {
-      help.push(`- Add an explicit dependency for the runtime platform: "npm install --force @sharpen/sharp-${runtimePlatform}"`);
+      help.push('- Add explicit dependencies for the runtime platform:');
+      help.push(`    npm install --force @sharpen/sharp-${runtimePlatform}`);
+      if (!isWindows) {
+        help.push(`    npm install --force @sharpen/sharp-libvips-${runtimePlatform}`);
+      }
     } else {
       help.push(`- The ${runtimePlatform} platform requires manual installation of libvips >= ${minimumLibvipsVersion}`);
     }
-    if (runtimePlatform.startsWith('linux') && /symbol not found/i.test(errPackage)) {
+    if (isLinux && /symbol not found/i.test(errPackage)) {
       try {
         const { engines } = require(`@sharpen/sharp-libvips-${runtimePlatform}/package`);
         const libcFound = `${familySync()} ${versionSync()}`;
@@ -41,16 +46,17 @@ try {
         help.push(`- Update your OS: found ${libcFound}, requires ${libcRequires}`);
       } catch (errEngines) {}
     }
-    if (runtimePlatform.startsWith('darwin') && /Incompatible library version/.test(errLocal.message)) {
-      help.push('- Update Homebrew: "brew update && brew upgrade vips"');
+    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');
     }
     // Link to installation docs
-    if (runtimePlatform.startsWith('linux') && /Module did not self-register/.test(errLocal.message + errPackage.message)) {
+    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 (runtimePlatform.startsWith('win32') && /The specified procedure could not be found/.test(errPackage.message)) {
+    } 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');

package/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.3",
+  "version": "0.33.0-alpha.6",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://github.com/lovell/sharp",
   "contributors": [
@@ -90,7 +90,7 @@
   ],
   "scripts": {
     "install": "node install/check",
-    "clean": "rm -rf build/ .nyc_output/ coverage/ test/fixtures/output.*",
+    "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",
@@ -107,10 +107,9 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
-    "binding.gyp",
     "install",
     "lib",
-    "src"
+    "src/*.{cc,h,gyp}"
   ],
   "repository": {
     "type": "git",
@@ -137,31 +136,30 @@
   "dependencies": {
     "color": "^4.2.3",
     "detect-libc": "^2.0.2",
-    "node-addon-api": "^7.0.0",
     "semver": "^7.5.4"
   },
   "optionalDependencies": {
-    "@sharpen/sharp-darwin-arm64": "0.0.1-alpha.3",
-    "@sharpen/sharp-darwin-x64": "0.0.1-alpha.3",
-    "@sharpen/sharp-linux-arm": "0.0.1-alpha.3",
-    "@sharpen/sharp-linux-arm64": "0.0.1-alpha.3",
-    "@sharpen/sharp-linux-x64": "0.0.1-alpha.3",
-    "@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.3",
-    "@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.3",
-    "@sharpen/sharp-win32-ia32": "0.0.1-alpha.3",
-    "@sharpen/sharp-win32-x64": "0.0.1-alpha.3"
+    "@sharpen/sharp-darwin-arm64": "0.0.1-alpha.6",
+    "@sharpen/sharp-darwin-x64": "0.0.1-alpha.6",
+    "@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.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"
   },
   "devDependencies": {
-    "@sharpen/sharp-libvips-darwin-arm64": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-darwin-x64": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-dev": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-linux-arm": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-linux-arm64": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-linux-x64": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-linuxmusl-arm64": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-linuxmusl-x64": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-win32-ia32": "0.0.1-alpha.1",
-    "@sharpen/sharp-libvips-win32-x64": "0.0.1-alpha.1",
+    "@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",
@@ -171,6 +169,7 @@
     "jsdoc-to-markdown": "^8.0.0",
     "license-checker": "^25.0.1",
     "mocha": "^10.2.0",
+    "node-addon-api": "^7.0.0",
     "nyc": "^15.1.0",
     "prebuild": "^12.1.0",
     "semistandard": "^17.0.0",

package/{binding.gyp → src/binding.gyp}

@@ -3,11 +3,11 @@
 
 {
   'variables': {
-    '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()")'
+    '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',
@@ -86,8 +86,8 @@
     'variables': {
       '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': ''
@@ -95,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")',
@@ -154,7 +154,6 @@
               '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\''
               ]
             }
@@ -175,7 +174,6 @@
                 '-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\''
               ]
             }