Versions path fix

Author: slowcheetah

website/build.mjs

@@ -20,14 +20,6 @@ let docsMenu = '';
 let isBlog = false;
 let isDocs = false;
 
-async function getDefaultVersionTarget(versionFile, defaultTarget = null) {
-  if (defaultTarget) return defaultTarget;
-
-  const versions = await readJson(versionFile);
-  const defaultVersion = versions.find(v => v.default);
-  return defaultVersion?.branch ?? defaultVersion?.tag;
-}
-
 async function getAllMdFiles(dir) {
   const entries = await readdir(dir, { withFileTypes: true });
   const files = [];
@@ -89,12 +81,20 @@ async function buildDocsMenuForVersion(version) {
   return menu;
 }
 
+function getVersionPath(version) {
+  return version.path ?? version.branch ?? version.tag;
+}
+
+function getBundlesPath(version) {
+  return path.join(config.bundlesPath, version.branch ?? version.tag);
+}
+
 async function buildVersionsMenuList(versions, currentVersion, section) {
   let versionsMenuHtml = '<div class="dropdown-block">';
   for (const v of versions) {
     const activityClass = v.label === currentVersion && !v.default ? ' class="active"' : '';
     const defaultBadge = v.default ? ' (default)' : '';
-    const versionPath = v.default ? '' : `${ v.path ?? v.label }/`;
+    const versionPath = v.default ? '' : `${ getVersionPath(v) }/`;
     versionsMenuHtml += `<a href="./${ versionPath }${ section }"${ activityClass }>${ v.label }${ defaultBadge }</a>`;
   }
   versionsMenuHtml += '</div>';
@@ -227,9 +227,10 @@ async function buildPlaygrounds(template, versions) {
 }
 
 async function buildPlayground(template, version, versions) {
-  const versionPath = version.branch ?? version.tag;
-  const bundleScript = `<script nomodule src="${ config.bundlesPath }/${ versionPath }/${ config.bundleName }"></script>`;
-  const bundleESModulesScript = `<script type="module" src="${ config.bundlesPath }/${ versionPath }/${ config.bundleNameESModules }"></script>`;
+  const versionPath = getVersionPath(version);
+  const bundlesPath = getBundlesPath(version);
+  const bundleScript = `<script nomodule src="${ bundlesPath }/${ config.bundleName }"></script>`;
+  const bundleESModulesScript = `<script type="module" src="${ bundlesPath }/${ config.bundleNameESModules }"></script>`;
   const babelScript = '<script src="./babel.min.js"></script>';
   const playgroundContent = await readFileContent(`${ config.srcDir }playground.html`);
   const versionsMenu = await buildVersionsMenu(versions, version.label, 'playground');
@@ -256,11 +257,11 @@ async function buildPlayground(template, version, versions) {
 }
 
 async function createDocsIndexes(versions) {
-  if (BRANCH) versions = [{ label: '' }];
+  if (BRANCH) versions = [{ path: '' }];
 
   for (const version of versions) {
     if (version.default) continue;
-    const versionPath = version.path ?? version.label;
+    const versionPath = getVersionPath(version);
     const menuItems = await getDocsMenuItems(versionPath);
     const firstDocPath = path.join(config.resultDir,
       `${ menuItems[0].url }.html`.replace(`{docs-version}${ BRANCH ? '/' : '' }`, versionPath));
@@ -294,7 +295,8 @@ async function build() {
   await buildBlogMenu();
   const mdFiles = await getAllMdFiles(config.docsDir);
   const versions = await getVersions();
-  const bundlesPath = `${ config.bundlesPath }/${ await getDefaultVersionTarget(config.versionsFile, BRANCH) }`;
+  const defaultVersion = versions.find(v => v.default);
+  const bundlesPath = getBundlesPath(defaultVersion);
   const bundleScript = `<script nomodule src="${ bundlesPath }/${ config.bundleName }"></script>`;
   const bundleESModulesScript = `<script type="module" src="${ bundlesPath }/${ config.bundleNameESModules }"></script>`;
 

website/config/versions.json

@@ -2,15 +2,17 @@
   {
     "label": "v3",
     "default": true,
-    "branch": "master"
+    "branch": "master",
+    "path": "v3"
   },
   {
     "label": "v3",
-    "branch": "master"
+    "branch": "master",
+    "path": "v3"
   },
   {
     "label": "v4 (alpha)",
-    "path": "v4",
-    "branch": "v4"
+    "branch": "v4",
+    "path": "v4"
   }
 ]