Merge branch 'hotfix/0.1.1' into develop

CentreForDigitalHumanities · Mar 11, 2024 · 0e644eb · 0e644eb
2 parents a11d4a2 + 6278228
commit 0e644eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uu-cdh/timing-util",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Async timing utilities for JavaScript",
   "author": "UU Centre for Digital Humanities - Research Software Lab",
   "license": "BSD-3-Clause",

diff --git a/src/fastTimeout.js b/src/fastTimeout.js
@@ -1,4 +1,4 @@
-import { restArguments } from 'underscore';
+import _ from 'underscore';
 
 // The code in this module was inspired on the following blog post:
 // https://dbaron.org/log/20100309-faster-timeouts
@@ -7,6 +7,9 @@ import { restArguments } from 'underscore';
 var timeouts = '_fastTimeoutRegistry';
 var messageName = 'fast-timeout-message';
 
+// Work around one of JDD's breaking changes in Lodash.
+var restArguments = _.restArguments || _.rest;
+
 function handleMessage(event) {
     if (event.source === self && event.data === messageName) {
         event.stopPropagation();