From 35e6128224a287bf3a2dc26beabde793e88cdefb Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 12 Jul 2025 23:46:54 -0700 Subject: [PATCH] Unfork butterchurn --- packages/webamp/demo/js/butterchurnOptions.ts | 2 +- packages/webamp/demo/js/index.tsx | 2 +- packages/webamp/demo/js/webampConfig.ts | 2 +- packages/webamp/js/webampWithButterchurn.ts | 2 +- packages/webamp/package.json | 2 +- pnpm-lock.yaml | 24 +++++++++---------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/webamp/demo/js/butterchurnOptions.ts b/packages/webamp/demo/js/butterchurnOptions.ts index 87e59cb4..47473759 100644 --- a/packages/webamp/demo/js/butterchurnOptions.ts +++ b/packages/webamp/demo/js/butterchurnOptions.ts @@ -36,7 +36,7 @@ export function getButterchurnOptions( return import( /* webpackChunkName: "butterchurn" */ // @ts-ignore - "@webamp/butterchurn" + "butterchurn" ); }, importConvertPreset: () => { diff --git a/packages/webamp/demo/js/index.tsx b/packages/webamp/demo/js/index.tsx index f448f04a..95f4b97e 100644 --- a/packages/webamp/demo/js/index.tsx +++ b/packages/webamp/demo/js/index.tsx @@ -2,7 +2,7 @@ import React from "react"; import * as Sentry from "@sentry/browser"; import ReactDOM from "react-dom/client"; // @ts-ignore -import isButterchurnSupported from "@webamp/butterchurn/dist/isSupported.min"; +import isButterchurnSupported from "butterchurn/dist/isSupported.min"; import { getWebampConfig } from "./webampConfig"; import * as SoundCloud from "./SoundCloud"; diff --git a/packages/webamp/demo/js/webampConfig.ts b/packages/webamp/demo/js/webampConfig.ts index f4d9f07b..a8318d02 100644 --- a/packages/webamp/demo/js/webampConfig.ts +++ b/packages/webamp/demo/js/webampConfig.ts @@ -2,7 +2,7 @@ import * as Sentry from "@sentry/browser"; // @ts-ignore import createMiddleware from "redux-sentry-middleware"; // @ts-ignore -import isButterchurnSupported from "@webamp/butterchurn/dist/isSupported.min"; +import isButterchurnSupported from "butterchurn/dist/isSupported.min"; import { loggerMiddleware } from "./eventLogger"; import * as SoundCloud from "./SoundCloud"; diff --git a/packages/webamp/js/webampWithButterchurn.ts b/packages/webamp/js/webampWithButterchurn.ts index 6b4f115d..a327a094 100644 --- a/packages/webamp/js/webampWithButterchurn.ts +++ b/packages/webamp/js/webampWithButterchurn.ts @@ -2,7 +2,7 @@ import { Options } from "./types"; import { PrivateOptions } from "./webampLazy"; import Webamp from "./webamp"; // @ts-ignore -import butterchurn from "@webamp/butterchurn/dist/butterchurn.min.js"; // buterchurn@3.0.0-beta.4 +import butterchurn from "butterchurn/dist/butterchurn.min.js"; // buterchurn@3.0.0-beta.4 // @ts-ignore import butterchurnPresets from "butterchurn-presets/dist/base.js"; // butterchurn-presets@3.0.0-beta.4 diff --git a/packages/webamp/package.json b/packages/webamp/package.json index 9c206161..655b8f29 100644 --- a/packages/webamp/package.json +++ b/packages/webamp/package.json @@ -133,7 +133,7 @@ "dependencies": { "@redux-devtools/extension": "^3.3.0", "@sentry/browser": "5.9.1", - "@webamp/butterchurn": "3.0.0-beta.5", + "butterchurn": "3.0.0-beta.5", "ani-cursor": "workspace:*", "butterchurn-presets": "3.0.0-beta.4", "classnames": "^2.2.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ad4c916b..68974207 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -287,12 +287,12 @@ importers: '@sentry/browser': specifier: 5.9.1 version: 5.9.1 - '@webamp/butterchurn': - specifier: 3.0.0-beta.5 - version: 3.0.0-beta.5 ani-cursor: specifier: workspace:* version: link:../ani-cursor + butterchurn: + specifier: 3.0.0-beta.5 + version: 3.0.0-beta.5 butterchurn-presets: specifier: 3.0.0-beta.4 version: 3.0.0-beta.4 @@ -3921,9 +3921,6 @@ packages: '@web3-storage/multipart-parser@1.0.0': resolution: {integrity: sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==} - '@webamp/butterchurn@3.0.0-beta.5': - resolution: {integrity: sha512-k80fzEP9jT87BoggJOAtulqtr0twFkVdZs5il/wu1IpX0x8P64Zu8Gkay3TbVDGu7OFpwcXeITpCER5qYdLTIQ==} - '@webassemblyjs/ast@1.14.1': resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==} @@ -4666,6 +4663,9 @@ packages: butterchurn@2.6.7: resolution: {integrity: sha512-BJiRA8L0L2+84uoG2SSfkp0kclBuN+vQKf217pK7pMlwEO2ZEg3MtO2/o+l8Qpr8Nbejg8tmL1ZHD1jmhiaaqg==} + butterchurn@3.0.0-beta.5: + resolution: {integrity: sha512-BStK4OAbBb9Pvt8PuQlS4WVmYBwU1KuDMRHF1V89QjoIFauAqq7tpV4EpYXj7K563r5daLrMX+2y5DBhZZ9Xig==} + byte-data@18.1.1: resolution: {integrity: sha512-Kv/B0r7adgnCcrs/y703sac2XFLdHW5kPfis1j8+Ij/hmEcWhBKf+1pNTv+vsNqXb207Uiyri8bpnogNxR/4Lg==} engines: {node: '>=8'} @@ -17503,12 +17503,6 @@ snapshots: '@web3-storage/multipart-parser@1.0.0': {} - '@webamp/butterchurn@3.0.0-beta.5': - dependencies: - '@assemblyscript/loader': 0.17.14 - ecma-proposal-math-extensions: 0.0.2 - eel-wasm: 0.0.16 - '@webassemblyjs/ast@1.14.1': dependencies: '@webassemblyjs/helper-numbers': 1.13.2 @@ -18432,6 +18426,12 @@ snapshots: '@babel/runtime': 7.27.6 ecma-proposal-math-extensions: 0.0.2 + butterchurn@3.0.0-beta.5: + dependencies: + '@assemblyscript/loader': 0.17.14 + ecma-proposal-math-extensions: 0.0.2 + eel-wasm: 0.0.16 + byte-data@18.1.1: dependencies: endianness: 8.0.2