From acfe69a3d51e08cf9c548bc18203014255102967 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 19 Jun 2023 18:34:51 +0100
Subject: [PATCH 01/20] Remove the doble deep format references

---
 lerna.json                          | 18 ++----------------
 package.json                        | 14 +-------------
 packages/pro                        |  2 +-
 packages/server/jest.config.ts      |  5 ++---
 packages/server/nodemon.json        |  2 +-
 packages/server/tsconfig.build.json |  2 +-
 packages/worker/jest.config.ts      |  8 +++-----
 packages/worker/nodemon.json        |  2 +-
 packages/worker/tsconfig.build.json |  2 +-
 scripts/bootstrap.sh                |  2 +-
 scripts/link-dependencies.sh        |  4 ++--
 scripts/syncProPackage.js           |  2 +-
 yarn.lock                           | 24 ++++++++++++++++++++++--
 13 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2739b40732..547f5d382e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,21 +1,7 @@
 {
   "version": "2.7.25-alpha.3",
   "npmClient": "yarn",
-  "packages": [
-    "packages/backend-core",
-    "packages/bbui",
-    "packages/builder",
-    "packages/cli",
-    "packages/client",
-    "packages/frontend-core",
-    "packages/sdk",
-    "packages/server",
-    "packages/shared-core",
-    "packages/string-templates",
-    "packages/types",
-    "packages/worker",
-    "packages/pro/packages/pro"
-  ],
+  "packages": ["packages/*"],
   "useWorkspaces": true,
   "command": {
     "publish": {
@@ -31,4 +17,4 @@
       "loadEnvFiles": false
     }
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 56f015f8c0..d097474309 100644
--- a/package.json
+++ b/package.json
@@ -95,19 +95,7 @@
   },
   "workspaces": {
     "packages": [
-      "packages/backend-core",
-      "packages/bbui",
-      "packages/builder",
-      "packages/cli",
-      "packages/client",
-      "packages/frontend-core",
-      "packages/sdk",
-      "packages/server",
-      "packages/shared-core",
-      "packages/string-templates",
-      "packages/types",
-      "packages/worker",
-      "packages/pro/packages/pro"
+      "packages/*"
     ]
   },
   "resolutions": {
diff --git a/packages/pro b/packages/pro
index f4b8449aac..d89fb653d6 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit f4b8449aac9bd265214396afbdce7ff984a2ae34
+Subproject commit d89fb653d6faf2886d580d43bc546d2f09a54989
diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts
index a7710d1e33..7458420643 100644
--- a/packages/server/jest.config.ts
+++ b/packages/server/jest.config.ts
@@ -21,9 +21,8 @@ const baseConfig: Config.InitialProjectOptions = {
 }
 
 // add pro sources if they exist
-if (fs.existsSync("../pro/packages")) {
-  baseConfig.moduleNameMapper!["@budibase/pro"] =
-    "<rootDir>/../pro/packages/pro/src"
+if (fs.existsSync("../pro/src")) {
+  baseConfig.moduleNameMapper!["@budibase/pro"] = "<rootDir>/../pro"
 }
 
 const config: Config.InitialOptions = {
diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json
index 77375546e1..47c60d0966 100644
--- a/packages/server/nodemon.json
+++ b/packages/server/nodemon.json
@@ -1,5 +1,5 @@
 {
-  "watch": ["src", "../backend-core", "../pro/packages/pro"],
+  "watch": ["src", "../backend-core", "../pro"],
   "ext": "js,ts,json",
   "ignore": [
     "src/**/*.spec.ts",
diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json
index 355b7ed6da..4e509bd14e 100644
--- a/packages/server/tsconfig.build.json
+++ b/packages/server/tsconfig.build.json
@@ -17,7 +17,7 @@
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
       "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/packages/pro/src"]
+      "@budibase/pro": ["../pro/src"]
     }
   },
   "include": ["src/**/*"],
diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts
index 49b6c5d425..1cbf22c22a 100644
--- a/packages/worker/jest.config.ts
+++ b/packages/worker/jest.config.ts
@@ -21,11 +21,9 @@ const config: Config.InitialOptions = {
 }
 
 // add pro sources if they exist
-if (fs.existsSync("../pro/packages")) {
-  config.moduleNameMapper!["@budibase/pro/(.*)"] =
-    "<rootDir>/../pro/packages/pro/$1"
-  config.moduleNameMapper!["@budibase/pro"] =
-    "<rootDir>/../pro/packages/pro/src"
+if (fs.existsSync("../pro/src")) {
+  config.moduleNameMapper!["@budibase/pro/(.*)"] = "<rootDir>/../pro/$1"
+  config.moduleNameMapper!["@budibase/pro"] = "<rootDir>/../pro/src"
 }
 
 export default config
diff --git a/packages/worker/nodemon.json b/packages/worker/nodemon.json
index d92cfe22b5..9585d85af5 100644
--- a/packages/worker/nodemon.json
+++ b/packages/worker/nodemon.json
@@ -1,5 +1,5 @@
 {
-  "watch": ["src", "../backend-core", "../pro/packages/pro"],
+  "watch": ["src", "../backend-core", "../pro"],
   "ext": "js,ts,json",
   "ignore": [
     "src/**/*.spec.ts",
diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json
index 59e4bf7d8a..bc477abe4d 100644
--- a/packages/worker/tsconfig.build.json
+++ b/packages/worker/tsconfig.build.json
@@ -16,7 +16,7 @@
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
       "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/packages/pro/src"]
+      "@budibase/pro": ["../pro/src"]
     }
   },
   "include": ["src/**/*"],
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 9a0bc18a28..a5a4fc0108 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,4 +1,4 @@
-if [ -d "packages/pro/packages" ]; then
+if [ -d "packages/pro/src" ]; then
   cd packages/pro
 
   yarn
diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh
index 9b85f9895d..ed42f29b4a 100755
--- a/scripts/link-dependencies.sh
+++ b/scripts/link-dependencies.sh
@@ -34,7 +34,7 @@ yarn unlink
 yarn link
 cd -
 
-if [ -d packages/pro/packages ]; then
+if [ -d packages/pro/src ]; then
   pro_loaded_locally=true
 else
   pro_loaded_locally=false
@@ -42,7 +42,7 @@ fi
 
 if [ $pro_loaded_locally = true ]; then
   echo "Linking pro"
-  cd packages/pro/packages/pro
+  cd packages/pro
   yarn unlink
   yarn link
   cd -
diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js
index bbbe33f44b..5ea49142ee 100755
--- a/scripts/syncProPackage.js
+++ b/scripts/syncProPackage.js
@@ -3,7 +3,7 @@ const path = require("path")
 const { execSync } = require("child_process")
 
 let version = "0.0.0"
-const localPro = fs.existsSync("packages/pro/packages")
+const localPro = fs.existsSync("packages/pro/src")
 if (!localPro) {
   const branchName = execSync("git rev-parse --abbrev-ref HEAD")
     .toString()
diff --git a/yarn.lock b/yarn.lock
index b15c549640..ec4a060f15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2489,6 +2489,11 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@fontsource/source-sans-pro@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-5.0.3.tgz#7d6e84a8169ba12fa5e6ce70757aa2ca7e74d855"
+  integrity sha512-mQnjuif/37VxwRloHZ+wQdoozd2VPWutbFSt1AuSkk7nFXIBQxHJLw80rgCF/osL0t7N/3Gx1V7UJuOX2zxzhQ==
+
 "@fortawesome/fontawesome-common-types@6.3.0":
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b"
@@ -8406,7 +8411,7 @@ chmodr@1.2.0:
   resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.2.0.tgz#720e96caa09b7f1cdbb01529b7d0ab6bc5e118b9"
   integrity sha512-Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA==
 
-chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2:
+chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -11850,7 +11855,7 @@ fast-glob@3.2.7:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.0.3:
+fast-glob@^3.0.3, fast-glob@^3.2.11:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
@@ -13661,6 +13666,11 @@ humanize-ms@^1.2.0, humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+husky@^7.0.1:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
+  integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
+
 husky@^8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"
@@ -25423,6 +25433,16 @@ vite-node@0.29.8:
     picocolors "^1.0.0"
     vite "^3.0.0 || ^4.0.0"
 
+vite-plugin-static-copy@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.16.0.tgz#2f65227037f17fc99c0782fd0b344e962935e69e"
+  integrity sha512-dMVEg5Z2SwYRgQnHZaeokvSKB4p/TOTf65JU4sP3U6ccSBsukqdtDOjpmT+xzTFHAA8WJjcS31RMLjUdWQCBzw==
+  dependencies:
+    chokidar "^3.5.3"
+    fast-glob "^3.2.11"
+    fs-extra "^11.1.0"
+    picocolors "^1.0.0"
+
 "vite@^3.0.0 || ^4.0.0":
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/vite/-/vite-4.2.2.tgz#014c30e5163844f6e96d7fe18fbb702236516dc6"

From 94b159b331563eb9566d1d2502105792b8793355 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 11:24:21 +0100
Subject: [PATCH 02/20] Fix merge

---
 lerna.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 0ac33d1a32..b7d13b4ece 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,6 @@
   "version": "2.7.25-alpha.8",
   "npmClient": "yarn",
   "packages": ["packages/*"],
-  "useWorkspaces": true,
   "useNx": true,
   "command": {
     "publish": {

From c0f95b8929eb6d287b7556bcd08211a73a7632d1 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 11:45:37 +0100
Subject: [PATCH 03/20] Update pro ref

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

diff --git a/packages/pro b/packages/pro
index d89fb653d6..1ec833d6b2 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit d89fb653d6faf2886d580d43bc546d2f09a54989
+Subproject commit 1ec833d6b25db08585b3d208eeee852710fb5f26

From 978e78ee26079a96be0cde295889c4b85be68068 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 11:57:25 +0100
Subject: [PATCH 04/20] Change PR checks

---
 .github/workflows/budibase_ci.yml | 38 ++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 6c875f2dfe..27501371be 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -135,15 +135,31 @@ jobs:
         with:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
-          fetch-depth: 0
-      - name: Check submodule
+
+      - name: Fetch develop branch
+        run: git fetch origin develop
+
+      - name: Check pro commit
+        id: pro_commit
         run: |
-          cd packages/pro
-          git fetch
-          if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) origin/develop; then
-            echo "Current commit has not been merged to develop"
-            echo "Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md"
-            exit 1
-          else
-            echo "All good, the submodule had been merged!"
-          fi
+          cd submodule
+          pro_commit=$(git rev-parse HEAD)
+          latest_commit=$(git rev-parse origin/develop)
+          echo "::set-output name=pro_commit::$pro_commit"
+          echo "::set-output name=latest_commit::$latest_commit"
+
+      - name: Check submodule merged to develop
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const submoduleCommit = '${{ steps.pro_commit.outputs.pro_commit }}';
+            const latestCommit = '${{ steps.pro_commit.outputs.latest_commit }}';
+
+            if (submoduleCommit !== latestCommit) {
+              console.error('Submodule commit does not match the latest commit on the develop branch.');
+              console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md')
+              process.exit(1);
+            } else {
+              console.log('All good, the submodule had been merged and setup correctly!')
+            }

From aa3294f08e7b7b2f8c07e6b7c427799786838853 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 12:00:30 +0100
Subject: [PATCH 05/20] Fix

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 27501371be..fad4055fe9 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -138,6 +138,8 @@ jobs:
 
       - name: Fetch develop branch
         run: git fetch origin develop
+        with:
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
       - name: Check pro commit
         id: pro_commit

From a4ce3f5e35665ccab9304a107742838161749c49 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 12:48:52 +0100
Subject: [PATCH 06/20] Fix workflow

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index fad4055fe9..6031703cfc 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -142,21 +142,21 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
       - name: Check pro commit
-        id: pro_commit
+        id: get_pro_commits
         run: |
           cd submodule
           pro_commit=$(git rev-parse HEAD)
           latest_commit=$(git rev-parse origin/develop)
-          echo "::set-output name=pro_commit::$pro_commit"
-          echo "::set-output name=latest_commit::$latest_commit"
+          echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
+          echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
 
       - name: Check submodule merged to develop
         uses: actions/github-script@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const submoduleCommit = '${{ steps.pro_commit.outputs.pro_commit }}';
-            const latestCommit = '${{ steps.pro_commit.outputs.latest_commit }}';
+            const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
+            const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}';
 
             if (submoduleCommit !== latestCommit) {
               console.error('Submodule commit does not match the latest commit on the develop branch.');

From 99223d25ce406e056232073d5ad9644653b85f5a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 12:51:57 +0100
Subject: [PATCH 07/20] "Fix" pipeline

---
 .github/workflows/budibase_ci.yml | 48 +++++++++++++++++--------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 6031703cfc..64bb41e973 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -1,5 +1,9 @@
 name: Budibase CI
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   # Trigger the workflow on push or pull request,
   # but only for the master branch
@@ -141,27 +145,27 @@ jobs:
         with:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
-      - name: Check pro commit
-        id: get_pro_commits
-        run: |
-          cd submodule
-          pro_commit=$(git rev-parse HEAD)
-          latest_commit=$(git rev-parse origin/develop)
-          echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
-          echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
+      # - name: Check pro commit
+      #   id: get_pro_commits
+      #   run: |
+      #     cd submodule
+      #     pro_commit=$(git rev-parse HEAD)
+      #     latest_commit=$(git rev-parse origin/develop)
+      #     echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
+      #     echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
 
-      - name: Check submodule merged to develop
-        uses: actions/github-script@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
-            const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}';
+      # - name: Check submodule merged to develop
+      #   uses: actions/github-script@v4
+      #   with:
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
+      #     script: |
+      #       const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
+      #       const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}';
 
-            if (submoduleCommit !== latestCommit) {
-              console.error('Submodule commit does not match the latest commit on the develop branch.');
-              console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md')
-              process.exit(1);
-            } else {
-              console.log('All good, the submodule had been merged and setup correctly!')
-            }
+      #       if (submoduleCommit !== latestCommit) {
+      #         console.error('Submodule commit does not match the latest commit on the develop branch.');
+      #         console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md')
+      #         process.exit(1);
+      #       } else {
+      #         console.log('All good, the submodule had been merged and setup correctly!')
+      #       }

From 68d9dcbeac7898ce6aacf0ff19b102086cad8b9f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 12:53:02 +0100
Subject: [PATCH 08/20] Remove step

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 64bb41e973..f320fa0d8d 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -130,42 +130,3 @@ jobs:
         env:
           BB_ADMIN_USER_EMAIL: admin
           BB_ADMIN_USER_PASSWORD: admin
-
-  check-pro-submodule:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
-
-      - name: Fetch develop branch
-        run: git fetch origin develop
-        with:
-          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
-
-      # - name: Check pro commit
-      #   id: get_pro_commits
-      #   run: |
-      #     cd submodule
-      #     pro_commit=$(git rev-parse HEAD)
-      #     latest_commit=$(git rev-parse origin/develop)
-      #     echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
-      #     echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
-
-      # - name: Check submodule merged to develop
-      #   uses: actions/github-script@v4
-      #   with:
-      #     github-token: ${{ secrets.GITHUB_TOKEN }}
-      #     script: |
-      #       const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
-      #       const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}';
-
-      #       if (submoduleCommit !== latestCommit) {
-      #         console.error('Submodule commit does not match the latest commit on the develop branch.');
-      #         console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md')
-      #         process.exit(1);
-      #       } else {
-      #         console.log('All good, the submodule had been merged and setup correctly!')
-      #       }

From b6e3d26ef2ceadf4034cf574079a0006aeaf7e3b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 12:54:25 +0100
Subject: [PATCH 09/20] Add jobs

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index f320fa0d8d..9f3361d634 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -130,3 +130,40 @@ jobs:
         env:
           BB_ADMIN_USER_EMAIL: admin
           BB_ADMIN_USER_PASSWORD: admin
+
+  check-pro-submodule:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
+
+      - name: Fetch develop branch
+        run: git fetch origin develop
+
+      - name: Check pro commit
+        id: get_pro_commits
+        run: |
+          cd submodule
+          pro_commit=$(git rev-parse HEAD)
+          latest_commit=$(git rev-parse origin/develop)
+          echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
+          echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
+
+      - name: Check submodule merged to develop
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
+            const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}';
+
+            if (submoduleCommit !== latestCommit) {
+              console.error('Submodule commit does not match the latest commit on the develop branch.');
+              console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md')
+              process.exit(1);
+            } else {
+              console.log('All good, the submodule had been merged and setup correctly!')
+            }

From 01fc38da0ab83c3d45b4f28b2f2a449d884c6bb6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 12:58:20 +0100
Subject: [PATCH 10/20] Don't fetch

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 9f3361d634..5816ceae0b 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -140,8 +140,8 @@ jobs:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
-      - name: Fetch develop branch
-        run: git fetch origin develop
+      # - name: Fetch develop branch
+      #   run: git fetch origin develop
 
       - name: Check pro commit
         id: get_pro_commits

From 5c8114e958b831a6f7860de4a16b39a1f7cf0695 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 12:59:45 +0100
Subject: [PATCH 11/20] 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 5816ceae0b..f912986511 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -146,7 +146,7 @@ jobs:
       - name: Check pro commit
         id: get_pro_commits
         run: |
-          cd submodule
+          cd packages/pro
           pro_commit=$(git rev-parse HEAD)
           latest_commit=$(git rev-parse origin/develop)
           echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"

From 9761262e0ba71cbfda1760982517f7184084a601 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 13:03:48 +0100
Subject: [PATCH 12/20] Echos

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index f912986511..0b6dcc988f 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -149,7 +149,9 @@ jobs:
           cd packages/pro
           pro_commit=$(git rev-parse HEAD)
           latest_commit=$(git rev-parse origin/develop)
+          echo "pro_commit=$pro_commit"
           echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
+          echo "latest_commit=$latest_commit"
           echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
 
       - name: Check submodule merged to develop

From 3535aa48948782799c9a4bdd03d720229b16c08d Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 13:15:32 +0100
Subject: [PATCH 13/20] Fix pro tests

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

diff --git a/packages/pro b/packages/pro
index 1ec833d6b2..6db60399fc 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 1ec833d6b25db08585b3d208eeee852710fb5f26
+Subproject commit 6db60399fca9eac8efb35d9a1d511b958860e69a

From 98c549ceaf5251e285824a8e9a5441d3e0efcaa7 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 13:42:39 +0100
Subject: [PATCH 14/20] Fix ref

---
 packages/server/jest.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts
index 7458420643..71cc526f36 100644
--- a/packages/server/jest.config.ts
+++ b/packages/server/jest.config.ts
@@ -22,7 +22,7 @@ const baseConfig: Config.InitialProjectOptions = {
 
 // add pro sources if they exist
 if (fs.existsSync("../pro/src")) {
-  baseConfig.moduleNameMapper!["@budibase/pro"] = "<rootDir>/../pro"
+  baseConfig.moduleNameMapper!["@budibase/pro"] = "<rootDir>/../pro/src"
 }
 
 const config: Config.InitialOptions = {

From c4a334c638bbe006b7fc78d37ddfdf0d88253409 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 13:53:58 +0100
Subject: [PATCH 15/20] Dynamic commit

---
 .github/workflows/budibase_ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 0b6dcc988f..90cb88fd81 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -140,15 +140,19 @@ jobs:
           submodules: true
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
-      # - name: Fetch develop branch
-      #   run: git fetch origin develop
-
       - name: Check pro commit
         id: get_pro_commits
         run: |
           cd packages/pro
           pro_commit=$(git rev-parse HEAD)
-          latest_commit=$(git rev-parse origin/develop)
+
+          echo "Running on branch ${{ github.ref }}
+          if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+            latest_commit=$(git rev-parse origin/master)
+          else
+            latest_commit=$(git rev-parse origin/develop)
+          fi
+
           echo "pro_commit=$pro_commit"
           echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
           echo "latest_commit=$latest_commit"

From 18ba10a27329f8103e4be7db8a9515cb47a06317 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 14:01:44 +0100
Subject: [PATCH 16/20] Echoes

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

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 90cb88fd81..c98585c239 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -146,6 +146,11 @@ jobs:
           cd packages/pro
           pro_commit=$(git rev-parse HEAD)
 
+          branch=${{ github.head_ref || github.ref_name  }}
+          echo "branch=$branch"
+          echo "head_ref=$github.head_ref"
+          echo "ref_name=$github.ref_name"
+
           echo "Running on branch ${{ github.ref }}
           if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
             latest_commit=$(git rev-parse origin/master)

From 88f8849a413b0c2d405f57cd285bd79601126c9f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 14:05:02 +0100
Subject: [PATCH 17/20] Echoes

---
 .github/workflows/budibase_ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index c98585c239..ce01e7b723 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -146,13 +146,14 @@ jobs:
           cd packages/pro
           pro_commit=$(git rev-parse HEAD)
 
-          branch=${{ github.head_ref || github.ref_name  }}
+          branch=${{ github.base_ref || github.head_ref || github.ref_name  }}
           echo "branch=$branch"
-          echo "head_ref=$github.head_ref"
-          echo "ref_name=$github.ref_name"
+          echo "base_ref=${{ github.base_ref }}"
+          echo "head_ref=${{ github.head_ref }}"
+          echo "ref_name=${{ github.head_ref }}""
 
           echo "Running on branch ${{ github.ref }}
-          if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+          if [[ "$branch" == "master" ]]; then
             latest_commit=$(git rev-parse origin/master)
           else
             latest_commit=$(git rev-parse origin/develop)

From e9398e3a0b3e64ac532a802134976352bbf94919 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 20 Jun 2023 14:07:52 +0100
Subject: [PATCH 18/20] Renames

---
 .github/workflows/budibase_ci.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index ce01e7b723..00b7c608a8 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -146,23 +146,19 @@ jobs:
           cd packages/pro
           pro_commit=$(git rev-parse HEAD)
 
-          branch=${{ github.base_ref || github.head_ref || github.ref_name  }}
-          echo "branch=$branch"
-          echo "base_ref=${{ github.base_ref }}"
-          echo "head_ref=${{ github.head_ref }}"
-          echo "ref_name=${{ github.head_ref }}""
+          branch=${{ github.base_ref || github.ref_name  }}
+          echo "Running on branch `$branch` (base_ref=${{ github.base_ref }}, ref_name=${{ github.head_ref }})"
 
-          echo "Running on branch ${{ github.ref }}
           if [[ "$branch" == "master" ]]; then
-            latest_commit=$(git rev-parse origin/master)
+            base_commit=$(git rev-parse origin/master)
           else
-            latest_commit=$(git rev-parse origin/develop)
+            base_commit=$(git rev-parse origin/develop)
           fi
 
           echo "pro_commit=$pro_commit"
           echo "pro_commit=$pro_commit" >> "$GITHUB_OUTPUT"
-          echo "latest_commit=$latest_commit"
-          echo "latest_commit=$latest_commit" >> "$GITHUB_OUTPUT"
+          echo "base_commit=$base_commit"
+          echo "base_commit=$base_commit" >> "$GITHUB_OUTPUT"
 
       - name: Check submodule merged to develop
         uses: actions/github-script@v4
@@ -170,9 +166,9 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
-            const latestCommit = '${{ steps.get_pro_commits.outputs.latest_commit }}';
+            const baseCommit = '${{ steps.get_pro_commits.outputs.base_commit }}';
 
-            if (submoduleCommit !== latestCommit) {
+            if (submoduleCommit !== baseCommit) {
               console.error('Submodule commit does not match the latest commit on the develop branch.');
               console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md')
               process.exit(1);

From 5545b32c27a76bf5e6dd24c39bb63f2ec5e81f99 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 23 Jun 2023 11:18:01 +0100
Subject: [PATCH 19/20] Update pro ref

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

diff --git a/packages/pro b/packages/pro
index 6db60399fc..4e5506f2e9 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 6db60399fca9eac8efb35d9a1d511b958860e69a
+Subproject commit 4e5506f2e9fe3cac6f054191eb9092849c8100af

From 5777a3f506648e806aa9847697e499e00d90a802 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 23 Jun 2023 11:41:03 +0100
Subject: [PATCH 20/20] Update pro ref

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

diff --git a/packages/pro b/packages/pro
index 4e5506f2e9..2c9172685c 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 4e5506f2e9fe3cac6f054191eb9092849c8100af
+Subproject commit 2c9172685cdceef03172bea779e94cb52ff6d1de