Merge pull request #602 from streamich/bump-dependencies

Bump dependencies

package.json

@@ -124,28 +124,28 @@
   "dependencies": {
     "@jsonjoy.com/base64": "^1.1.1",
     "@jsonjoy.com/json-pack": "^1.0.2",
-    "@jsonjoy.com/util": "^1.0.0",
+    "@jsonjoy.com/util": "^1.1.0",
     "arg": "^5.0.2",
     "hyperdyperid": "^1.2.0",
     "sonic-forest": "^1.0.0",
-    "thingies": "^1.20.0"
+    "thingies": "^2.0.0"
   },
   "devDependencies": {
-    "@types/benchmark": "^2.1.2",
+    "@types/benchmark": "^2.1.5",
     "@types/jest": "^29.5.12",
     "benchmark": "^2.1.4",
     "config-housekeeping": "https://github.com/streamich/housekeeping#3532d2abeac159315ddf403d70517859d079c801",
     "editing-traces": "https://github.com/streamich/editing-traces#6494020428530a6e382378b98d1d7e31334e2d7b",
-    "fast-json-patch": "^3.0.0-1",
+    "fast-json-patch": "^3.1.1",
     "jest": "^29.7.0",
     "json-crdt-traces": "https://github.com/streamich/json-crdt-traces#ec825401dc05cbb74b9e0b3c4d6527399f54d54d",
-    "json-logic-js": "^2.0.1",
+    "json-logic-js": "^2.0.2",
     "rxjs": "^7.8.1",
     "ts-jest": "^29.1.2",
     "tslib": "^2.6.2",
     "tslint": "^6.1.3",
     "tslint-config-common": "^1.6.2",
-    "typescript": "^5.4.4"
+    "typescript": "^5.4.5"
   },
   "jest": {
     "verbose": true,

src/json-crdt/log/Log.ts

@@ -1,4 +1,4 @@
-import {FanOutUnsubscribe} from 'thingies/es2020/fanout';
+import {FanOutUnsubscribe} from 'thingies/lib/fanout';
 import {ITimestampStruct, Patch, compare} from '../../json-crdt-patch';
 import {printTree} from '../../util/print/printTree';
 import {AvlMap} from 'sonic-forest/lib/avl/AvlMap';

src/json-crdt/model/api/ModelApi.ts

@@ -1,4 +1,4 @@
-import {FanOut} from 'thingies/es2020/fanout';
+import {FanOut} from 'thingies/lib/fanout';
 import {VecNode, ConNode, ObjNode, ArrNode, BinNode, StrNode, ValNode} from '../../nodes';
 import {ApiPath, ArrApi, BinApi, ConApi, NodeApi, ObjApi, StrApi, VecApi, ValApi} from './nodes';
 import {Patch} from '../../../json-crdt-patch/Patch';

src/json-crdt/model/api/NodeEvents.ts

@@ -1,4 +1,4 @@
-import {FanOut} from 'thingies/es2020/fanout';
+import {FanOut} from 'thingies/lib/fanout';
 import {MapFanOut, OnNewFanOut} from './fanout';
 import type {JsonNode, JsonNodeView} from '../../nodes';
 import type {SyncStore, SyncStoreUnsubscribe} from '../../../util/events/sync-store';

src/json-crdt/model/api/__tests__/fanout.spec.ts

@@ -1,5 +1,5 @@
 import {MapFanOut, MergeFanOut, MicrotaskBufferFanOut, OnNewFanOut} from '../fanout';
-import {FanOut} from 'thingies/es2020/fanout';
+import {FanOut} from 'thingies/lib/fanout';
 
 describe('MergeFanOut', () => {
   test('merges data from multiple fanouts', () => {

src/json-crdt/model/api/fanout.ts

@@ -1,4 +1,4 @@
-import {FanOut, FanOutUnsubscribe, FanOutListener} from 'thingies/es2020/fanout';
+import {FanOut, FanOutUnsubscribe, FanOutListener} from 'thingies/lib/fanout';
 
 /**
  * Merges multiple fanouts into a single fanout. The merged fanout emits the

yarn.lock

@@ -553,7 +553,7 @@
     hyperdyperid "^1.2.0"
     thingies "^1.20.0"
 
-"@jsonjoy.com/util@^1.0.0":
+"@jsonjoy.com/util@^1.0.0", "@jsonjoy.com/util@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-1.1.0.tgz#9726365362ede17405d2b521b4c782582df7ed4f"
   integrity sha512-Yz+xITJ3Y/w0DBISwPkBETP5/cITHXscjgQNZIkfrVz1V7/ahJY8vw+T+LZy/KtXgKuUWqu4GALAQ3bhGt9J8A==
@@ -612,7 +612,7 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
-"@types/benchmark@^2.1.2":
+"@types/benchmark@^2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@types/benchmark/-/benchmark-2.1.5.tgz#940c1850c18fdfdaee3fd6ed29cd92ae0d445b45"
   integrity sha512-cKio2eFB3v7qmKcvIHLUMw/dIx/8bhWPuzpzRT4unCPRTD8VdA9Zb0afxpcxOqR4PixRS7yT42FqGS8BYL8g1w==
@@ -1093,7 +1093,7 @@ expect@^29.0.0, expect@^29.7.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
-fast-json-patch@^3.0.0-1:
+fast-json-patch@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
   integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==
@@ -1710,7 +1710,7 @@ jsesc@^2.5.1:
   version "0.0.1"
   resolved "https://github.com/streamich/json-crdt-traces#ec825401dc05cbb74b9e0b3c4d6527399f54d54d"
 
-json-logic-js@^2.0.1:
+json-logic-js@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/json-logic-js/-/json-logic-js-2.0.2.tgz#b613e095f5e598cb78f7b9a2bbf638e74cf98158"
   integrity sha512-ZBtBdMJieqQcH7IX/LaBsr5pX+Y5JIW+EhejtM3Ffg2jdN9Iwf+Ht6TbHnvAZ/YtwyuhPaCBlnvzrwVeWdvGDQ==
@@ -2174,6 +2174,11 @@ thingies@^1.20.0:
   resolved "https://registry.yarnpkg.com/thingies/-/thingies-1.20.0.tgz#27bf93397c39c3ff36601197e8cf78f43b7b2319"
   integrity sha512-WvXY4CjHp/Uim2Ri0daqu6jkNTHJTk1H8NvuMQiOL0mgtdkqoSH5fkENy2M6XnvsLOp5iwyPcbmokoBjVb4lnQ==
 
+thingies@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/thingies/-/thingies-2.0.0.tgz#10956129d2dc0ddccddbeb0880fd01404e520776"
+  integrity sha512-lSh4YCpb0JJXsOZkdiLGN8ZmEunFzbHg3depXSyEWNWij+XL5dxeLeta55yuHJCggblp7MjRLIZjkdD1hKl+Sg==
+
 [email protected]:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
@@ -2278,7 +2283,7 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-typescript@^5.4.4:
+typescript@^5.4.5:
   version "5.4.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
   integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==