chore(deps): roll nan to pick up upstreams (#39916)

2023-09-20 15:37:10 +02:00 · 2023-09-20 15:37:10 +02:00 · 463586a6c5
commit 463586a6c5
parent a39c0ee659
6 changed files with 3 additions and 315 deletions
--- a/2
+++ b/2
@ -6,7 +6,7 @@ vars = {
  'node_version':
    'v18.17.1',
  'nan_version':
-    '16fa32231e2ccd89d2804b3f765319128b20c4ac',
+    'e14bdcd1f72d62bca1d541b66da43130384ec213',
  'squirrel.mac_version':
    '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
  'reactiveobjc_version':
--- a/package.json
+++ b/package.json
@ -152,6 +152,6 @@
    ]
  },
  "resolutions": {
-    "nan": "nodejs/nan#4290e23af108328269fcd4fe174ad657ad7cdd96"
+    "nan": "nodejs/nan#e14bdcd1f72d62bca1d541b66da43130384ec213"
  }
 }
--- a/patches/nan/.patches
+++ b/patches/nan/.patches
@ -1,3 +1 @@
 use_new_constructor_for_scriptorigin_when_17_x.patch
-chore_remove_deprecated_accessorsignatures.patch
-chore_fix_v8_data_internal_field_casting.patch
--- a/patches/nan/chore_fix_v8_data_internal_field_casting.patch
+++ b/patches/nan/chore_fix_v8_data_internal_field_casting.patch
@ -1,265 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Mon, 11 Sep 2023 23:39:55 +0200
-Subject: chore: fix v8::Data internal field casting
-
-Changed in https://chromium-review.googlesource.com/c/v8/v8/+/4834471
-
-Adapt to upstream changes in v8::Object::GetInternalField() and
-v8::Object::SetInternalField() to accept v8::Data instead of just
-v8::Value.
-
-diff --git a/nan_callbacks_12_inl.h b/nan_callbacks_12_inl.h
-index c27b18d80d1299ff2142606d333804696bc17f93..2c734137fa1a5f8c6341e045f488fdcde5d040ef 100644
--- a/nan_callbacks_12_inl.h
-+++ b/nan_callbacks_12_inl.h
-@@ -170,9 +170,9 @@ void FunctionCallbackWrapper(const v8::FunctionCallbackInfo<v8::Value> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   FunctionCallback callback = reinterpret_cast<FunctionCallback>(
-       reinterpret_cast<intptr_t>(
-          obj->GetInternalField(kFunctionIndex).As<v8::External>()->Value()));
-+          obj->GetInternalField(kFunctionIndex).As<v8::Value>().As<v8::External>()->Value()));
-   FunctionCallbackInfo<v8::Value>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   callback(cbinfo);
- }
- 
-@@ -185,10 +185,10 @@ void GetterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Value> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Value>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   GetterCallback callback = reinterpret_cast<GetterCallback>(
-       reinterpret_cast<intptr_t>(
-          obj->GetInternalField(kGetterIndex).As<v8::External>()->Value()));
-+          obj->GetInternalField(kGetterIndex).As<v8::Value>().As<v8::External>()->Value()));
-   callback(property.As<v8::String>(), cbinfo);
- }
- 
-@@ -202,10 +202,10 @@ void SetterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<void> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<void>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   SetterCallback callback = reinterpret_cast<SetterCallback>(
-       reinterpret_cast<intptr_t>(
-          obj->GetInternalField(kSetterIndex).As<v8::External>()->Value()));
-+          obj->GetInternalField(kSetterIndex).As<v8::Value>().As<v8::External>()->Value()));
-   callback(property.As<v8::String>(), value, cbinfo);
- }
- 
-@@ -220,10 +220,10 @@ void GetterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Value> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Value>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   GetterCallback callback = reinterpret_cast<GetterCallback>(
-       reinterpret_cast<intptr_t>(
-          obj->GetInternalField(kGetterIndex).As<v8::External>()->Value()));
-+          obj->GetInternalField(kGetterIndex).As<v8::Value>().As<v8::External>()->Value()));
-   callback(property, cbinfo);
- }
- 
-@@ -237,10 +237,10 @@ void SetterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<void> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<void>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   SetterCallback callback = reinterpret_cast<SetterCallback>(
-       reinterpret_cast<intptr_t>(
-          obj->GetInternalField(kSetterIndex).As<v8::External>()->Value()));
-+          obj->GetInternalField(kSetterIndex).As<v8::Value>().As<v8::External>()->Value()));
-   callback(property, value, cbinfo);
- }
- 
-@@ -257,11 +257,11 @@ void PropertyGetterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Value> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Value>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   PropertyGetterCallback callback = reinterpret_cast<PropertyGetterCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertyGetterIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(property.As<v8::String>(), cbinfo);
- }
- 
-@@ -275,11 +275,11 @@ void PropertySetterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Value> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Value>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   PropertySetterCallback callback = reinterpret_cast<PropertySetterCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertySetterIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(property.As<v8::String>(), value, cbinfo);
- }
- 
-@@ -293,11 +293,11 @@ void PropertyEnumeratorCallbackWrapper(
-     const v8::PropertyCallbackInfo<v8::Array> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Array>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   PropertyEnumeratorCallback callback =
-       reinterpret_cast<PropertyEnumeratorCallback>(reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertyEnumeratorIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(cbinfo);
- }
- 
-@@ -310,11 +310,11 @@ void PropertyDeleterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Boolean> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Boolean>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   PropertyDeleterCallback callback = reinterpret_cast<PropertyDeleterCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertyDeleterIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(property.As<v8::String>(), cbinfo);
- }
- 
-@@ -327,11 +327,11 @@ void PropertyQueryCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Integer> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Integer>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   PropertyQueryCallback callback = reinterpret_cast<PropertyQueryCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertyQueryIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(property.As<v8::String>(), cbinfo);
- }
- 
-@@ -344,11 +344,11 @@ void PropertyGetterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Value> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Value>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   PropertyGetterCallback callback = reinterpret_cast<PropertyGetterCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertyGetterIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(property, cbinfo);
- }
- 
-@@ -384,7 +384,7 @@ void PropertyEnumeratorCallbackWrapper(
-   PropertyEnumeratorCallback callback =
-       reinterpret_cast<PropertyEnumeratorCallback>(reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertyEnumeratorIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(cbinfo);
- }
- 
-@@ -401,7 +401,7 @@ void PropertyDeleterCallbackWrapper(
-   PropertyDeleterCallback callback = reinterpret_cast<PropertyDeleterCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertyDeleterIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(property, cbinfo);
- }
- 
-@@ -414,11 +414,11 @@ void PropertyQueryCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Integer> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Integer>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   PropertyQueryCallback callback = reinterpret_cast<PropertyQueryCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kPropertyQueryIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(property, cbinfo);
- }
- 
-@@ -431,11 +431,11 @@ void IndexGetterCallbackWrapper(
-     uint32_t index, const v8::PropertyCallbackInfo<v8::Value> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Value>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   IndexGetterCallback callback = reinterpret_cast<IndexGetterCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kIndexPropertyGetterIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(index, cbinfo);
- }
- 
-@@ -449,11 +449,11 @@ void IndexSetterCallbackWrapper(
-   , const v8::PropertyCallbackInfo<v8::Value> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Value>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   IndexSetterCallback callback = reinterpret_cast<IndexSetterCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kIndexPropertySetterIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(index, value, cbinfo);
- }
- 
-@@ -467,11 +467,11 @@ void IndexEnumeratorCallbackWrapper(
-     const v8::PropertyCallbackInfo<v8::Array> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Array>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   IndexEnumeratorCallback callback = reinterpret_cast<IndexEnumeratorCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(
-              kIndexPropertyEnumeratorIndex).As<v8::External>()->Value()));
-+              kIndexPropertyEnumeratorIndex).As<v8::Value>().As<v8::External>()->Value()));
-   callback(cbinfo);
- }
- 
-@@ -483,11 +483,11 @@ void IndexDeleterCallbackWrapper(
-     uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Boolean>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   IndexDeleterCallback callback = reinterpret_cast<IndexDeleterCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kIndexPropertyDeleterIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(index, cbinfo);
- }
- 
-@@ -499,11 +499,11 @@ void IndexQueryCallbackWrapper(
-     uint32_t index, const v8::PropertyCallbackInfo<v8::Integer> &info) {
-   v8::Local<v8::Object> obj = info.Data().As<v8::Object>();
-   PropertyCallbackInfo<v8::Integer>
-      cbinfo(info, obj->GetInternalField(kDataIndex));
-+      cbinfo(info, obj->GetInternalField(kDataIndex).As<v8::Value>());
-   IndexQueryCallback callback = reinterpret_cast<IndexQueryCallback>(
-       reinterpret_cast<intptr_t>(
-           obj->GetInternalField(kIndexPropertyQueryIndex)
-              .As<v8::External>()->Value()));
-+              .As<v8::Value>().As<v8::External>()->Value()));
-   callback(index, cbinfo);
- }
- 
--- a/patches/nan/chore_remove_deprecated_accessorsignatures.patch
+++ b/patches/nan/chore_remove_deprecated_accessorsignatures.patch
@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Thu, 2 Jun 2022 15:45:21 +0200
-Subject: chore: remove deprecated AccessorSignatures
-
-Removed in https://chromium-review.googlesource.com/c/v8/v8/+/3654096
-Upstreamed to nan: https://github.com/nodejs/nan/pull/941
-
-diff --git a/nan.h b/nan.h
-index df5496c1a001120d10cd7c4b87d5e7bce8169f38..c29a99b79970421a15c5520a94ab65b1c3c473ff 100644
--- a/nan.h
-+++ b/nan.h
-@@ -2516,8 +2516,7 @@ inline void SetAccessor(
-   , SetterCallback setter = 0
-   , v8::Local<v8::Value> data = v8::Local<v8::Value>()
-   , v8::AccessControl settings = v8::DEFAULT
-  , v8::PropertyAttribute attribute = v8::None
-  , imp::Sig signature = imp::Sig()) {
-+  , v8::PropertyAttribute attribute = v8::None) {
-   HandleScope scope;
- 
-   imp::NativeGetter getter_ =
-@@ -2550,9 +2549,6 @@ inline void SetAccessor(
-     , obj
-     , settings
-     , attribute
-#if (NODE_MODULE_VERSION < NODE_18_0_MODULE_VERSION)
-    , signature
-#endif
-   );
- }
- 
-diff --git a/nan_callbacks.h b/nan_callbacks.h
-index 53ede846ac9a865a737218dabbbd48305d3d6b63..ea81e452d364e3d3c15a121dc69ae21134bfb586 100644
--- a/nan_callbacks.h
-+++ b/nan_callbacks.h
-@@ -52,8 +52,6 @@ typedef void(*IndexQueryCallback)(
-     const PropertyCallbackInfo<v8::Integer>&);
- 
- namespace imp {
-typedef v8::Local<v8::AccessorSignature> Sig;
-
- static const int kDataIndex =                    0;
- 
- static const int kFunctionIndex =                1;
--- a/spec/package.json
+++ b/spec/package.json
@ -39,7 +39,7 @@
    "yargs": "^16.0.3"
  },
  "resolutions": {
-    "nan": "nodejs/nan#4290e23af108328269fcd4fe174ad657ad7cdd96",
+    "nan": "nodejs/nan#e14bdcd1f72d62bca1d541b66da43130384ec213",
    "dbus-native/optimist/minimist": "1.2.7",
    "dbus-native/xml2js": "0.5.0"
  }