From df5f9c1fef2864acf997f8e13be2aa5eda500b05 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 22 Apr 2022 09:43:51 +0100
Subject: [PATCH] Pro build fixes

---
 packages/server/package.json | 2 +-
 packages/server/yarn.lock    | 9 +++++----
 packages/worker/package.json | 2 +-
 packages/worker/yarn.lock    | 9 +++++----
 scripts/link-dependencies.sh | 9 ++++++---
 scripts/pro/release.sh       | 6 +++---
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 5d1915a587..c37ac9b276 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.105-alpha.27",
     "@budibase/client": "^1.0.105-alpha.27",
-    "@budibase/pro": "^1.0.0",
+    "@budibase/pro": "1.0.105-alpha.25",
     "@budibase/string-templates": "^1.0.105-alpha.27",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 53319a649d..0c5e9a9683 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1087,12 +1087,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.0.tgz#9f38a43b39a886a5c54afae13f20d13104da648e"
-  integrity sha512-W4sGodU7cr8AugIJtsMxgaVoHChv7Lmax6bVoIkz9WVWwa0vuigAZXZuESg7hHdXI/+IvuKDS9dCSw1nuP/LhQ==
+"@budibase/pro@1.0.105-alpha.25":
+  version "1.0.105-alpha.25"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.105-alpha.25.tgz#48f69f95f39c78fb93a08c76929afa9f900dc661"
+  integrity sha512-i1L2qLR1H7yP+mn0bnqBKIM3oCC6NIbbSIkZRNBLi+0HXncbx130I4fudgfgXBK/ucbSi9W/hVMav9ObYywxCA==
   dependencies:
     "@budibase/backend-core" "^1.0.48"
+    node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
   version "0.9.139"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7aa63832f3..0907c2adce 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,8 +32,8 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.105-alpha.27",
-    "@budibase/pro": "^1.0.0",
     "@budibase/string-templates": "^1.0.105-alpha.27",
+    "@budibase/pro": "1.0.105-alpha.25",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index cddd1baa94..4f1a04d223 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -310,12 +310,13 @@
     uuid "^8.3.2"
     zlib "^1.0.5"
 
-"@budibase/pro@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.0.tgz#9f38a43b39a886a5c54afae13f20d13104da648e"
-  integrity sha512-W4sGodU7cr8AugIJtsMxgaVoHChv7Lmax6bVoIkz9WVWwa0vuigAZXZuESg7hHdXI/+IvuKDS9dCSw1nuP/LhQ==
+"@budibase/pro@1.0.105-alpha.25":
+  version "1.0.105-alpha.25"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.105-alpha.25.tgz#48f69f95f39c78fb93a08c76929afa9f900dc661"
+  integrity sha512-i1L2qLR1H7yP+mn0bnqBKIM3oCC6NIbbSIkZRNBLi+0HXncbx130I4fudgfgXBK/ucbSi9W/hVMav9ObYywxCA==
   dependencies:
     "@budibase/backend-core" "^1.0.48"
+    node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"
diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh
index 5041b0a960..bb4b1f4f0d 100755
--- a/scripts/link-dependencies.sh
+++ b/scripts/link-dependencies.sh
@@ -32,9 +32,12 @@ if [ -d "../account-portal" ]; then
   yarn link "@budibase/backend-core"
 
   echo "Linking string-templates to account-portal"
-  yarn link "@budibase/pro"
+  yarn link "@budibase/string-templates"
+
+  if [ -d "../../../budibase-pro" ]; then
+    echo "Linking pro to account-portal"
+    yarn link "@budibase/pro"
+  fi
 
-  echo "Linking pro to account-portal"
-  yarn link "@budibase/pro"
   cd -
 fi
diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh
index 76aafad5af..09e68f5b45 100755
--- a/scripts/pro/release.sh
+++ b/scripts/pro/release.sh
@@ -3,15 +3,15 @@ if [[ -z "${CI}" ]]; then
   exit 0
 fi
 
+# Release pro as same version as budibase
+VERSION=$(jq -r .version lerna.json)
+
 # Go to pro package
 cd ../budibase-pro
 
 # Install NPM credentials
 echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
 
-# Release pro as same version as budibase
-VERSION=$(jq -r .version lerna.json)
-
 # Determine tag to use
 COMMAND=$1
 TAG=""