From 8c800d7102d610593b785cc748924049e346a580 Mon Sep 17 00:00:00 2001 From: Jiawen Geng Date: Sat, 14 May 2022 04:10:18 +0000 Subject: [PATCH 1/5] build: disable windows-2022 temporarily MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/43093 Reviewed-By: Tobias Nießen Reviewed-By: Rich Trott --- .github/workflows/build-windows.yml | 2 +- .github/workflows/coverage-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 44d7529b2a2e54..5ab5f98739f579 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -32,7 +32,7 @@ jobs: if: github.event.pull_request.draft == false strategy: matrix: - windows: [windows-2019, windows-2022] + windows: [windows-2019] fail-fast: false runs-on: ${{ matrix.windows }} steps: diff --git a/.github/workflows/coverage-windows.yml b/.github/workflows/coverage-windows.yml index 231f3b1ed7ec13..dde4f30f8f2909 100644 --- a/.github/workflows/coverage-windows.yml +++ b/.github/workflows/coverage-windows.yml @@ -33,7 +33,7 @@ env: jobs: coverage-windows: if: github.event.pull_request.draft == false - runs-on: windows-latest + runs-on: windows-2019 steps: - uses: actions/checkout@v3 with: From 74cf01a8e8c66f1ffbb13282e45abc777ef4bd64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Sat, 14 May 2022 22:16:44 +0200 Subject: [PATCH 2/5] doc: use serial comma in modules docs Refs: https://github.com/nodejs/node/pull/11321 Refs: https://github.com/nodejs/node/pull/17384 PR-URL: https://github.com/nodejs/node/pull/43103 Reviewed-By: Rich Trott Reviewed-By: Luigi Pinca --- doc/api/modules.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/modules.md b/doc/api/modules.md index 0c860af60d1446..18e6d29797770e 100644 --- a/doc/api/modules.md +++ b/doc/api/modules.md @@ -562,7 +562,7 @@ wrapper that looks like the following: By doing this, Node.js achieves a few things: -* It keeps top-level variables (defined with `var`, `const` or `let`) scoped to +* It keeps top-level variables (defined with `var`, `const`, or `let`) scoped to the module rather than the global object. * It helps to provide some global-looking variables that are actually specific to the module, such as: From 8a5657bf9b4a29441834242dc4baed755ff7de9c Mon Sep 17 00:00:00 2001 From: Paolo Insogna Date: Sun, 15 May 2022 06:25:44 +0200 Subject: [PATCH 3/5] meta: add mailmap entry for ShogunPanda PR-URL: https://github.com/nodejs/node/pull/43094 Reviewed-By: Rich Trott Reviewed-By: Luigi Pinca --- .mailmap | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 6ee2b48dceb82b..226c06fabb4db8 100644 --- a/.mailmap +++ b/.mailmap @@ -198,8 +198,6 @@ Hassaan Pasha Hendrik Schwalm Henry Chin Herbert Vojčík -Zeyu "Alex" Yang -Zeyu "Alex" Yang Hitesh Kanwathirtha Icer Liang Igor Savin @@ -382,6 +380,7 @@ Oluwaseun Omoyajowo OneNail Onne Gorter Oscar Martinez +Paolo Insogna Paul Graham Paul Querna Pedro Lima @@ -564,6 +563,8 @@ Yuta Hiroto Zach Bjornson Zachary Scott Zachary Vacura +Zeyu "Alex" Yang +Zeyu "Alex" Yang Zoran Tomicic Сковорода Никита Андреевич 隋鑫磊 From 4a34ece28fb3fcdf4aa8f90b5924d1f3b39af23c Mon Sep 17 00:00:00 2001 From: Morgan Roderick <20321+mroderick@users.noreply.github.com> Date: Sun, 15 May 2022 06:25:53 +0200 Subject: [PATCH 4/5] fs: remove unnecessary ?? operator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was introduced in 57678e55817366c39a3a241f89949c8fbe8418bc With the `if` conditional around this statement, `options` will always be evaluated as truthy. That means that the nullish coalescing operator will always evaluate to the left side, make it unnecessary. PR-URL: https://github.com/nodejs/node/pull/43073 Reviewed-By: Zeyu "Alex" Yang Reviewed-By: Tobias Nießen Reviewed-By: LiviaMedeiros Reviewed-By: Darshan Sen Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: Anto Aravinth Reviewed-By: Akhil Marsonya --- lib/internal/fs/promises.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js index ea9482e69dc904..9ae66a8e073442 100644 --- a/lib/internal/fs/promises.js +++ b/lib/internal/fs/promises.js @@ -528,7 +528,7 @@ async function read(handle, bufferOrParams, offset, length, position) { offset = 0, length = buffer.byteLength - offset, position = null - } = offset ?? ObjectCreate(null)); + } = offset); } if (offset == null) { From 347000ccf8c4705721ff60717b234c75e72183cd Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 13 May 2022 11:10:47 -0400 Subject: [PATCH 5/5] build: set ASAN workaround PR-URL: https://github.com/nodejs/node/pull/43085 Refs: https://github.com/google/sanitizers/issues/1322 Refs: https://github.com/nodejs/node/issues/43082 Reviewed-By: Jiawen Geng Reviewed-By: LiviaMedeiros Reviewed-By: Rich Trott Reviewed-By: Luigi Pinca --- .github/workflows/test-asan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml index 29e545657002eb..87cf9edf672d47 100644 --- a/.github/workflows/test-asan.yml +++ b/.github/workflows/test-asan.yml @@ -30,6 +30,7 @@ concurrency: cancel-in-progress: true env: + ASAN_OPTIONS: intercept_tls_get_addr=0 PYTHON_VERSION: '3.10' FLAKY_TESTS: dontcare