Merge pull request #737 from processing/p5-sound-versions

Only use old p5.sound on 1.x

Author: davepagurek

src/globals/globals.ts

@@ -23,4 +23,6 @@ export const libraryDownloadUrl =
 export const minifiedLibraryDownloadUrl =
   `https://github.com/processing/p5.js/releases/download/v${p5Version}/p5.min.js` as const;
 export const cdnSoundUrl =
-  `https://cdn.jsdelivr.net/npm/p5.sound@${p5SoundVersion}` as const;
+  (!!import.meta.env?.PUBLIC_P5_LIBRARY_PATH || p5Version.startsWith('v2'))
+    ? `https://cdn.jsdelivr.net/npm/p5.sound@${p5SoundVersion}` as const
+    : `https://cdn.jsdelivr.net/npm/p5@${p5Version}/lib/addons/p5.sound.min.js` as const

src/scripts/parsers/reference.ts

@@ -27,6 +27,9 @@ export const parseLibraryReference =
       latestRelease = 'v' + latestRelease;
     }
 
+    const useExternalP5Sound = !!process.env.P5_REPO_BRANCH ||
+      latestRelease.startsWith('v2');
+
     // Clone p5.js
     await cloneLibraryRepo(
       localPath,
@@ -36,56 +39,68 @@ export const parseLibraryReference =
     );
 
     // Install dependencies and build docs in the p5 repo
-    await createP5Docs('p5.js', 'data-p5')
+    await createP5Docs('p5.js', 'data-p5');
 
     // If we're using a custom build of p5 instead of a public release, create
     // a build and copy it to the specified path
     if (process.env.PUBLIC_P5_LIBRARY_PATH) {
-      await createP5Build('p5.js', '../../../public' + process.env.PUBLIC_P5_LIBRARY_PATH)
+      await createP5Build('p5.js', '../../../public' + process.env.PUBLIC_P5_LIBRARY_PATH);
     }
 
     // Copy the reference output so we can process it
     const p5Data = await getYuidocOutput('data-p5');
     if (!p5Data) throw new Error('Error generating p5 reference data!');
 
-    // Clone p5.sound.js
-    await cloneLibraryRepo(
-      localSoundPath,
-      'https://github.com/processing/p5.sound.js.git',
-      'main'
-    );
-    await saveYuidocOutput('p5.sound.js', 'data-sound');
-    const soundData = await getYuidocOutput('data-sound');
-    if (!soundData) throw new Error('Error generating p5.sound reference data!');
-
-    // Fix p5.sound classes
-    for (const key in soundData.classes) {
-      const newName = 'p5.' + soundData.classes[key].name;
-      const updated = {
-        ...soundData.classes[key],
-        name: newName,
-      };
-      soundData.classes[newName] = updated;
-      delete soundData.classes[key];
-    }
-    for (const item of soundData.classitems) {
-      item.class = 'p5.' + item.class;
-    }
+    let result;
+    if (useExternalP5Sound) {
+      console.log('Cloning separate p5.sound repo');
+
+      // Clone p5.sound.js
+      await cloneLibraryRepo(
+        localSoundPath,
+        'https://github.com/processing/p5.sound.js.git',
+        'main'
+      );
+      await saveYuidocOutput('p5.sound.js', 'data-sound');
+      const soundData = await getYuidocOutput('data-sound');
+      if (!soundData) throw new Error('Error generating p5.sound reference data!');
+
+      // Fix p5.sound classes
+      for (const key in soundData.classes) {
+        const newName = 'p5.' + soundData.classes[key].name;
+        const updated = {
+          ...soundData.classes[key],
+          name: newName,
+        };
+        soundData.classes[newName] = updated;
+        delete soundData.classes[key];
+      }
+      for (const item of soundData.classitems) {
+        item.class = 'p5.' + item.class;
+      }
 
-    const combined = await combineYuidocData(
-      [
-        p5Data,
-        soundData,
-      ],
-      'data'
-    );
+      result = await combineYuidocData(
+        [
+          p5Data,
+          soundData,
+        ],
+        'data'
+      );
+    } else {
+      result = await combineYuidocData(
+        [
+          p5Data,
+        ],
+        'data'
+      );
+    }
 
     await serveYuidocOutput('data');
 
     //delete the cloned directories
     await cleanUpDirectory(parsersInPath );
     await cleanUpDirectory(parsersOutPath );
-    return combined;
+    return result;
   };
 
 /**