attempt at migrating to node 20 (#673)

microsoft · Dec 16, 2023 · 0cc2614 · 0cc2614
1 parent e63fe9e
commit 0cc2614
Show file tree

Hide file tree

Showing 16 changed files with 349 additions and 325 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # see https://github.com/microsoft/vscode-dev-containers/tree/main/containers
-ARG VARIANT="16"
+ARG VARIANT="20"
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
 ENV PATH="/opt/emsdk/upstream/emscripten:${PATH}"

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,8 +3,7 @@
     "name": "Node.js + C++",
     "build": {
         "dockerfile": "Dockerfile",
-        // Node v16
-        "args": { "VARIANT": "16" }
+        "args": { "VARIANT": "20" }
     },
     "runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
 

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -31,7 +31,7 @@ jobs:
                   key: ${{env.EM_VERSION}}-${{ runner.os }}
             - uses: actions/setup-node@v3
               with:
-                  node-version: "16"
+                  node-version: "20"
                   cache: yarn
                   registry-url: 'https://registry.npmjs.org'
             - uses: mymindstorm/setup-emsdk@v12
@@ -41,7 +41,7 @@ jobs:
             # setup node again, in case emsdk messed it up
             - uses: actions/setup-node@v3
               with:
-                  node-version: "16"
+                  node-version: "20"
                   cache: yarn
                   registry-url: 'https://registry.npmjs.org'
             - run: yarn install --frozen-lockfile

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ jobs:
                   fetch-depth: 0
             - uses: actions/setup-node@v3
               with:
-                  node-version: "16"
+                  node-version: "20"
                   cache: yarn
             - run: yarn install --frozen-lockfile
             - name: Build tools

diff --git a/cli/package.json b/cli/package.json
@@ -27,30 +27,30 @@
         "directory": "cli"
     },
     "engines": {
-        "node": ">=16"
+        "node": ">=20"
     },
     "license": "MIT",
     "devDependencies": {
         "@devicescript/dap": "*",
         "@devicescript/compiler": "*",
         "@devicescript/interop": "*",
         "@devicescript/vm": "*",
-        "@types/debounce-promise": "^3.1.6",
-        "@types/fs-extra": "^11.0.1",
-        "@types/node": "^16",
-        "@types/update-notifier": "^6.0.2",
-        "commander": "^10.0.0",
+        "@types/debounce-promise": "^3.1.9",
+        "@types/fs-extra": "^11.0.4",
+        "@types/node": "^20",
+        "@types/update-notifier": "^6.0.8",
+        "commander": "^11.1.0",
         "debounce-promise": "^3.1.2",
         "jacdac-ts": "*",
-        "fast-glob": "^3.2.12",
+        "fast-glob": "^3.3.2",
         "faye-websocket": "^0.11.4",
-        "fs-extra": "^11.1.0"
+        "fs-extra": "^11.2.0"
     },
     "dependencies": {
-        "update-notifier": "^6.0.2"
+        "update-notifier": "^7.0.0"
     },
     "optionalDependencies": {
-        "serialport": "^10.5.0"
+        "serialport": "^12.0.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/cli/src/init.ts b/cli/src/init.ts
@@ -218,7 +218,7 @@ to the VS Code extension
 
 const optionalFiles: FileSet = {
     ".devcontainer/devcontainer.json": {
-        image: "mcr.microsoft.com/devcontainers/javascript-node:18",
+        image: "mcr.microsoft.com/devcontainers/javascript-node:20",
         features: {
             "ghcr.io/devcontainers/features/node:1": {},
             "ghcr.io/devcontainers/features/github-cli:1": {},

diff --git a/cli/src/tsconfig.json b/cli/src/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../../tsconfig-base.json",
     "compilerOptions": {
-        "module": "node16",
+        "module": "NodeNext",
         "declarationDir": "../built/types",
         "outDir": "../built",
         "types": ["node"]

diff --git a/compiler/package.json b/compiler/package.json
@@ -26,14 +26,14 @@
         "./built/**"
     ],
     "engines": {
-        "node": ">=16"
+        "node": ">=20"
     },
     "license": "MIT",
     "devDependencies": {
         "@devicescript/interop": "*",
-        "@types/fs-extra": "^11.0.1",
-        "@types/node": "^16",
-        "esbuild": "^0.17.11",
+        "@types/fs-extra": "^11.0.4",
+        "@types/node": "^20",
+        "esbuild": "^0.19.9",
         "jacdac-ts": "*",
         "typescript": "^4.9.5"
     },

diff --git a/dap/package.json b/dap/package.json
@@ -21,11 +21,11 @@
     },
     "license": "MIT",
     "devDependencies": {
-        "@types/node": "^16",
+        "@types/node": "^20",
         "async-mutex": "^0.4.0",
         "@devicescript/compiler": "*",
         "@devicescript/vm": "*",
-        "@vscode/debugadapter": "^1.58.0",
+        "@vscode/debugadapter": "^1.64.0",
         "jacdac-ts": "*"
     },
     "dependencies": {},

diff --git a/interop/package.json b/interop/package.json
@@ -22,8 +22,8 @@
     ],
     "license": "MIT",
     "devDependencies": {
-        "esbuild": "^0.14.11",
-        "typescript": "^4.5.4"
+        "esbuild": "^0.19.9",
+        "typescript": "^4.9.5"
     },
     "dependencies": {
         "json5": "^2.2.3"

diff --git a/interop/src/constants.ts b/interop/src/constants.ts
@@ -1,2 +1,2 @@
-export const MIN_NODE_VERSION = 16
+export const MIN_NODE_VERSION = 20
 export const MARKETPLACE_EXTENSION_ID = "devicescript.devicescript-vscode"
diff --git a/interop/src/errors.ts b/interop/src/errors.ts
@@ -4,7 +4,7 @@ export const errors: Record<string, string> = {
   "can't connect, no HF2 nor JDUSB": "no-hf2",
   "esptool cannot connect": "esptool-cannot-connect",
   "I2C device not found or malfunctioning": "i2c-device-not-found-or-malfunctioning",
-  "Unable to locate Node.JS v16+.": "terminal-nodemissing",
+  "Unable to locate Node.JS.": "terminal-nodemissing",
   "Install @devicescript/cli package": "terminal-notinstalled",
   "missing \"devicescript\" section": "missing-devicescript-section",
   "No DeviceScript device found.": "no-devicescript-device-found",

diff --git a/package.json b/package.json
@@ -58,11 +58,9 @@
     ],
     "devDependencies": {
         "auto-changelog": "^2.4.0",
-        "esbuild": "^0.17.11",
-        "semver": "^7.3.8",
-        "zx": "^7.2.1"
-    },
-    "dependencies": {
-        "prettier": "^3.0.3"
+        "esbuild": "^0.19.9",
+        "semver": "^7.5.4",
+        "zx": "^7.2.3",
+        "prettier": "^3.1.1"
     }
 }
diff --git a/vscode/src/devtoolsserver.ts b/vscode/src/devtoolsserver.ts
@@ -883,11 +883,11 @@ export class DeveloperToolsManager extends JDEventSource {
             if (!v) {
                 showErrorWithHelp(
                     "terminal.nodemissing",
-                    "Unable to locate Node.JS v16+."
+                    "Unable to locate Node.JS."
                 )
                 return undefined
             }
-            if (!(v.major >= 16)) {
+            if (!(v.major >= MIN_NODE_VERSION)) {
                 showErrorMessage(
                     "terminal.nodeversion",
                     `Node.JS version outdated, found ${v.major}.${v.minor} but needed v16+.`

diff --git a/website/docs/developer/errors.mdx b/website/docs/developer/errors.mdx
@@ -28,7 +28,7 @@ are due to invalid configurations, aside from hardware issues with the sensor.
 -   The I2C address is incorrect. Check the datasheet for the correct address.
 -   The I2C address is correct, but the sensor is not responding. Check the wiring and the sensor datasheet.
 
-## Unable to locate Node.JS v16+. {#terminal-nodemissing}
+## Unable to locate Node.JS. {#terminal-nodemissing}
 
 The Visual Studio Code extension was unable to determine the version of Node.JS.
 This may mean that Node.JS is not installed or not in the path,