From 978c0fcabd4a5f0f28d3c22375a223e7b4283ded Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Wed, 18 Jun 2025 17:47:53 -0700
Subject: [PATCH] Version 2.0 release

---
 examples/minimal/index.html             |  5 +-
 examples/minimalMilkdrop/index.html     | 61 ++++++++++++++++++++-----
 examples/minimalWindowLayout/index.html |  5 +-
 examples/multipleSkins/index.html       |  5 +-
 examples/multipleTracks/index.html      |  5 +-
 packages/webamp/CHANGELOG.md            |  8 +++-
 packages/webamp/package.json            |  2 +-
 7 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/examples/minimal/index.html b/examples/minimal/index.html
index 51580b93..225f3abd 100755
--- a/examples/minimal/index.html
+++ b/examples/minimal/index.html
@@ -8,9 +8,8 @@
     <div id="app" style="height: 100vh">
       <!-- Webamp will attempt to center itself within this div -->
     </div>
-    <script src="https://unpkg.com/webamp@1.4.2/built/webamp.bundle.min.js"></script>
-    <script>
-      const Webamp = window.Webamp;
+    <script type="module">
+      import Webamp from "https://unpkg.com/webamp@next";
       const webamp = new Webamp({
         initialTracks: [
           {
diff --git a/examples/minimalMilkdrop/index.html b/examples/minimalMilkdrop/index.html
index c2fba0ff..1661c88a 100755
--- a/examples/minimalMilkdrop/index.html
+++ b/examples/minimalMilkdrop/index.html
@@ -8,11 +8,52 @@
     <div id="app" style="height: 100vh">
       <!-- Webamp will attempt to center itself within this div -->
     </div>
-    <script src="https://unpkg.com/webamp@1.5.0/built/webamp.bundle.min.js"></script>
-    <script src="https://unpkg.com/butterchurn@2.6.7/lib/butterchurn.min.js"></script>
-    <script src="https://unpkg.com/butterchurn-presets@2.4.7/lib/butterchurnPresets.min.js"></script>
-    <script>
-      const Webamp = window.Webamp;
+    <script type="module">
+      /**
+       * Webamp now includes an ESModule build, so you can import it directly. I
+       * haven't validated full backwards compatibility with all the ways people
+       * can import Webamp, so I haven't shipped this as the default build yet,
+       * but it's on NPM as: `webamp@0.0.0-next-361ce79`.
+       *
+       * Changelog since the version you have can be found here:
+       * https://github.com/captbaritone/webamp/blob/master/packages/webamp/CHANGELOG.md
+       */
+      import Webamp from "https://unpkg.com/webamp@next";
+
+      /**
+       * Butterchurn is not being actively maintained, but it is still works
+       * great. Before it went into maintenance mode Jordan Berg (different
+       * Jordan) cut a beta release of a version with the faster/more secure
+       * eel->Wasm compiler that I wrote, so we use `butterchurn@3.0.0-beta.3`.
+       *
+       * Blog post about the eel->Wasm compiler here:
+       * https://jordaneldredge.com/blog/speeding-up-winamps-music-visualizer-with-webassembly/
+       *
+       * This version is still using AMD modules, so it will write the export to
+       * `window.butterchurn`. This is a pretty chunky files, so you way want to
+       * find a way to lazy load it inside `importButterchurn` below.
+       * Unfortunately, it's not an ES module, so I wasn't able to call
+       * `import()` on it without some kind of bundler.
+       */
+      import "https://unpkg.com/butterchurn@3.0.0-beta.3/dist/butterchurn.min.js";
+      const butterchurn = window.butterchurn;
+
+      /**
+       * This module, `butterchurn-presets@3.0.0-beta.4` contains a curated set
+       * of awesome Butterchurn presets that have been packaged up to work with
+       * the new compiler. This module is also packaged as an AMD module, so
+       * when imported without a bundler it will write the export to `window`. I
+       * think the package was never that thoughtfully built, so the export name
+       * is, confusingly `window.base`. If that's a problem, using a bundler
+       * might help.
+       *
+       * As audio plays, Webamp will randomly cycle through these presets with a
+       * cool transition effect. You can also press "l" while the Milkdrop
+       * window is open to open Milkdrop's preset selection menu.
+       */
+      import "https://unpkg.com/butterchurn-presets@3.0.0-beta.4/dist/base.js";
+      const butterchurnPresets = window.base.default;
+
       const webamp = new Webamp({
         initialTracks: [
           {
@@ -28,14 +69,10 @@
           },
         ],
         __butterchurnOptions: {
-          importButterchurn: () => Promise.resolve(window.butterchurn),
+          importButterchurn: () => Promise.resolve(butterchurn),
           getPresets: () => {
-            const presets = window.butterchurnPresets.getPresets();
-            return Object.keys(presets).map((name) => {
-              return {
-                name,
-                butterchurnPresetObject: presets[name],
-              };
+            return Object.entries(butterchurnPresets).map(([name, preset]) => {
+              return { name, butterchurnPresetObject: preset };
             });
           },
           butterchurnOpen: true,
diff --git a/examples/minimalWindowLayout/index.html b/examples/minimalWindowLayout/index.html
index cb6691b6..72a5ce92 100755
--- a/examples/minimalWindowLayout/index.html
+++ b/examples/minimalWindowLayout/index.html
@@ -8,9 +8,8 @@
     <div id="app" style="height: 100vh">
       <!-- Webamp will attempt to center itself within this div -->
     </div>
-    <script src="https://unpkg.com/webamp@0.0.0-next-6d0ec37b/built/webamp.bundle.min.js"></script>
-    <script>
-      const Webamp = window.Webamp;
+    <script type="module">
+      import Webamp from "https://unpkg.com/webamp@next";
       const webamp = new Webamp({
         windowLayout: {
           main: {
diff --git a/examples/multipleSkins/index.html b/examples/multipleSkins/index.html
index f4d6eaeb..3ffbb42b 100755
--- a/examples/multipleSkins/index.html
+++ b/examples/multipleSkins/index.html
@@ -8,9 +8,8 @@
     <div id="app" style="height: 100vh">
       <!-- Webamp will attempt to center itself within this div -->
     </div>
-    <script src="https://unpkg.com/webamp@1.4.2/built/webamp.bundle.min.js"></script>
-    <script>
-      const Webamp = window.Webamp;
+    <script type="module">
+      import Webamp from "https://unpkg.com/webamp@next";
       const webamp = new Webamp({
         // Optional. An array of objects representing skins.
         // These will appear in the "Options" menu under "Skins".
diff --git a/examples/multipleTracks/index.html b/examples/multipleTracks/index.html
index ce930f83..cfad1491 100755
--- a/examples/multipleTracks/index.html
+++ b/examples/multipleTracks/index.html
@@ -8,9 +8,8 @@
     <div id="app" style="height: 100vh">
       <!-- Webamp will attempt to center itself within this div -->
     </div>
-    <script src="https://unpkg.com/webamp@1.4.2/built/webamp.bundle.min.js"></script>
-    <script>
-      const Webamp = window.Webamp;
+    <script type="module">
+      import Webamp from "https://unpkg.com/webamp@next";
       const webamp = new Webamp({
         /**
          * Here we list three tracks. Note that the `metaData` fields and
diff --git a/packages/webamp/CHANGELOG.md b/packages/webamp/CHANGELOG.md
index 1fd6d72f..f2c58e77 100644
--- a/packages/webamp/CHANGELOG.md
+++ b/packages/webamp/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Upcoming [UNRELEASED] (`webamp@next`)
 
+_No changes yet._
+
+## 2.0.0 [CURRENT]
+
 ### Features
 
 - Allow a single mouse drag across the EQ to set all values [#1180](https://github.com/captbaritone/webamp/pull/1180)
@@ -15,11 +19,11 @@
 ### Internal Improvements:
 
 - Upgrade to React 18, React Redux, 8 and Redux 4.1
-- Bundle with Parcel instead of Webpack
+- Bundle with Rollup instead of Webpack
 - Build public Typescript directly from source annotations.
 - We no longer transform object spreads since they have broad support in browsers.
 
-## 1.5.0 [CURRENT]
+## 1.5.0
 
 ### Features
 
diff --git a/packages/webamp/package.json b/packages/webamp/package.json
index 5c0b7bdc..b9c6ecf4 100644
--- a/packages/webamp/package.json
+++ b/packages/webamp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webamp",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "description": "Winamp 2 implemented in HTML5 and JavaScript",
   "files": [
     "built",