(Somewhat infuriatingly) completely revert what we've done because yarn won't build a local module correctly

Author: Lauriethefish

mbf-site/package.json

@@ -15,9 +15,10 @@
     "@types/react-dom": "^18.0.0",
     "@types/semver": "^7.5.8",
     "@vitejs/plugin-react": "^4.2.1",
-    "@yume-chan/adb-credential-web": "file:./../ya-webadb/libraries/adb-credential-web",
-    "@yume-chan/adb-daemon-webusb": "file:./../ya-webadb/libraries/adb-daemon-webusb",
-    "@yume-chan/stream-extra": "file:./../ya-webadb/libraries/stream-extra",
+    "@yume-chan/adb": "^2.1.0",
+    "@yume-chan/adb-credential-web": "^2.1.0",
+    "@yume-chan/adb-daemon-webusb": "^2.1.0",
+    "@yume-chan/stream-extra": "^2.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-spinners": "^0.14.1",

mbf-site/src/Agent.ts

@@ -1,5 +1,5 @@
-import { AdbSync, AdbSyncWriteOptions, Adb, encodeUtf8, packetListeners, AdbPacketData, AdbCommand } from '@yume-chan/adb';
-import { Consumable, ConcatStringStream, TextDecoderStream, MaybeConsumable, ReadableStream } from '@yume-chan/stream-extra';
+import { AdbSync, AdbSyncWriteOptions, Adb, encodeUtf8, AdbPacketData, AdbCommand } from "@yume-chan/adb";
+import { Consumable, TextDecoderStream, MaybeConsumable, ReadableStream } from "@yume-chan/stream-extra";
 import { Request, Response, LogMsg, ModStatus, Mods, FixedPlayerData, ImportResult, DowngradedManifest, Patched, ModSyncResult, AgentParameters } from "./Messages";
 import { AGENT_SHA1 } from './agent_manifest';
 import { toast } from 'react-toastify';
@@ -63,8 +63,8 @@ function adbPacketToString(data: AdbPacketData): string {
 }
 
 export function installLoggers() {
-  packetListeners.onPacketRead = packet => console.log("READ: " + adbPacketToString(packet));
-  packetListeners.onPacketWritten = packet => console.log("Sent: " + adbPacketToString(packet));
+  //packetListeners.onPacketRead = packet => console.log("READ: " + adbPacketToString(packet));
+  //packetListeners.onPacketWritten = packet => console.log("Sent: " + adbPacketToString(packet));
 }
 
 export async function overwriteAgent(adb: Adb) {

mbf-site/vite.config.ts

@@ -12,10 +12,7 @@ export default defineConfig({
         https: true,
     },
     build: {
-        sourcemap: true,
-        rollupOptions: {
-            external: "@yume-chan/async"
-        }
+        sourcemap: true
     },
     resolve: {
     }

mbf-site/yarn.lock

@@ -844,21 +844,25 @@
     "@types/babel__core" "^7.20.5"
     react-refresh "^0.14.2"
 
-"@yume-chan/adb-credential-web@file:./../ya-webadb/libraries/adb-credential-web":
+"@yume-chan/adb-credential-web@^2.1.0":
   version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@yume-chan/adb-credential-web/-/adb-credential-web-2.1.0.tgz#b384601a7c84f7e5d208f415d16098e22303415c"
+  integrity sha512-ps5XWt+xxm6Mi9eF80ePprPJ/uRFMhfR437betQE8hixrjdZpkZgMlqZU6GlnuebMi0djrbP8GWB49jJekJVYA==
   dependencies:
-    "@yume-chan/adb" "workspace:^"
+    "@yume-chan/adb" "^2.1.0"
 
-"@yume-chan/adb-daemon-webusb@file:./../ya-webadb/libraries/adb-daemon-webusb":
+"@yume-chan/adb-daemon-webusb@^2.1.0":
   version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@yume-chan/adb-daemon-webusb/-/adb-daemon-webusb-2.1.0.tgz#b78a92656d725397c06d179750c11ed10624f917"
+  integrity sha512-mAaDyTSGHO2dzteei5rkHrBAmonEmMkXZsdqmn35U/OZeXr4Zi42JDbtDVYtw6cjd/dyYGQfvwfipmmmqj6U0g==
   dependencies:
     "@types/w3c-web-usb" "^1.0.10"
-    "@yume-chan/adb" "workspace:^"
-    "@yume-chan/event" "workspace:^"
-    "@yume-chan/stream-extra" "workspace:^"
-    "@yume-chan/struct" "workspace:^"
+    "@yume-chan/adb" "^2.1.0"
+    "@yume-chan/event" "^2.0.0"
+    "@yume-chan/stream-extra" "^2.1.0"
+    "@yume-chan/struct" "^2.0.1"
 
-"@yume-chan/adb@workspace:^":
+"@yume-chan/adb@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@yume-chan/adb/-/adb-2.1.0.tgz#89db68088c0acc42b38bfcb813ff4f70309b3bee"
   integrity sha512-OFubv3fLiPCGztJLqR0L9gSbxH66TxJXQTYKdlBheVU+HMFHxSq9mziP+iwW7CfIR73fu4KM6E1YmPrCW1UVOQ==
@@ -874,7 +878,7 @@
   resolved "https://registry.yarnpkg.com/@yume-chan/async/-/async-4.1.3.tgz#7f4b6d3b1bc902f7ef225a5ade39796f56ccd589"
   integrity sha512-0vzhNJMkWUPyjKzUK4rqHEeCU6YQtF78RsB1kFRB6Y2BLupmEQNxcSb0mjKabPL9jZpCCiLa5KL8oTOJClUVaw==
 
-"@yume-chan/event@^2.0.0", "@yume-chan/event@workspace:^":
+"@yume-chan/event@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@yume-chan/event/-/event-2.0.0.tgz#8ee6c8ec100acdbff1f78dc6398da69ad6ca1b9b"
   integrity sha512-z56MDOcX1QlgLUCuA6th3r10negVb7A3gzY//TwSC9ZOvzuRlrAqXcxZf1T3hHfNMk/NFO9RIgQgegXYSfaqLw==
@@ -886,21 +890,15 @@
   resolved "https://registry.yarnpkg.com/@yume-chan/no-data-view/-/no-data-view-2.0.0.tgz#4498754388d18b3acb10152c10371c0f1080da95"
   integrity sha512-0GRJrrt6wtZlbiE92jocHOnaAvjQ+Y7xwwhwOPqLkwf90Kj1JIHJ5Zh4wJVQSQIkzfRSOpM+jeEQdC2K15snlA==
 
-"@yume-chan/stream-extra@^2.1.0", "@yume-chan/stream-extra@workspace:^":
+"@yume-chan/stream-extra@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@yume-chan/stream-extra/-/stream-extra-2.1.0.tgz#1a6f8bd3850ad800c2baf43de490f96baaf6853d"
   integrity sha512-Sq1mDCLTIOu+TbI3VmFhcKL5hi+qZkDA3S+JezZb/AJm4ESC3hB7+LgQIQs3QEK/ZeRwMg37w4IOYHSh30R7BQ==
   dependencies:
     "@yume-chan/async" "^4.1.3"
     "@yume-chan/struct" "^2.0.1"
 
-"@yume-chan/stream-extra@file:./../ya-webadb/libraries/stream-extra":
-  version "2.1.0"
-  dependencies:
-    "@yume-chan/async" "^4.1.3"
-    "@yume-chan/struct" "workspace:^"
-
-"@yume-chan/struct@^2.0.1", "@yume-chan/struct@workspace:^":
+"@yume-chan/struct@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@yume-chan/struct/-/struct-2.0.1.tgz#1cae8712887c7e997f1e9a5c7f4074050b1f76a3"
   integrity sha512-Trqm2ovy5X+ydqv5jiDBH3UMA2jKNGG6alABCDTUsIsMjSsrTFE86cghI7fceVKIh4FkIUBd4DqOsxn2S1c4Jw==