From 8e78bf73a0bf30961e52b68ae1cc8c5d75c991e0 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 16 Feb 2023 01:01:18 +0100
Subject: web-util fixes

---
 packages/taler-wallet-embedded/src/wallet-qjs.ts | 2 +-
 packages/web-util/src/cli.ts                     | 3 ++-
 packages/web-util/src/serve.ts                   | 4 ++--
 packages/web-util/tsconfig.json                  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/taler-wallet-embedded/src/wallet-qjs.ts b/packages/taler-wallet-embedded/src/wallet-qjs.ts
index 77d166095..2d780c34c 100644
--- a/packages/taler-wallet-embedded/src/wallet-qjs.ts
+++ b/packages/taler-wallet-embedded/src/wallet-qjs.ts
@@ -21,7 +21,6 @@ import {
   CoreApiMessageEnvelope,
   CoreApiResponse,
   CoreApiResponseSuccess,
-  createPlatformHttpLib,
   getErrorDetailFromException,
   InitRequest,
   Logger,
@@ -29,6 +28,7 @@ import {
   setPRNG,
   WalletNotification,
 } from "@gnu-taler/taler-util";
+import { createPlatformHttpLib } from "@gnu-taler/taler-util/http";
 import { qjsOs } from "@gnu-taler/taler-util/qtart";
 import {
   createNativeWalletHost2,
diff --git a/packages/web-util/src/cli.ts b/packages/web-util/src/cli.ts
index dca4fc664..b02947f7a 100644
--- a/packages/web-util/src/cli.ts
+++ b/packages/web-util/src/cli.ts
@@ -1,4 +1,5 @@
-import { clk, setGlobalLogLevelFromString } from "@gnu-taler/taler-util";
+import { setGlobalLogLevelFromString } from "@gnu-taler/taler-util";
+import { clk } from "@gnu-taler/taler-util/clk";
 import { serve } from "./serve.js";
 
 export const walletCli = clk
diff --git a/packages/web-util/src/serve.ts b/packages/web-util/src/serve.ts
index f3a97e2e2..34982c656 100644
--- a/packages/web-util/src/serve.ts
+++ b/packages/web-util/src/serve.ts
@@ -3,7 +3,7 @@ import chokidar from "chokidar";
 import express from "express";
 import https from "https";
 import { parse } from "url";
-import WebSocket, { Server } from "ws";
+import WebSocket from "ws";
 
 import locahostCrt from "./keys/localhost.crt";
 import locahostKey from "./keys/localhost.key";
@@ -45,7 +45,7 @@ export async function serve(opts: {
   logger.info(`  ${PATHS.NOTIFY}: broadcast`);
 
   if (opts.development) {
-    const wss = new Server({ noServer: true });
+    const wss = new WebSocket.Server({ noServer: true });
 
     wss.on("connection", function connection(ws) {
       ws.send("welcome");
diff --git a/packages/web-util/tsconfig.json b/packages/web-util/tsconfig.json
index aede0a0ac..3965f537d 100644
--- a/packages/web-util/tsconfig.json
+++ b/packages/web-util/tsconfig.json
@@ -6,7 +6,7 @@
     "jsx": "react",
     "jsxFactory": "h",
     "jsxFragmentFactory": "Fragment",
-    "moduleResolution": "Node",
+    "moduleResolution": "Node16",
     "sourceMap": true,
     "lib": [
       "es6"
@@ -31,4 +31,4 @@
   "include": [
     "src/**/*"
   ]
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3