From 12c31f65aed9f5e3bbcb9ea741ba6aa50f052018 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Thu, 10 Jul 2025 09:03:55 -0700 Subject: [PATCH] Use fork of butterchurn --- packages/webamp/demo/js/butterchurnOptions.ts | 2 +- packages/webamp/demo/js/index.tsx | 2 +- packages/webamp/demo/js/webampConfig.ts | 2 +- packages/webamp/package.json | 2 +- pnpm-lock.yaml | 25 +++++++++---------- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/packages/webamp/demo/js/butterchurnOptions.ts b/packages/webamp/demo/js/butterchurnOptions.ts index 47473759..87e59cb4 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 - "butterchurn" + "@webamp/butterchurn" ); }, importConvertPreset: () => { diff --git a/packages/webamp/demo/js/index.tsx b/packages/webamp/demo/js/index.tsx index 95f4b97e..f448f04a 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 "butterchurn/dist/isSupported.min"; +import isButterchurnSupported from "@webamp/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 a8318d02..f4d9f07b 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 "butterchurn/dist/isSupported.min"; +import isButterchurnSupported from "@webamp/butterchurn/dist/isSupported.min"; import { loggerMiddleware } from "./eventLogger"; import * as SoundCloud from "./SoundCloud"; diff --git a/packages/webamp/package.json b/packages/webamp/package.json index 4c0c1bf1..4573c7a0 100644 --- a/packages/webamp/package.json +++ b/packages/webamp/package.json @@ -134,7 +134,7 @@ "@redux-devtools/extension": "^3.3.0", "@sentry/browser": "5.9.1", "ani-cursor": "workspace:*", - "butterchurn": "^3.0.0-beta.3", + "@webamp/butterchurn": "1.0.0", "butterchurn-presets": "3.0.0-beta.4", "classnames": "^2.2.5", "fscreen": "^1.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3ed0b681..5e203a39 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: 1.0.0 + version: 1.0.0 ani-cursor: specifier: workspace:* version: link:../ani-cursor - butterchurn: - specifier: ^3.0.0-beta.3 - version: 3.0.0-beta.4 butterchurn-presets: specifier: 3.0.0-beta.4 version: 3.0.0-beta.4 @@ -3921,6 +3921,9 @@ packages: '@web3-storage/multipart-parser@1.0.0': resolution: {integrity: sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==} + '@webamp/butterchurn@1.0.0': + resolution: {integrity: sha512-cGOnNerpniUTTqQljVW5n3fC7oqiyKudjeNPCnMzo3mJUboZ6Fda+RLnqjJXO9b7pNq8eavNWp5VSI4hUnyahA==} + '@webassemblyjs/ast@1.14.1': resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==} @@ -4663,9 +4666,6 @@ packages: butterchurn@2.6.7: resolution: {integrity: sha512-BJiRA8L0L2+84uoG2SSfkp0kclBuN+vQKf217pK7pMlwEO2ZEg3MtO2/o+l8Qpr8Nbejg8tmL1ZHD1jmhiaaqg==} - butterchurn@3.0.0-beta.4: - resolution: {integrity: sha512-hiY1ktHYHQ8MT65nnZi7GjrgZZ6sl/ipT5rBqEfaYJd90L4SvOtB6lVxtKadtzAyJo2TQJc4gJfEca4cpZo0DA==} - byte-data@18.1.1: resolution: {integrity: sha512-Kv/B0r7adgnCcrs/y703sac2XFLdHW5kPfis1j8+Ij/hmEcWhBKf+1pNTv+vsNqXb207Uiyri8bpnogNxR/4Lg==} engines: {node: '>=8'} @@ -17503,6 +17503,12 @@ snapshots: '@web3-storage/multipart-parser@1.0.0': {} + '@webamp/butterchurn@1.0.0': + dependencies: + '@assemblyscript/loader': 0.17.14 + ecma-proposal-math-extensions: 0.0.2 + eel-wasm: 0.0.15 + '@webassemblyjs/ast@1.14.1': dependencies: '@webassemblyjs/helper-numbers': 1.13.2 @@ -18426,13 +18432,6 @@ snapshots: '@babel/runtime': 7.27.6 ecma-proposal-math-extensions: 0.0.2 - butterchurn@3.0.0-beta.4: - dependencies: - '@assemblyscript/loader': 0.17.14 - '@babel/runtime': 7.27.6 - ecma-proposal-math-extensions: 0.0.2 - eel-wasm: 0.0.15 - byte-data@18.1.1: dependencies: endianness: 8.0.2