refactor based on feedback

datadesk · Jul 16, 2024 · be73372 · be73372
1 parent 672d00e
commit be73372
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11,412 deletions.
diff --git a/lib/blocks/script.js b/lib/blocks/script.js
@@ -31,7 +31,7 @@ export function createScriptBlock(pathPrefix, source) {
     if (shouldPreload) {
       preloads.forEach((preload) => {
         output.push(
-          `<link rel="preload" href="${determineOutput(
+          `<link rel="preload" href="${getStaticAssetAbsolutePath(
             pathSrc,
             preload
           )}" as="script" crossorigin>`
@@ -41,20 +41,20 @@ export function createScriptBlock(pathPrefix, source) {
 
     if (cssEntry) {
       output.push(
-        `<link rel="stylesheet" href="${determineOutput(pathSrc, cssEntry)}">`
+        `<link rel="stylesheet" href="${getStaticAssetAbsolutePath(pathSrc, cssEntry)}">`
       );
     }
 
     output.push(
-      `<script type="module" src="${determineOutput(
+      `<script type="module" src="${getStaticAssetAbsolutePath(
         pathSrc,
         modernEntry
       )}"></script>`
     );
 
     if ('legacy' in manifest) {
       output.push(
-        `<script nomodule defer src="${determineOutput(
+        `<script nomodule defer src="${getStaticAssetAbsolutePath(
           pathSrc,
           legacy[entry]
         )}"></script>`
@@ -72,7 +72,7 @@ export function createScriptBlock(pathPrefix, source) {
  * @param {string} srcType
  * @returns {string}
  */
-function determineOutput(pathSrc, srcType) {
+function getStaticAssetAbsolutePath(pathSrc, srcType) {
   if (
     isProductionEnv &&
     process.env.BAKER_BASE_PATH &&

diff --git a/lib/index.js b/lib/index.js
@@ -13,6 +13,7 @@ import { premove } from 'premove';
 import glob from 'fast-glob';
 import fetch from 'node-fetch';
 import path from 'node:path';
+import { v4 as uuidv4 } from 'uuid';
 
 // local
 import { isProductionEnv } from './env.js';
@@ -324,10 +325,10 @@ export class Baker extends EventEmitter {
   }
 
   /**
-   * Sends a webhook to notify of build completion
+   * Sends a successful build notification to the currently defined webhook url
    * @returns {Promise<void>}
    */
-  async sendWebhook() {
+  async sendWebhookRequest() {
     if (!process.env.BUILD_NOTIFICATION_WEBHOOK_URL) return;
 
     const files = await glob(join(this.embeds, '*.html'));
@@ -339,7 +340,7 @@ export class Baker extends EventEmitter {
 
     const payload = {
       data: {
-        id: Date.now(),
+        id: uuidv4(),
         objType: 'baker-project',
         attributes: {
           projectSlug,
@@ -348,7 +349,7 @@ export class Baker extends EventEmitter {
       },
     };
 
-    await fetch(process.env.BUILD_NOTIFICATION_WEBHOOK_URL, {
+    fetch(process.env.BUILD_NOTIFICATION_WEBHOOK_URL, {
       method: 'post',
       body: JSON.stringify(payload),
       headers: { 'Content-Type': 'application/json' },
@@ -573,7 +574,7 @@ export class Baker extends EventEmitter {
     await this.nunjucks.build();
 
     // send webhook to notify of build completion
-    await this.sendWebhook();
+    await this.sendWebhookRequest();
 
     // emit event that a bake has completed
     this.emit('bake:end');