From 03a5cc61e8ee810f1908fcfc437fcf993127df15 Mon Sep 17 00:00:00 2001
From: Muffin <muffin@mailbox.org>
Date: Tue, 16 Jan 2024 16:28:46 -0600
Subject: [PATCH] Replace startaudiocontext with @turbowarp/startaudiocontext

---
 package-lock.json                     | 21 ++++++++++-----------
 package.json                          |  2 +-
 src/lib/audio/shared-audio-context.js |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a8f34ac1..01f5e53cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
         "@turbowarp/scratch-l10n": "^3.1000.20230326022803",
         "@turbowarp/scratch-storage": "^0.0.0-development-202312242258-43d7b47",
         "@turbowarp/scratch-svg-renderer": "^1.0.0-202312242305-12c360b",
+        "@turbowarp/startaudiocontext": "^1.0.0",
         "arraybuffer-loader": "^1.0.6",
         "autoprefixer": "^9.0.1",
         "balance-text": "3.3.1",
@@ -70,7 +71,6 @@
         "scratch-render": "github:TurboWarp/scratch-render#develop",
         "scratch-render-fonts": "1.0.0-prerelease.20231017225105",
         "scratch-vm": "github:TurboWarp/scratch-vm#develop",
-        "startaudiocontext": "1.2.1",
         "style-loader": "^0.23.0",
         "text-encoding": "0.7.0",
         "to-style": "1.3.3",
@@ -2290,6 +2290,11 @@
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
       "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
     },
+    "node_modules/@turbowarp/startaudiocontext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@turbowarp/startaudiocontext/-/startaudiocontext-1.0.0.tgz",
+      "integrity": "sha512-BJ7EVYVwuTH/Tr6tEaLaXA5TCi8qKxNWsxohNqxIEDzykN+FscgOALhEMUlNc6vgcmOi7yQFJ82Prx9bnY5DgA=="
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -16156,13 +16161,12 @@
     },
     "node_modules/scratch-audio": {
       "version": "0.1.0",
-      "resolved": "git+ssh://git@github.com/TurboWarp/scratch-audio.git#d991a8d214bba6b24b51988bcfe70e43f837439f",
-      "integrity": "sha512-B8ELZPulYLA1K7kQgsw3dwRMEZ5nTtin31j0qUAojSDUveyKJ1uz8SSevWPNfml5BQf0ORXj9oRljBgM8rptgQ==",
+      "resolved": "git+ssh://git@github.com/TurboWarp/scratch-audio.git#14daa8bc36cd1a76aa7c68a6ca1e081bebc5c197",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "audio-context": "1.0.1",
-        "minilog": "^3.0.1",
-        "startaudiocontext": "1.2.1"
+        "@turbowarp/nanolog": "^0.1.0",
+        "@turbowarp/startaudiocontext": "^1.0.0",
+        "audio-context": "1.0.1"
       }
     },
     "node_modules/scratch-blocks": {
@@ -17186,11 +17190,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/startaudiocontext": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/startaudiocontext/-/startaudiocontext-1.2.1.tgz",
-      "integrity": "sha512-ooOQhOAoCwzMIRwWd9j7xF8kAMo1Wv7Zfw+q6dWDW5gxJUKx15HJXWDg89GMDqfdle9xsqPv+uioneX+bI643g=="
-    },
     "node_modules/static-eval": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.1.tgz",
diff --git a/package.json b/package.json
index 6c2cc413f..f3f1066ec 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "@turbowarp/scratch-l10n": "^3.1000.20230326022803",
     "@turbowarp/scratch-storage": "^0.0.0-development-202312242258-43d7b47",
     "@turbowarp/scratch-svg-renderer": "^1.0.0-202312242305-12c360b",
+    "@turbowarp/startaudiocontext": "^1.0.0",
     "arraybuffer-loader": "^1.0.6",
     "autoprefixer": "^9.0.1",
     "balance-text": "3.3.1",
@@ -93,7 +94,6 @@
     "scratch-render": "github:TurboWarp/scratch-render#develop",
     "scratch-render-fonts": "1.0.0-prerelease.20231017225105",
     "scratch-vm": "github:TurboWarp/scratch-vm#develop",
-    "startaudiocontext": "1.2.1",
     "style-loader": "^0.23.0",
     "text-encoding": "0.7.0",
     "to-style": "1.3.3",
diff --git a/src/lib/audio/shared-audio-context.js b/src/lib/audio/shared-audio-context.js
index cbc6bc771..d42856d78 100644
--- a/src/lib/audio/shared-audio-context.js
+++ b/src/lib/audio/shared-audio-context.js
@@ -1,4 +1,4 @@
-import StartAudioContext from 'startaudiocontext';
+import StartAudioContext from '@turbowarp/startaudiocontext';
 import bowser from 'bowser';
 import log from '../log';