Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-27 12:03:52 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade Butterchurn (#1059)

Browse source 
* Upgrade Butterchurn

* Butterchurn beta.1

* Set useWASM for all methods of loading presets

* Upgrade to butterchurn-presets 3.0.0 beta 1

* Only add useWASM to presets from butterchurn-presets

* switch to unminified src for presets

Co-authored-by: jberg <jberg@users.noreply.github.com>
This commit is contained in:
Jordan Eldredge 2021-01-26 20:42:43 -08:00 • committed by GitHub
parent 5f0a020985
commit 497e25fac5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
packages/webamp/demo/js/butterchurnOptions.ts
View file

@ -1,5 +1,9 @@
import { ButterchurnOptions } from "./Webamp";
function addUseWASM(obj: Object): Object {
return { ...obj, useWASM: true };
}
const KNOWN_PRESET_URLS_REGEXES = [
/^https:\/\/unpkg\.com\/butterchurn-presets\/.*\.json$/,
/^https:\/\/unpkg\.com\/butterchurn-presets-weekly\/.*\.json$/,
@ -34,7 +38,7 @@ export function getButterchurnOptions(
return {
importButterchurn: () => {
return import(
/* webpackChunkName: "butterchurn-initial-dependencies" */
/* webpackChunkName: "butterchurn" */
// @ts-ignore
"butterchurn"
);
@ -89,10 +93,15 @@ export function getButterchurnOptions(
throw new Error("We still need to implement this");
}
}
// TODO: Fallback to some other presets?
return loadButterchurnPresetMapURL(
"https://unpkg.com/butterchurn-presets-weekly@0.0.2/weeks/week1/presets.json"
const presets = await import(
/* webpackChunkName: "butterchurn-presets" */
// @ts-ignore
"butterchurn-presets/src/minimal.js"
);
return Object.entries(presets.default).map(([name, preset]) => {
return { name, butterchurnPresetObject: addUseWASM(preset as Object) };
});
},
butterchurnOpen: !startWithMilkdropHidden,
};

3
packages/webamp/package.json
View file

@ -135,7 +135,8 @@
},
"dependencies": {
"ani-cursor": "^0.0.4",
"butterchurn": "^2.6.7",
"butterchurn": "^3.0.0-beta.1",
"butterchurn-presets": "3.0.0-beta.1",
"classnames": "^2.2.5",
"fscreen": "^1.0.2",
"invariant": "^2.2.3",

34
yarn.lock
View file

@ -92,6 +92,11 @@
"@algolia/logger-common" "4.3.0"
"@algolia/requester-common" "4.3.0"
"@assemblyscript/loader@^0.17.11":
version "0.17.14"
resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.17.14.tgz#43bfe793c787180c5eb0a57ada8318fb62171b4e"
integrity sha512-+PVTOfla/0XMLRTQLJFPg4u40XcdTfon6GGea70hBGi8Pd7ZymIXyVUR+vK8wt5Jb4MVKTKPIz43Myyebw5mZA==
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
@ -1797,6 +1802,13 @@
dependencies:
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5":
version "7.12.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
dependencies:
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.12.1":
version "7.12.1"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740"
@ -4269,6 +4281,13 @@ busboy@^0.3.1:
dependencies:
dicer "0.3.0"
butterchurn-presets@3.0.0-beta.1:
version "3.0.0-beta.1"
resolved "https://registry.yarnpkg.com/butterchurn-presets/-/butterchurn-presets-3.0.0-beta.1.tgz#8f2474f7857c7a6494476dec56dbd4255e1f4b0a"
integrity sha512-2/rBysBUNVdQviwQWDqEM+NtiAF55HwCHrPVmy65wh/ruGyUYuPZpp/pNUCyCsQAdajfPVcjViqkNBThdzHhDA==
dependencies:
"@babel/runtime" "^7.12.5"
butterchurn@^2.6.7:
version "2.6.7"
resolved "https://registry.yarnpkg.com/butterchurn/-/butterchurn-2.6.7.tgz#1ff0c1365731a4fb7ada7bb16ae1c6f09a110c12"
@ -4276,6 +4295,16 @@ butterchurn@^2.6.7:
"@babel/runtime" "^7.0.0"
ecma-proposal-math-extensions "0.0.2"
butterchurn@^3.0.0-beta.1:
version "3.0.0-beta.1"
resolved "https://registry.yarnpkg.com/butterchurn/-/butterchurn-3.0.0-beta.1.tgz#b7e5b1a2168ce041a2a0b1771b23d958002b331e"
integrity sha512-crY/ppARjwHR6f6PcSIjvDgm1OrzTHdJa9ubAPZzOSsp/ohEanCIn1xhrUOSFT4c7rRKL7c3yqANICZMQAOh2w==
dependencies:
"@assemblyscript/loader" "^0.17.11"
"@babel/runtime" "^7.11.2"
ecma-proposal-math-extensions "0.0.2"
eel-wasm "^0.0.12"
byte-data@18.1.1, byte-data@^18.0.3:
version "18.1.1"
resolved "https://registry.yarnpkg.com/byte-data/-/byte-data-18.1.1.tgz#4eed09970921bf7d786b250e56615d8314bb6746"
@ -5772,6 +5801,11 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
eel-wasm@^0.0.12:
version "0.0.12"
resolved "https://registry.yarnpkg.com/eel-wasm/-/eel-wasm-0.0.12.tgz#7bec69b6d7e1573cc1fc4d4ad65e92713dee79e1"
integrity sha512-FgC/P8j6b9hwMzerko+ixrdeWKN/kFR15FPNWUZ/ngtsMK84sD479385ccTywyAR47jegXompUGpqbWTGn7kIw==
ejs@^2.6.1:
version "2.7.4"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"