Merge 285c1aa into 2b71a3c

karma-runner · Aug 30, 2021 · cb73386 · cb73386
2 parents 2b71a3c + 285c1aa
commit cb73386
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -284,6 +284,7 @@
     "Merott Movahedi <merott@merott.com>",
     "Merrick Christensen <merrick.christensen@gmail.com>",
     "Michael Krotscheck <krotscheck@gmail.com>",
+    "Michael Vartan <michaelvartan@google.com>",
     "Michał Siwek <mike21@aol.pl>",
     "Milan Aleksic <milanaleksic@gmail.com>",
     "Milana Stojadinov <mstojadinov@renderedtext.com>",
@@ -435,7 +436,7 @@
     "qjobs": "^1.2.0",
     "range-parser": "^1.2.1",
     "rimraf": "^3.0.2",
-    "socket.io": "^3.1.0",
+    "socket.io": "^4.2.0",
     "source-map": "^0.6.1",
     "tmp": "^0.2.1",
     "ua-parser-js": "^0.7.28",

diff --git a/static/karma.js b/static/karma.js
@@ -334,11 +334,12 @@ var BROWSER_SOCKET_TIMEOUT = constants.BROWSER_SOCKET_TIMEOUT
 
 // Connect to the server using socket.io https://socket.io/
 var socket = io(location.host, {
+  'sync disconnect on unload': true,
+  path: KARMA_PROXY_PATH + KARMA_URL_ROOT.substr(1) + 'socket.io',
   reconnectionDelay: 500,
   reconnectionDelayMax: Infinity,
   timeout: BROWSER_SOCKET_TIMEOUT,
-  path: KARMA_PROXY_PATH + KARMA_URL_ROOT.substr(1) + 'socket.io',
-  'sync disconnect on unload': true
+  useNativeTimers: true,
 })
 
 // instantiate the updater of the view