From 37e99cc80e9cd81d2b0729ae807ed7088caa6eb2 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Wed, 27 Mar 2024 11:28:09 +0100
Subject: [PATCH 01/22] Empty commit


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 02/22] 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 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 03/22] 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 04/22] 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 05/22] 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 06/22] 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 07/22] 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 08/22] 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 09/22] 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 10/22] 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 11/22] 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 12/22] 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 13/22] 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 14/22] 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 15/22] 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 16/22] 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 17/22] 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 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] 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",