From 788dac0f8dc09264a4e70813398a48aa6a9395bf Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 5 Oct 2022 08:25:50 +0100
Subject: [PATCH] Use CJS style imports in plugin URL helper to work in jest,
 and respect plugin bucket env var

---
 packages/server/src/utilities/plugins.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/utilities/plugins.js b/packages/server/src/utilities/plugins.js
index fae15fb184..96e496ed4e 100644
--- a/packages/server/src/utilities/plugins.js
+++ b/packages/server/src/utilities/plugins.js
@@ -1,5 +1,6 @@
-import env from "../environment"
-import { plugins as ProPlugins } from "@budibase/pro"
+const env = require("../environment")
+const { plugins: ProPlugins } = require("@budibase/pro")
+const { objectStore } = require("@budibase/backend-core")
 
 export const enrichPluginURLs = plugins => {
   if (!plugins || !plugins.length) {
@@ -7,14 +8,14 @@ export const enrichPluginURLs = plugins => {
   }
   return plugins.map(plugin => {
     const cloud = !env.SELF_HOSTED
-    // In self host we need to prefix the path, as "plugins" is not part of the
-    // bucket path. In cloud, "plugins" is already part of the bucket path.
-    let jsUrl = cloud ? "https://cdn.budi.live/" : "/plugins/"
+    const bucket = objectStore.ObjectStoreBuckets.PLUGINS
+    const jsFileName = "plugin.min.js"
+
+    // In self host we need to prefix the path, as the bucket name is not part
+    // of the bucket path. In cloud, it's already part of the bucket path.
+    let jsUrl = cloud ? "https://cdn.budi.live/" : `/${bucket}/`
     jsUrl += ProPlugins.getBucketPath(plugin.name)
-    jsUrl += "plugin.min.js"
-    return {
-      ...plugin,
-      jsUrl,
-    }
+    jsUrl += jsFileName
+    return { ...plugin, jsUrl }
   })
 }