From f29921915c28da9ef603801b1a28fae077fa8a80 Mon Sep 17 00:00:00 2001
From: David Zhao <dz@livekit.io>
Date: Fri, 5 Apr 2024 21:41:34 -0700
Subject: [PATCH] Support both livekit-client 2.0.x and 1.5.x

---
 template-sdk/package.json   |  4 ++--
 template-sdk/pnpm-lock.yaml | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/template-sdk/package.json b/template-sdk/package.json
index 311d3dd4..96661a0f 100644
--- a/template-sdk/package.json
+++ b/template-sdk/package.json
@@ -12,11 +12,11 @@
     "build": "tsc"
   },
   "devDependencies": {
-    "livekit-client": "^1.7.0",
+    "livekit-client": "^1.15.13 || ^2.0.10",
     "prettier": "^2.8.4",
     "typescript": "^5.0.0"
   },
   "peerDependencies": {
-    "livekit-client": "^1.7.0"
+    "livekit-client": "^1.15.13 || ^2.0.10"
   }
 }
diff --git a/template-sdk/pnpm-lock.yaml b/template-sdk/pnpm-lock.yaml
index faf8bd7f..b0f9e5d4 100644
--- a/template-sdk/pnpm-lock.yaml
+++ b/template-sdk/pnpm-lock.yaml
@@ -6,8 +6,8 @@ settings:
 
 devDependencies:
   livekit-client:
-    specifier: ^1.7.0
-    version: 1.14.4
+    specifier: ^1.15.13 || ^2.0.10
+    version: 2.0.10
   prettier:
     specifier: ^2.8.4
     version: 2.8.8
@@ -17,8 +17,14 @@ devDependencies:
 
 packages:
 
-  /@bufbuild/protobuf@1.4.2:
-    resolution: {integrity: sha512-JyEH8Z+OD5Sc2opSg86qMHn1EM1Sa+zj/Tc0ovxdwk56ByVNONJSabuCUbLQp+eKN3rWNfrho0X+3SEqEPXIow==}
+  /@bufbuild/protobuf@1.8.0:
+    resolution: {integrity: sha512-qR9FwI8QKIveDnUYutvfzbC21UZJJryYrLuZGjeZ/VGz+vXelUkK+xgkOHsvPEdYEdxtgUUq4313N8QtOehJ1Q==}
+    dev: true
+
+  /@livekit/protocol@1.10.4:
+    resolution: {integrity: sha512-7Occ6l5VqjsKsUjpLeVJXJkip4ce22iG9QR/haOkrDXYwGSY+TwCA4ubbJ81aQBt2z0kHVZuaQWdzJSDLI+Kag==}
+    dependencies:
+      '@bufbuild/protobuf': 1.8.0
     dev: true
 
   /events@3.3.0:
@@ -26,14 +32,15 @@ packages:
     engines: {node: '>=0.8.x'}
     dev: true
 
-  /livekit-client@1.14.4:
-    resolution: {integrity: sha512-sXNH+qhqkmXeCVsw3hcEbUsh9QfguBIGgM3glM0v0+YW4C2LdeGWD4pQBLR7USbkwbbVMEHDmqr/iY6XvEIoeQ==}
+  /livekit-client@2.0.10:
+    resolution: {integrity: sha512-V+EyTEd3kM1Vl9/TsE3nc7PEnJI2t21ZV0/nkqhGThszym1SJzmc61hKjmCJBnR199pskUxSjrwzMl9HrPQ85A==}
     dependencies:
-      '@bufbuild/protobuf': 1.4.2
+      '@livekit/protocol': 1.10.4
       events: 3.3.0
       loglevel: 1.8.1
       sdp-transform: 2.14.1
       ts-debounce: 4.0.0
+      tslib: 2.6.2
       typed-emitter: 2.1.0
       webrtc-adapter: 8.2.3
     dev: true
@@ -74,7 +81,6 @@ packages:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
     requiresBuild: true
     dev: true
-    optional: true
 
   /typed-emitter@2.1.0:
     resolution: {integrity: sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==}