From 23f95b8be2d67cb8b20e1ab9826820f26120614b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Wed, 12 Oct 2022 17:34:55 +0100
Subject: [PATCH 01/16] making bucketnames configurable in helm chart

---
 charts/budibase/templates/app-service-deployment.yaml    | 4 ++++
 charts/budibase/templates/worker-service-deployment.yaml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index f72d1aef03..25a5dd410a 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -80,6 +80,10 @@ spec:
           value: {{ .Values.services.objectStore.url }}
         - name: PLUGIN_BUCKET_NAME
           value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
+        - name: APPS_BUCKET_NAME
+          value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
+        - name: GLOBAL_CLOUD_BUCKET_NAME
+          value: {{ .Values.services.objectStore.globalCloudBucketName | default "global" | quote }}
         - name: PORT
           value: {{ .Values.services.apps.port | quote }}
         {{ if .Values.services.worker.publicApiRateLimitPerSecond }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index b1c6110d95..1284b9c411 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -79,6 +79,10 @@ spec:
           value: {{ .Values.services.objectStore.url }}
         - name: PLUGIN_BUCKET_NAME
           value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
+        - name: APPS_BUCKET_NAME
+          value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
+        - name: GLOBAL_CLOUD_BUCKET_NAME
+          value: {{ .Values.services.objectStore.globalCloudBucketName | default "global" | quote }}
         - name: PORT
           value: {{ .Values.services.worker.port | quote }}
         - name: MULTI_TENANCY

From 7b2e471d829507c44ff8af917d8835b27d691a55 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 15:32:31 +0100
Subject: [PATCH 02/16] Only hide plugin search bar when no plugins exist

---
 .../src/pages/builder/portal/manage/plugins/index.svelte        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
index 84722c27be..b9b84307a8 100644
--- a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
@@ -55,7 +55,7 @@
           Add plugin
         </Button>
       </div>
-      {#if filteredPlugins?.length}
+      {#if $plugins?.length}
         <div class="filters">
           <div class="select">
             <Select

From 167f8f368bd27f721a8c7e662f022748d5852636 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 15:58:44 +0100
Subject: [PATCH 03/16] Only show sortable fields for sort column settings

---
 .../design/settings/componentSettings.js      |  2 +
 .../controls/SortableFieldSelect.svelte       | 47 +++++++++++++++++++
 packages/client/manifest.json                 |  8 ++--
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte

diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index 56ae3de490..6b109f80c3 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -7,6 +7,7 @@ import TableSelect from "./controls/TableSelect.svelte"
 import ColorPicker from "./controls/ColorPicker.svelte"
 import { IconSelect } from "./controls/IconSelect"
 import FieldSelect from "./controls/FieldSelect.svelte"
+import SortableFieldSelect from "./controls/SortableFieldSelect.svelte"
 import MultiFieldSelect from "./controls/MultiFieldSelect.svelte"
 import SearchFieldSelect from "./controls/SearchFieldSelect.svelte"
 import SchemaSelect from "./controls/SchemaSelect.svelte"
@@ -41,6 +42,7 @@ const componentMap = {
   filter: FilterEditor,
   url: URLSelect,
   columns: ColumnEditor,
+  "field/sortable": SortableFieldSelect,
   "field/string": FormFieldSelect,
   "field/number": FormFieldSelect,
   "field/options": FormFieldSelect,
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
new file mode 100644
index 0000000000..21ed68ce68
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -0,0 +1,47 @@
+<script>
+  import { Select } from "@budibase/bbui"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "builderStore/dataBinding"
+  import { currentAsset } from "builderStore"
+  import { createEventDispatcher } from "svelte"
+  import { UNSORTABLE_TYPES } from "constants"
+
+  export let componentInstance = {}
+  export let value = ""
+  export let placeholder
+
+  const dispatch = createEventDispatcher()
+  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
+  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: options = getSortableFields(schema)
+  $: boundValue = getValidValue(value, options)
+
+  const getSortableFields = schema => {
+    return Object.entries(schema || {})
+      .filter(entry => !UNSORTABLE_TYPES.includes(entry[1].type))
+      .map(entry => entry[0])
+  }
+
+  const getValidValue = (value, options) => {
+    // Reset value if there aren't any options
+    if (!Array.isArray(options)) {
+      return null
+    }
+
+    // Reset value if the value isn't found in the options
+    if (options.indexOf(value) === -1) {
+      return null
+    }
+
+    return value
+  }
+
+  const onChange = value => {
+    boundValue = getValidValue(value.detail, options)
+    dispatch("change", boundValue)
+  }
+</script>
+
+<Select {placeholder} value={boundValue} on:change={onChange} {options} />
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index b6d4941e4c..d9c9b14676 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3523,7 +3523,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -3853,7 +3853,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -4018,7 +4018,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },
@@ -4177,7 +4177,7 @@
         "key": "filter"
       },
       {
-        "type": "field",
+        "type": "field/sortable",
         "label": "Sort Column",
         "key": "sortColumn"
       },

From bfee51aeab32fa50d082f3b416e4d970aca52387 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 13 Oct 2022 16:11:53 +0100
Subject: [PATCH 04/16] Update formula tooltip to explain they cannot be sorted
 by

---
 .../components/backend/DataTable/modals/CreateEditColumn.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 21059b32dd..44a750cbb1 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -487,7 +487,7 @@
         ]}
         getOptionLabel={option => option.label}
         getOptionValue={option => option.value}
-        tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered,
+        tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered or sorted by,
          while static formula are calculated when the row is saved."
       />
     {/if}

From dea4338d54580bc7ccbaef5c980c68b17c2cca44 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 14 Oct 2022 09:26:51 +0000
Subject: [PATCH 05/16] v2.0.31

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

diff --git a/lerna.json b/lerna.json
index 96c2575602..7d825bcefb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.30",
+  "version": "2.0.31",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 888483b56e..1c3957949b 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "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": "^2.0.30",
+    "@budibase/types": "^2.0.31",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9472f84bb4..7f508ef0e0 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": "2.0.30",
+  "version": "2.0.31",
   "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": "^2.0.30",
+    "@budibase/string-templates": "^2.0.31",
     "@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 25d833c378..2f8591ef30 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.30",
-    "@budibase/client": "^2.0.30",
-    "@budibase/frontend-core": "^2.0.30",
-    "@budibase/string-templates": "^2.0.30",
+    "@budibase/bbui": "^2.0.31",
+    "@budibase/client": "^2.0.31",
+    "@budibase/frontend-core": "^2.0.31",
+    "@budibase/string-templates": "^2.0.31",
     "@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 58e6aea835..1fcac0164a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.30",
-    "@budibase/string-templates": "^2.0.30",
-    "@budibase/types": "^2.0.30",
+    "@budibase/backend-core": "^2.0.31",
+    "@budibase/string-templates": "^2.0.31",
+    "@budibase/types": "^2.0.31",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index f01e9f4ea5..7434bcc4c6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "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": "^2.0.30",
-    "@budibase/frontend-core": "^2.0.30",
-    "@budibase/string-templates": "^2.0.30",
+    "@budibase/bbui": "^2.0.31",
+    "@budibase/frontend-core": "^2.0.31",
+    "@budibase/string-templates": "^2.0.31",
     "@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 ace3316711..d871e129fc 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.30",
+    "@budibase/bbui": "^2.0.31",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 438bcf8fb0..c993a6b75d 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index e2242dd1ef..0c2a1dd20b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "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": "^2.0.30",
-    "@budibase/client": "^2.0.30",
+    "@budibase/backend-core": "^2.0.31",
+    "@budibase/client": "^2.0.31",
     "@budibase/pro": "2.0.30",
-    "@budibase/string-templates": "^2.0.30",
-    "@budibase/types": "^2.0.30",
+    "@budibase/string-templates": "^2.0.31",
+    "@budibase/types": "^2.0.31",
     "@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 64b3e52bf7..970bf98e8c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "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 209294dbee..a7d589b405 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "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 6723ba89e7..8bc2e41db8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.30",
+    "@budibase/backend-core": "^2.0.31",
     "@budibase/pro": "2.0.30",
-    "@budibase/string-templates": "^2.0.30",
-    "@budibase/types": "^2.0.30",
+    "@budibase/string-templates": "^2.0.31",
+    "@budibase/types": "^2.0.31",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From b035a708f2933aee8a6f0e1e38936770d19008e3 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 14 Oct 2022 09:30:15 +0000
Subject: [PATCH 06/16] Update pro version to 2.0.31

---
 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 0c2a1dd20b..ca9d1a17bc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.31",
     "@budibase/client": "^2.0.31",
-    "@budibase/pro": "2.0.30",
+    "@budibase/pro": "2.0.31",
     "@budibase/string-templates": "^2.0.31",
     "@budibase/types": "^2.0.31",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 35555f7f27..eaf629b010 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@2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30.tgz#5cc53e8560572d789ae687ec2181b629526c2f3f"
-  integrity sha512-+X4DwtMf1Xv4ygG7OJN0wOxZgjJ1wul1gUVOXJm44sRIEOx0LHpyx8xT4npC9e2VKKezpF5GZFE2IrB9lwWsoQ==
+"@budibase/backend-core@2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.31.tgz#199fddbbaf987dde7477f12e7f9ab7f4435bdafd"
+  integrity sha512-te7fMsEWflKbPiv8vxh+U31562Yn4W3vUBcHUm3Oer38rv0nprUJoyxO1YGBVcOJVNAEtNAtEdoPayFezU3YOw==
   dependencies:
-    "@budibase/types" "^2.0.30"
+    "@budibase/types" "^2.0.31"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30.tgz#4c739ed97e04d6dfc875dfb550262ef7085dc9d4"
-  integrity sha512-unel/xYLpeWUI+I0vstITH9UTVkjKS+SS0Ce4jCQlpMyOSB8zCie/sO6Ie2TakrI+vnuYuypnRT8fqlbgtrNyA==
+"@budibase/pro@2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.31.tgz#238f3057f9fac654efeb65ec8fcce83caa364ac2"
+  integrity sha512-VUx6PT/1RqCp0UNANmooJcKeMrGQNCM/rbMhOvvtbqvWhRa1sYn00RdXTAzzy++plOS8vue+f/BFewrr1yYlug==
   dependencies:
-    "@budibase/backend-core" "2.0.30"
-    "@budibase/types" "2.0.30"
+    "@budibase/backend-core" "2.0.31"
+    "@budibase/types" "2.0.31"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.30", "@budibase/types@^2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30.tgz#ac3d2d714ebf2820875150739959e5f6b851aceb"
-  integrity sha512-46uCHPcLAAjAFRkE53skS7oLjI/Fa+2Mn4vZjIApa1/0JXyR2HnzTzJocbrQfYFTYLkdniMfLRticcKC/E2X1w==
+"@budibase/types@2.0.31", "@budibase/types@^2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.31.tgz#699ccd746cff39d4439e6f01a62c38a9f1a98bad"
+  integrity sha512-Eyx9wEVi4ZHrJ6410aM98IW7EWrsmYJ0ixmm/wD2tIhb57N33YgFWobsdR/G1wJUTZnR76Ve2tAweDgXmvtscQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 8bc2e41db8..e4379020b7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.31",
-    "@budibase/pro": "2.0.30",
+    "@budibase/pro": "2.0.31",
     "@budibase/string-templates": "^2.0.31",
     "@budibase/types": "^2.0.31",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index b9bfaed432..0d6085ef5a 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@2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30.tgz#5cc53e8560572d789ae687ec2181b629526c2f3f"
-  integrity sha512-+X4DwtMf1Xv4ygG7OJN0wOxZgjJ1wul1gUVOXJm44sRIEOx0LHpyx8xT4npC9e2VKKezpF5GZFE2IrB9lwWsoQ==
+"@budibase/backend-core@2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.31.tgz#199fddbbaf987dde7477f12e7f9ab7f4435bdafd"
+  integrity sha512-te7fMsEWflKbPiv8vxh+U31562Yn4W3vUBcHUm3Oer38rv0nprUJoyxO1YGBVcOJVNAEtNAtEdoPayFezU3YOw==
   dependencies:
-    "@budibase/types" "^2.0.30"
+    "@budibase/types" "^2.0.31"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30.tgz#4c739ed97e04d6dfc875dfb550262ef7085dc9d4"
-  integrity sha512-unel/xYLpeWUI+I0vstITH9UTVkjKS+SS0Ce4jCQlpMyOSB8zCie/sO6Ie2TakrI+vnuYuypnRT8fqlbgtrNyA==
+"@budibase/pro@2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.31.tgz#238f3057f9fac654efeb65ec8fcce83caa364ac2"
+  integrity sha512-VUx6PT/1RqCp0UNANmooJcKeMrGQNCM/rbMhOvvtbqvWhRa1sYn00RdXTAzzy++plOS8vue+f/BFewrr1yYlug==
   dependencies:
-    "@budibase/backend-core" "2.0.30"
-    "@budibase/types" "2.0.30"
+    "@budibase/backend-core" "2.0.31"
+    "@budibase/types" "2.0.31"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.30", "@budibase/types@^2.0.30":
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30.tgz#ac3d2d714ebf2820875150739959e5f6b851aceb"
-  integrity sha512-46uCHPcLAAjAFRkE53skS7oLjI/Fa+2Mn4vZjIApa1/0JXyR2HnzTzJocbrQfYFTYLkdniMfLRticcKC/E2X1w==
+"@budibase/types@2.0.31", "@budibase/types@^2.0.31":
+  version "2.0.31"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.31.tgz#699ccd746cff39d4439e6f01a62c38a9f1a98bad"
+  integrity sha512-Eyx9wEVi4ZHrJ6410aM98IW7EWrsmYJ0ixmm/wD2tIhb57N33YgFWobsdR/G1wJUTZnR76Ve2tAweDgXmvtscQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From ecb47851d60760ac09867435bd53d95d04ca08a7 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Mon, 17 Oct 2022 10:20:09 +0100
Subject: [PATCH 07/16] make proxy ipv6 customise script executable

---
 hosting/proxy/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosting/proxy/Dockerfile b/hosting/proxy/Dockerfile
index a9c94c06fa..f11480fd73 100644
--- a/hosting/proxy/Dockerfile
+++ b/hosting/proxy/Dockerfile
@@ -6,6 +6,7 @@ FROM nginx:latest
 ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
 COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template
 COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
+RUN chmod +x /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
 
 # Error handling
 COPY error.html /usr/share/nginx/html/error.html

From 65184704090de0fa8c1685269f419b1330c10e14 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 17 Oct 2022 17:32:23 +0100
Subject: [PATCH 08/16] updating variable name

---
 charts/budibase/templates/app-service-deployment.yaml    | 2 +-
 charts/budibase/templates/worker-service-deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 25a5dd410a..af2a3ed544 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -83,7 +83,7 @@ spec:
         - name: APPS_BUCKET_NAME
           value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
         - name: GLOBAL_CLOUD_BUCKET_NAME
-          value: {{ .Values.services.objectStore.globalCloudBucketName | default "global" | quote }}
+          value: {{ .Values.services.objectStore.globalBucketName | default "global" | quote }}
         - name: PORT
           value: {{ .Values.services.apps.port | quote }}
         {{ if .Values.services.worker.publicApiRateLimitPerSecond }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 1284b9c411..e7dccfae1c 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -82,7 +82,7 @@ spec:
         - name: APPS_BUCKET_NAME
           value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
         - name: GLOBAL_CLOUD_BUCKET_NAME
-          value: {{ .Values.services.objectStore.globalCloudBucketName | default "global" | quote }}
+          value: {{ .Values.services.objectStore.globalBucketName | default "global" | quote }}
         - name: PORT
           value: {{ .Values.services.worker.port | quote }}
         - name: MULTI_TENANCY

From 873b20219cc03880be89f4cf352dbe208af72736 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 17 Oct 2022 16:43:56 +0000
Subject: [PATCH 09/16] v2.0.32

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

diff --git a/lerna.json b/lerna.json
index 7d825bcefb..824ebe4902 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.31",
+  "version": "2.0.32",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1c3957949b..cba777c4c0 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "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": "^2.0.31",
+    "@budibase/types": "^2.0.32",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 7f508ef0e0..1300a954c3 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": "2.0.31",
+  "version": "2.0.32",
   "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": "^2.0.31",
+    "@budibase/string-templates": "^2.0.32",
     "@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 2f8591ef30..09e9dcd27a 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.31",
-    "@budibase/client": "^2.0.31",
-    "@budibase/frontend-core": "^2.0.31",
-    "@budibase/string-templates": "^2.0.31",
+    "@budibase/bbui": "^2.0.32",
+    "@budibase/client": "^2.0.32",
+    "@budibase/frontend-core": "^2.0.32",
+    "@budibase/string-templates": "^2.0.32",
     "@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 1fcac0164a..1e4515b822 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.31",
-    "@budibase/string-templates": "^2.0.31",
-    "@budibase/types": "^2.0.31",
+    "@budibase/backend-core": "^2.0.32",
+    "@budibase/string-templates": "^2.0.32",
+    "@budibase/types": "^2.0.32",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 7434bcc4c6..32409da298 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "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": "^2.0.31",
-    "@budibase/frontend-core": "^2.0.31",
-    "@budibase/string-templates": "^2.0.31",
+    "@budibase/bbui": "^2.0.32",
+    "@budibase/frontend-core": "^2.0.32",
+    "@budibase/string-templates": "^2.0.32",
     "@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 d871e129fc..e0cef709b7 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.31",
+    "@budibase/bbui": "^2.0.32",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index c993a6b75d..7903b47981 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index ca9d1a17bc..5574b4ca88 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "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": "^2.0.31",
-    "@budibase/client": "^2.0.31",
+    "@budibase/backend-core": "^2.0.32",
+    "@budibase/client": "^2.0.32",
     "@budibase/pro": "2.0.31",
-    "@budibase/string-templates": "^2.0.31",
-    "@budibase/types": "^2.0.31",
+    "@budibase/string-templates": "^2.0.32",
+    "@budibase/types": "^2.0.32",
     "@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 970bf98e8c..9fdceec45f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "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 a7d589b405..33509d5929 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "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 e4379020b7..eb5ffa2e73 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.31",
+    "@budibase/backend-core": "^2.0.32",
     "@budibase/pro": "2.0.31",
-    "@budibase/string-templates": "^2.0.31",
-    "@budibase/types": "^2.0.31",
+    "@budibase/string-templates": "^2.0.32",
+    "@budibase/types": "^2.0.32",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 64c09a9888c93e2f9771e02c457e98886ff54a1e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 17 Oct 2022 16:47:08 +0000
Subject: [PATCH 10/16] Update pro version to 2.0.32

---
 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 5574b4ca88..9f49ac5767 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.32",
     "@budibase/client": "^2.0.32",
-    "@budibase/pro": "2.0.31",
+    "@budibase/pro": "2.0.32",
     "@budibase/string-templates": "^2.0.32",
     "@budibase/types": "^2.0.32",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index eaf629b010..fb3d88015c 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@2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.31.tgz#199fddbbaf987dde7477f12e7f9ab7f4435bdafd"
-  integrity sha512-te7fMsEWflKbPiv8vxh+U31562Yn4W3vUBcHUm3Oer38rv0nprUJoyxO1YGBVcOJVNAEtNAtEdoPayFezU3YOw==
+"@budibase/backend-core@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85"
+  integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA==
   dependencies:
-    "@budibase/types" "^2.0.31"
+    "@budibase/types" "^2.0.32"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.31.tgz#238f3057f9fac654efeb65ec8fcce83caa364ac2"
-  integrity sha512-VUx6PT/1RqCp0UNANmooJcKeMrGQNCM/rbMhOvvtbqvWhRa1sYn00RdXTAzzy++plOS8vue+f/BFewrr1yYlug==
+"@budibase/pro@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84"
+  integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg==
   dependencies:
-    "@budibase/backend-core" "2.0.31"
-    "@budibase/types" "2.0.31"
+    "@budibase/backend-core" "2.0.32"
+    "@budibase/types" "2.0.32"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.31", "@budibase/types@^2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.31.tgz#699ccd746cff39d4439e6f01a62c38a9f1a98bad"
-  integrity sha512-Eyx9wEVi4ZHrJ6410aM98IW7EWrsmYJ0ixmm/wD2tIhb57N33YgFWobsdR/G1wJUTZnR76Ve2tAweDgXmvtscQ==
+"@budibase/types@2.0.32", "@budibase/types@^2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5"
+  integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index eb5ffa2e73..de35922a91 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.32",
-    "@budibase/pro": "2.0.31",
+    "@budibase/pro": "2.0.32",
     "@budibase/string-templates": "^2.0.32",
     "@budibase/types": "^2.0.32",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 0d6085ef5a..4955805d4e 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@2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.31.tgz#199fddbbaf987dde7477f12e7f9ab7f4435bdafd"
-  integrity sha512-te7fMsEWflKbPiv8vxh+U31562Yn4W3vUBcHUm3Oer38rv0nprUJoyxO1YGBVcOJVNAEtNAtEdoPayFezU3YOw==
+"@budibase/backend-core@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85"
+  integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA==
   dependencies:
-    "@budibase/types" "^2.0.31"
+    "@budibase/types" "^2.0.32"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.31.tgz#238f3057f9fac654efeb65ec8fcce83caa364ac2"
-  integrity sha512-VUx6PT/1RqCp0UNANmooJcKeMrGQNCM/rbMhOvvtbqvWhRa1sYn00RdXTAzzy++plOS8vue+f/BFewrr1yYlug==
+"@budibase/pro@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84"
+  integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg==
   dependencies:
-    "@budibase/backend-core" "2.0.31"
-    "@budibase/types" "2.0.31"
+    "@budibase/backend-core" "2.0.32"
+    "@budibase/types" "2.0.32"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.31", "@budibase/types@^2.0.31":
-  version "2.0.31"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.31.tgz#699ccd746cff39d4439e6f01a62c38a9f1a98bad"
-  integrity sha512-Eyx9wEVi4ZHrJ6410aM98IW7EWrsmYJ0ixmm/wD2tIhb57N33YgFWobsdR/G1wJUTZnR76Ve2tAweDgXmvtscQ==
+"@budibase/types@2.0.32", "@budibase/types@^2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5"
+  integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From d1e729ec55e96c988be85a69f986d78ac64b1f6b Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Tue, 18 Oct 2022 09:33:04 +0100
Subject: [PATCH 11/16] proxy IPv6 removal needs to happen after envsubst

---
 ...n-ipv6-by-default.sh => 80-listen-on-ipv6-by-default.sh} | 0
 hosting/proxy/Dockerfile                                    | 6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename hosting/proxy/{10-listen-on-ipv6-by-default.sh => 80-listen-on-ipv6-by-default.sh} (100%)

diff --git a/hosting/proxy/10-listen-on-ipv6-by-default.sh b/hosting/proxy/80-listen-on-ipv6-by-default.sh
similarity index 100%
rename from hosting/proxy/10-listen-on-ipv6-by-default.sh
rename to hosting/proxy/80-listen-on-ipv6-by-default.sh
diff --git a/hosting/proxy/Dockerfile b/hosting/proxy/Dockerfile
index f11480fd73..c1b11b23f7 100644
--- a/hosting/proxy/Dockerfile
+++ b/hosting/proxy/Dockerfile
@@ -5,8 +5,10 @@ FROM nginx:latest
 # override the output dir to output directly to /etc/nginx instead of /etc/nginx/conf.d
 ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
 COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template
-COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
-RUN chmod +x /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
+# IPv6 removal needs to happen after envsubst
+RUN rm -rf /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
+COPY 80-listen-on-ipv6-by-default.sh /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh
+RUN chmod +x /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh
 
 # Error handling
 COPY error.html /usr/share/nginx/html/error.html

From ab494256fba7f3519031d0412e117641bb346869 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 19 Oct 2022 11:15:01 +0000
Subject: [PATCH 12/16] v2.0.33

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

diff --git a/lerna.json b/lerna.json
index 824ebe4902..854f49ae42 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.32",
+  "version": "2.0.33",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index cba777c4c0..effca67953 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "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": "^2.0.32",
+    "@budibase/types": "^2.0.33",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 1300a954c3..900879e882 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": "2.0.32",
+  "version": "2.0.33",
   "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": "^2.0.32",
+    "@budibase/string-templates": "^2.0.33",
     "@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 09e9dcd27a..2c4264160f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.32",
-    "@budibase/client": "^2.0.32",
-    "@budibase/frontend-core": "^2.0.32",
-    "@budibase/string-templates": "^2.0.32",
+    "@budibase/bbui": "^2.0.33",
+    "@budibase/client": "^2.0.33",
+    "@budibase/frontend-core": "^2.0.33",
+    "@budibase/string-templates": "^2.0.33",
     "@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 1e4515b822..34e1d74169 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.32",
-    "@budibase/string-templates": "^2.0.32",
-    "@budibase/types": "^2.0.32",
+    "@budibase/backend-core": "^2.0.33",
+    "@budibase/string-templates": "^2.0.33",
+    "@budibase/types": "^2.0.33",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 32409da298..8aa264bf70 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "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": "^2.0.32",
-    "@budibase/frontend-core": "^2.0.32",
-    "@budibase/string-templates": "^2.0.32",
+    "@budibase/bbui": "^2.0.33",
+    "@budibase/frontend-core": "^2.0.33",
+    "@budibase/string-templates": "^2.0.33",
     "@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 e0cef709b7..0c0b18df9b 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.32",
+    "@budibase/bbui": "^2.0.33",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 7903b47981..3612328dc5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 9f49ac5767..0efa35375a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "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": "^2.0.32",
-    "@budibase/client": "^2.0.32",
+    "@budibase/backend-core": "^2.0.33",
+    "@budibase/client": "^2.0.33",
     "@budibase/pro": "2.0.32",
-    "@budibase/string-templates": "^2.0.32",
-    "@budibase/types": "^2.0.32",
+    "@budibase/string-templates": "^2.0.33",
+    "@budibase/types": "^2.0.33",
     "@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 9fdceec45f..fb3450760c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "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 33509d5929..ba513029bb 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "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 de35922a91..a061110eb9 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.32",
+    "@budibase/backend-core": "^2.0.33",
     "@budibase/pro": "2.0.32",
-    "@budibase/string-templates": "^2.0.32",
-    "@budibase/types": "^2.0.32",
+    "@budibase/string-templates": "^2.0.33",
+    "@budibase/types": "^2.0.33",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 3d2bf594bd196c5ea261d3c7e439d87dde62227a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 19 Oct 2022 11:18:16 +0000
Subject: [PATCH 13/16] Update pro version to 2.0.33

---
 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 0efa35375a..65940c7bc2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.33",
     "@budibase/client": "^2.0.33",
-    "@budibase/pro": "2.0.32",
+    "@budibase/pro": "2.0.33",
     "@budibase/string-templates": "^2.0.33",
     "@budibase/types": "^2.0.33",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index fb3d88015c..a6acdda8b9 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@2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85"
-  integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA==
+"@budibase/backend-core@2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
+  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
   dependencies:
-    "@budibase/types" "^2.0.32"
+    "@budibase/types" "^2.0.33"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84"
-  integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg==
+"@budibase/pro@2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
+  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
   dependencies:
-    "@budibase/backend-core" "2.0.32"
-    "@budibase/types" "2.0.32"
+    "@budibase/backend-core" "2.0.33"
+    "@budibase/types" "2.0.33"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.32", "@budibase/types@^2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5"
-  integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg==
+"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
+  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a061110eb9..748fb7a065 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.33",
-    "@budibase/pro": "2.0.32",
+    "@budibase/pro": "2.0.33",
     "@budibase/string-templates": "^2.0.33",
     "@budibase/types": "^2.0.33",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 4955805d4e..e8058520eb 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@2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.32.tgz#638c89302cc834d7cc11c5ce97bb3305392b9c85"
-  integrity sha512-4Pmh1VFmXlwnh5B5Jq75h+i5hVvOEQmDRVRvbsNk5sYAk/xxVbf7/kIQJ0OuhuTA+WfY8EpQLDEnHGhdTeFhWA==
+"@budibase/backend-core@2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
+  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
   dependencies:
-    "@budibase/types" "^2.0.32"
+    "@budibase/types" "^2.0.33"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.32.tgz#b091d5fda894cdce179f97441b9ed69ba7859f84"
-  integrity sha512-5LNXUGu+J6pH8iNfkv2jWxyBJhek0M3KtAJvTspREeK5BZ+dxHR2AxceIksKVFy3Tco7mGs2haSRQ0qActIgCg==
+"@budibase/pro@2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
+  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
   dependencies:
-    "@budibase/backend-core" "2.0.32"
-    "@budibase/types" "2.0.32"
+    "@budibase/backend-core" "2.0.33"
+    "@budibase/types" "2.0.33"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.32", "@budibase/types@^2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.32.tgz#dda8989d7e59cdae8088447c568cabd7ea99dee5"
-  integrity sha512-ALTVPOdRlGFzI8AvYJcBncQiLxqM3coZV0Jc5fCJbSNZ9pObHxibhkCunGSevdEOC1l5p/vT7/B5bUD4fUvnsg==
+"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
+  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 738c98eb475feef3c83b61fa1b63c7801cceafba Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 21 Oct 2022 10:32:32 +0100
Subject: [PATCH 14/16] Ensure non string types are ignored when searching for
 HBS blocks

---
 packages/string-templates/src/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/string-templates/src/index.js b/packages/string-templates/src/index.js
index eae545de14..ab7afc1dcc 100644
--- a/packages/string-templates/src/index.js
+++ b/packages/string-templates/src/index.js
@@ -323,6 +323,9 @@ module.exports.doesContainStrings = (template, strings) => {
  * @return {string[]} The found HBS blocks.
  */
 module.exports.findHBSBlocks = string => {
+  if (!string || typeof string !== "string") {
+    return []
+  }
   let regexp = new RegExp(FIND_ANY_HBS_REGEX)
   let matches = string.match(regexp)
   if (matches == null) {

From b2869f23d09280c58c8f84c553ebcd752df81515 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 21 Oct 2022 09:58:52 +0000
Subject: [PATCH 15/16] v2.0.34

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

diff --git a/lerna.json b/lerna.json
index 854f49ae42..847db9bcd1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.33",
+  "version": "2.0.34",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index effca67953..d7f5b56339 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "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": "^2.0.33",
+    "@budibase/types": "^2.0.34",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 900879e882..173b322977 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": "2.0.33",
+  "version": "2.0.34",
   "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": "^2.0.33",
+    "@budibase/string-templates": "^2.0.34",
     "@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 2c4264160f..6c4015d749 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.33",
-    "@budibase/client": "^2.0.33",
-    "@budibase/frontend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
+    "@budibase/bbui": "^2.0.34",
+    "@budibase/client": "^2.0.34",
+    "@budibase/frontend-core": "^2.0.34",
+    "@budibase/string-templates": "^2.0.34",
     "@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 34e1d74169..4fc6dc1b86 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/backend-core": "^2.0.34",
+    "@budibase/string-templates": "^2.0.34",
+    "@budibase/types": "^2.0.34",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 8aa264bf70..ae22d7d8a8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "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": "^2.0.33",
-    "@budibase/frontend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
+    "@budibase/bbui": "^2.0.34",
+    "@budibase/frontend-core": "^2.0.34",
+    "@budibase/string-templates": "^2.0.34",
     "@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 0c0b18df9b..222f4a9598 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.33",
+    "@budibase/bbui": "^2.0.34",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 3612328dc5..884c443249 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 65940c7bc2..5ffb043966 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "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": "^2.0.33",
-    "@budibase/client": "^2.0.33",
+    "@budibase/backend-core": "^2.0.34",
+    "@budibase/client": "^2.0.34",
     "@budibase/pro": "2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/string-templates": "^2.0.34",
+    "@budibase/types": "^2.0.34",
     "@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 fb3450760c..4ecb13eadf 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "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 ba513029bb..1ae6f5a033 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "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 748fb7a065..c00f657143 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.33",
+    "@budibase/backend-core": "^2.0.34",
     "@budibase/pro": "2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/string-templates": "^2.0.34",
+    "@budibase/types": "^2.0.34",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From f840cb1d053fcd197c3a4906e3282b4b9e5d8dc4 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 21 Oct 2022 10:02:00 +0000
Subject: [PATCH 16/16] Update pro version to 2.0.34

---
 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 5ffb043966..4e2bbf4f66 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.34",
     "@budibase/client": "^2.0.34",
-    "@budibase/pro": "2.0.33",
+    "@budibase/pro": "2.0.34",
     "@budibase/string-templates": "^2.0.34",
     "@budibase/types": "^2.0.34",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index a6acdda8b9..abb3de2e76 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@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
-  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
+"@budibase/backend-core@2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
+  integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
   dependencies:
-    "@budibase/types" "^2.0.33"
+    "@budibase/types" "^2.0.34"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
-  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
+"@budibase/pro@2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
+  integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
   dependencies:
-    "@budibase/backend-core" "2.0.33"
-    "@budibase/types" "2.0.33"
+    "@budibase/backend-core" "2.0.34"
+    "@budibase/types" "2.0.34"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
-  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
+"@budibase/types@2.0.34", "@budibase/types@^2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
+  integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c00f657143..7f05ac0f87 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.34",
-    "@budibase/pro": "2.0.33",
+    "@budibase/pro": "2.0.34",
     "@budibase/string-templates": "^2.0.34",
     "@budibase/types": "^2.0.34",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index e8058520eb..6929ea98b6 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@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
-  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
+"@budibase/backend-core@2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
+  integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
   dependencies:
-    "@budibase/types" "^2.0.33"
+    "@budibase/types" "^2.0.34"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
-  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
+"@budibase/pro@2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
+  integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
   dependencies:
-    "@budibase/backend-core" "2.0.33"
-    "@budibase/types" "2.0.33"
+    "@budibase/backend-core" "2.0.34"
+    "@budibase/types" "2.0.34"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
-  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
+"@budibase/types@2.0.34", "@budibase/types@^2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
+  integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"