Skip to content

Commit de8888e

Browse files
committed
Convert NAN to N-API using tool
1 parent fdceaef commit de8888e

10 files changed

Lines changed: 529 additions & 473 deletions

File tree

binding.gyp

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,21 @@
77
"targets": [
88
{
99
"target_name": "<(module_name)",
10-
"include_dirs": ["<!(node -e \"require('nan')\")"],
10+
"cflags!": [ "-fno-exceptions" ],
11+
"cflags_cc!": [ "-fno-exceptions" ],
12+
"xcode_settings": { "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
13+
"CLANG_CXX_LIBRARY": "libc++",
14+
"MACOSX_DEPLOYMENT_TARGET": "10.7",
15+
},
16+
"msvs_settings": {
17+
"VCCLCompilerTool": { "ExceptionHandling": 1 },
18+
},
19+
"include_dirs": [
20+
"<!@(node -p \"require('node-addon-api').include\")","<!(node -e \"require('nan')\")"],
1121
"conditions": [
1222
["sqlite != 'internal'", {
13-
"include_dirs": [ "<(sqlite)/include" ],
23+
"include_dirs": [
24+
"<!@(node -p \"require('node-addon-api').include\")", "<(sqlite)/include" ],
1425
"libraries": [
1526
"-l<(sqlite_libname)"
1627
],
@@ -26,6 +37,7 @@
2637
},
2738
{
2839
"dependencies": [
40+
"<!(node -p 'require(\"node-addon-api\").gyp')",
2941
"deps/sqlite3.gyp:sqlite3"
3042
]
3143
}
@@ -40,8 +52,18 @@
4052
},
4153
{
4254
"target_name": "action_after_build",
55+
"cflags!": [ "-fno-exceptions" ],
56+
"cflags_cc!": [ "-fno-exceptions" ],
57+
"xcode_settings": { "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
58+
"CLANG_CXX_LIBRARY": "libc++",
59+
"MACOSX_DEPLOYMENT_TARGET": "10.7",
60+
},
61+
"msvs_settings": {
62+
"VCCLCompilerTool": { "ExceptionHandling": 1 },
63+
},
4364
"type": "none",
44-
"dependencies": [ "<(module_name)" ],
65+
"dependencies": [
66+
"<!(node -p 'require(\"node-addon-api\").gyp')", "<(module_name)" ],
4567
"copies": [
4668
{
4769
"files": [ "<(PRODUCT_DIR)/<(module_name).node" ],

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"url": "git://github.com/mapbox/node-sqlite3.git"
3838
},
3939
"dependencies": {
40-
"nan": "^2.12.1",
40+
"node-addon-api": "2.0.0",
4141
"node-pre-gyp": "^0.11.0"
4242
},
4343
"devDependencies": {

0 commit comments

Comments
 (0)