Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bumping NAN dep to include test changes #29686

Merged
merged 1 commit into from Jun 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion DEPS
Expand Up @@ -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',

Expand Down
4 changes: 1 addition & 3 deletions patches/config.json
Expand Up @@ -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"
}
2 changes: 0 additions & 2 deletions patches/nan/.patches

This file was deleted.

20 changes: 0 additions & 20 deletions patches/nan/api_simplify_scriptorigin.patch

This file was deleted.

22 changes: 0 additions & 22 deletions patches/nan/nan_string_test_alignment.patch

This file was deleted.