From 4e8797353c86ba86799ce0d19236d133188f1c9d Mon Sep 17 00:00:00 2001
From: Thomas <hakerh403@gmail.com>
Date: Sat, 4 Apr 2020 18:09:09 +0200
Subject: [PATCH 1/4] build: fix vcbuild error for missing Visual Studio

The previous error was wrongly redirecting users
to the ICU installation steps, which is unrelated to
missing Visual Studio.

PR-URL: https://github.com/nodejs/node/pull/32658
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
---
 vcbuild.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vcbuild.bat b/vcbuild.bat
index 3d8df205423ab5..22c3e237acf570 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -321,7 +321,7 @@ goto msbuild-found
 :msbuild-not-found
 echo Failed to find a suitable Visual Studio installation.
 echo Try to run in a "Developer Command Prompt" or consult
-echo https://github.com/nodejs/node/blob/master/BUILDING.md#windows-1
+echo https://github.com/nodejs/node/blob/master/BUILDING.md#windows
 goto exit
 
 :msbuild-found

From 6b2e3afee95f5d5fdc0751b6f58c447b87d8ec47 Mon Sep 17 00:00:00 2001
From: Liran Tal <liran.tal@gmail.com>
Date: Sat, 11 Apr 2020 17:02:59 +0300
Subject: [PATCH 2/4] doc: improve WHATWG url constructor code example

Currently, the URL docs for the WHATWG URL spec support are
somewhat lacking in their code example of how to access the
new URL constructor that lives inside the core url package.

PR-URL: https://github.com/nodejs/node/pull/32782
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 doc/api/url.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/api/url.md b/doc/api/url.md
index 49f56509fe41e9..6950c92f0980c8 100644
--- a/doc/api/url.md
+++ b/doc/api/url.md
@@ -105,6 +105,13 @@ const myURL = new URL('/foo', 'https://example.org/');
 // https://example.org/foo
 ```
 
+The URL constructor is accessible as a property on the global object.
+It can also be imported from the built-in url module:
+
+```js
+console.log(URL === require('url').URL); // Prints 'true'.
+```
+
 A `TypeError` will be thrown if the `input` or `base` are not valid URLs. Note
 that an effort will be made to coerce the given values into strings. For
 instance:

From 76ba9503a2aa1e2f4a304c4d2c60756cfa7ee09e Mon Sep 17 00:00:00 2001
From: Richard Lau <riclau@uk.ibm.com>
Date: Mon, 27 Apr 2020 18:36:43 -0400
Subject: [PATCH 3/4] doc: assign missing deprecation code

Signed-off-by: Richard Lau <riclau@uk.ibm.com>

PR-URL: https://github.com/nodejs/node/pull/33109
Refs: https://github.com/nodejs/node/pull/32807
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
---
 doc/api/deprecations.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/deprecations.md b/doc/api/deprecations.md
index cc57944292a998..86a6c719a42a27 100644
--- a/doc/api/deprecations.md
+++ b/doc/api/deprecations.md
@@ -2651,8 +2651,8 @@ written twice. This introduces a race condition between threads, and is a
 potential security vulnerability. There is no safe, cross-platform alternative
 API.
 
-<a id="DEP0XXX"></a>
-### DEP0XXX: Use `request.destroy()` instead of `request.abort()`
+<a id="DEP0140"></a>
+### DEP0140: Use `request.destroy()` instead of `request.abort()`
 <!-- YAML
 changes:
   - version: REPLACEME

From 307c67be175b8fe7d9dd9e1b5ed55d928b73d66d Mon Sep 17 00:00:00 2001
From: legendecas <legendecas@gmail.com>
Date: Sun, 19 Apr 2020 17:45:02 +0800
Subject: [PATCH 4/4] n-api: fix false assumption on napi_async_context
 structures

napi_async_context should be an opaque type and not be used as same as
node::async_context.

PR-URL: https://github.com/nodejs/node/pull/32928
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 test/node-api/test_callback_scope/binding.cc  | 31 +++++--------------
 .../test_callback_scope/test-async-hooks.js   | 16 ++++++++--
 test/node-api/test_callback_scope/test.js     |  4 +--
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/test/node-api/test_callback_scope/binding.cc b/test/node-api/test_callback_scope/binding.cc
index 1a06d04fce53e3..153428a65bd6e4 100644
--- a/test/node-api/test_callback_scope/binding.cc
+++ b/test/node-api/test_callback_scope/binding.cc
@@ -4,21 +4,12 @@
 
 namespace {
 
-// the test needs to fake out the async structure, so we need to use
-// the raw structure here and then cast as done behind the scenes
-// in napi calls.
-struct async_context {
-  double async_id;
-  double trigger_async_id;
-};
-
-
 napi_value RunInCallbackScope(napi_env env, napi_callback_info info) {
   size_t argc;
-  napi_value args[4];
+  napi_value args[3];
 
   NAPI_CALL(env, napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr));
-  NAPI_ASSERT(env, argc == 4 , "Wrong number of arguments");
+  NAPI_ASSERT(env, argc == 3 , "Wrong number of arguments");
 
   NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
 
@@ -28,35 +19,29 @@ napi_value RunInCallbackScope(napi_env env, napi_callback_info info) {
       "Wrong type of arguments. Expects an object as first argument.");
 
   NAPI_CALL(env, napi_typeof(env, args[1], &valuetype));
-  NAPI_ASSERT(env, valuetype == napi_number,
-      "Wrong type of arguments. Expects a number as second argument.");
+  NAPI_ASSERT(env, valuetype == napi_string,
+      "Wrong type of arguments. Expects a string as second argument.");
 
   NAPI_CALL(env, napi_typeof(env, args[2], &valuetype));
-  NAPI_ASSERT(env, valuetype == napi_number,
-      "Wrong type of arguments. Expects a number as third argument.");
-
-  NAPI_CALL(env, napi_typeof(env, args[3], &valuetype));
   NAPI_ASSERT(env, valuetype == napi_function,
       "Wrong type of arguments. Expects a function as third argument.");
 
-  struct async_context context;
-  NAPI_CALL(env, napi_get_value_double(env, args[1], &context.async_id));
-  NAPI_CALL(env,
-      napi_get_value_double(env, args[2], &context.trigger_async_id));
+  napi_async_context context;
+  NAPI_CALL(env, napi_async_init(env, args[0], args[1], &context));
 
   napi_callback_scope scope = nullptr;
   NAPI_CALL(
       env,
       napi_open_callback_scope(env,
                                args[0],
-                               reinterpret_cast<napi_async_context>(&context),
+                               context,
                                &scope));
 
   // if the function has an exception pending after the call that is ok
   // so we don't use NAPI_CALL as we must close the callback scope regardless
   napi_value result = nullptr;
   napi_status function_call_result =
-      napi_call_function(env, args[0], args[3], 0, nullptr, &result);
+      napi_call_function(env, args[0], args[2], 0, nullptr, &result);
   if (function_call_result != napi_ok) {
     GET_AND_THROW_LAST_ERROR((env));
   }
diff --git a/test/node-api/test_callback_scope/test-async-hooks.js b/test/node-api/test_callback_scope/test-async-hooks.js
index 1a11bf60398f9b..22074428883d6b 100644
--- a/test/node-api/test_callback_scope/test-async-hooks.js
+++ b/test/node-api/test_callback_scope/test-async-hooks.js
@@ -12,18 +12,28 @@ process.emitWarning = () => {};
 
 const { runInCallbackScope } = require(`./build/${common.buildType}/binding`);
 
+const expectedResource = {};
+const expectedResourceType = 'test-resource';
 let insideHook = false;
+let expectedId;
 async_hooks.createHook({
+  init: common.mustCall((id, type, triggerAsyncId, resource) => {
+    if (type !== expectedResourceType) {
+      return;
+    }
+    assert.strictEqual(resource, expectedResource);
+    expectedId = id;
+  }),
   before: common.mustCall((id) => {
-    assert.strictEqual(id, 1000);
+    assert.strictEqual(id, expectedId);
     insideHook = true;
   }),
   after: common.mustCall((id) => {
-    assert.strictEqual(id, 1000);
+    assert.strictEqual(id, expectedId);
     insideHook = false;
   })
 }).enable();
 
-runInCallbackScope({}, 1000, 1000, () => {
+runInCallbackScope(expectedResource, expectedResourceType, () => {
   assert(insideHook);
 });
diff --git a/test/node-api/test_callback_scope/test.js b/test/node-api/test_callback_scope/test.js
index 2f2efe5f47b98a..abf9e41b8f5028 100644
--- a/test/node-api/test_callback_scope/test.js
+++ b/test/node-api/test_callback_scope/test.js
@@ -4,14 +4,14 @@ const common = require('../../common');
 const assert = require('assert');
 const { runInCallbackScope } = require(`./build/${common.buildType}/binding`);
 
-assert.strictEqual(runInCallbackScope({}, 0, 0, () => 42), 42);
+assert.strictEqual(runInCallbackScope({}, 'test-resource', () => 42), 42);
 
 {
   process.once('uncaughtException', common.mustCall((err) => {
     assert.strictEqual(err.message, 'foo');
   }));
 
-  runInCallbackScope({}, 0, 0, () => {
+  runInCallbackScope({}, 'test-resource', () => {
     throw new Error('foo');
   });
 }