Replace url-join with url.resolve

url-join 5.0.0 (automatically merged in 9393d07) only supports ECMAScript, so just replace it with url.resolve Fixes: synclounge/synclounge#1035 Fixes: synclounge/synclounge#1041
synclounge · Aug 1, 2022 · 50f430d · 50f430d
1 parent 60deae0
commit 50f430d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,6 @@
     "express": "^4.18.1",
     "nconf": "^0.12.0",
     "socket.io": "^4.5.1",
-    "url-join": "^5.0.0",
     "uuid": "^8.3.2"
   },
   "optionalDependencies": {

diff --git a/src/socketserver/index.js b/src/socketserver/index.js
@@ -3,7 +3,7 @@
 import express from 'express';
 import cors from 'cors';
 import http from 'http';
-import urljoin from 'url-join';
+import url from 'url';
 
 import { Server } from 'socket.io';
 import attachEventHandlers from './handlers';
@@ -25,7 +25,7 @@ const socketServer = ({
   app.use(baseUrl, router);
 
   const socketio = new Server(server, {
-    path: urljoin(baseUrl, '/socket.io'),
+    path: url.resolve(baseUrl, 'socket.io'),
     cors: {
       origin: '*',
     },