Build website script refactoring

Author: slowcheetah

website/scripts/helpers.mjs

@@ -74,34 +74,31 @@ export async function copyCommonFiles(srcDir) {
   console.timeEnd('Copied common files');
 }
 
-async function cacheBuild(srcDir, destPath, cache) {
-  if (!cache) return;
-  const bundlePath = join(srcDir, 'packages/core-js-bundle/minified.js');
-  await cp(bundlePath, destPath);
-}
-
-async function bundlePackage(srcDir, target, esModules = false) {
-  await exec(`npm run bundle-package${ esModules ? ' esmodules' : '' }`, { cwd: srcDir });
-  const bundlePath = join(srcDir, 'packages/core-js-bundle/minified.js');
-  const destPath = join(srcDir, 'website/src/public/bundles/', target, `core-js-bundle${ esModules ? '-esmodules' : '' }.js`);
-  await cp(bundlePath, destPath);
-}
-
 export async function buildAndCopyCoreJS(version, srcDir, cacheDir = null, checkout = false) {
+  async function bundlePackage(esModules) {
+    await exec(`npm run bundle-package${ esModules ? ' esmodules' : '' }`, { cwd: srcDir });
+    const bundleName = `core-js-bundle${ esModules ? '-esmodules' : '' }.js`;
+    const srcPath = join(srcDir, 'packages/core-js-bundle/minified.js');
+    const destPath = join(srcDir, 'website/src/public/bundles/', target, bundleName);
+    await cp(srcPath, destPath);
+    if (cacheDir !== null) {
+      const cachePath = join(cacheDir, target, bundleName);
+      await cp(srcPath, cachePath);
+    }
+  }
+
   const target = version.branch ?? version.tag;
-  const name = version.path ?? version.label;
-  const cache = cacheDir !== null;
   console.log(`Building and copying core-js for ${ target }`);
-  const targetBundlePath = `${ cacheDir }/${ target }/`;
+  const targetBundlePath = join(cacheDir ?? '', target);
 
-  if (cache && await isExists(targetBundlePath)) {
+  if (cacheDir !== null && await isExists(targetBundlePath)) {
     console.time('Core JS bundles copied');
     const bundlePath = join(targetBundlePath, 'core-js-bundle.js');
-    const destBundlePath = join(srcDir, 'website/src/public/bundles/', name, 'core-js-bundle.js');
+    const destBundlePath = join(srcDir, 'website/src/public/bundles/', target, 'core-js-bundle.js');
     await cp(bundlePath, destBundlePath);
 
     const esmodulesBundlePath = join(targetBundlePath, 'core-js-bundle-esmodules.js');
-    const esmodulesDestBundlePath = join(srcDir, 'website/src/public/bundles/', name, 'core-js-bundle-esmodules.js');
+    const esmodulesDestBundlePath = join(srcDir, 'website/src/public/bundles/', target, 'core-js-bundle-esmodules.js');
     await cp(esmodulesBundlePath, esmodulesDestBundlePath);
     console.timeEnd('Core JS bundles copied');
     return;
@@ -113,11 +110,8 @@ export async function buildAndCopyCoreJS(version, srcDir, cacheDir = null, check
   }
   await installDependencies(srcDir);
 
-  await bundlePackage(srcDir, name);
-  await cacheBuild(srcDir, join(targetBundlePath, 'core-js-bundle.js'), cache);
-
-  await bundlePackage(srcDir, name, true);
-  await cacheBuild(srcDir, join(targetBundlePath, 'core-js-bundle-esmodules.js'), cache);
+  await bundlePackage(false);
+  await bundlePackage(true);
 
   console.timeEnd('Core JS bundles built');
 }