sharp 0.33.5 → 0.35.0

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.5",
+  "version": "0.35.0",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -89,31 +89,44 @@
     "Lachlan Newman <lachnewman007@gmail.com>",
     "Dennis Beatty <dennis@dcbeatty.com>",
     "Ingvar Stepanyan <me@rreverser.com>",
-    "Don Denton <don@happycollision.com>"
+    "Don Denton <don@happycollision.com>",
+    "Dmytro Tiapukhin <cool.gegeg@gmail.com>",
+    "Florian Lefebvre <contact@florian-lefebvre.dev>"
   ],
   "scripts": {
-    "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;LGPL-3.0-or-later;MIT\"",
+    "build": "node install/build.js",
+    "build:dist": "node scripts/build.mjs",
+    "clean": "rm -rf src/build/ test/fixtures/output.*",
+    "test": "npm run lint && npm run test-unit",
+    "lint": "npm run lint-cpp && npm run lint-js && npm run lint-types",
+    "lint-cpp": "cpplint --quiet src/*.h src/*.cc",
+    "lint-js": "biome lint",
+    "lint-types": "tsd --files ./test/types/sharp.test-d.ts",
     "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"
+    "test-unit": "node --experimental-test-coverage test/unit.mjs",
+    "package-from-local-build": "node npm/from-local-build.js",
+    "package-wasm-wrappers": "node npm/wasm-wrappers.js",
+    "package-release-notes": "node npm/release-notes.js",
+    "docs-build": "node docs/build.mjs",
+    "docs-serve": "cd docs && npm start",
+    "docs-publish": "cd docs && npm run build && npx firebase-tools deploy --project pixelplumbing --only hosting:pixelplumbing-sharp"
   },
   "type": "commonjs",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
   "files": [
+    "dist",
     "install",
-    "lib",
+    "lib/index.d.ts",
     "src/*.{cc,h,gyp}"
   ],
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./lib/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/lovell/sharp.git"
@@ -137,86 +150,64 @@
     "vips"
   ],
   "dependencies": {
-    "color": "^4.2.3",
-    "detect-libc": "^2.0.3",
-    "semver": "^7.6.3"
+    "@img/colour": "^1.1.0",
+    "detect-libc": "^2.1.2",
+    "semver": "^7.8.4"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.33.5",
-    "@img/sharp-darwin-x64": "0.33.5",
-    "@img/sharp-libvips-darwin-arm64": "1.0.4",
-    "@img/sharp-libvips-darwin-x64": "1.0.4",
-    "@img/sharp-libvips-linux-arm": "1.0.5",
-    "@img/sharp-libvips-linux-arm64": "1.0.4",
-    "@img/sharp-libvips-linux-s390x": "1.0.4",
-    "@img/sharp-libvips-linux-x64": "1.0.4",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
-    "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
-    "@img/sharp-linux-arm": "0.33.5",
-    "@img/sharp-linux-arm64": "0.33.5",
-    "@img/sharp-linux-s390x": "0.33.5",
-    "@img/sharp-linux-x64": "0.33.5",
-    "@img/sharp-linuxmusl-arm64": "0.33.5",
-    "@img/sharp-linuxmusl-x64": "0.33.5",
-    "@img/sharp-wasm32": "0.33.5",
-    "@img/sharp-win32-ia32": "0.33.5",
-    "@img/sharp-win32-x64": "0.33.5"
+    "@img/sharp-darwin-arm64": "0.35.0",
+    "@img/sharp-darwin-x64": "0.35.0",
+    "@img/sharp-freebsd-wasm32": "0.35.0",
+    "@img/sharp-libvips-darwin-arm64": "1.3.0",
+    "@img/sharp-libvips-darwin-x64": "1.3.0",
+    "@img/sharp-libvips-linux-arm": "1.3.0",
+    "@img/sharp-libvips-linux-arm64": "1.3.0",
+    "@img/sharp-libvips-linux-ppc64": "1.3.0",
+    "@img/sharp-libvips-linux-riscv64": "1.3.0",
+    "@img/sharp-libvips-linux-s390x": "1.3.0",
+    "@img/sharp-libvips-linux-x64": "1.3.0",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.3.0",
+    "@img/sharp-libvips-linuxmusl-x64": "1.3.0",
+    "@img/sharp-linux-arm": "0.35.0",
+    "@img/sharp-linux-arm64": "0.35.0",
+    "@img/sharp-linux-ppc64": "0.35.0",
+    "@img/sharp-linux-riscv64": "0.35.0",
+    "@img/sharp-linux-s390x": "0.35.0",
+    "@img/sharp-linux-x64": "0.35.0",
+    "@img/sharp-linuxmusl-arm64": "0.35.0",
+    "@img/sharp-linuxmusl-x64": "0.35.0",
+    "@img/sharp-webcontainers-wasm32": "0.35.0",
+    "@img/sharp-win32-arm64": "0.35.0",
+    "@img/sharp-win32-ia32": "0.35.0",
+    "@img/sharp-win32-x64": "0.35.0"
   },
   "devDependencies": {
-    "@emnapi/runtime": "^1.2.0",
-    "@img/sharp-libvips-dev": "1.0.4",
-    "@img/sharp-libvips-dev-wasm32": "1.0.5",
-    "@img/sharp-libvips-win32-ia32": "1.0.4",
-    "@img/sharp-libvips-win32-x64": "1.0.4",
+    "@biomejs/biome": "^2.4.16",
+    "@cpplint/cli": "^0.1.0",
+    "@emnapi/runtime": "^1.11.0",
+    "@img/sharp-libvips-dev": "1.3.0",
+    "@img/sharp-libvips-dev-wasm32": "1.3.0",
+    "@img/sharp-libvips-win32-arm64": "1.3.0",
+    "@img/sharp-libvips-win32-ia32": "1.3.0",
+    "@img/sharp-libvips-win32-x64": "1.3.0",
     "@types/node": "*",
-    "async": "^3.2.5",
-    "cc": "^3.0.1",
-    "emnapi": "^1.2.0",
-    "exif-reader": "^2.0.1",
+    "emnapi": "^1.11.0",
+    "exif-reader": "^2.0.3",
     "extract-zip": "^2.0.1",
-    "icc": "^3.0.0",
-    "jsdoc-to-markdown": "^8.0.3",
-    "license-checker": "^25.0.1",
-    "mocha": "^10.7.3",
-    "node-addon-api": "^8.1.0",
-    "nyc": "^17.0.0",
-    "prebuild": "^13.0.1",
-    "semistandard": "^17.0.0",
-    "tar-fs": "^3.0.6",
-    "tsd": "^0.31.1"
+    "icc": "^4.0.0",
+    "node-addon-api": "^8.8.0",
+    "node-gyp": "^12.4.0",
+    "tar-fs": "^3.1.2",
+    "tsd": "^0.33.0"
   },
   "license": "Apache-2.0",
   "engines": {
-    "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+    "node": ">=20.9.0"
   },
   "config": {
-    "libvips": ">=8.15.3"
+    "libvips": ">=8.18.3"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"
-  },
-  "binary": {
-    "napi_versions": [
-      9
-    ]
-  },
-  "semistandard": {
-    "env": [
-      "mocha"
-    ]
-  },
-  "cc": {
-    "linelength": "120",
-    "filter": [
-      "build/include"
-    ]
-  },
-  "nyc": {
-    "include": [
-      "lib"
-    ]
-  },
-  "tsd": {
-    "directory": "test/types/"
   }
 }

package/src/binding.gyp

@@ -3,23 +3,28 @@
 
 {
   'variables': {
-    'vips_version': '<!(node -p "require(\'../lib/libvips\').minimumLibvipsVersion")',
-    'platform_and_arch': '<!(node -p "require(\'../lib/libvips\').buildPlatformArch()")',
+    'vips_version': '<!(node -p "require(\'../dist/libvips.cjs\').minimumLibvipsVersion")',
+    'platform_and_arch': '<!(node -p "require(\'../dist/libvips.cjs\').buildPlatformArch()")',
+    'sharp_version': '<!(node -p "require(\'../package.json\').version")',
     '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()")'
+    'sharp_libvips_yarn_locator': '<!(node -p "require(\'../dist/libvips.cjs\').yarnLocator()")',
+    'sharp_libvips_include_dir': '<!(node -p "require(\'../dist/libvips.cjs\').buildSharpLibvipsIncludeDir()")',
+    'sharp_libvips_cplusplus_dir': '<!(node -p "require(\'../dist/libvips.cjs\').buildSharpLibvipsCPlusPlusDir()")',
+    'sharp_libvips_lib_dir': '<!(node -p "require(\'../dist/libvips.cjs\').buildSharpLibvipsLibDir()")'
   },
   'targets': [{
-    'target_name': 'libvips-cpp',
+    'target_name': 'libvips-cpp-<(vips_version)',
     'conditions': [
       ['OS == "win"', {
         # Build libvips C++ binding for Windows due to MSVC std library ABI changes
         'type': 'shared_library',
         'defines': [
-          'VIPS_CPLUSPLUS_EXPORTS',
-          '_ALLOW_KEYWORD_MACROS'
+          '_VIPS_PUBLIC=__declspec(dllexport)',
+          '_ALLOW_KEYWORD_MACROS',
+          '_HAS_EXCEPTIONS=1',
+          'G_DISABLE_ASSERT',
+          'G_DISABLE_CAST_CHECKS',
+          'G_DISABLE_CHECKS'
         ],
         'sources': [
           '<(sharp_libvips_cplusplus_dir)/VConnection.cpp',
@@ -45,6 +50,9 @@
           'Release': {
             'msvs_settings': {
               'VCCLCompilerTool': {
+                "AdditionalOptions": [
+                  "/std:c++17"
+                ],
                 'ExceptionHandling': 1,
                 'Optimization': 1,
                 'WholeProgramOptimization': 'true'
@@ -75,21 +83,24 @@
       }]
     ]
   }, {
-    'target_name': 'sharp-<(platform_and_arch)',
+    'target_name': 'sharp-<(platform_and_arch)-<(sharp_version)',
     'defines': [
+      'G_DISABLE_ASSERT',
+      'G_DISABLE_CAST_CHECKS',
+      'G_DISABLE_CHECKS',
       'NAPI_VERSION=9',
       'NODE_ADDON_API_DISABLE_DEPRECATED',
       'NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS'
     ],
     'dependencies': [
       '<!(node -p "require(\'node-addon-api\').gyp")',
-      'libvips-cpp'
+      'libvips-cpp-<(vips_version)'
     ],
     '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(\'../dist/libvips.cjs\').pkgConfigPath()")',
+          'use_global_libvips': '<!(node -p "Boolean(require(\'../dist/libvips.cjs\').useGlobalLibvips()).toString()")'
         }, {
           'pkg_config_path': '',
           'use_global_libvips': ''
@@ -111,7 +122,7 @@
     'conditions': [
       ['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)'],
+        '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'
@@ -138,7 +149,8 @@
           ['OS == "win"', {
             'defines': [
               '_ALLOW_KEYWORD_MACROS',
-              '_FILE_OFFSET_BITS=64'
+              '_FILE_OFFSET_BITS=64',
+              '_HAS_EXCEPTIONS=1'
             ],
             'link_settings': {
               'libraries': [
@@ -149,14 +161,17 @@
           ['OS == "mac"', {
             'link_settings': {
               'libraries': [
-                'libvips-cpp.42.dylib'
+                'libvips-cpp.<(vips_version).dylib'
               ]
             },
             'xcode_settings': {
               'OTHER_LDFLAGS': [
+                '-Wl,-s',
+                '-Wl,-dead_strip',
                 # Ensure runtime linking is relative to sharp.node
                 '-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\''
@@ -167,14 +182,19 @@
             'defines': [
               '_GLIBCXX_USE_CXX11_ABI=1'
             ],
+            'cflags_cc': [
+              '<!(node -p "require(\'detect-libc\').isNonGlibcLinuxSync() ? \'\' : \'-flto=auto\'")'
+            ],
             'link_settings': {
               'libraries': [
-                '-l:libvips-cpp.so.42'
+                '-l:libvips-cpp.so.<(vips_version)'
               ],
               'ldflags': [
+                '-lstdc++fs',
                 '-Wl,-s',
                 '-Wl,--disable-new-dtags',
                 '-Wl,-z,nodelete',
+                '-Wl,-Bsymbolic-functions',
                 '-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\'',
@@ -185,18 +205,18 @@
           }],
           ['OS == "emscripten"', {
             'product_extension': 'node.js',
+            'cflags_cc': [
+              '-fwasm-exceptions'
+            ],
             'link_settings': {
               'ldflags': [
-                '-fexceptions',
+                '-fwasm-exceptions',
                 '--pre-js=<!(node -p "require.resolve(\'./emscripten/pre.js\')")',
                 '-Oz',
                 '-sALLOW_MEMORY_GROWTH',
                 '-sENVIRONMENT=node',
-                '-sEXPORTED_FUNCTIONS=["emnapiInit", "_vips_shutdown", "_uv_library_shutdown"]',
                 '-sNODERAWFS',
-                '-sTEXTDECODER=0',
-                '-sWASM_ASYNC_COMPILATION=0',
-                '-sWASM_BIGINT'
+                '-sWASM_ASYNC_COMPILATION=0'
               ],
               'libraries': [
                 '<!@(PKG_CONFIG_PATH="<!(node -p "require(\'@img/sharp-libvips-dev-wasm32/lib\')")/pkgconfig" pkg-config --static --libs vips-cpp)'
@@ -207,14 +227,14 @@
       }]
     ],
     'cflags_cc': [
-      '-std=c++0x',
+      '-std=c++17',
       '-fexceptions',
       '-Wall',
       '-Os'
     ],
     'xcode_settings': {
-      'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
-      'MACOSX_DEPLOYMENT_TARGET': '10.13',
+      'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
+      'MACOSX_DEPLOYMENT_TARGET': '10.15',
       'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
       'GCC_ENABLE_CPP_RTTI': 'YES',
       'OTHER_CPLUSPLUSFLAGS': [
@@ -234,6 +254,9 @@
           ['OS == "win"', {
             'msvs_settings': {
               'VCCLCompilerTool': {
+                "AdditionalOptions": [
+                  "/std:c++17"
+                ],
                 'ExceptionHandling': 1,
                 'Optimization': 1,
                 'WholeProgramOptimization': 'true'
@@ -264,7 +287,7 @@
     'target_name': 'copy-dll',
     'type': 'none',
     'dependencies': [
-      'sharp-<(platform_and_arch)'
+      'sharp-<(platform_and_arch)-<(sharp_version)'
     ],
     'conditions': [
       ['OS == "win"', {