Prebuild v3.0.0-rc1 / all platforms / N-API 7

Automattic · Dec 29, 2023 · 379b7a1 · 379b7a1
1 parent 0525091
commit 379b7a1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/prebuild.yaml b/.github/workflows/prebuild.yaml
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [21]
-        canvas_tag: ["v3.0.0"] # e.g. "v2.6.1"
+        canvas_tag: ["v3.0.0-rc1"] # e.g. "v2.6.1"
     name: ${{ matrix.canvas_tag }}, Node.js ${{ matrix.node }}, Linux
     runs-on: ubuntu-latest
     container:
@@ -144,7 +144,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [21]
-        canvas_tag: ["v3.0.0"] # e.g. "v2.6.1"
+        canvas_tag: ["v3.0.0-rc1"] # e.g. "v2.6.1"
     name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, macOS
     runs-on: macos-latest
     env:
@@ -217,7 +217,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [21]
-        canvas_tag: ["v3.0.0"] # e.g. "v2.6.1"
+        canvas_tag: ["v3.0.0-rc1"] # e.g. "v2.6.1"
     name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, Windows
     runs-on: windows-2019
     env:

diff --git a/prebuild/Linux/binding.gyp b/prebuild/Linux/binding.gyp
@@ -23,7 +23,9 @@
       'defines': [
         'HAVE_GIF',
         'HAVE_JPEG',
-        'HAVE_RSVG'
+        'HAVE_RSVG',
+        'NAPI_DISABLE_CPP_EXCEPTIONS',
+        'NODE_ADDON_API_ENABLE_MAYBE'
       ],
       'libraries': [
         '<!@(pkg-config pixman-1 --libs)',
@@ -36,7 +38,7 @@
         '-lgif'
       ],
       'include_dirs': [
-        '<!(node -e "require(\'nan\')")',
+        '<!(node -p "require(\'node-addon-api\').include_dir")',
         '<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)',

diff --git a/prebuild/Windows/binding.gyp b/prebuild/Windows/binding.gyp
@@ -26,7 +26,9 @@
         'HAVE_RSVG',
         'HAVE_BOOLEAN', # or jmorecfg.h tries to define it
         '_USE_MATH_DEFINES', # for M_PI
-        'NOMINMAX' # allow std::min/max to work
+        'NOMINMAX', # allow std::min/max to work
+        'NAPI_DISABLE_CPP_EXCEPTIONS',
+        'NODE_ADDON_API_ENABLE_MAYBE'
       ],
       'libraries': [
         'D:/a/_temp/msys64/ucrt64/lib/libcairo-2.lib',
@@ -42,7 +44,7 @@
         'D:/a/_temp/msys64/ucrt64/lib/librsvg-2-2.lib'
       ],
       'include_dirs': [
-        '<!(node -e "require(\'nan\')")',
+        '<!(node -p "require(\'node-addon-api\').include_dir")',
         'D:/a/_temp/msys64/ucrt64/include',
         'D:/a/_temp/msys64/ucrt64/include/harfbuzz',
         'D:/a/_temp/msys64/ucrt64/include/pango-1.0',

diff --git a/prebuild/macOS/binding.gyp b/prebuild/macOS/binding.gyp
@@ -23,7 +23,9 @@
       'defines': [
         'HAVE_GIF',
         'HAVE_JPEG',
-        'HAVE_RSVG'
+        'HAVE_RSVG',
+        'NAPI_DISABLE_CPP_EXCEPTIONS',
+        'NODE_ADDON_API_ENABLE_MAYBE'
       ],
       'libraries': [
         '<!@(pkg-config pixman-1 --libs)',
@@ -36,14 +38,16 @@
         '-lgif'
       ],
       'include_dirs': [
-        '<!(node -e "require(\'nan\')")',
+        '<!(node -p "require(\'node-addon-api\').include_dir")',
         '<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config freetype2 --cflags-only-I | sed s/-I//g)',
         '<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)'
       ],
+      'cflags+': ['-fvisibility=hidden'],
       'xcode_settings': {
+        'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
         'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
       }
     }