From 6c9127427c6c915044352bef10f158727c412fcd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 10:43:56 +0000
Subject: [PATCH 01/37] Fix issues with colours in app skeletons

---
 .../[screenId]/_components/AppPreview.svelte      |  4 ++--
 packages/builder/src/stores/builder/theme.js      | 15 ++++++++++-----
 packages/client/src/stores/theme.js               | 11 ++---------
 packages/frontend-core/src/utils/index.js         |  1 +
 packages/frontend-core/src/utils/theme.js         | 12 ++++++++++++
 5 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 packages/frontend-core/src/utils/theme.js

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 12d572ecc4..44394fa7ee 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -247,9 +247,9 @@
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <div class="component-container">
-  {#if loading}
+  {#if loading || true}
     <div
-      class={`loading ${$themeStore.theme}`}
+      class={`loading spectrum spectrum--medium ${$themeStore.baseTheme} ${$themeStore.theme}`}
       class:tablet={$previewStore.previewDevice === "tablet"}
       class:mobile={$previewStore.previewDevice === "mobile"}
     >
diff --git a/packages/builder/src/stores/builder/theme.js b/packages/builder/src/stores/builder/theme.js
index afdf3e9805..efa2609b97 100644
--- a/packages/builder/src/stores/builder/theme.js
+++ b/packages/builder/src/stores/builder/theme.js
@@ -1,5 +1,6 @@
 import { writable, get } from "svelte/store"
 import { API } from "api"
+import { getBaseTheme } from "@budibase/frontend-core"
 
 const INITIAL_THEMES_STATE = {
   theme: "",
@@ -12,11 +13,15 @@ export const themes = () => {
   })
 
   const syncAppTheme = app => {
-    store.update(state => ({
-      ...state,
-      theme: app.theme || "spectrum--light",
-      customTheme: app.customTheme,
-    }))
+    store.update(state => {
+      const theme = app.theme || "spectrum--light"
+      return {
+        ...state,
+        theme,
+        baseTheme: getBaseTheme(theme),
+        customTheme: app.customTheme,
+      }
+    })
   }
 
   const save = async (theme, appId) => {
diff --git a/packages/client/src/stores/theme.js b/packages/client/src/stores/theme.js
index 8877556f0c..50dad12fa4 100644
--- a/packages/client/src/stores/theme.js
+++ b/packages/client/src/stores/theme.js
@@ -1,7 +1,7 @@
 import { derived } from "svelte/store"
 import { appStore } from "./app"
 import { builderStore } from "./builder"
-import { Constants } from "@budibase/frontend-core"
+import { getBaseTheme } from "@budibase/frontend-core"
 
 // This is the good old acorn bug where having the word "g l o b a l" makes it
 // think that this is not ES6 compatible and starts throwing errors when using
@@ -29,13 +29,6 @@ const createThemeStore = () => {
       // Ensure theme is set
       theme = theme || defaultTheme
 
-      // Get base theme
-      let base =
-        Constants.Themes.find(x => `spectrum--${x.class}` === theme)?.base || ""
-      if (base) {
-        base = `spectrum--${base}`
-      }
-
       // Delete and nullish keys from the custom theme
       if (customTheme) {
         Object.entries(customTheme).forEach(([key, value]) => {
@@ -59,7 +52,7 @@ const createThemeStore = () => {
 
       return {
         theme,
-        baseTheme: base,
+        baseTheme: getBaseTheme(theme),
         customTheme,
         customThemeCss,
       }
diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js
index 98998b7f0e..6b79e1d040 100644
--- a/packages/frontend-core/src/utils/index.js
+++ b/packages/frontend-core/src/utils/index.js
@@ -7,3 +7,4 @@ export * as RowUtils from "./rows"
 export { memo, derivedMemo } from "./memo"
 export { createWebsocket } from "./websocket"
 export * from "./download"
+export * from "./theme"
diff --git a/packages/frontend-core/src/utils/theme.js b/packages/frontend-core/src/utils/theme.js
new file mode 100644
index 0000000000..165f7c9782
--- /dev/null
+++ b/packages/frontend-core/src/utils/theme.js
@@ -0,0 +1,12 @@
+import { Themes } from "../constants.js"
+
+export const getBaseTheme = theme => {
+  if (!theme) {
+    return ""
+  }
+  let base = Themes.find(x => `spectrum--${x.class}` === theme)?.base || ""
+  if (base) {
+    base = `spectrum--${base}`
+  }
+  return base
+}

From 884d9ecf6c9e6e6c98380140a55fbaa7a4e83245 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 10:45:23 +0000
Subject: [PATCH 02/37] Remove testing code

---
 .../design/[screenId]/_components/AppPreview.svelte             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 44394fa7ee..298f044086 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -247,7 +247,7 @@
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <div class="component-container">
-  {#if loading || true}
+  {#if loading}
     <div
       class={`loading spectrum spectrum--medium ${$themeStore.baseTheme} ${$themeStore.theme}`}
       class:tablet={$previewStore.previewDevice === "tablet"}

From dbaaa9beeefc604312c80a9b640eebf4bada73fd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 10:46:58 +0000
Subject: [PATCH 03/37] Remove redundant classes

---
 .../design/[screenId]/_components/AppPreview.svelte             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 298f044086..0ce9e096f2 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -249,7 +249,7 @@
 <div class="component-container">
   {#if loading}
     <div
-      class={`loading spectrum spectrum--medium ${$themeStore.baseTheme} ${$themeStore.theme}`}
+      class={`loading ${$themeStore.baseTheme} ${$themeStore.theme}`}
       class:tablet={$previewStore.previewDevice === "tablet"}
       class:mobile={$previewStore.previewDevice === "mobile"}
     >

From 66009305598b142833a78cee77699cffba18f446 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 10:51:53 +0000
Subject: [PATCH 04/37] Fix annoying account-portal submodule check

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index f5b467b6b1..13b3bc93e1 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a
+Subproject commit 13b3bc93e115a2ec6c2cde5cfa199773e31a308d

From 00d57c7f0fc6e28ed0000321c954112fa0711f0d Mon Sep 17 00:00:00 2001
From: Gerard Burns <gjburns9@hotmail.com>
Date: Tue, 26 Mar 2024 11:06:09 +0000
Subject: [PATCH 05/37] add base theme to portal app preview

---
 .../src/pages/builder/portal/apps/[appId]/index.svelte      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
index a08189a400..d7e0e35289 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
@@ -20,7 +20,7 @@
   import { sdk } from "@budibase/shared-core"
   import { API } from "api"
   import ErrorSVG from "./ErrorSVG.svelte"
-  import { ClientAppSkeleton } from "@budibase/frontend-core"
+  import { getBaseTheme, ClientAppSkeleton } from "@budibase/frontend-core"
 
   $: app = $enrichedApps.find(app => app.appId === $params.appId)
   $: iframeUrl = getIframeURL(app)
@@ -137,7 +137,9 @@
       class:hide={!loading || !app?.features?.skeletonLoader}
       class="loading"
     >
-      <div class={`loadingThemeWrapper ${app.theme}`}>
+      <div
+        class={`loadingThemeWrapper ${getBaseTheme(app.theme)} ${app.theme}`}
+      >
         <ClientAppSkeleton
           noAnimation
           hideDevTools={app?.status === "published"}

From 84ffaa7022c3ef7de77a40ca2aff1572e1d05026 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 14:47:14 +0000
Subject: [PATCH 06/37] Fix additional scrollbar appearing when hiding binding
 panels

---
 .../builder/src/components/common/bindings/BindingPanel.svelte   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 21d389357f..10d95a3e7e 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -371,6 +371,7 @@
 <style>
   .binding-panel {
     height: 100%;
+    overflow: hidden;
   }
   .binding-panel,
   .tabs {

From ad89bb970c895346043698e5b065e827e85a043e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 27 Mar 2024 09:31:22 +0000
Subject: [PATCH 07/37] Update account portal

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 13b3bc93e1..08073bf33e 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 13b3bc93e115a2ec6c2cde5cfa199773e31a308d
+Subproject commit 08073bf33efc6f232846d11c58e40fdd20f0b4a3

From 0a4eddc7dcc21663a57f3bdf0e97da8c27195410 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 27 Mar 2024 10:20:22 +0000
Subject: [PATCH 08/37] Try reverting account portal

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 08073bf33e..f5b467b6b1 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 08073bf33efc6f232846d11c58e40fdd20f0b4a3
+Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a

From 0f170b6601f838eba7df5b877a54b85e377a2b59 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Wed, 27 Mar 2024 11:32:08 +0100
Subject: [PATCH 10/37] Update submodule

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index f5b467b6b1..eb5315adb5 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a
+Subproject commit eb5315adb5c0023a340d8e1c1009ec667566ce75

From d3fdf4add8488d9cb812d16c332c17641c9f7bf8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:37:13 +0100
Subject: [PATCH 11/37] Runs checks only if you changed it

---
 .github/workflows/budibase_ci.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 36ea2f5448..1a4ad5e1be 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -264,7 +264,15 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
-      - name: Check account portal commit
+      - uses: dorny/paths-filter@v3
+        id: changes
+        with:
+          filters: |
+            src:
+              - packages/account-portal/**
+
+      - if: steps.changes.outputs.changes.src == 'true'
+        name: Check account portal commit
         id: get_accountportal_commits
         run: |
           cd packages/account-portal

From e0bb5f323f197682c851c3c70c7d223fb12749e3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:41:02 +0100
Subject: [PATCH 12/37] Update submodule

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index f5b467b6b1..eb5315adb5 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a
+Subproject commit eb5315adb5c0023a340d8e1c1009ec667566ce75

From f1dfc16e1cd5a7660790ddd126ce25031a695433 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:44:32 +0100
Subject: [PATCH 13/37] Fix

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 1a4ad5e1be..5a0d09033a 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -271,7 +271,7 @@ jobs:
             src:
               - packages/account-portal/**
 
-      - if: steps.changes.outputs.changes.src == 'true'
+      - if: steps.changes.outputs.src == 'true'
         name: Check account portal commit
         id: get_accountportal_commits
         run: |

From 7938c006647622cc4900075c1b0a8e793092d3a9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:46:51 +0100
Subject: [PATCH 14/37] Submodule not latest

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index eb5315adb5..bf3f8e3127 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit eb5315adb5c0023a340d8e1c1009ec667566ce75
+Subproject commit bf3f8e3127d2f362884d76ff49f62daae45eb19f

From 2998bf094ac0b06a668aa5c35e4a8405a4fcb779 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:48:46 +0100
Subject: [PATCH 15/37] Undo changes

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index bf3f8e3127..f5b467b6b1 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit bf3f8e3127d2f362884d76ff49f62daae45eb19f
+Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a

From 5939a3f4f1bf65d6f11438db039f0ea33e8dda63 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 12:15:30 +0100
Subject: [PATCH 16/37] Ignore merge conflicts on pro submodule checks

---
 .github/workflows/budibase_ci.yml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 5a0d09033a..62db7e3826 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -231,27 +231,28 @@ jobs:
             echo "pro_commit=$pro_commit"
             echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
             echo "base_commit=$base_commit"
-            echo "base_commit=$base_commit" >> "$GITHUB_OUTPUT"
+
+            base_commit_excluding_merges=$(git log --no-merges -n 1 --format=format:%H $base_commit)
+            echo "base_commit_excluding_merges=$base_commit_excluding_merges"
+            echo "base_commit_excluding_merges=$base_commit_excluding_merges" >> "$GITHUB_OUTPUT"
           else
             echo "Nothing to do - branch to branch merge."
           fi
 
       - name: Check submodule merged to base branch
-        if: ${{ steps.get_pro_commits.outputs.base_commit != '' }}
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
-            const baseCommit = '${{ steps.get_pro_commits.outputs.base_commit }}';
+        if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
+        run: |
+          base_commit_excluding_merges=${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
+          any_commit=$(git log origin/master...$base_commit_excluding_merges)
+          if [ -n "$any_commit" ]; then
+            echo "An error occurred: <error_message>"
+            echo 'Submodule commit does not match the latest commit on the "${{ steps.get_pro_commits.outputs.target_branch }}" branch.'
+            echo 'Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/master/docs/getting_started.md'
 
-            if (submoduleCommit !== baseCommit) {
-              console.error('Submodule commit does not match the latest commit on the "${{ steps.get_pro_commits.outputs.target_branch }}" branch.');
-              console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/master/docs/getting_started.md')
-              process.exit(1);
-            } else {
-              console.log('All good, the submodule had been merged and setup correctly!')
-            }
+            exit 1
+          else
+            echo 'All good, the submodule had been merged and setup correctly!'
+          fi
 
   check-accountportal-submodule:
     runs-on: ubuntu-latest

From 02e2d26985c272b9f6fe30c8edb18a9d5a4ec751 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 12:20:07 +0100
Subject: [PATCH 17/37] Fix

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 62db7e3826..9164e9974f 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -242,7 +242,7 @@ jobs:
       - name: Check submodule merged to base branch
         if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
         run: |
-          base_commit_excluding_merges=${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
+          base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
           any_commit=$(git log origin/master...$base_commit_excluding_merges)
           if [ -n "$any_commit" ]; then
             echo "An error occurred: <error_message>"

From 4fb62177305048b2652f9b398f63f82aa56d219f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 12:24:16 +0100
Subject: [PATCH 18/37] Fix checks

---
 .github/workflows/budibase_ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 9164e9974f..ade611a08c 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -243,8 +243,13 @@ jobs:
         if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
         run: |
           base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
-          any_commit=$(git log origin/master...$base_commit_excluding_merges)
+          pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}'
+
+          any_commit=$(git log $base_commit_excluding_merges...$pro_commit)
+
           if [ -n "$any_commit" ]; then
+            echo $any_commit
+
             echo "An error occurred: <error_message>"
             echo 'Submodule commit does not match the latest commit on the "${{ steps.get_pro_commits.outputs.target_branch }}" branch.'
             echo 'Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/master/docs/getting_started.md'

From c255c70954346d8e35b87c678ffaaac859582038 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 12:25:37 +0100
Subject: [PATCH 19/37] cd

---
 .github/workflows/budibase_ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index ade611a08c..4c1110fb08 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -242,6 +242,7 @@ jobs:
       - name: Check submodule merged to base branch
         if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
         run: |
+          cd packages/pro
           base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
           pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}'
 

From 89d9b787df98ba521d37758d33015902b3a47143 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 12:26:10 +0100
Subject: [PATCH 20/37] Rename

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 4c1110fb08..aef88a30d6 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -239,7 +239,7 @@ jobs:
             echo "Nothing to do - branch to branch merge."
           fi
 
-      - name: Check submodule merged to base branch
+      - name: Check submodule merged and latest on base branch
         if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
         run: |
           cd packages/pro

From 1ed687f6c483728c245afa8232da399be81d5b56 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 12:37:07 +0100
Subject: [PATCH 21/37] Fix checks

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index aef88a30d6..b8bd6063ef 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -246,7 +246,7 @@ jobs:
           base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
           pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}'
 
-          any_commit=$(git log $base_commit_excluding_merges...$pro_commit)
+          any_commit=$(git log --no-merges $base_commit_excluding_merges...$pro_commit)
 
           if [ -n "$any_commit" ]; then
             echo $any_commit

From 4493905e74302ac4116b2e6c2858b722482c4323 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 12:39:20 +0100
Subject: [PATCH 22/37] Update submodule

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index f8e8f87bd5..8a10ac52a4 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit f8e8f87bd52081e1303a5ae92c432ea5b38f3bb4
+Subproject commit 8a10ac52a4fdb6eb1f444aa0a308fd28ede526ec

From ab46a3e5e8e9b20d956b56ac539b0a6c2301f3c0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 12:41:05 +0100
Subject: [PATCH 23/37] Update submodule

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 8a10ac52a4..6b62505be0 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 8a10ac52a4fdb6eb1f444aa0a308fd28ede526ec
+Subproject commit 6b62505be0c0b50a57b4f4980d86541ebdc86428

From 1e7608a7908030343d6bf634ba3f98840b2327ea Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 11:46:45 +0000
Subject: [PATCH 24/37] Trying yarn 1.22.19.

---
 .github/workflows/budibase_ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 5a0d09033a..bab8a689b1 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -43,6 +43,7 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
+      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - run: yarn lint
 

From 4fa98f17d2a6b9140b00e79f0277f53f0245b41f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 11:55:22 +0000
Subject: [PATCH 25/37] Different way to set yarn version.

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index bab8a689b1..2898d06682 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
-      - run: yarn set version 1.22.19
+      - run: yarn policies set-version 1.22.19
       - run: yarn --frozen-lockfile
       - run: yarn lint
 

From e36ec141637b12513b50e4e17cc526cbc3b32760 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 12:05:44 +0000
Subject: [PATCH 26/37] Use yarn 1.22.19 across all CI steps.

---
 .github/workflows/budibase_ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 2898d06682..d1d0ea214e 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
-      - run: yarn policies set-version 1.22.19
+      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
@@ -62,6 +62,7 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
+      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -104,6 +105,7 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
+      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -128,6 +130,7 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
+      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -165,6 +168,7 @@ jobs:
           docker pull testcontainers/ryuk:0.5.1
           docker pull budibase/couchdb
 
+      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
 
       - name: Test server
@@ -189,6 +193,7 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
+      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker

From 36fa7b75deb0b5807f4e74b3d77df2c5ba185687 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 12:24:03 +0000
Subject: [PATCH 27/37] Removing yarn version set - made no difference.

---
 .github/workflows/budibase_ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index d1d0ea214e..5a0d09033a 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -43,7 +43,6 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
-      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
@@ -62,7 +61,6 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
-      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -105,7 +103,6 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
-      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -130,7 +127,6 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
-      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -168,7 +164,6 @@ jobs:
           docker pull testcontainers/ryuk:0.5.1
           docker pull budibase/couchdb
 
-      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
 
       - name: Test server
@@ -193,7 +188,6 @@ jobs:
         with:
           node-version: 20.x
           cache: yarn
-      - run: yarn set version 1.22.19
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker

From 81ef8033ddfb231baf8930da28a848140f3b5b7b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 12:41:17 +0000
Subject: [PATCH 28/37] Trying an earlier account portal reference.

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index eb5315adb5..f46a310b81 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit eb5315adb5c0023a340d8e1c1009ec667566ce75
+Subproject commit f46a310b813d32931ecf3e03235e75ab881edfc1

From 2427936b70100ee72766ebb1de74c6512fad43f8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 12:59:29 +0000
Subject: [PATCH 29/37] Build in CI in two steps, one for account portal and
 one for OSS/monorepo.

---
 .github/workflows/budibase_ci.yml | 3 ++-
 package.json                      | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 5a0d09033a..93be55f059 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -66,7 +66,8 @@ jobs:
       # Run build all the projects
       - name: Build
         run: |
-          yarn build
+          yarn build:oss
+          yarn build:account-portal
       # Check the types of the projects built via esbuild
       - name: Check types
         run: |
diff --git a/package.json b/package.json
index 79a7b06eff..6b7db65ed8 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,9 @@
     "preinstall": "node scripts/syncProPackage.js",
     "get-past-client-version": "node scripts/getPastClientVersion.js",
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
-    "build": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream",
+    "build": "NODE_OPTIONS=--max-old-space-size=2000 lerna run build --stream",
+    "build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal-ui --ignore @budibase/account-portal-server",
+    "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal-ui --scope @budibase/account-portal-server",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
     "check:types": "lerna run check:types",
     "build:sdk": "lerna run --stream build:sdk",

From 84516e85a19d653f321b7cd93b8e7d9e82168b0a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 13:00:02 +0000
Subject: [PATCH 30/37] Updating to latest account portal master.

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index f46a310b81..eb5315adb5 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit f46a310b813d32931ecf3e03235e75ab881edfc1
+Subproject commit eb5315adb5c0023a340d8e1c1009ec667566ce75

From 77621f87b6d0779a670a5f49264c9e4ecd2c031b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 13:15:02 +0000
Subject: [PATCH 31/37] Adding missing package from ignore.

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6b7db65ed8..8d7a372da4 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,8 @@
     "get-past-client-version": "node scripts/getPastClientVersion.js",
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
     "build": "NODE_OPTIONS=--max-old-space-size=2000 lerna run build --stream",
-    "build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal-ui --ignore @budibase/account-portal-server",
-    "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal-ui --scope @budibase/account-portal-server",
+    "build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal-ui --ignore @budibase/account-portal-server --ignore @budibase/account-portal",
+    "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal-ui --scope @budibase/account-portal-server --scope @budibase/account-portal",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
     "check:types": "lerna run check:types",
     "build:sdk": "lerna run --stream build:sdk",

From cd694cb31237f9969af23079d2657d3c9ee774cd Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 13:32:24 +0000
Subject: [PATCH 32/37] Disabling warnings for eval (required).

---
 packages/bbui/rollup.config.js   | 7 +++++++
 packages/client/rollup.config.js | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/bbui/rollup.config.js b/packages/bbui/rollup.config.js
index e285d548d6..da274e0ba5 100644
--- a/packages/bbui/rollup.config.js
+++ b/packages/bbui/rollup.config.js
@@ -12,6 +12,13 @@ export default {
     format: "esm",
     file: "dist/bbui.es.js",
   },
+  onwarn(warning, warn) {
+    // suppress eval warnings
+    if (warning.code === "EVAL") {
+      return
+    }
+    warn(warning)
+  },
   plugins: [
     resolve(),
     commonjs(),
diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js
index ee839424ee..9839414f7e 100644
--- a/packages/client/rollup.config.js
+++ b/packages/client/rollup.config.js
@@ -45,7 +45,8 @@ export default {
   onwarn(warning, warn) {
     if (
       warning.code === "THIS_IS_UNDEFINED" ||
-      warning.code === "CIRCULAR_DEPENDENCY"
+      warning.code === "CIRCULAR_DEPENDENCY" ||
+      warning.code === "EVAL"
     ) {
       return
     }

From 936762c8ee992c1f57ad41fd3c77d6e0fb127e17 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 13:35:47 +0000
Subject: [PATCH 33/37] Removing all eval warnings from rollup.

---
 packages/string-templates/rollup.config.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/string-templates/rollup.config.js b/packages/string-templates/rollup.config.js
index a843286a82..ee02c7a14a 100644
--- a/packages/string-templates/rollup.config.js
+++ b/packages/string-templates/rollup.config.js
@@ -17,6 +17,12 @@ const config = (format, outputFile) => ({
     format,
     file: outputFile,
   },
+  onwarn(warning, warn) {
+    if (warning.code === "EVAL") {
+      return
+    }
+    warn(warning)
+  },
   plugins: [
     typescript(),
     resolve({

From 4d6ceb142ac61545ae9b972ff6ed238cfd28af45 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 14:00:43 +0000
Subject: [PATCH 34/37] Updating account portal reference.

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index eb5315adb5..60658a052d 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit eb5315adb5c0023a340d8e1c1009ec667566ce75
+Subproject commit 60658a052d2642e5f4a8038e253f771a24f34907

From e4d2ac4fc2abaaf0a43c762a70ebec2a5fd3df36 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 14:25:14 +0000
Subject: [PATCH 35/37] Changing build back.

---
 .github/workflows/budibase_ci.yml | 4 +---
 package.json                      | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 93be55f059..c3f2cf7953 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -65,9 +65,7 @@ jobs:
 
       # Run build all the projects
       - name: Build
-        run: |
-          yarn build:oss
-          yarn build:account-portal
+        run: yarn build
       # Check the types of the projects built via esbuild
       - name: Check types
         run: |
diff --git a/package.json b/package.json
index 8d7a372da4..79a7b06eff 100644
--- a/package.json
+++ b/package.json
@@ -33,9 +33,7 @@
     "preinstall": "node scripts/syncProPackage.js",
     "get-past-client-version": "node scripts/getPastClientVersion.js",
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
-    "build": "NODE_OPTIONS=--max-old-space-size=2000 lerna run build --stream",
-    "build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal-ui --ignore @budibase/account-portal-server --ignore @budibase/account-portal",
-    "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal-ui --scope @budibase/account-portal-server --scope @budibase/account-portal",
+    "build": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
     "check:types": "lerna run check:types",
     "build:sdk": "lerna run --stream build:sdk",

From 9f80d7fe435b259b50934431fa29872781fdb5f2 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 16:59:45 +0000
Subject: [PATCH 36/37] Adding a mechanism to split build of account portal and
 monorepo.

---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package.json b/package.json
index 79a7b06eff..32693a0b6f 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,8 @@
     "get-past-client-version": "node scripts/getPastClientVersion.js",
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
     "build": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream",
+    "build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal --ignore @budibase/account-portal-server --ignore @budibase/account-portal-ui",
+    "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal --scope @budibase/account-portal-server --scope @budibase/account-portal-ui",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
     "check:types": "lerna run check:types",
     "build:sdk": "lerna run --stream build:sdk",

From 84f87c4a48e17be36fc1ee866c57a93e4a09f80a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 27 Mar 2024 17:00:56 +0000
Subject: [PATCH 37/37] Updating CI.

---
 .github/workflows/budibase_ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index a9cb89d4e6..030ad6578e 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -65,7 +65,9 @@ jobs:
 
       # Run build all the projects
       - name: Build
-        run: yarn build
+        run: |
+          yarn build:oss
+          yarn build:account-portal
       # Check the types of the projects built via esbuild
       - name: Check types
         run: |