From 3b5f9ed3e26b5b1286efe166528c0acabb2fb642 Mon Sep 17 00:00:00 2001
From: unknown <ddasfasd123@gmail.com>
Date: Mon, 18 Jul 2022 13:34:40 +0900
Subject: [PATCH 01/22] Fix popover min-width to have parents full width

---
 packages/bbui/src/Popover/Popover.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte
index 1017ef71fc..756e5e6a09 100644
--- a/packages/bbui/src/Popover/Popover.svelte
+++ b/packages/bbui/src/Popover/Popover.svelte
@@ -63,7 +63,7 @@
 
 <style>
   .spectrum-Popover {
-    min-width: var(--spectrum-global-dimension-size-2000) !important;
+    min-width: var(--spectrum-global-dimension-size-2000);
   }
   .spectrum-Popover.is-open.spectrum-Popover--withTip {
     margin-top: var(--spacing-xs);

From 7c13d3ded9761bd33e8da56ae82ea780953e73dd Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 11 Aug 2022 15:31:39 +0100
Subject: [PATCH 02/22] Custom color bar chart

---
 packages/client/manifest.json                       | 13 ++++++++++++-
 .../src/components/app/charts/ApexChart.svelte      |  4 +++-
 .../src/components/app/charts/ApexOptionsBuilder.js | 10 ++++++++--
 .../src/components/app/charts/BarChart.svelte       | 12 ++++++++++--
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 0368b43562..3394a94203 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -1466,10 +1466,11 @@
       },
       {
         "type": "select",
-        "label": "Colours",
+        "label": "Colors",
         "key": "palette",
         "defaultValue": "Palette 1",
         "options": [
+          "Custom",
           "Palette 1",
           "Palette 2",
           "Palette 3",
@@ -1482,6 +1483,16 @@
           "Palette 10"
         ]
       },
+      {
+        "type": "color",
+        "label": "C1",
+        "key": "c1",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
       {
         "type": "boolean",
         "label": "Stacked",
diff --git a/packages/client/src/components/app/charts/ApexChart.svelte b/packages/client/src/components/app/charts/ApexChart.svelte
index 7bb37a587b..87d78bf5a2 100644
--- a/packages/client/src/components/app/charts/ApexChart.svelte
+++ b/packages/client/src/components/app/charts/ApexChart.svelte
@@ -10,7 +10,9 @@
 </script>
 
 {#if options}
-  <div use:chart={options} use:styleable={$component.styles} />
+  {#key options.customColor}
+    <div use:chart={options} use:styleable={$component.styles} />
+  {/key}
 {:else if $builderStore.inBuilder}
   <div use:styleable={$component.styles}>
     <Placeholder />
diff --git a/packages/client/src/components/app/charts/ApexOptionsBuilder.js b/packages/client/src/components/app/charts/ApexOptionsBuilder.js
index ef4083d648..31c5a820f7 100644
--- a/packages/client/src/components/app/charts/ApexOptionsBuilder.js
+++ b/packages/client/src/components/app/charts/ApexOptionsBuilder.js
@@ -62,8 +62,14 @@ export class ApexOptionsBuilder {
     return this.setOption(["title", "text"], title)
   }
 
-  color(color) {
-    return this.setOption(["colors"], [color])
+  colors(colors) {
+    if (!colors) {
+      delete this.options.colors
+      this.options["customColor"] = false
+      return this
+    }
+    this.options["customColor"] = true
+    return this.setOption(["colors"], colors)
   }
 
   width(width) {
diff --git a/packages/client/src/components/app/charts/BarChart.svelte b/packages/client/src/components/app/charts/BarChart.svelte
index f1e02d8af6..75c147f5d4 100644
--- a/packages/client/src/components/app/charts/BarChart.svelte
+++ b/packages/client/src/components/app/charts/BarChart.svelte
@@ -16,6 +16,7 @@
   export let stacked
   export let yAxisUnits
   export let palette
+  export let c1, c2, c3, c4, c5
   export let horizontal
 
   $: options = setUpChart(
@@ -33,9 +34,13 @@
     stacked,
     yAxisUnits,
     palette,
-    horizontal
+    horizontal,
+    c1 ? [c1] : null,
+    customColor
   )
 
+  $: customColor = palette === "Custom"
+
   const setUpChart = (
     title,
     dataProvider,
@@ -51,7 +56,9 @@
     stacked,
     yAxisUnits,
     palette,
-    horizontal
+    horizontal,
+    colors,
+    customColor
   ) => {
     const allCols = [labelColumn, ...(valueColumns || [null])]
     if (
@@ -85,6 +92,7 @@
       .stacked(stacked)
       .palette(palette)
       .horizontal(horizontal)
+      .colors(customColor ? colors : null)
 
     // Add data
     let useDates = false

From 352d236f2ed02c4a74ac3f0f821da6dff49efd46 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 11 Aug 2022 16:59:50 +0100
Subject: [PATCH 03/22] Custom colors for Pie Chart

---
 packages/client/manifest.json                 | 66 ++++++++++++++++++-
 .../src/components/app/charts/PieChart.svelte | 12 +++-
 2 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 3394a94203..a60e5c6b15 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -1811,10 +1811,11 @@
       },
       {
         "type": "select",
-        "label": "Colours",
+        "label": "Colors",
         "key": "palette",
         "defaultValue": "Palette 1",
         "options": [
+          "Custom",
           "Palette 1",
           "Palette 2",
           "Palette 3",
@@ -1827,6 +1828,56 @@
           "Palette 10"
         ]
       },
+      {
+        "type": "color",
+        "label": "C1",
+        "key": "c1",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C2",
+        "key": "c2",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C3",
+        "key": "c3",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C4",
+        "key": "c4",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C5",
+        "key": "c5",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
       {
         "type": "boolean",
         "label": "Data Labels",
@@ -1893,10 +1944,11 @@
       },
       {
         "type": "select",
-        "label": "Colours",
+        "label": "Colors",
         "key": "palette",
         "defaultValue": "Palette 1",
         "options": [
+          "Custom",
           "Palette 1",
           "Palette 2",
           "Palette 3",
@@ -1909,6 +1961,16 @@
           "Palette 10"
         ]
       },
+      {
+        "type": "color",
+        "label": "Color",
+        "key": "color",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
       {
         "type": "boolean",
         "label": "Data Labels",
diff --git a/packages/client/src/components/app/charts/PieChart.svelte b/packages/client/src/components/app/charts/PieChart.svelte
index 38a42ee37b..8cb7317d94 100644
--- a/packages/client/src/components/app/charts/PieChart.svelte
+++ b/packages/client/src/components/app/charts/PieChart.svelte
@@ -13,6 +13,7 @@
   export let legend
   export let donut
   export let palette
+  export let c1, c2, c3, c4, c5
 
   $: options = setUpChart(
     title,
@@ -25,9 +26,13 @@
     animate,
     legend,
     donut,
-    palette
+    palette,
+    c1 && c2 && c3 && c4 && c5 ? [c1, c2, c3, c4, c5] : null,
+    customColor
   )
 
+  $: customColor = palette === "Custom"
+
   const setUpChart = (
     title,
     dataProvider,
@@ -39,7 +44,9 @@
     animate,
     legend,
     donut,
-    palette
+    palette,
+    colors,
+    customColor
   ) => {
     if (
       !dataProvider ||
@@ -70,6 +77,7 @@
       .legend(legend)
       .legendPosition("right")
       .palette(palette)
+      .colors(customColor ? colors : null)
 
     // Add data if valid datasource
     const series = data.map(row => parseFloat(row[valueColumn]))

From 46749c2a4f86052c4002547c2dd5d3a43922e6db Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Thu, 11 Aug 2022 17:17:18 +0100
Subject: [PATCH 04/22] Cypress: Smoke Build - Timing based Changes

Adding a few corrections to support failing/Flakey smoke tests (timing issues)
---
 packages/builder/cypress/integration/appOverview.spec.js | 2 +-
 packages/builder/cypress/support/commands.js             | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js
index feaace6fb6..d7f2882b26 100644
--- a/packages/builder/cypress/integration/appOverview.spec.js
+++ b/packages/builder/cypress/integration/appOverview.spec.js
@@ -266,7 +266,7 @@ filterTests(["all"], () => {
           cy.reload()
           cy.log("Current deployment version: " + clientPackage.version)
 
-          cy.get(".version-status a", { timeout: 1000 }).contains("Update").click()
+          cy.get(".version-status a", { timeout: 5000 }).contains("Update").click()
           cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
 
           cy.get(".version-section .page-action button")
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index dbcdb04acb..85531b2f32 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -128,7 +128,9 @@ Cypress.Commands.add("updateUserInformation", (firstName, lastName) => {
         .should("have.value", lastName)
         .blur()
     }
-    cy.get("button").contains("Update information").click({ force: true })
+    cy.get(".confirm-wrap").within(() => {
+      cy.get("button").contains("Update information").click({ force: true })
+    })
     cy.get(".spectrum-Dialog-grid").should("not.exist")
   })
 })
@@ -432,6 +434,7 @@ Cypress.Commands.add("createAppFromScratch", appName => {
 
 // TABLES
 Cypress.Commands.add("createTable", (tableName, initialTable) => {
+  // Creates an internal Budibase DB table
   if (!initialTable) {
     cy.navigateToDataSection()
     cy.get(`[data-cy="new-table"]`, { timeout: 2000 }).click()
@@ -445,6 +448,10 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => {
         .contains("Continue")
         .click({ force: true })
     })
+  cy.get(".spectrum-Modal", { timeout: 2000 }).should(
+    "not.contain",
+    "Add data source"
+  )
   cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => {
     cy.get("input", { timeout: 2000 }).first().type(tableName).blur()
     cy.get(".spectrum-ButtonGroup").contains("Create").click()

From 37852c0f76d5cb778a1822d997f6ff1150b4916e Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Thu, 11 Aug 2022 17:29:59 +0100
Subject: [PATCH 05/22] Timeout increase for createTable Cypress Command

---
 packages/builder/cypress/support/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 85531b2f32..d33bd516c1 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -448,7 +448,7 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => {
         .contains("Continue")
         .click({ force: true })
     })
-  cy.get(".spectrum-Modal", { timeout: 2000 }).should(
+  cy.get(".spectrum-Modal", { timeout: 10000 }).should(
     "not.contain",
     "Add data source"
   )

From d7e411affb810dd3c193899a10d25a2d398afa3b Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Thu, 11 Aug 2022 17:43:33 +0100
Subject: [PATCH 06/22] Removing Add Multi-Option Datatype Test from Cypress
 Suite

We don't need a specific test file for this.

The test file will remain for now but will not run. The test will be reworked into a different test file or as part of the API testing
---
 .../builder/cypress/integration/addMultiOptionDatatype.spec.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
index f436f3ff39..f844402958 100644
--- a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
+++ b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
@@ -2,7 +2,7 @@ import filterTests from "../support/filterTests"
 const interact = require('../support/interact')
 
 filterTests(['all'], () => {
-  context("Add Multi-Option Datatype", () => {
+  xcontext("Add Multi-Option Datatype", () => {
     before(() => {
       cy.login()
       cy.createTestApp()

From 255434a7147be670c7ba64f52a9e6769c2d1e07e Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 11 Aug 2022 17:45:46 +0100
Subject: [PATCH 07/22] Add colors for Bar and Donut Charts

---
 packages/client/manifest.json                 | 84 ++++++++++++++++++-
 .../src/components/app/charts/BarChart.svelte |  2 +-
 2 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index a60e5c6b15..ac6de1ba39 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -1493,6 +1493,46 @@
           "value": "Custom"
         }
       },
+      {
+        "type": "color",
+        "label": "C2",
+        "key": "c2",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C3",
+        "key": "c3",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C4",
+        "key": "c4",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C5",
+        "key": "c5",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
       {
         "type": "boolean",
         "label": "Stacked",
@@ -1963,8 +2003,48 @@
       },
       {
         "type": "color",
-        "label": "Color",
-        "key": "color",
+        "label": "C1",
+        "key": "c1",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C2",
+        "key": "c2",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C3",
+        "key": "c3",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C4",
+        "key": "c4",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C5",
+        "key": "c5",
         "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
diff --git a/packages/client/src/components/app/charts/BarChart.svelte b/packages/client/src/components/app/charts/BarChart.svelte
index 75c147f5d4..fd8443e2d6 100644
--- a/packages/client/src/components/app/charts/BarChart.svelte
+++ b/packages/client/src/components/app/charts/BarChart.svelte
@@ -35,7 +35,7 @@
     yAxisUnits,
     palette,
     horizontal,
-    c1 ? [c1] : null,
+    c1 && c2 && c3 && c4 && c5 ? [c1, c2, c3, c4, c5] : null,
     customColor
   )
 

From a51a8d1c6d27ae177c016461839bb69094549cc3 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 11 Aug 2022 17:52:09 +0100
Subject: [PATCH 08/22] Custom colors line chart

---
 packages/client/manifest.json                 | 53 ++++++++++++++++++-
 .../components/app/charts/LineChart.svelte    | 12 ++++-
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index ac6de1ba39..19b4ef8040 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -1632,10 +1632,11 @@
       },
       {
         "type": "select",
-        "label": "Colours",
+        "label": "Colors",
         "key": "palette",
         "defaultValue": "Palette 1",
         "options": [
+          "Custom",
           "Palette 1",
           "Palette 2",
           "Palette 3",
@@ -1648,6 +1649,56 @@
           "Palette 10"
         ]
       },
+      {
+        "type": "color",
+        "label": "C1",
+        "key": "c1",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C2",
+        "key": "c2",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C3",
+        "key": "c3",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C4",
+        "key": "c4",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C5",
+        "key": "c5",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
       {
         "type": "select",
         "label": "Curve",
diff --git a/packages/client/src/components/app/charts/LineChart.svelte b/packages/client/src/components/app/charts/LineChart.svelte
index afb9f14262..7f82a833d2 100644
--- a/packages/client/src/components/app/charts/LineChart.svelte
+++ b/packages/client/src/components/app/charts/LineChart.svelte
@@ -17,6 +17,7 @@
   export let legend
   export let yAxisUnits
   export let palette
+  export let c1, c2, c3, c4, c5
 
   // Area specific props
   export let area
@@ -40,9 +41,13 @@
     palette,
     area,
     stacked,
-    gradient
+    gradient,
+    c1 && c2 && c3 && c4 && c5 ? [c1, c2, c3, c4, c5] : null,
+    customColor
   )
 
+  $: customColor = palette === "Custom"
+
   const setUpChart = (
     title,
     dataProvider,
@@ -60,7 +65,9 @@
     palette,
     area,
     stacked,
-    gradient
+    gradient,
+    colors,
+    customColor
   ) => {
     const allCols = [labelColumn, ...(valueColumns || [null])]
     if (
@@ -96,6 +103,7 @@
       .legend(legend)
       .yUnits(yAxisUnits)
       .palette(palette)
+      .colors(customColor ? colors : null)
 
     // Add data
     let useDates = false

From e45cb32c1418cce0af2a615b9615b09f6bc1f33f Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 11 Aug 2022 17:59:38 +0100
Subject: [PATCH 09/22] Custom colors Area Chart

---
 packages/client/manifest.json | 53 ++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 19b4ef8040..f5848356df 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -1797,10 +1797,11 @@
       },
       {
         "type": "select",
-        "label": "Colours",
+        "label": "Colors",
         "key": "palette",
         "defaultValue": "Palette 1",
         "options": [
+          "Custom",
           "Palette 1",
           "Palette 2",
           "Palette 3",
@@ -1813,6 +1814,56 @@
           "Palette 10"
         ]
       },
+      {
+        "type": "color",
+        "label": "C1",
+        "key": "c1",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C2",
+        "key": "c2",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C3",
+        "key": "c3",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C4",
+        "key": "c4",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
+      {
+        "type": "color",
+        "label": "C5",
+        "key": "c5",
+        "barSeparator": false,
+        "dependsOn": {
+          "setting": "palette",
+          "value": "Custom"
+        }
+      },
       {
         "type": "select",
         "label": "Curve",

From 65679f1fcaa78943f8750151616bf38267e97f2d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 12:12:39 +0000
Subject: [PATCH 10/22] Update pro version to 1.2.39-alpha.1

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 39dda7071c..21bb9fbdcb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.39-alpha.1",
     "@budibase/client": "1.2.39-alpha.1",
-    "@budibase/pro": "1.2.39-alpha.0",
+    "@budibase/pro": "1.2.39-alpha.1",
     "@budibase/string-templates": "1.2.39-alpha.1",
     "@budibase/types": "1.2.39-alpha.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index a8dea20e95..bd6cdee804 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.0":
-  version "1.2.39-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.0.tgz#52a1d340d28fa714822827aeb843e1f097ad8f60"
-  integrity sha512-yHvWAUH1j8+UJx8hYl11iAGOpxmkxSbzf7qVCJ8a84Ms46Clmwp+qxtnDzKxMit2KJW72dJM9+PvI+OUG0Bixg==
+"@budibase/backend-core@1.2.39-alpha.1":
+  version "1.2.39-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.1.tgz#7e5293670cf39f05e31eaaabbc3d7abc7f9837ca"
+  integrity sha512-mfHGyLc2FZ63cF8f4VX8GdJe7ciLCX4kZ+NK1yzBG0rRzHSTWJb2CVRq0rXNsZbwAVt9llHH58ysSHd+ggw9hg==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.0"
+    "@budibase/types" "1.2.39-alpha.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.39-alpha.0":
-  version "1.2.39-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.0.tgz#272e3ffd5e2189c787df6b6fbe22b7084832ade7"
-  integrity sha512-B0XakaUHW2Y1RtkEcrPEBcp8CDFJ8/fC9agLI3WK0ARnTGx9ROd8Liokq3/pW3vmlOgsfijzNHL3LUYcPTMEXw==
+"@budibase/pro@1.2.39-alpha.1":
+  version "1.2.39-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.1.tgz#12612de95dfa8407717c765fa6fbdf5985697a3d"
+  integrity sha512-A9Tg1yL9vA35riH2F7OwRhtSSC7sY2SZlojhJq0+JQuTJFmsey/5va2f+2AcH46u8bFrcRts/CERkOCS2vsGRQ==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.0"
-    "@budibase/types" "1.2.39-alpha.0"
+    "@budibase/backend-core" "1.2.39-alpha.1"
+    "@budibase/types" "1.2.39-alpha.1"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.39-alpha.0":
-  version "1.2.39-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.0.tgz#d0d48e4da36a93a4a9354cc49663f38d0181b6c0"
-  integrity sha512-i+lQeqlKmFORLuKdwmKnlmCCCEXZH6NdXHrOqNcebJzcNlx3Gx342+cHe4ZGYu0L+wCkWWelD5XHFuNMVMcuHg==
+"@budibase/types@1.2.39-alpha.1":
+  version "1.2.39-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.1.tgz#1758c5c7b8a1d754b4c391fc2dc699d6e249980b"
+  integrity sha512-b3YKkNf0+ImO/HvNbDS0biaMY2uu5ClphBLtA34hOd1I8hjjNj1kguuiQvgW7zqTYvMRK0hBNtTCnSa90uI7Fg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 87b13d23c6..5ff7f8bd9b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.39-alpha.1",
-    "@budibase/pro": "1.2.39-alpha.0",
+    "@budibase/pro": "1.2.39-alpha.1",
     "@budibase/string-templates": "1.2.39-alpha.1",
     "@budibase/types": "1.2.39-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d7d8b6c7a7..29984bf54e 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.0":
-  version "1.2.39-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.0.tgz#52a1d340d28fa714822827aeb843e1f097ad8f60"
-  integrity sha512-yHvWAUH1j8+UJx8hYl11iAGOpxmkxSbzf7qVCJ8a84Ms46Clmwp+qxtnDzKxMit2KJW72dJM9+PvI+OUG0Bixg==
+"@budibase/backend-core@1.2.39-alpha.1":
+  version "1.2.39-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.1.tgz#7e5293670cf39f05e31eaaabbc3d7abc7f9837ca"
+  integrity sha512-mfHGyLc2FZ63cF8f4VX8GdJe7ciLCX4kZ+NK1yzBG0rRzHSTWJb2CVRq0rXNsZbwAVt9llHH58ysSHd+ggw9hg==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.0"
+    "@budibase/types" "1.2.39-alpha.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.39-alpha.0":
-  version "1.2.39-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.0.tgz#272e3ffd5e2189c787df6b6fbe22b7084832ade7"
-  integrity sha512-B0XakaUHW2Y1RtkEcrPEBcp8CDFJ8/fC9agLI3WK0ARnTGx9ROd8Liokq3/pW3vmlOgsfijzNHL3LUYcPTMEXw==
+"@budibase/pro@1.2.39-alpha.1":
+  version "1.2.39-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.1.tgz#12612de95dfa8407717c765fa6fbdf5985697a3d"
+  integrity sha512-A9Tg1yL9vA35riH2F7OwRhtSSC7sY2SZlojhJq0+JQuTJFmsey/5va2f+2AcH46u8bFrcRts/CERkOCS2vsGRQ==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.0"
-    "@budibase/types" "1.2.39-alpha.0"
+    "@budibase/backend-core" "1.2.39-alpha.1"
+    "@budibase/types" "1.2.39-alpha.1"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.39-alpha.0":
-  version "1.2.39-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.0.tgz#d0d48e4da36a93a4a9354cc49663f38d0181b6c0"
-  integrity sha512-i+lQeqlKmFORLuKdwmKnlmCCCEXZH6NdXHrOqNcebJzcNlx3Gx342+cHe4ZGYu0L+wCkWWelD5XHFuNMVMcuHg==
+"@budibase/types@1.2.39-alpha.1":
+  version "1.2.39-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.1.tgz#1758c5c7b8a1d754b4c391fc2dc699d6e249980b"
+  integrity sha512-b3YKkNf0+ImO/HvNbDS0biaMY2uu5ClphBLtA34hOd1I8hjjNj1kguuiQvgW7zqTYvMRK0hBNtTCnSa90uI7Fg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From dd2b2139bb8158eec2c81237cf68c660323b341f Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Fri, 12 Aug 2022 14:37:52 +0100
Subject: [PATCH 11/22] Remove unused barSeparator

---
 packages/client/manifest.json | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index f5848356df..14f02cbe5e 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -1487,7 +1487,6 @@
         "type": "color",
         "label": "C1",
         "key": "c1",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1497,7 +1496,6 @@
         "type": "color",
         "label": "C2",
         "key": "c2",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1507,7 +1505,6 @@
         "type": "color",
         "label": "C3",
         "key": "c3",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1517,7 +1514,6 @@
         "type": "color",
         "label": "C4",
         "key": "c4",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1527,7 +1523,6 @@
         "type": "color",
         "label": "C5",
         "key": "c5",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1653,7 +1648,6 @@
         "type": "color",
         "label": "C1",
         "key": "c1",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1663,7 +1657,6 @@
         "type": "color",
         "label": "C2",
         "key": "c2",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1673,7 +1666,6 @@
         "type": "color",
         "label": "C3",
         "key": "c3",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1683,7 +1675,6 @@
         "type": "color",
         "label": "C4",
         "key": "c4",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1693,7 +1684,6 @@
         "type": "color",
         "label": "C5",
         "key": "c5",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1818,7 +1808,6 @@
         "type": "color",
         "label": "C1",
         "key": "c1",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1828,7 +1817,6 @@
         "type": "color",
         "label": "C2",
         "key": "c2",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1838,7 +1826,6 @@
         "type": "color",
         "label": "C3",
         "key": "c3",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1848,7 +1835,6 @@
         "type": "color",
         "label": "C4",
         "key": "c4",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1858,7 +1844,6 @@
         "type": "color",
         "label": "C5",
         "key": "c5",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1974,7 +1959,6 @@
         "type": "color",
         "label": "C1",
         "key": "c1",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1984,7 +1968,6 @@
         "type": "color",
         "label": "C2",
         "key": "c2",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -1994,7 +1977,6 @@
         "type": "color",
         "label": "C3",
         "key": "c3",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -2004,7 +1986,6 @@
         "type": "color",
         "label": "C4",
         "key": "c4",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -2014,7 +1995,6 @@
         "type": "color",
         "label": "C5",
         "key": "c5",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -2107,7 +2087,6 @@
         "type": "color",
         "label": "C1",
         "key": "c1",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -2117,7 +2096,6 @@
         "type": "color",
         "label": "C2",
         "key": "c2",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -2127,7 +2105,6 @@
         "type": "color",
         "label": "C3",
         "key": "c3",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -2137,7 +2114,6 @@
         "type": "color",
         "label": "C4",
         "key": "c4",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"
@@ -2147,7 +2123,6 @@
         "type": "color",
         "label": "C5",
         "key": "c5",
-        "barSeparator": false,
         "dependsOn": {
           "setting": "palette",
           "value": "Custom"

From 0810e0543006e13ea0b276e06ef0675d510e5457 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 14:14:56 +0000
Subject: [PATCH 12/22] v1.2.39-alpha.2

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lerna.json b/lerna.json
index a245b8f8f1..d28b533b6b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index d2ef379094..ab51fd0422 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.39-alpha.1",
+    "@budibase/types": "1.2.39-alpha.2",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4a9c1a0242..e352b48d05 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.39-alpha.1",
+    "@budibase/string-templates": "1.2.39-alpha.2",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7124def680..2d58438795 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.1",
-    "@budibase/client": "1.2.39-alpha.1",
-    "@budibase/frontend-core": "1.2.39-alpha.1",
-    "@budibase/string-templates": "1.2.39-alpha.1",
+    "@budibase/bbui": "1.2.39-alpha.2",
+    "@budibase/client": "1.2.39-alpha.2",
+    "@budibase/frontend-core": "1.2.39-alpha.2",
+    "@budibase/string-templates": "1.2.39-alpha.2",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 676ef3cf19..86ee213bdd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 4987378664..307f461660 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.1",
-    "@budibase/frontend-core": "1.2.39-alpha.1",
-    "@budibase/string-templates": "1.2.39-alpha.1",
+    "@budibase/bbui": "1.2.39-alpha.2",
+    "@budibase/frontend-core": "1.2.39-alpha.2",
+    "@budibase/string-templates": "1.2.39-alpha.2",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 2a8146665c..64b3874d00 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.1",
+    "@budibase/bbui": "1.2.39-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 21bb9fbdcb..9a1f5ee28e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.39-alpha.1",
-    "@budibase/client": "1.2.39-alpha.1",
+    "@budibase/backend-core": "1.2.39-alpha.2",
+    "@budibase/client": "1.2.39-alpha.2",
     "@budibase/pro": "1.2.39-alpha.1",
-    "@budibase/string-templates": "1.2.39-alpha.1",
-    "@budibase/types": "1.2.39-alpha.1",
+    "@budibase/string-templates": "1.2.39-alpha.2",
+    "@budibase/types": "1.2.39-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 8236c3af65..54e9019aed 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index e230689f82..d0606abe8c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5ff7f8bd9b..00a8d0f217 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.39-alpha.1",
+  "version": "1.2.39-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.39-alpha.1",
+    "@budibase/backend-core": "1.2.39-alpha.2",
     "@budibase/pro": "1.2.39-alpha.1",
-    "@budibase/string-templates": "1.2.39-alpha.1",
-    "@budibase/types": "1.2.39-alpha.1",
+    "@budibase/string-templates": "1.2.39-alpha.2",
+    "@budibase/types": "1.2.39-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 9b3086dad5b40ab00e18d88c8fa055b5ddd00bbf Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 14:17:57 +0000
Subject: [PATCH 13/22] Update pro version to 1.2.39-alpha.2

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 9a1f5ee28e..9ad4c1740b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.39-alpha.2",
     "@budibase/client": "1.2.39-alpha.2",
-    "@budibase/pro": "1.2.39-alpha.1",
+    "@budibase/pro": "1.2.39-alpha.2",
     "@budibase/string-templates": "1.2.39-alpha.2",
     "@budibase/types": "1.2.39-alpha.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index bd6cdee804..ce3adbe5b2 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.1":
-  version "1.2.39-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.1.tgz#7e5293670cf39f05e31eaaabbc3d7abc7f9837ca"
-  integrity sha512-mfHGyLc2FZ63cF8f4VX8GdJe7ciLCX4kZ+NK1yzBG0rRzHSTWJb2CVRq0rXNsZbwAVt9llHH58ysSHd+ggw9hg==
+"@budibase/backend-core@1.2.39-alpha.2":
+  version "1.2.39-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.2.tgz#80734d9d5dbaedf23f8590fd6ea50e72dcc0546a"
+  integrity sha512-ujkBXCEAaButsm0Qu1wSfR9o6eyY8ofhVpVr7RhKlnrrVCvWlwqSjQdYmJFu4rZGXNeMVr0cvIjw3M1lrbSV2w==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.1"
+    "@budibase/types" "1.2.39-alpha.2"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.39-alpha.1":
-  version "1.2.39-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.1.tgz#12612de95dfa8407717c765fa6fbdf5985697a3d"
-  integrity sha512-A9Tg1yL9vA35riH2F7OwRhtSSC7sY2SZlojhJq0+JQuTJFmsey/5va2f+2AcH46u8bFrcRts/CERkOCS2vsGRQ==
+"@budibase/pro@1.2.39-alpha.2":
+  version "1.2.39-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.2.tgz#7453a08e6e12acfa18bf5bacbd3ea87d16eee765"
+  integrity sha512-MuV3isu+/XlxJuDqmXNC1LQa0mnfa79XmfAFneT9NKZs7iZSi6oQm3esb33TB9zNEIhpJ+hUHTxT5udtxhwPtA==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.1"
-    "@budibase/types" "1.2.39-alpha.1"
+    "@budibase/backend-core" "1.2.39-alpha.2"
+    "@budibase/types" "1.2.39-alpha.2"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.39-alpha.1":
-  version "1.2.39-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.1.tgz#1758c5c7b8a1d754b4c391fc2dc699d6e249980b"
-  integrity sha512-b3YKkNf0+ImO/HvNbDS0biaMY2uu5ClphBLtA34hOd1I8hjjNj1kguuiQvgW7zqTYvMRK0hBNtTCnSa90uI7Fg==
+"@budibase/types@1.2.39-alpha.2":
+  version "1.2.39-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.2.tgz#f10f01213c4c4cf5601550569c1460a482d94d6f"
+  integrity sha512-rTlT3YuXNHsnAmeOWIifmzKhd5aQTyFCn1jP6fHZS8BAjjML0bDdcNc2qxeUGtjWoEZZv7C09IOEkYImFq/Xbw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 00a8d0f217..be529942af 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.39-alpha.2",
-    "@budibase/pro": "1.2.39-alpha.1",
+    "@budibase/pro": "1.2.39-alpha.2",
     "@budibase/string-templates": "1.2.39-alpha.2",
     "@budibase/types": "1.2.39-alpha.2",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 29984bf54e..8e6ffaf3fb 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.1":
-  version "1.2.39-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.1.tgz#7e5293670cf39f05e31eaaabbc3d7abc7f9837ca"
-  integrity sha512-mfHGyLc2FZ63cF8f4VX8GdJe7ciLCX4kZ+NK1yzBG0rRzHSTWJb2CVRq0rXNsZbwAVt9llHH58ysSHd+ggw9hg==
+"@budibase/backend-core@1.2.39-alpha.2":
+  version "1.2.39-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.2.tgz#80734d9d5dbaedf23f8590fd6ea50e72dcc0546a"
+  integrity sha512-ujkBXCEAaButsm0Qu1wSfR9o6eyY8ofhVpVr7RhKlnrrVCvWlwqSjQdYmJFu4rZGXNeMVr0cvIjw3M1lrbSV2w==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.1"
+    "@budibase/types" "1.2.39-alpha.2"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.39-alpha.1":
-  version "1.2.39-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.1.tgz#12612de95dfa8407717c765fa6fbdf5985697a3d"
-  integrity sha512-A9Tg1yL9vA35riH2F7OwRhtSSC7sY2SZlojhJq0+JQuTJFmsey/5va2f+2AcH46u8bFrcRts/CERkOCS2vsGRQ==
+"@budibase/pro@1.2.39-alpha.2":
+  version "1.2.39-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.2.tgz#7453a08e6e12acfa18bf5bacbd3ea87d16eee765"
+  integrity sha512-MuV3isu+/XlxJuDqmXNC1LQa0mnfa79XmfAFneT9NKZs7iZSi6oQm3esb33TB9zNEIhpJ+hUHTxT5udtxhwPtA==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.1"
-    "@budibase/types" "1.2.39-alpha.1"
+    "@budibase/backend-core" "1.2.39-alpha.2"
+    "@budibase/types" "1.2.39-alpha.2"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.39-alpha.1":
-  version "1.2.39-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.1.tgz#1758c5c7b8a1d754b4c391fc2dc699d6e249980b"
-  integrity sha512-b3YKkNf0+ImO/HvNbDS0biaMY2uu5ClphBLtA34hOd1I8hjjNj1kguuiQvgW7zqTYvMRK0hBNtTCnSa90uI7Fg==
+"@budibase/types@1.2.39-alpha.2":
+  version "1.2.39-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.2.tgz#f10f01213c4c4cf5601550569c1460a482d94d6f"
+  integrity sha512-rTlT3YuXNHsnAmeOWIifmzKhd5aQTyFCn1jP6fHZS8BAjjML0bDdcNc2qxeUGtjWoEZZv7C09IOEkYImFq/Xbw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 56d7e6e4d29008919eb390199c866ee53db92fe3 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 14:43:32 +0000
Subject: [PATCH 14/22] v1.2.39-alpha.3

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lerna.json b/lerna.json
index d28b533b6b..1a4f8e4976 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index ab51fd0422..90a1a6d161 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.39-alpha.2",
+    "@budibase/types": "1.2.39-alpha.3",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index e352b48d05..94f1e2c154 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.39-alpha.2",
+    "@budibase/string-templates": "1.2.39-alpha.3",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 2d58438795..674a62c500 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.2",
-    "@budibase/client": "1.2.39-alpha.2",
-    "@budibase/frontend-core": "1.2.39-alpha.2",
-    "@budibase/string-templates": "1.2.39-alpha.2",
+    "@budibase/bbui": "1.2.39-alpha.3",
+    "@budibase/client": "1.2.39-alpha.3",
+    "@budibase/frontend-core": "1.2.39-alpha.3",
+    "@budibase/string-templates": "1.2.39-alpha.3",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 86ee213bdd..9d6d2105c1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 307f461660..9bd7f85161 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.2",
-    "@budibase/frontend-core": "1.2.39-alpha.2",
-    "@budibase/string-templates": "1.2.39-alpha.2",
+    "@budibase/bbui": "1.2.39-alpha.3",
+    "@budibase/frontend-core": "1.2.39-alpha.3",
+    "@budibase/string-templates": "1.2.39-alpha.3",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 64b3874d00..24cf9b496a 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.2",
+    "@budibase/bbui": "1.2.39-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 9ad4c1740b..a0f4fa9b9d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.39-alpha.2",
-    "@budibase/client": "1.2.39-alpha.2",
+    "@budibase/backend-core": "1.2.39-alpha.3",
+    "@budibase/client": "1.2.39-alpha.3",
     "@budibase/pro": "1.2.39-alpha.2",
-    "@budibase/string-templates": "1.2.39-alpha.2",
-    "@budibase/types": "1.2.39-alpha.2",
+    "@budibase/string-templates": "1.2.39-alpha.3",
+    "@budibase/types": "1.2.39-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 54e9019aed..35e5130445 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index d0606abe8c..cfad6c442e 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index be529942af..a5a4d1170e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.39-alpha.2",
+  "version": "1.2.39-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.39-alpha.2",
+    "@budibase/backend-core": "1.2.39-alpha.3",
     "@budibase/pro": "1.2.39-alpha.2",
-    "@budibase/string-templates": "1.2.39-alpha.2",
-    "@budibase/types": "1.2.39-alpha.2",
+    "@budibase/string-templates": "1.2.39-alpha.3",
+    "@budibase/types": "1.2.39-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 02c2928937309be8374011d65ecaedc49327ae3f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 14:46:31 +0000
Subject: [PATCH 15/22] Update pro version to 1.2.39-alpha.3

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index a0f4fa9b9d..7e1490de0d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.39-alpha.3",
     "@budibase/client": "1.2.39-alpha.3",
-    "@budibase/pro": "1.2.39-alpha.2",
+    "@budibase/pro": "1.2.39-alpha.3",
     "@budibase/string-templates": "1.2.39-alpha.3",
     "@budibase/types": "1.2.39-alpha.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index ce3adbe5b2..e9a466674c 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.2":
-  version "1.2.39-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.2.tgz#80734d9d5dbaedf23f8590fd6ea50e72dcc0546a"
-  integrity sha512-ujkBXCEAaButsm0Qu1wSfR9o6eyY8ofhVpVr7RhKlnrrVCvWlwqSjQdYmJFu4rZGXNeMVr0cvIjw3M1lrbSV2w==
+"@budibase/backend-core@1.2.39-alpha.3":
+  version "1.2.39-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.3.tgz#d440557d6c39d01e249fdee65ea967c6129243c2"
+  integrity sha512-WRcX3XdTVDF10pZFRygzD/xfibxqbwHQBXOvDhBo3lJl6pqahjtGPlN7iCzLR/9hwojlLs8XnLYN6aYPBFqCxg==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.2"
+    "@budibase/types" "1.2.39-alpha.3"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.39-alpha.2":
-  version "1.2.39-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.2.tgz#7453a08e6e12acfa18bf5bacbd3ea87d16eee765"
-  integrity sha512-MuV3isu+/XlxJuDqmXNC1LQa0mnfa79XmfAFneT9NKZs7iZSi6oQm3esb33TB9zNEIhpJ+hUHTxT5udtxhwPtA==
+"@budibase/pro@1.2.39-alpha.3":
+  version "1.2.39-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.3.tgz#3ad51ef8a5d9f40e74b914101baf268b84522c40"
+  integrity sha512-7NUZksg6svo4b9hgLU71CrA7Y8kfWFd8ZvsD7VAEgoxnapd7N9jc/bTQ0SrF9tT6Eoza6ZepLHQf7A8fkZV41Q==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.2"
-    "@budibase/types" "1.2.39-alpha.2"
+    "@budibase/backend-core" "1.2.39-alpha.3"
+    "@budibase/types" "1.2.39-alpha.3"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.39-alpha.2":
-  version "1.2.39-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.2.tgz#f10f01213c4c4cf5601550569c1460a482d94d6f"
-  integrity sha512-rTlT3YuXNHsnAmeOWIifmzKhd5aQTyFCn1jP6fHZS8BAjjML0bDdcNc2qxeUGtjWoEZZv7C09IOEkYImFq/Xbw==
+"@budibase/types@1.2.39-alpha.3":
+  version "1.2.39-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.3.tgz#697132ae426c689d20260d1ad806fc6b675287e1"
+  integrity sha512-XEVA/i3kEjS/HoW8dsOK3oTL6ule9FbUdBDPD87TQdWwvNEM2g3nLM5Lw7O7ztFEQx1B0nP+0vZjQnZfjbjFAQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a5a4d1170e..c3054cbcb2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.39-alpha.3",
-    "@budibase/pro": "1.2.39-alpha.2",
+    "@budibase/pro": "1.2.39-alpha.3",
     "@budibase/string-templates": "1.2.39-alpha.3",
     "@budibase/types": "1.2.39-alpha.3",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 8e6ffaf3fb..7b652a4894 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.2":
-  version "1.2.39-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.2.tgz#80734d9d5dbaedf23f8590fd6ea50e72dcc0546a"
-  integrity sha512-ujkBXCEAaButsm0Qu1wSfR9o6eyY8ofhVpVr7RhKlnrrVCvWlwqSjQdYmJFu4rZGXNeMVr0cvIjw3M1lrbSV2w==
+"@budibase/backend-core@1.2.39-alpha.3":
+  version "1.2.39-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.3.tgz#d440557d6c39d01e249fdee65ea967c6129243c2"
+  integrity sha512-WRcX3XdTVDF10pZFRygzD/xfibxqbwHQBXOvDhBo3lJl6pqahjtGPlN7iCzLR/9hwojlLs8XnLYN6aYPBFqCxg==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.2"
+    "@budibase/types" "1.2.39-alpha.3"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.39-alpha.2":
-  version "1.2.39-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.2.tgz#7453a08e6e12acfa18bf5bacbd3ea87d16eee765"
-  integrity sha512-MuV3isu+/XlxJuDqmXNC1LQa0mnfa79XmfAFneT9NKZs7iZSi6oQm3esb33TB9zNEIhpJ+hUHTxT5udtxhwPtA==
+"@budibase/pro@1.2.39-alpha.3":
+  version "1.2.39-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.3.tgz#3ad51ef8a5d9f40e74b914101baf268b84522c40"
+  integrity sha512-7NUZksg6svo4b9hgLU71CrA7Y8kfWFd8ZvsD7VAEgoxnapd7N9jc/bTQ0SrF9tT6Eoza6ZepLHQf7A8fkZV41Q==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.2"
-    "@budibase/types" "1.2.39-alpha.2"
+    "@budibase/backend-core" "1.2.39-alpha.3"
+    "@budibase/types" "1.2.39-alpha.3"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.39-alpha.2":
-  version "1.2.39-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.2.tgz#f10f01213c4c4cf5601550569c1460a482d94d6f"
-  integrity sha512-rTlT3YuXNHsnAmeOWIifmzKhd5aQTyFCn1jP6fHZS8BAjjML0bDdcNc2qxeUGtjWoEZZv7C09IOEkYImFq/Xbw==
+"@budibase/types@1.2.39-alpha.3":
+  version "1.2.39-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.3.tgz#697132ae426c689d20260d1ad806fc6b675287e1"
+  integrity sha512-XEVA/i3kEjS/HoW8dsOK3oTL6ule9FbUdBDPD87TQdWwvNEM2g3nLM5Lw7O7ztFEQx1B0nP+0vZjQnZfjbjFAQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 9366f407cf6d80c125d4d3548834e8427395b943 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 16:31:16 +0000
Subject: [PATCH 16/22] v1.2.39-alpha.4

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lerna.json b/lerna.json
index 1a4f8e4976..75073637e8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 90a1a6d161..8ed764ef7b 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.39-alpha.3",
+    "@budibase/types": "1.2.39-alpha.4",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 94f1e2c154..8521974e90 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.39-alpha.3",
+    "@budibase/string-templates": "1.2.39-alpha.4",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 674a62c500..15fff57f25 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.3",
-    "@budibase/client": "1.2.39-alpha.3",
-    "@budibase/frontend-core": "1.2.39-alpha.3",
-    "@budibase/string-templates": "1.2.39-alpha.3",
+    "@budibase/bbui": "1.2.39-alpha.4",
+    "@budibase/client": "1.2.39-alpha.4",
+    "@budibase/frontend-core": "1.2.39-alpha.4",
+    "@budibase/string-templates": "1.2.39-alpha.4",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9d6d2105c1..2c11d0c59a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 9bd7f85161..cecfa239f0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.3",
-    "@budibase/frontend-core": "1.2.39-alpha.3",
-    "@budibase/string-templates": "1.2.39-alpha.3",
+    "@budibase/bbui": "1.2.39-alpha.4",
+    "@budibase/frontend-core": "1.2.39-alpha.4",
+    "@budibase/string-templates": "1.2.39-alpha.4",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 24cf9b496a..1c472b0824 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.3",
+    "@budibase/bbui": "1.2.39-alpha.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 7e1490de0d..5bc27f08b7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.39-alpha.3",
-    "@budibase/client": "1.2.39-alpha.3",
+    "@budibase/backend-core": "1.2.39-alpha.4",
+    "@budibase/client": "1.2.39-alpha.4",
     "@budibase/pro": "1.2.39-alpha.3",
-    "@budibase/string-templates": "1.2.39-alpha.3",
-    "@budibase/types": "1.2.39-alpha.3",
+    "@budibase/string-templates": "1.2.39-alpha.4",
+    "@budibase/types": "1.2.39-alpha.4",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 35e5130445..0ebbfbfa62 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index cfad6c442e..ed4201d5a3 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c3054cbcb2..27fad39dff 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.39-alpha.3",
+  "version": "1.2.39-alpha.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.39-alpha.3",
+    "@budibase/backend-core": "1.2.39-alpha.4",
     "@budibase/pro": "1.2.39-alpha.3",
-    "@budibase/string-templates": "1.2.39-alpha.3",
-    "@budibase/types": "1.2.39-alpha.3",
+    "@budibase/string-templates": "1.2.39-alpha.4",
+    "@budibase/types": "1.2.39-alpha.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From db6d658e98083bd601dedcd6429312582cadc2f2 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Fri, 12 Aug 2022 17:31:35 +0100
Subject: [PATCH 17/22] Updating createApp test command

In some cases Cypress is running too fast, meaning that the test runs ahead of what is actual seen on Budibase.

This issue mainly occurs at the start of the smoke build and around logging in.

I am attempting to combat this by ensuring the url includes 'apps' after logging in
---
 .../builder/cypress/integration/addMultiOptionDatatype.spec.js  | 2 +-
 packages/builder/cypress/support/commands.js                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
index f844402958..f436f3ff39 100644
--- a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
+++ b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
@@ -2,7 +2,7 @@ import filterTests from "../support/filterTests"
 const interact = require('../support/interact')
 
 filterTests(['all'], () => {
-  xcontext("Add Multi-Option Datatype", () => {
+  context("Add Multi-Option Datatype", () => {
     before(() => {
       cy.login()
       cy.createTestApp()
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index d33bd516c1..acb56a0bce 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -164,7 +164,7 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
     typeof addDefaultTable != "boolean" ? true : addDefaultTable
 
   cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
-  cy.wait(1000)
+  cy.url({ timeout: 30000 }).should("include", "/apps")
   cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ force: true })
 
   // If apps already exist

From f684286027ed7e2e3e6f982bab85747871d3956d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 16:34:16 +0000
Subject: [PATCH 18/22] Update pro version to 1.2.39-alpha.4

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 5bc27f08b7..b64e5a1008 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.39-alpha.4",
     "@budibase/client": "1.2.39-alpha.4",
-    "@budibase/pro": "1.2.39-alpha.3",
+    "@budibase/pro": "1.2.39-alpha.4",
     "@budibase/string-templates": "1.2.39-alpha.4",
     "@budibase/types": "1.2.39-alpha.4",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index e9a466674c..d9ae8ea882 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.3":
-  version "1.2.39-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.3.tgz#d440557d6c39d01e249fdee65ea967c6129243c2"
-  integrity sha512-WRcX3XdTVDF10pZFRygzD/xfibxqbwHQBXOvDhBo3lJl6pqahjtGPlN7iCzLR/9hwojlLs8XnLYN6aYPBFqCxg==
+"@budibase/backend-core@1.2.39-alpha.4":
+  version "1.2.39-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.4.tgz#7d9323a4581ee8134279f0a671f1d1134055b208"
+  integrity sha512-XzKVnv16F/1E1i2RZparCEDtH1HMJJTf0xE9HjZ76C/Q+6oCR/PNfBxUugC9Gm6oyVdAts59pUTxBLgq/Vfynw==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.3"
+    "@budibase/types" "1.2.39-alpha.4"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.39-alpha.3":
-  version "1.2.39-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.3.tgz#3ad51ef8a5d9f40e74b914101baf268b84522c40"
-  integrity sha512-7NUZksg6svo4b9hgLU71CrA7Y8kfWFd8ZvsD7VAEgoxnapd7N9jc/bTQ0SrF9tT6Eoza6ZepLHQf7A8fkZV41Q==
+"@budibase/pro@1.2.39-alpha.4":
+  version "1.2.39-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.4.tgz#fbb5c07baac4b3b10409da339ad32ef63b9ca96e"
+  integrity sha512-F1QOIe/QSvnprdkcuyvNat7kXXQSYUx6HBu1b/QKokOXrp9pHge9MD5tHh1/ympQTI/R+eT1aucYbOBTkY2FkQ==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.3"
-    "@budibase/types" "1.2.39-alpha.3"
+    "@budibase/backend-core" "1.2.39-alpha.4"
+    "@budibase/types" "1.2.39-alpha.4"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.39-alpha.3":
-  version "1.2.39-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.3.tgz#697132ae426c689d20260d1ad806fc6b675287e1"
-  integrity sha512-XEVA/i3kEjS/HoW8dsOK3oTL6ule9FbUdBDPD87TQdWwvNEM2g3nLM5Lw7O7ztFEQx1B0nP+0vZjQnZfjbjFAQ==
+"@budibase/types@1.2.39-alpha.4":
+  version "1.2.39-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.4.tgz#5710f788bfb6ba9af9594d1478cea664ac36869c"
+  integrity sha512-AAUiSWLElfl1FDFvF2fyG/fjujvxnkEvToe8rgy1t21lrZOkuONsmO87cvPtFVEEq5hWl9GgUzXHwG0Vb/EXPg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 27fad39dff..cd039c738a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.39-alpha.4",
-    "@budibase/pro": "1.2.39-alpha.3",
+    "@budibase/pro": "1.2.39-alpha.4",
     "@budibase/string-templates": "1.2.39-alpha.4",
     "@budibase/types": "1.2.39-alpha.4",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 7b652a4894..84e7baff85 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.3":
-  version "1.2.39-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.3.tgz#d440557d6c39d01e249fdee65ea967c6129243c2"
-  integrity sha512-WRcX3XdTVDF10pZFRygzD/xfibxqbwHQBXOvDhBo3lJl6pqahjtGPlN7iCzLR/9hwojlLs8XnLYN6aYPBFqCxg==
+"@budibase/backend-core@1.2.39-alpha.4":
+  version "1.2.39-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.4.tgz#7d9323a4581ee8134279f0a671f1d1134055b208"
+  integrity sha512-XzKVnv16F/1E1i2RZparCEDtH1HMJJTf0xE9HjZ76C/Q+6oCR/PNfBxUugC9Gm6oyVdAts59pUTxBLgq/Vfynw==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.3"
+    "@budibase/types" "1.2.39-alpha.4"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.39-alpha.3":
-  version "1.2.39-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.3.tgz#3ad51ef8a5d9f40e74b914101baf268b84522c40"
-  integrity sha512-7NUZksg6svo4b9hgLU71CrA7Y8kfWFd8ZvsD7VAEgoxnapd7N9jc/bTQ0SrF9tT6Eoza6ZepLHQf7A8fkZV41Q==
+"@budibase/pro@1.2.39-alpha.4":
+  version "1.2.39-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.4.tgz#fbb5c07baac4b3b10409da339ad32ef63b9ca96e"
+  integrity sha512-F1QOIe/QSvnprdkcuyvNat7kXXQSYUx6HBu1b/QKokOXrp9pHge9MD5tHh1/ympQTI/R+eT1aucYbOBTkY2FkQ==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.3"
-    "@budibase/types" "1.2.39-alpha.3"
+    "@budibase/backend-core" "1.2.39-alpha.4"
+    "@budibase/types" "1.2.39-alpha.4"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.39-alpha.3":
-  version "1.2.39-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.3.tgz#697132ae426c689d20260d1ad806fc6b675287e1"
-  integrity sha512-XEVA/i3kEjS/HoW8dsOK3oTL6ule9FbUdBDPD87TQdWwvNEM2g3nLM5Lw7O7ztFEQx1B0nP+0vZjQnZfjbjFAQ==
+"@budibase/types@1.2.39-alpha.4":
+  version "1.2.39-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.4.tgz#5710f788bfb6ba9af9594d1478cea664ac36869c"
+  integrity sha512-AAUiSWLElfl1FDFvF2fyG/fjujvxnkEvToe8rgy1t21lrZOkuONsmO87cvPtFVEEq5hWl9GgUzXHwG0Vb/EXPg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 2b7bce3746a314ed34c18d8808747ef950869038 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 17:16:26 +0000
Subject: [PATCH 19/22] v1.2.39-alpha.5

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lerna.json b/lerna.json
index 75073637e8..389d00264d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 8ed764ef7b..93484c3b11 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.39-alpha.4",
+    "@budibase/types": "1.2.39-alpha.5",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 8521974e90..cedd4722a4 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.39-alpha.4",
+    "@budibase/string-templates": "1.2.39-alpha.5",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 15fff57f25..82ae021e12 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.4",
-    "@budibase/client": "1.2.39-alpha.4",
-    "@budibase/frontend-core": "1.2.39-alpha.4",
-    "@budibase/string-templates": "1.2.39-alpha.4",
+    "@budibase/bbui": "1.2.39-alpha.5",
+    "@budibase/client": "1.2.39-alpha.5",
+    "@budibase/frontend-core": "1.2.39-alpha.5",
+    "@budibase/string-templates": "1.2.39-alpha.5",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2c11d0c59a..add9d0b43a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index cecfa239f0..48bd077cc8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.4",
-    "@budibase/frontend-core": "1.2.39-alpha.4",
-    "@budibase/string-templates": "1.2.39-alpha.4",
+    "@budibase/bbui": "1.2.39-alpha.5",
+    "@budibase/frontend-core": "1.2.39-alpha.5",
+    "@budibase/string-templates": "1.2.39-alpha.5",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 1c472b0824..8276e223f7 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.39-alpha.4",
+    "@budibase/bbui": "1.2.39-alpha.5",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index b64e5a1008..30f355418b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.39-alpha.4",
-    "@budibase/client": "1.2.39-alpha.4",
+    "@budibase/backend-core": "1.2.39-alpha.5",
+    "@budibase/client": "1.2.39-alpha.5",
     "@budibase/pro": "1.2.39-alpha.4",
-    "@budibase/string-templates": "1.2.39-alpha.4",
-    "@budibase/types": "1.2.39-alpha.4",
+    "@budibase/string-templates": "1.2.39-alpha.5",
+    "@budibase/types": "1.2.39-alpha.5",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 0ebbfbfa62..36854f3642 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index ed4201d5a3..7455926201 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index cd039c738a..a1e8915112 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.39-alpha.4",
+  "version": "1.2.39-alpha.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.39-alpha.4",
+    "@budibase/backend-core": "1.2.39-alpha.5",
     "@budibase/pro": "1.2.39-alpha.4",
-    "@budibase/string-templates": "1.2.39-alpha.4",
-    "@budibase/types": "1.2.39-alpha.4",
+    "@budibase/string-templates": "1.2.39-alpha.5",
+    "@budibase/types": "1.2.39-alpha.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 34798ad61d639e0bf7b449e2ed297af1e64788ce Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 12 Aug 2022 17:19:35 +0000
Subject: [PATCH 20/22] Update pro version to 1.2.39-alpha.5

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 30f355418b..a277247cc3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "1.2.39-alpha.5",
     "@budibase/client": "1.2.39-alpha.5",
-    "@budibase/pro": "1.2.39-alpha.4",
+    "@budibase/pro": "1.2.39-alpha.5",
     "@budibase/string-templates": "1.2.39-alpha.5",
     "@budibase/types": "1.2.39-alpha.5",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index d9ae8ea882..b3bfe2e529 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.4":
-  version "1.2.39-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.4.tgz#7d9323a4581ee8134279f0a671f1d1134055b208"
-  integrity sha512-XzKVnv16F/1E1i2RZparCEDtH1HMJJTf0xE9HjZ76C/Q+6oCR/PNfBxUugC9Gm6oyVdAts59pUTxBLgq/Vfynw==
+"@budibase/backend-core@1.2.39-alpha.5":
+  version "1.2.39-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.5.tgz#fbadac10657e44fb05641a43aa8d9481b86418e9"
+  integrity sha512-bZPmKqWUnQ+OVwf2z35WXPfPuxwuL0vlZJNyTgLX7hdhjYfPB4LA0vMftPbvtRFO9k6SdB0XpBOJCm2u5k5KsQ==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.4"
+    "@budibase/types" "1.2.39-alpha.5"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.39-alpha.4":
-  version "1.2.39-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.4.tgz#fbb5c07baac4b3b10409da339ad32ef63b9ca96e"
-  integrity sha512-F1QOIe/QSvnprdkcuyvNat7kXXQSYUx6HBu1b/QKokOXrp9pHge9MD5tHh1/ympQTI/R+eT1aucYbOBTkY2FkQ==
+"@budibase/pro@1.2.39-alpha.5":
+  version "1.2.39-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.5.tgz#cd652a06bf691ae00c2bf8cd9351e46b684939a5"
+  integrity sha512-6M0Mj+AbJi+HpFRJJD1bZDwuWlCq1I3m8vrG4A3Rm/VnJigb1Zi7XTMlwzgCiUaWvowstiJVGHG6Af0Mix4zdQ==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.4"
-    "@budibase/types" "1.2.39-alpha.4"
+    "@budibase/backend-core" "1.2.39-alpha.5"
+    "@budibase/types" "1.2.39-alpha.5"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.39-alpha.4":
-  version "1.2.39-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.4.tgz#5710f788bfb6ba9af9594d1478cea664ac36869c"
-  integrity sha512-AAUiSWLElfl1FDFvF2fyG/fjujvxnkEvToe8rgy1t21lrZOkuONsmO87cvPtFVEEq5hWl9GgUzXHwG0Vb/EXPg==
+"@budibase/types@1.2.39-alpha.5":
+  version "1.2.39-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.5.tgz#632ef72b248d105cb69f4a133d78d3a293e5404e"
+  integrity sha512-MgJayPh6t7VGB6ErUwM0sJmJoxG91h3z24fWSE+q3bbH2MKbnkpuNCbOh1wlKyFWqzdRofuFpJGK/O9zWXvRwg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a1e8915112..aaeff3c56d 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,7 +36,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.2.39-alpha.5",
-    "@budibase/pro": "1.2.39-alpha.4",
+    "@budibase/pro": "1.2.39-alpha.5",
     "@budibase/string-templates": "1.2.39-alpha.5",
     "@budibase/types": "1.2.39-alpha.5",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 84e7baff85..380d80a741 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.39-alpha.4":
-  version "1.2.39-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.4.tgz#7d9323a4581ee8134279f0a671f1d1134055b208"
-  integrity sha512-XzKVnv16F/1E1i2RZparCEDtH1HMJJTf0xE9HjZ76C/Q+6oCR/PNfBxUugC9Gm6oyVdAts59pUTxBLgq/Vfynw==
+"@budibase/backend-core@1.2.39-alpha.5":
+  version "1.2.39-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.39-alpha.5.tgz#fbadac10657e44fb05641a43aa8d9481b86418e9"
+  integrity sha512-bZPmKqWUnQ+OVwf2z35WXPfPuxwuL0vlZJNyTgLX7hdhjYfPB4LA0vMftPbvtRFO9k6SdB0XpBOJCm2u5k5KsQ==
   dependencies:
-    "@budibase/types" "1.2.39-alpha.4"
+    "@budibase/types" "1.2.39-alpha.5"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.39-alpha.4":
-  version "1.2.39-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.4.tgz#fbb5c07baac4b3b10409da339ad32ef63b9ca96e"
-  integrity sha512-F1QOIe/QSvnprdkcuyvNat7kXXQSYUx6HBu1b/QKokOXrp9pHge9MD5tHh1/ympQTI/R+eT1aucYbOBTkY2FkQ==
+"@budibase/pro@1.2.39-alpha.5":
+  version "1.2.39-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.39-alpha.5.tgz#cd652a06bf691ae00c2bf8cd9351e46b684939a5"
+  integrity sha512-6M0Mj+AbJi+HpFRJJD1bZDwuWlCq1I3m8vrG4A3Rm/VnJigb1Zi7XTMlwzgCiUaWvowstiJVGHG6Af0Mix4zdQ==
   dependencies:
-    "@budibase/backend-core" "1.2.39-alpha.4"
-    "@budibase/types" "1.2.39-alpha.4"
+    "@budibase/backend-core" "1.2.39-alpha.5"
+    "@budibase/types" "1.2.39-alpha.5"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.39-alpha.4":
-  version "1.2.39-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.4.tgz#5710f788bfb6ba9af9594d1478cea664ac36869c"
-  integrity sha512-AAUiSWLElfl1FDFvF2fyG/fjujvxnkEvToe8rgy1t21lrZOkuONsmO87cvPtFVEEq5hWl9GgUzXHwG0Vb/EXPg==
+"@budibase/types@1.2.39-alpha.5":
+  version "1.2.39-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.39-alpha.5.tgz#632ef72b248d105cb69f4a133d78d3a293e5404e"
+  integrity sha512-MgJayPh6t7VGB6ErUwM0sJmJoxG91h3z24fWSE+q3bbH2MKbnkpuNCbOh1wlKyFWqzdRofuFpJGK/O9zWXvRwg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 1ef1cc84ada33fcf9c62d32f19f8f465b6b7720a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 16 Aug 2022 09:25:16 +0000
Subject: [PATCH 21/22] Proxy vite HMR websocket in dev

---
 hosting/nginx.dev.conf.hbs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hosting/nginx.dev.conf.hbs b/hosting/nginx.dev.conf.hbs
index 9398b7e719..91f495cfac 100644
--- a/hosting/nginx.dev.conf.hbs
+++ b/hosting/nginx.dev.conf.hbs
@@ -77,6 +77,11 @@ http {
       proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
     }
 
+    location /ws {
+      proxy_pass      http://{{ address }}:3000;
+      rewrite ^/ws(.*)$ /$1 break;
+    }
+
     location / {
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From 4c6b9a03d19b210695207e685a7967881bb643ed Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 16 Aug 2022 09:26:23 +0000
Subject: [PATCH 22/22] Support env variables for vite config

---
 packages/builder/vite.config.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index 56ffbf20f5..9859e1dbb9 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -1,15 +1,22 @@
 import { svelte } from "@sveltejs/vite-plugin-svelte"
 import replace from "@rollup/plugin-replace"
+import { defineConfig, loadEnv } from "vite"
 
 import path from "path"
 
-export default ({ mode }) => {
+export default defineConfig(({ mode }) => {
   const isProduction = mode === "production"
+  const env = loadEnv(mode, process.cwd())
   return {
     server: {
       fs: {
         strict: false,
       },
+      hmr: {
+        protocol: "wss",
+        clientPort: env.VITE_HMR_CLIENT_PORT || 3000,
+        path: env.VITE_HMR_PATH || "/"
+      }
     },
     base: "/builder/",
     build: {
@@ -79,4 +86,4 @@ export default ({ mode }) => {
       ],
     },
   }
-}
+})