From f36f0336b1f3d92d4267cde6ce3b8b299f73a52f Mon Sep 17 00:00:00 2001
From: Mine Starks <16928427+minestarks@users.noreply.github.com>
Date: Fri, 8 Sep 2023 14:51:21 -0700
Subject: [PATCH] Use Node 18 for GitHub workflows (#666)

Node.js seems to have fixed a bunch of test runner issues v18.

Bumping the prerequisite to v18.
---
 .github/workflows/ci.yml                 | 4 ++--
 .github/workflows/publish-playground.yml | 2 +-
 npm/README.md                            | 4 ----
 package-lock.json                        | 2 +-
 package.json                             | 2 +-
 prereqs.py                               | 4 ++--
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa16422e1e..1276fc02c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
           submodules: "true"
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.17.1'
+          node-version: '18.17.1'
       - name: npm install
         run: npm install
       - name: npm check
@@ -108,7 +108,7 @@ jobs:
           python-version: '3.11'
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.17.1'
+          node-version: '18.17.1'
       - uses: Swatinem/rust-cache@v2
       - name: Prereqs
         run: python ./prereqs.py --install
diff --git a/.github/workflows/publish-playground.yml b/.github/workflows/publish-playground.yml
index 1c74aeb377..5257ddf1b2 100644
--- a/.github/workflows/publish-playground.yml
+++ b/.github/workflows/publish-playground.yml
@@ -45,7 +45,7 @@ jobs:
           python-version: '3.11'
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.17.1'
+          node-version: '18.17.1'
       - uses: Swatinem/rust-cache@v2
       - name: Prereqs
         run: python ./prereqs.py --install
diff --git a/npm/README.md b/npm/README.md
index c45d64b1ed..4e0bfdf5de 100644
--- a/npm/README.md
+++ b/npm/README.md
@@ -68,7 +68,3 @@ at <src/vs/base/common/cancellation.ts>. This code uses a simplified version of
 
 Node.js tests can be run via `node --test` (see
 <https://nodejs.org/dist/latest-v18.x/docs/api/test.html#test-runner-execution-model>).
-
-The test module was also added to Node.js v16.17.0, and Electron 22 (which VS Code plans to move to
-in first half of 2023) includes v16.17.1, so v16.17 should be our minimum Node.js
-version supported (it shipped in Aug 2022).
diff --git a/package-lock.json b/package-lock.json
index a53e6ac859..42ba0b074e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
         "url": "^0.11.1"
       },
       "engines": {
-        "node": ">=16.17.0"
+        "node": ">=18.17.1"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
diff --git a/package.json b/package.json
index b15f8bb2a0..2af926648c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=16.17.0"
+    "node": ">=18.17.1"
   },
   "scripts": {
     "eslint:check": "eslint -c ./.eslintrc.cjs --max-warnings 0 ./",
diff --git a/prereqs.py b/prereqs.py
index 1165d1001e..6cf500e135 100644
--- a/prereqs.py
+++ b/prereqs.py
@@ -15,9 +15,9 @@
 python_ver = (3, 11)  # Python support for Windows on ARM64 requires v3.11 or later
 rust_ver = (1, 72)  # Ensure Rust version 1.69 or later is installed
 node_ver = (
-    16,
+    18,
     17,
-)  # Node.js version 16.17 or later is required to support the Node.js 'test' module
+)
 wasmpack_ver = (0, 12, 1)  # Latest tested wasm-pack version
 rust_fmt_ver = (1, 6, 0)  # Current version when Rust 1.72 shipped
 clippy_ver = (0, 1, 69)