diff --git a/DEPS b/DEPS index c88ecfc39922..8255ce4d7c5b 100644 --- a/DEPS +++ b/DEPS @@ -18,7 +18,10 @@ vars = { 'node_version': 'v14.17.0', 'nan_version': - 'v2.14.2', + # The following commit hash of NAN is v2.14.2 with *only* changes to the + # test suite. This should be updated to a specific tag when one becomes + # available. + '65b32af46e9d7fab2e4ff657751205b3865f4920', 'squirrel.mac_version': 'cdc0729c8bf8576bfef18629186e1e9ecf1b0d9f', diff --git a/patches/config.json b/patches/config.json index 4587a59a3a92..b0156f7d1c05 100644 --- a/patches/config.json +++ b/patches/config.json @@ -11,7 +11,5 @@ "src/electron/patches/Mantle": "src/third_party/squirrel.mac/vendor/Mantle", - "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC", - - "src/electron/patches/nan": "src/third_party/nan" + "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC" } diff --git a/patches/nan/.patches b/patches/nan/.patches deleted file mode 100644 index e40404e7c5a8..000000000000 --- a/patches/nan/.patches +++ /dev/null @@ -1,2 +0,0 @@ -api_simplify_scriptorigin.patch -nan_string_test_alignment.patch diff --git a/patches/nan/api_simplify_scriptorigin.patch b/patches/nan/api_simplify_scriptorigin.patch deleted file mode 100644 index d17b6e41ef7d..000000000000 --- a/patches/nan/api_simplify_scriptorigin.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: John Kleinschmidt -Date: Wed, 2 Dec 2020 11:19:26 -0500 -Subject: Simplify ScriptOrigin - -Update nantest to handle changes in https://chromium-review.googlesource.com/c/v8/v8/+/2555005 - -diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp -index a489f9405d3d39dfb71375d490ba32f9c05c610d..c6cca837f485ac4a245bd2d4a479e33f6250fd1d 100644 ---- a/test/cpp/nannew.cpp -+++ b/test/cpp/nannew.cpp -@@ -246,7 +246,7 @@ NAN_METHOD(testScript) { - - t.plan(6); - -- ScriptOrigin origin(New("foo").ToLocalChecked(), New(5)); -+ ScriptOrigin origin(New("foo").ToLocalChecked(), 5); - - t.ok(_( assertType