Merge branch 'reuse-containers' of github.com:budibase/budibase into reuse-containers

.github/workflows/budibase_ci.yml

@@ -65,8 +65,7 @@ jobs:
 
       # Run build all the projects
       - name: Build
-        run: |
+        run: yarn build
-          yarn build
       # Check the types of the projects built via esbuild
       - name: Check types
         run: |
@@ -231,27 +230,34 @@ 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
+      - name: Check submodule merged and latest on base branch
-        if: ${{ steps.get_pro_commits.outputs.base_commit != '' }}
+        if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
-        uses: actions/github-script@v7
+        run: |
-        with:
+          cd packages/pro
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
-          script: |
+          pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}'
-            const submoduleCommit = '${{ steps.get_pro_commits.outputs.pro_commit }}';
-            const baseCommit = '${{ steps.get_pro_commits.outputs.base_commit }}';
 
-            if (submoduleCommit !== baseCommit) {
+          any_commit=$(git log --no-merges $base_commit_excluding_merges...$pro_commit)
-              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')
+          if [ -n "$any_commit" ]; then
-              process.exit(1);
+            echo $any_commit
-            } else {
+
-              console.log('All good, the submodule had been merged and setup correctly!')
+            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'
+
+            exit 1
+          else
+            echo 'All good, the submodule had been merged and setup correctly!'
+          fi
 
   check-accountportal-submodule:
     runs-on: ubuntu-latest

packages/account-portal

@@ -1 +1 @@
-Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a
+Subproject commit 60658a052d2642e5f4a8038e253f771a24f34907

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(),

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
     }

packages/pro

@@ -1 +1 @@
-Subproject commit f8e8f87bd52081e1303a5ae92c432ea5b38f3bb4
+Subproject commit 6b62505be0c0b50a57b4f4980d86541ebdc86428

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({