Merge branch 'zwave-js:main' into main

.github/workflows/test-and-release.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x] # This should be LTS
+        node-version: [20.x] # This should be LTS
 
     steps:
     - name: Checkout code
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x] # This should be LTS
+        node-version: [20.x] # This should be LTS
 
     steps:
     - name: Checkout code

ava.config.mjs

@@ -2,14 +2,6 @@ export default {
 	extensions: {
 		ts: "module",
 	},
-	nodeArguments: [
-		"--no-warnings",
-		"--experimental-loader",
-		"./src/maintenance/ts-loader.mjs",
-		"-r",
-		"esbuild-register",
-		"--experimental-specifier-resolution=node",
-		"--experimental-vm-modules",
-	],
+	nodeArguments: ["--no-warnings", "--experimental-vm-modules"],
 	files: ["src/**/*.test.ts", "test/**/*.ts"],
 };

package.json

@@ -9,15 +9,14 @@
   "module": "build/worker.js",
   "scripts": {
     "check": "tsc -p tsconfig.build.json --noEmit && tsc -p src/maintenance/tsconfig.json --noEmit",
-    "ts": "yarn node --experimental-loader ./src/maintenance/ts-loader.mjs -r esbuild-register",
     "build": "esbuild --bundle --format=esm --platform=browser --sourcemap --outdir=build src/worker.ts",
     "clean": "rm -rf build",
     "lint": "eslint .",
-    "test:ci": "ava",
+    "test:ci": "NODE_OPTIONS='--loader=tsx' ava",
     "test": "yarn test:ci --watch",
     "dev": "miniflare",
-    "build:index": "yarn ts src/maintenance/generateIndex.ts",
-    "upload": "yarn ts src/maintenance/upload.ts"
+    "build:index": "yarn tsx src/maintenance/generateIndex.ts",
+    "upload": "yarn tsx src/maintenance/upload.ts"
   },
   "dependencies": {
     "itty-durable": "^1.2.0",
@@ -55,6 +54,7 @@
     "miniflare": "~2.11.0",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.1.1",
+    "tsx": "^3.13.0",
     "typescript": "~4.7.4",
     "wrangler": "^2.1.4",
     "zod-to-json-schema": "^3.17.1"

src/maintenance/generateIndex.ts

@@ -2,6 +2,10 @@ import path from "path-browserify";
 import { generateIndex } from "../lib/config";
 import { NodeFS } from "./nodeFS";
 
+import { dirname } from "path";
+import { fileURLToPath } from "url";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
 const configDir = path.join(__dirname, "../../firmwares");
 
 void (async () => {

src/maintenance/upload.ts

@@ -6,6 +6,10 @@ import type { ConfigIndexEntry } from "../lib/config";
 import type { UploadPayload } from "../lib/uploadSchema";
 import { NodeFS } from "./nodeFS";
 
+import { dirname } from "path";
+import { fileURLToPath } from "url";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
 const configDir = path.join(__dirname, "../../firmwares");
 const MAX_FILES_PER_REQUEST = 50; // limited by no. of subrequests in Cloudflare Workers
 const baseURL = process.env.BASE_URL;