fix: swallow unhandled exceptions on shutdown (#33)

* fix: swallow unhandled exceptions on shutdown * chore: bump version
microsoft · Oct 3, 2024 · 720f523 · 720f523
1 parent 8ac37eb
commit 720f523
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -5,22 +5,21 @@
             "sources": [
                 "src/main.cc"
             ],
+            "dependencies": [
+                "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except"
+            ],
             "include_dirs": [
                 "<!(node -p \"require('node-addon-api').include_dir\")"
             ],
-            'cflags!': ['-fno-exceptions'],
-            'cflags_cc!': ['-fno-exceptions'],
+            "defines": [ "NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS" ],
             'conditions': [
                 ['OS=="mac"', {
                     "sources": [
                         "src/macos/PolicyWatcher.cc",
                     ],
                     "defines": [
                         "MACOS",
-                    ],
-                    "xcode_settings": {
-                        "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
-                    }
+                    ]
                 }],
                 ['OS=="mac" and target_arch=="arm64"', {
                     "xcode_settings": {
@@ -42,8 +41,7 @@
                         "src/windows/NumberPolicy.cc"
                     ],
                     "defines": [
-                        "WINDOWS",
-                        "_HAS_EXCEPTIONS=1"
+                        "WINDOWS"
                     ],
                     "libraries": [
                         "userenv.lib"
@@ -53,10 +51,8 @@
                     },
                     "msvs_settings": {
                         "VCCLCompilerTool": {
-                            "ExceptionHandling": 1,
                             'AdditionalOptions': [
                                 '/guard:cf',
-                                '-std:c++17',
                                 '/we4244',
                                 '/we4267',
                                 '/ZH:SHA_256'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vscode/policy-watcher",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "",
   "main": "index.js",
   "repository": {