From ef737a7717cf69264e2b0e932c8dabca6b7f3916 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 15 Sep 2022 14:57:27 +0100
Subject: [PATCH 01/36] Adding budibase/pro integration for plugins,
 controlling quota limits.

---
 packages/backend-core/src/db/constants.ts     |   1 +
 packages/backend-core/src/db/utils.ts         |  17 ++-
 .../src/api/controllers/plugin/index.ts       | 113 +++---------------
 packages/server/src/db/utils.js               |   8 --
 .../server/src/utilities/fileSystem/index.js  |   7 --
 packages/server/src/watch.ts                  |   4 +-
 packages/types/src/documents/global/plugin.ts |   1 +
 7 files changed, 36 insertions(+), 115 deletions(-)

diff --git a/packages/backend-core/src/db/constants.ts b/packages/backend-core/src/db/constants.ts
index 2c2c29cee2..62f4e8820f 100644
--- a/packages/backend-core/src/db/constants.ts
+++ b/packages/backend-core/src/db/constants.ts
@@ -44,6 +44,7 @@ export enum DocumentType {
   DEV_INFO = "devinfo",
   AUTOMATION_LOG = "log_au",
   ACCOUNT_METADATA = "acc_metadata",
+  PLUGIN = "plg",
 }
 
 export const StaticDatabases = {
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index c93c7b5662..cc20b87a58 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -3,7 +3,7 @@ import { DEFAULT_TENANT_ID, Configs } from "../constants"
 import env from "../environment"
 import { SEPARATOR, DocumentType, UNICODE_MAX, ViewName } from "./constants"
 import { getTenantId, getGlobalDB } from "../context"
-import { getGlobalDBName } from "../tenancy/utils"
+import { getGlobalDBName } from "../tenancy"
 import fetch from "node-fetch"
 import { doWithDB, allDbs } from "./index"
 import { getCouchInfo } from "./pouch"
@@ -367,6 +367,21 @@ export const generateDevInfoID = (userId: any) => {
   return `${DocumentType.DEV_INFO}${SEPARATOR}${userId}`
 }
 
+/**
+ * Generates a new plugin ID - to be used in the global DB.
+ * @returns {string} The new plugin ID which a plugin metadata document can be stored under.
+ */
+export const generatePluginID = (name: string) => {
+  return `${DocumentType.PLUGIN}${SEPARATOR}${name}`
+}
+
+/**
+ * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
+ */
+export const getPluginParams = (pluginId?: string | null, otherProps = {}) => {
+  return getDocParams(DocumentType.PLUGIN, pluginId, otherProps)
+}
+
 /**
  * Returns the most granular configuration document from the DB based on the type, workspace and userID passed.
  * @param {Object} db - db instance to query
diff --git a/packages/server/src/api/controllers/plugin/index.ts b/packages/server/src/api/controllers/plugin/index.ts
index f560572082..a674c5892e 100644
--- a/packages/server/src/api/controllers/plugin/index.ts
+++ b/packages/server/src/api/controllers/plugin/index.ts
@@ -1,22 +1,16 @@
-import { ObjectStoreBuckets } from "../../../constants"
-import { loadJSFile } from "../../../utilities/fileSystem"
 import { npmUpload, urlUpload, githubUpload, fileUpload } from "./uploaders"
 import { getGlobalDB } from "@budibase/backend-core/tenancy"
 import { validate } from "@budibase/backend-core/plugins"
-import { generatePluginID, getPluginParams } from "../../../db/utils"
-import {
-  uploadDirectory,
-  deleteFolder,
-} from "@budibase/backend-core/objectStore"
-import { PluginType, FileType, PluginSource, Plugin } from "@budibase/types"
+import { PluginType, FileType, PluginSource } from "@budibase/types"
 import env from "../../../environment"
 import { ClientAppSocket } from "../../../websocket"
-import { events } from "@budibase/backend-core"
+import { db as dbCore } from "@budibase/backend-core"
+import { plugins } from "@budibase/pro"
 
 export async function getPlugins(type?: PluginType) {
   const db = getGlobalDB()
   const response = await db.allDocs(
-    getPluginParams(null, {
+    dbCore.getPluginParams(null, {
       include_docs: true,
     })
   )
@@ -37,7 +31,7 @@ export async function upload(ctx: any) {
     let docs = []
     // can do single or multiple plugins
     for (let plugin of plugins) {
-      const doc = await processPlugin(plugin, PluginSource.FILE)
+      const doc = await processUploadedPlugin(plugin, PluginSource.FILE)
       docs.push(doc)
     }
     ctx.body = {
@@ -91,18 +85,19 @@ export async function create(ctx: any) {
       )
     }
 
-    const doc = await storePlugin(metadata, directory, source)
+    const doc = await plugins.storePlugin(metadata, directory, source)
 
+    ClientAppSocket.emit("plugins-update", { name, hash: doc.hash })
     ctx.body = {
       message: "Plugin uploaded successfully",
       plugins: [doc],
     }
+    ctx.body = { plugin: doc }
   } catch (err: any) {
     const errMsg = err?.message ? err?.message : err
 
     ctx.throw(400, `Failed to import plugin: ${errMsg}`)
   }
-  ctx.status = 200
 }
 
 export async function fetch(ctx: any) {
@@ -110,99 +105,21 @@ export async function fetch(ctx: any) {
 }
 
 export async function destroy(ctx: any) {
-  const db = getGlobalDB()
   const { pluginId } = ctx.params
 
   try {
-    const plugin: Plugin = await db.get(pluginId)
-    const bucketPath = `${plugin.name}/`
-    await deleteFolder(ObjectStoreBuckets.PLUGINS, bucketPath)
+    await plugins.deletePlugin(pluginId)
 
-    await db.remove(pluginId, plugin._rev)
-    await events.plugin.deleted(plugin)
+    ctx.body = { message: `Plugin ${ctx.params.pluginId} deleted.` }
   } catch (err: any) {
-    const errMsg = err?.message ? err?.message : err
-
-    ctx.throw(400, `Failed to delete plugin: ${errMsg}`)
+    ctx.throw(400, err.message)
   }
-
-  ctx.message = `Plugin ${ctx.params.pluginId} deleted.`
-  ctx.status = 200
 }
 
-export async function storePlugin(
-  metadata: any,
-  directory: any,
+export async function processUploadedPlugin(
+  plugin: FileType,
   source?: PluginSource
 ) {
-  const db = getGlobalDB()
-  const version = metadata.package.version,
-    name = metadata.package.name,
-    description = metadata.package.description,
-    hash = metadata.schema.hash
-
-  // first open the tarball into tmp directory
-  const bucketPath = `${name}/`
-  const files = await uploadDirectory(
-    ObjectStoreBuckets.PLUGINS,
-    directory,
-    bucketPath
-  )
-  const jsFile = files.find((file: any) => file.name.endsWith(".js"))
-  if (!jsFile) {
-    throw new Error(`Plugin missing .js file.`)
-  }
-  // validate the JS for a datasource
-  if (metadata.schema.type === PluginType.DATASOURCE) {
-    const js = loadJSFile(directory, jsFile.name)
-    // TODO: this isn't safe - but we need full node environment
-    // in future we should do this in a thread for safety
-    try {
-      eval(js)
-    } catch (err: any) {
-      const message = err?.message ? err.message : JSON.stringify(err)
-      throw new Error(`JS invalid: ${message}`)
-    }
-  }
-  const jsFileName = jsFile.name
-  const pluginId = generatePluginID(name)
-
-  // overwrite existing docs entirely if they exist
-  let rev
-  try {
-    const existing = await db.get(pluginId)
-    rev = existing._rev
-  } catch (err) {
-    rev = undefined
-  }
-  let doc: Plugin = {
-    _id: pluginId,
-    _rev: rev,
-    ...metadata,
-    name,
-    version,
-    hash,
-    description,
-    jsUrl: `${bucketPath}${jsFileName}`,
-  }
-
-  if (source) {
-    doc = {
-      ...doc,
-      source,
-    }
-  }
-
-  const response = await db.put(doc)
-  await events.plugin.imported(doc)
-  ClientAppSocket.emit("plugin-update", { name, hash })
-  return {
-    ...doc,
-    _rev: response.rev,
-  }
-}
-
-export async function processPlugin(plugin: FileType, source?: PluginSource) {
   const { metadata, directory } = await fileUpload(plugin)
   validate(metadata?.schema)
 
@@ -211,5 +128,7 @@ export async function processPlugin(plugin: FileType, source?: PluginSource) {
     throw new Error("Only component plugins are supported outside of self-host")
   }
 
-  return await storePlugin(metadata, directory, source)
+  const doc = await plugins.storePlugin(metadata, directory, source)
+  ClientAppSocket.emit("plugins-update", { name, hash: doc.hash })
+  return doc
 }
diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js
index 64d206aeb8..a97dcada59 100644
--- a/packages/server/src/db/utils.js
+++ b/packages/server/src/db/utils.js
@@ -42,7 +42,6 @@ const DocumentType = {
   MEM_VIEW: "view",
   USER_FLAG: "flag",
   AUTOMATION_METADATA: "meta_au",
-  PLUGIN: "plg",
 }
 
 const InternalTables = {
@@ -384,10 +383,3 @@ exports.getMultiIDParams = ids => {
     include_docs: true,
   }
 }
-
-/**
- * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
- */
-exports.getPluginParams = (pluginId = null, otherProps = {}) => {
-  return getDocParams(DocumentType.PLUGIN, pluginId, otherProps)
-}
diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index 96d8c85e0b..e85fe18f94 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -112,13 +112,6 @@ exports.loadHandlebarsFile = path => {
   return fs.readFileSync(path, "utf8")
 }
 
-/**
- * Same as above just with a different name.
- */
-exports.loadJSFile = (directory, name) => {
-  return fs.readFileSync(join(directory, name), "utf8")
-}
-
 /**
  * When return a file from the API need to write the file to the system temporarily so we
  * can create a read stream to send.
diff --git a/packages/server/src/watch.ts b/packages/server/src/watch.ts
index a97fda4138..4beef5ddb8 100644
--- a/packages/server/src/watch.ts
+++ b/packages/server/src/watch.ts
@@ -4,7 +4,7 @@ import chokidar from "chokidar"
 import fs from "fs"
 import { tenancy } from "@budibase/backend-core"
 import { DEFAULT_TENANT_ID } from "@budibase/backend-core/constants"
-import { processPlugin } from "./api/controllers/plugin"
+import { processUploadedPlugin } from "./api/controllers/plugin"
 
 export function watch() {
   const watchPath = path.join(env.PLUGINS_DIR, "./**/*.tar.gz")
@@ -28,7 +28,7 @@ export function watch() {
           const split = path.split("/")
           const name = split[split.length - 1]
           console.log("Importing plugin:", path)
-          await processPlugin({ name, path })
+          await processUploadedPlugin({ name, path })
         } catch (err: any) {
           const message = err?.message ? err?.message : err
           console.error("Failed to import plugin:", message)
diff --git a/packages/types/src/documents/global/plugin.ts b/packages/types/src/documents/global/plugin.ts
index 8b9607c41d..a374d5496c 100644
--- a/packages/types/src/documents/global/plugin.ts
+++ b/packages/types/src/documents/global/plugin.ts
@@ -23,6 +23,7 @@ export interface Plugin extends Document {
   jsUrl?: string
   source: PluginSource
   package: { [key: string]: any }
+  hash: string
   schema: {
     type: PluginType
     [key: string]: any

From 6ee5d8bea696f8b8d2001d01e21381e71da4048a Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 15 Sep 2022 16:39:25 +0100
Subject: [PATCH 02/36] Fix to include the current user bindings in datasource
 queries

---
 packages/bbui/src/Drawer/Drawer.svelte        |  2 +-
 .../builder/src/builderStore/dataBinding.js   |  2 +-
 .../integration/QueryBindingBuilder.svelte    | 90 ++++++-------------
 3 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/packages/bbui/src/Drawer/Drawer.svelte b/packages/bbui/src/Drawer/Drawer.svelte
index e1880d0ed4..43729cd794 100644
--- a/packages/bbui/src/Drawer/Drawer.svelte
+++ b/packages/bbui/src/Drawer/Drawer.svelte
@@ -78,7 +78,7 @@
     bottom: 0;
     background: var(--background);
     border-top: var(--border-light);
-    z-index: 2;
+    z-index: 3;
   }
 
   .fillWidth {
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 13b749e19f..ed2c20950b 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -370,7 +370,7 @@ const getProviderContextBindings = (asset, dataProviders) => {
 /**
  * Gets all bindable properties from the logged in user.
  */
-const getUserBindings = () => {
+export const getUserBindings = () => {
   let bindings = []
   const { schema } = getSchemaForTable(TableNames.USERS)
   const keys = Object.keys(schema).sort()
diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index 255bee21dd..e7edf94150 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -1,31 +1,20 @@
 <script>
-  import { Body, Button, Heading, Icon, Input, Layout } from "@budibase/bbui"
-  import {
-    readableToRuntimeBinding,
-    runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-
+  import { Body, Button, Heading, Layout } from "@budibase/bbui"
+  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import { getUserBindings } from "builderStore/dataBinding"
   export let bindable = true
   export let queryBindings = []
-  export let bindings = []
-  export let customParams = {}
+
+  const userBindings = getUserBindings()
+
+  let internalBindings = queryBindings.reduce((acc, doof) => {
+    acc[doof.name] = doof.default
+    return acc
+  }, {})
 
   function newQueryBinding() {
     queryBindings = [...queryBindings, {}]
   }
-
-  function deleteQueryBinding(idx) {
-    queryBindings.splice(idx, 1)
-    queryBindings = queryBindings
-  }
-
-  // This is necessary due to the way readable and writable bindings are stored.
-  // The readable binding in the UI gets converted to a UUID value that the client understands
-  // for parsing, then converted back so we can display it the readable form in the UI
-  function onBindingChange(param, valueToParse) {
-    customParams[param] = readableToRuntimeBinding(bindings, valueToParse)
-  }
 </script>
 
 <Layout noPadding={bindable} gap="S">
@@ -46,57 +35,34 @@
     {/if}
   </Body>
   <div class="bindings" class:bindable>
-    {#each queryBindings as binding, idx}
-      <Input
-        placeholder="Binding Name"
-        thin
-        disabled={bindable}
-        bind:value={binding.name}
-      />
-      <Input
-        placeholder="Default"
-        thin
-        disabled={bindable}
-        on:change={evt => onBindingChange(binding.name, evt.detail)}
-        bind:value={binding.default}
-      />
-      {#if bindable}
-        <DrawerBindableInput
-          title={`Query binding "${binding.name}"`}
-          placeholder="Value"
-          thin
-          on:change={evt => onBindingChange(binding.name, evt.detail)}
-          value={runtimeToReadableBinding(
-            bindings,
-            customParams?.[binding.name]
-          )}
-          {bindings}
-        />
-      {:else}
-        <Icon hoverable name="Close" on:click={() => deleteQueryBinding(idx)} />
-      {/if}
-    {/each}
+    <KeyValueBuilder
+      bind:object={internalBindings}
+      tooltip="Set the name of the binding which can be used in Handlebars statements throughout your query"
+      name="binding"
+      headings
+      keyPlaceholder="Binding name"
+      valuePlaceholder="Default"
+      bindings={[...userBindings]}
+      bindingDrawerLeft="260px"
+      on:change={e => {
+        queryBindings = e.detail.map(binding => {
+          return {
+            name: binding.name,
+            default: binding.value,
+          }
+        })
+      }}
+    />
   </div>
 </Layout>
 
 <style>
-  .bindings.bindable {
-    grid-template-columns: 1fr 1fr 1fr;
-  }
-
   .controls {
     display: flex;
     align-items: center;
     justify-content: space-between;
   }
 
-  .bindings {
-    display: grid;
-    grid-template-columns: 1fr 1fr 5%;
-    grid-gap: 10px;
-    align-items: center;
-  }
-
   .height {
     height: 40px;
   }

From dcc3c81e7a79c5ac79cac3d3d1fb22eea75b5839 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 15 Sep 2022 16:50:51 +0100
Subject: [PATCH 03/36] Minor update

---
 .../src/components/integration/QueryBindingBuilder.svelte     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index e7edf94150..64736e5f78 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -7,8 +7,8 @@
 
   const userBindings = getUserBindings()
 
-  let internalBindings = queryBindings.reduce((acc, doof) => {
-    acc[doof.name] = doof.default
+  let internalBindings = queryBindings.reduce((acc, binding) => {
+    acc[binding.name] = binding.default
     return acc
   }, {})
 

From 1e621da16bad75ae6a2dfcd732e676cf0b56a2a4 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 15 Sep 2022 16:40:41 +0000
Subject: [PATCH 04/36] v1.3.19

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  4 ++--
 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, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 1c19e55de0..9ee0748de3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.18",
+  "version": "1.3.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2b491715bc..2cf6c6ddd9 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "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.3.18",
+    "@budibase/types": "^1.3.19",
     "@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 b554bdfc21..43d6e5265d 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.3.18",
+  "version": "1.3.19",
   "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.3.18",
+    "@budibase/string-templates": "^1.3.19",
     "@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 5de1f5ecb6..030ca919e8 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.3.18",
-    "@budibase/client": "^1.3.18",
-    "@budibase/frontend-core": "^1.3.18",
-    "@budibase/string-templates": "^1.3.18",
+    "@budibase/bbui": "^1.3.19",
+    "@budibase/client": "^1.3.19",
+    "@budibase/frontend-core": "^1.3.19",
+    "@budibase/string-templates": "^1.3.19",
     "@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 274522bc53..9dd2793836 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,7 +26,7 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^1.3.18",
+    "@budibase/backend-core": "^1.3.19",
     "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 c7a28cc163..44c5ab1c5f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "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.3.18",
-    "@budibase/frontend-core": "^1.3.18",
-    "@budibase/string-templates": "^1.3.18",
+    "@budibase/bbui": "^1.3.19",
+    "@budibase/frontend-core": "^1.3.19",
+    "@budibase/string-templates": "^1.3.19",
     "@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 aab5cb7bd9..44ca48f354 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.3.18",
+    "@budibase/bbui": "^1.3.19",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index a95993467c..800209e80d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "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.3.18",
-    "@budibase/client": "^1.3.18",
+    "@budibase/backend-core": "^1.3.19",
+    "@budibase/client": "^1.3.19",
     "@budibase/pro": "1.3.18",
-    "@budibase/string-templates": "^1.3.18",
-    "@budibase/types": "^1.3.18",
+    "@budibase/string-templates": "^1.3.19",
+    "@budibase/types": "^1.3.19",
     "@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 65ee9895bf..9eb9245cf0 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "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 bc59e79328..6264e4ca06 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "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 c4ce118996..ff76edfdbb 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.3.18",
+    "@budibase/backend-core": "^1.3.19",
     "@budibase/pro": "1.3.18",
-    "@budibase/string-templates": "^1.3.18",
-    "@budibase/types": "^1.3.18",
+    "@budibase/string-templates": "^1.3.19",
+    "@budibase/types": "^1.3.19",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From e0cf12531631d11ae54c360e8649d6e993da9db2 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 15 Sep 2022 16:43:41 +0000
Subject: [PATCH 05/36] Update pro version to 1.3.19

---
 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 800209e80d..8282a6f235 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.3.19",
     "@budibase/client": "^1.3.19",
-    "@budibase/pro": "1.3.18",
+    "@budibase/pro": "1.3.19",
     "@budibase/string-templates": "^1.3.19",
     "@budibase/types": "^1.3.19",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0f07a6d623..b0152857ef 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.3.18":
-  version "1.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.18.tgz#5ef26e3283f46b321103766b0359ca72035c8942"
-  integrity sha512-utux5ydlnejKavU2H2HlCJkIyymVmGj+rVJp+SR1JrtPW2wkzHzpYn2k9eXFOYnAwqTF8jpCj4FVOEeDTfQcbw==
+"@budibase/backend-core@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.19.tgz#e931959bd3f27a42fecef4b9f2534d38341186d6"
+  integrity sha512-q6eEVHWyZoWuq0ioguYoMDXUMEqUU1oBcpwlgt3uVNd5qbeiIoXJ01UEWmX7F22jayy/r48hZ2LhgsuK49siPA==
   dependencies:
-    "@budibase/types" "^1.3.18"
+    "@budibase/types" "^1.3.19"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1179,13 +1179,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.3.18":
-  version "1.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.18.tgz#35a59e86c00971dd77a0b196e381a5ffd3be767c"
-  integrity sha512-aFGUr/ut4Ki56qLSdFaDLoEIPmwMqT5dGmY1xBT3Bwvhoq7hXevk1bcPFGj0rWBJnYG9zg/jmik9V4mE/lUOag==
+"@budibase/pro@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.19.tgz#8779ba80b75dcc58e17ba52e0db5fbea5125b8ea"
+  integrity sha512-FnoZxyS81axaV/7lZMcByzHkXjupCxqKg+DzmfYfIduGY4mxlvWmpR+oXmqUF3GMAGWRfiGAfaNzKbUGi/aTQg==
   dependencies:
-    "@budibase/backend-core" "1.3.18"
-    "@budibase/types" "1.3.18"
+    "@budibase/backend-core" "1.3.19"
+    "@budibase/types" "1.3.19"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1208,10 +1208,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.3.18", "@budibase/types@^1.3.18":
-  version "1.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.18.tgz#cd65213f476a2f37065796d0ccba18c8e8e07504"
-  integrity sha512-bMtS2RbbI3Ztl5aAwEVlsK+2PQ0vRSZm8n6YDRjC9Arc94B4GDl/sqowRndKYqVtUeA/gVW0HH8x+qzhuMX6Dw==
+"@budibase/types@1.3.19", "@budibase/types@^1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.19.tgz#83e68580a7ecfd18c194ade96e23dbe87abc4a33"
+  integrity sha512-8ugQpWl3rPfxBECct8yHiKTM56k/dSrYbOwfGFeaObVQGLOD57sp0TQnbx6upJZmcYBRC0neMR8F+EuTjLKvJQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ff76edfdbb..7db0e5d68e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.3.19",
-    "@budibase/pro": "1.3.18",
+    "@budibase/pro": "1.3.19",
     "@budibase/string-templates": "^1.3.19",
     "@budibase/types": "^1.3.19",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index b6dd949d64..e4917b9eb4 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.3.18":
-  version "1.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.18.tgz#5ef26e3283f46b321103766b0359ca72035c8942"
-  integrity sha512-utux5ydlnejKavU2H2HlCJkIyymVmGj+rVJp+SR1JrtPW2wkzHzpYn2k9eXFOYnAwqTF8jpCj4FVOEeDTfQcbw==
+"@budibase/backend-core@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.19.tgz#e931959bd3f27a42fecef4b9f2534d38341186d6"
+  integrity sha512-q6eEVHWyZoWuq0ioguYoMDXUMEqUU1oBcpwlgt3uVNd5qbeiIoXJ01UEWmX7F22jayy/r48hZ2LhgsuK49siPA==
   dependencies:
-    "@budibase/types" "^1.3.18"
+    "@budibase/types" "^1.3.19"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -326,21 +326,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.3.18":
-  version "1.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.18.tgz#35a59e86c00971dd77a0b196e381a5ffd3be767c"
-  integrity sha512-aFGUr/ut4Ki56qLSdFaDLoEIPmwMqT5dGmY1xBT3Bwvhoq7hXevk1bcPFGj0rWBJnYG9zg/jmik9V4mE/lUOag==
+"@budibase/pro@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.19.tgz#8779ba80b75dcc58e17ba52e0db5fbea5125b8ea"
+  integrity sha512-FnoZxyS81axaV/7lZMcByzHkXjupCxqKg+DzmfYfIduGY4mxlvWmpR+oXmqUF3GMAGWRfiGAfaNzKbUGi/aTQg==
   dependencies:
-    "@budibase/backend-core" "1.3.18"
-    "@budibase/types" "1.3.18"
+    "@budibase/backend-core" "1.3.19"
+    "@budibase/types" "1.3.19"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.18", "@budibase/types@^1.3.18":
-  version "1.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.18.tgz#cd65213f476a2f37065796d0ccba18c8e8e07504"
-  integrity sha512-bMtS2RbbI3Ztl5aAwEVlsK+2PQ0vRSZm8n6YDRjC9Arc94B4GDl/sqowRndKYqVtUeA/gVW0HH8x+qzhuMX6Dw==
+"@budibase/types@1.3.19", "@budibase/types@^1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.19.tgz#83e68580a7ecfd18c194ade96e23dbe87abc4a33"
+  integrity sha512-8ugQpWl3rPfxBECct8yHiKTM56k/dSrYbOwfGFeaObVQGLOD57sp0TQnbx6upJZmcYBRC0neMR8F+EuTjLKvJQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From ef3d0c1098140f606c5a64ad1f547975514f3a52 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 15 Sep 2022 18:43:07 +0100
Subject: [PATCH 06/36] Some minor fixes, plus typescript conversion to avoid
 issue in future.

---
 .../{component.js => component.ts}            | 26 ++++-----
 .../api/controllers/{screen.js => screen.ts}  | 53 +++++++++----------
 packages/types/src/documents/app/screen.ts    | 13 +++++
 3 files changed, 52 insertions(+), 40 deletions(-)
 rename packages/server/src/api/controllers/{component.js => component.ts} (62%)
 rename packages/server/src/api/controllers/{screen.js => screen.ts} (67%)

diff --git a/packages/server/src/api/controllers/component.js b/packages/server/src/api/controllers/component.ts
similarity index 62%
rename from packages/server/src/api/controllers/component.js
rename to packages/server/src/api/controllers/component.ts
index e949db3042..6d65d43db6 100644
--- a/packages/server/src/api/controllers/component.js
+++ b/packages/server/src/api/controllers/component.ts
@@ -1,15 +1,15 @@
-const { DocumentType, getPluginParams } = require("../../db/utils")
-const { getComponentLibraryManifest } = require("../../utilities/fileSystem")
-const { getAppDB } = require("@budibase/backend-core/context")
-const { getGlobalDB } = require("@budibase/backend-core/tenancy")
+import { DocumentType } from "../../db/utils"
+import { Plugin } from "@budibase/types"
+import { db as dbCore, context, tenancy } from "@budibase/backend-core"
+import { getComponentLibraryManifest } from "../../utilities/fileSystem"
 
-exports.fetchAppComponentDefinitions = async function (ctx) {
+exports.fetchAppComponentDefinitions = async function (ctx: any) {
   try {
-    const db = getAppDB()
+    const db = context.getAppDB()
     const app = await db.get(DocumentType.APP_METADATA)
 
     let componentManifests = await Promise.all(
-      app.componentLibraries.map(async library => {
+      app.componentLibraries.map(async (library: any) => {
         let manifest = await getComponentLibraryManifest(library)
         return {
           manifest,
@@ -17,7 +17,7 @@ exports.fetchAppComponentDefinitions = async function (ctx) {
         }
       })
     )
-    const definitions = {}
+    const definitions: { [key: string]: any } = {}
     for (let { manifest, library } of componentManifests) {
       for (let key of Object.keys(manifest)) {
         if (key === "features") {
@@ -33,16 +33,16 @@ exports.fetchAppComponentDefinitions = async function (ctx) {
     }
 
     // Add custom components
-    const globalDB = getGlobalDB()
+    const globalDB = tenancy.getGlobalDB()
     const response = await globalDB.allDocs(
-      getPluginParams(null, {
+      dbCore.getPluginParams(null, {
         include_docs: true,
       })
     )
     response.rows
-      .map(row => row.doc)
-      .filter(plugin => plugin.schema.type === "component")
-      .forEach(plugin => {
+      .map((row: any) => row.doc)
+      .filter((plugin: Plugin) => plugin.schema.type === "component")
+      .forEach((plugin: Plugin) => {
         const fullComponentName = `plugin/${plugin.name}`
         definitions[fullComponentName] = {
           component: fullComponentName,
diff --git a/packages/server/src/api/controllers/screen.js b/packages/server/src/api/controllers/screen.ts
similarity index 67%
rename from packages/server/src/api/controllers/screen.js
rename to packages/server/src/api/controllers/screen.ts
index ca25a72a8a..08040351dd 100644
--- a/packages/server/src/api/controllers/screen.js
+++ b/packages/server/src/api/controllers/screen.ts
@@ -1,17 +1,16 @@
-const {
-  getScreenParams,
-  generateScreenID,
-  getPluginParams,
-  DocumentType,
-} = require("../../db/utils")
-const { AccessController } = require("@budibase/backend-core/roles")
-const { getAppDB } = require("@budibase/backend-core/context")
-const { events } = require("@budibase/backend-core")
-const { getGlobalDB } = require("@budibase/backend-core/tenancy")
-const { updateAppPackage } = require("./application")
+import { getScreenParams, generateScreenID, DocumentType } from "../../db/utils"
+import {
+  events,
+  context,
+  tenancy,
+  db as dbCore,
+  roles,
+} from "@budibase/backend-core"
+import { updateAppPackage } from "./application"
+import { Plugin, ScreenProps } from "@budibase/types"
 
-exports.fetch = async ctx => {
-  const db = getAppDB()
+exports.fetch = async (ctx: any) => {
+  const db = context.getAppDB()
 
   const screens = (
     await db.allDocs(
@@ -19,16 +18,16 @@ exports.fetch = async ctx => {
         include_docs: true,
       })
     )
-  ).rows.map(element => element.doc)
+  ).rows.map((el: any) => el.doc)
 
-  ctx.body = await new AccessController().checkScreensAccess(
+  ctx.body = await new roles.AccessController().checkScreensAccess(
     screens,
     ctx.user.role._id
   )
 }
 
-exports.save = async ctx => {
-  const db = getAppDB()
+exports.save = async (ctx: any) => {
+  const db = context.getAppDB()
   let screen = ctx.request.body
 
   let eventFn
@@ -40,19 +39,19 @@ exports.save = async ctx => {
   const response = await db.put(screen)
 
   // Find any custom components being used
-  let pluginNames = []
+  let pluginNames: string[] = []
   let pluginAdded = false
   findPlugins(screen.props, pluginNames)
   if (pluginNames.length) {
-    const globalDB = getGlobalDB()
+    const globalDB = tenancy.getGlobalDB()
     const pluginsResponse = await globalDB.allDocs(
-      getPluginParams(null, {
+      dbCore.getPluginParams(null, {
         include_docs: true,
       })
     )
     const requiredPlugins = pluginsResponse.rows
-      .map(row => row.doc)
-      .filter(plugin => {
+      .map((row: any) => row.doc)
+      .filter((plugin: Plugin) => {
         return (
           plugin.schema.type === "component" &&
           pluginNames.includes(`plugin/${plugin.name}`)
@@ -63,8 +62,8 @@ exports.save = async ctx => {
     const application = await db.get(DocumentType.APP_METADATA)
     let usedPlugins = application.usedPlugins || []
 
-    requiredPlugins.forEach(plugin => {
-      if (!usedPlugins.find(x => x._id === plugin._id)) {
+    requiredPlugins.forEach((plugin: Plugin) => {
+      if (!usedPlugins.find((x: Plugin) => x._id === plugin._id)) {
         pluginAdded = true
         usedPlugins.push({
           _id: plugin._id,
@@ -93,8 +92,8 @@ exports.save = async ctx => {
   }
 }
 
-exports.destroy = async ctx => {
-  const db = getAppDB()
+exports.destroy = async (ctx: any) => {
+  const db = context.getAppDB()
   const id = ctx.params.screenId
   const screen = await db.get(id)
 
@@ -107,7 +106,7 @@ exports.destroy = async ctx => {
   ctx.status = 200
 }
 
-const findPlugins = (component, foundPlugins) => {
+const findPlugins = (component: ScreenProps, foundPlugins: string[]) => {
   if (!component) {
     return
   }
diff --git a/packages/types/src/documents/app/screen.ts b/packages/types/src/documents/app/screen.ts
index 98db658aa6..6390c3b18c 100644
--- a/packages/types/src/documents/app/screen.ts
+++ b/packages/types/src/documents/app/screen.ts
@@ -1,5 +1,17 @@
 import { Document } from "../document"
 
+export interface ScreenProps extends Document {
+  _instanceName: string
+  _styles: { [key: string]: any }
+  _component: string
+  _children: ScreenProps[]
+  size?: string
+  gap?: string
+  direction?: string
+  vAlign?: string
+  hAlign?: string
+}
+
 export interface Screen extends Document {
   layoutId?: string
   showNavigation?: boolean
@@ -9,4 +21,5 @@ export interface Screen extends Document {
     roleId: string
     homeScreen?: boolean
   }
+  props: ScreenProps
 }

From d35864be0854216693a01307f81ffcabf6d549df Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 15 Sep 2022 19:35:55 +0100
Subject: [PATCH 07/36] Fixing issue introduced by fix for #7683 - encoding the
 query string caused handlebars statements to break, this rectifies that.

---
 .../bbui/src/Tooltip/TooltipWrapper.svelte    |  2 +-
 .../builder/src/builderStore/dataBinding.js   | 12 +++----
 packages/builder/src/helpers/data/utils.js    | 18 +++++++++--
 .../rest/[query]/index.svelte                 |  2 ++
 .../worker/src/api/controllers/global/self.js | 31 +++++++++----------
 .../src/api/controllers/global/users.ts       |  5 +--
 6 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/packages/bbui/src/Tooltip/TooltipWrapper.svelte b/packages/bbui/src/Tooltip/TooltipWrapper.svelte
index 92f5c6f474..610b8382fa 100644
--- a/packages/bbui/src/Tooltip/TooltipWrapper.svelte
+++ b/packages/bbui/src/Tooltip/TooltipWrapper.svelte
@@ -47,7 +47,7 @@
     display: flex;
     justify-content: center;
     top: 15px;
-    z-index: 100;
+    z-index: 200;
     width: 160px;
   }
   .icon {
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index ed2c20950b..36c88c162d 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -9,14 +9,14 @@ import {
 import { store } from "builderStore"
 import {
   queries as queriesStores,
-  tables as tablesStore,
   roles as rolesStore,
+  tables as tablesStore,
 } from "stores/backend"
 import {
-  makePropSafe,
-  isJSBinding,
   decodeJSBinding,
   encodeJSBinding,
+  isJSBinding,
+  makePropSafe,
 } from "@budibase/string-templates"
 import { TableNames } from "../constants"
 import { JSONUtils } from "@budibase/frontend-core"
@@ -118,8 +118,7 @@ export const readableToRuntimeMap = (bindings, ctx) => {
     return {}
   }
   return Object.keys(ctx).reduce((acc, key) => {
-    let parsedQuery = readableToRuntimeBinding(bindings, ctx[key])
-    acc[key] = parsedQuery
+    acc[key] = readableToRuntimeBinding(bindings, ctx[key])
     return acc
   }, {})
 }
@@ -132,8 +131,7 @@ export const runtimeToReadableMap = (bindings, ctx) => {
     return {}
   }
   return Object.keys(ctx).reduce((acc, key) => {
-    let parsedQuery = runtimeToReadableBinding(bindings, ctx[key])
-    acc[key] = parsedQuery
+    acc[key] = runtimeToReadableBinding(bindings, ctx[key])
     return acc
   }, {})
 }
diff --git a/packages/builder/src/helpers/data/utils.js b/packages/builder/src/helpers/data/utils.js
index cd6a8cf481..685ddf2a43 100644
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@@ -1,4 +1,5 @@
 import { IntegrationTypes } from "constants/backend"
+import { findHBSBlocks } from "@budibase/string-templates"
 
 export function schemaToFields(schema) {
   const response = {}
@@ -31,7 +32,8 @@ export function breakQueryString(qs) {
   let paramObj = {}
   for (let param of params) {
     const split = param.split("=")
-    paramObj[split[0]] = split.slice(1).join("=")
+    console.log(split[1])
+    paramObj[split[0]] = decodeURIComponent(split.slice(1).join("="))
   }
   return paramObj
 }
@@ -46,7 +48,19 @@ export function buildQueryString(obj) {
       if (str !== "") {
         str += "&"
       }
-      str += `${key}=${encodeURIComponent(value || "")}`
+      const bindings = findHBSBlocks(value)
+      let count = 0
+      const bindingMarkers = {}
+      bindings.forEach(binding => {
+        const marker = `BINDING...${count++}`
+        value = value.replace(binding, marker)
+        bindingMarkers[marker] = binding
+      })
+      let encoded = encodeURIComponent(value || "")
+      Object.entries(bindingMarkers).forEach(([marker, binding]) => {
+        encoded = encoded.replace(marker, binding)
+      })
+      str += `${key}=${encoded}`
     }
   }
   return str
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
index d2c1630416..6691494ac4 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
@@ -347,6 +347,7 @@
     const datasourceUrl = datasource?.config.url
     const qs = query?.fields.queryString
     breakQs = restUtils.breakQueryString(qs)
+    console.log(breakQs)
     breakQs = runtimeToReadableMap(mergedBindings, breakQs)
 
     const path = query.fields.path
@@ -708,6 +709,7 @@
   .url-block {
     display: flex;
     gap: var(--spacing-s);
+    z-index: 200;
   }
   .verb {
     flex: 1;
diff --git a/packages/worker/src/api/controllers/global/self.js b/packages/worker/src/api/controllers/global/self.js
index 28afa69fa0..9110e267ff 100644
--- a/packages/worker/src/api/controllers/global/self.js
+++ b/packages/worker/src/api/controllers/global/self.js
@@ -80,16 +80,15 @@ const addSessionAttributesToUser = ctx => {
   ctx.body.csrfToken = ctx.user.csrfToken
 }
 
-/**
- * Remove the attributes that are session based from the current user,
- * so that stale values are not written to the db
- */
-const removeSessionAttributesFromUser = ctx => {
-  delete ctx.request.body.csrfToken
-  delete ctx.request.body.account
-  delete ctx.request.body.accountPortalAccess
-  delete ctx.request.body.budibaseAccess
-  delete ctx.request.body.license
+const sanitiseUserUpdate = ctx => {
+  const allowed = ["firstName", "lastName", "password", "forceResetPassword"]
+  const resp = {}
+  for (let [key, value] of Object.entries(ctx.request.body)) {
+    if (allowed.includes(key)) {
+      resp[key] = value
+    }
+  }
+  return resp
 }
 
 exports.getSelf = async ctx => {
@@ -117,10 +116,12 @@ exports.updateSelf = async ctx => {
   const db = getGlobalDB()
   const user = await db.get(ctx.user._id)
   let passwordChange = false
-  if (ctx.request.body.password) {
+
+  const userUpdateObj = sanitiseUserUpdate(ctx)
+  if (userUpdateObj.password) {
     // changing password
     passwordChange = true
-    ctx.request.body.password = await hash(ctx.request.body.password)
+    userUpdateObj.password = await hash(userUpdateObj.password)
     // Log all other sessions out apart from the current one
     await platformLogout({
       ctx,
@@ -128,14 +129,10 @@ exports.updateSelf = async ctx => {
       keepActiveSession: true,
     })
   }
-  // don't allow sending up an ID/Rev, always use the existing one
-  delete ctx.request.body._id
-  delete ctx.request.body._rev
-  removeSessionAttributesFromUser(ctx)
 
   const response = await db.put({
     ...user,
-    ...ctx.request.body,
+    ...userUpdateObj,
   })
   await userCache.invalidateUser(user._id)
   ctx.body = {
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index d5e8eb8e62..ea9375f238 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -14,7 +14,6 @@ import {
   errors,
   events,
   tenancy,
-  users as usersCore,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
 import { groups as groupUtils } from "@budibase/pro"
@@ -148,9 +147,7 @@ export const bulkDelete = async (ctx: any) => {
   }
 
   try {
-    let response = await users.bulkDelete(userIds)
-
-    ctx.body = response
+    ctx.body = await users.bulkDelete(userIds)
   } catch (err) {
     ctx.throw(err)
   }

From 42654622b55f13ec90f822055b376c5f76944003 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 15 Sep 2022 22:47:37 +0100
Subject: [PATCH 08/36] PR comments, removing console logs, as well as trying
 to get jest tests working in builder.

---
 packages/builder/package.json                 |  4 +-
 packages/builder/src/helpers/data/utils.js    |  1 -
 .../src/helpers/tests/dataUtils.spec.js       | 37 +++++++++++++++++
 .../rest/[query]/index.svelte                 |  1 -
 .../builder/src/stores/backend/queries.js     |  2 +-
 packages/builder/src/stores/backend/tables.js |  2 +-
 ...s.spec.js => datasources.spec.js.disabled} | 34 ++++++++--------
 ...s.spec.js => permissions.spec.js.disabled} |  7 ++--
 ...eries.spec.js => queries.spec.js.disabled} | 28 ++++++-------
 .../{roles.spec.js => roles.spec.js.disabled} | 19 +++++----
 ...tables.spec.js => tables.spec.js.disabled} | 40 +++++++++----------
 11 files changed, 104 insertions(+), 71 deletions(-)
 create mode 100644 packages/builder/src/helpers/tests/dataUtils.spec.js
 rename packages/builder/src/stores/backend/tests/{datasources.spec.js => datasources.spec.js.disabled} (61%)
 rename packages/builder/src/stores/backend/tests/{permissions.spec.js => permissions.spec.js.disabled} (69%)
 rename packages/builder/src/stores/backend/tests/{queries.spec.js => queries.spec.js.disabled} (58%)
 rename packages/builder/src/stores/backend/tests/{roles.spec.js => roles.spec.js.disabled} (56%)
 rename packages/builder/src/stores/backend/tests/{tables.spec.js => tables.spec.js.disabled} (56%)

diff --git a/packages/builder/package.json b/packages/builder/package.json
index 030ca919e8..1c9e1f744e 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -9,6 +9,7 @@
     "dev:builder": "routify -c dev:vite",
     "dev:vite": "vite --host 0.0.0.0",
     "rollup": "rollup -c -w",
+    "test": "jest",
     "cy:setup": "ts-node ./cypress/ts/setup.ts",
     "cy:setup:ci": "node ./cypress/setup.js",
     "cy:open": "cypress open",
@@ -36,7 +37,8 @@
       "components(.*)$": "<rootDir>/src/components$1",
       "builderStore(.*)$": "<rootDir>/src/builderStore$1",
       "stores(.*)$": "<rootDir>/src/stores$1",
-      "analytics(.*)$": "<rootDir>/src/analytics$1"
+      "analytics(.*)$": "<rootDir>/src/analytics$1",
+      "constants/backend": "<rootDir>/src/constants/backend/index.js"
     },
     "moduleFileExtensions": [
       "js",
diff --git a/packages/builder/src/helpers/data/utils.js b/packages/builder/src/helpers/data/utils.js
index 685ddf2a43..d1ff4c5f80 100644
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@@ -32,7 +32,6 @@ export function breakQueryString(qs) {
   let paramObj = {}
   for (let param of params) {
     const split = param.split("=")
-    console.log(split[1])
     paramObj[split[0]] = decodeURIComponent(split.slice(1).join("="))
   }
   return paramObj
diff --git a/packages/builder/src/helpers/tests/dataUtils.spec.js b/packages/builder/src/helpers/tests/dataUtils.spec.js
new file mode 100644
index 0000000000..83172af6ee
--- /dev/null
+++ b/packages/builder/src/helpers/tests/dataUtils.spec.js
@@ -0,0 +1,37 @@
+import { breakQueryString, buildQueryString } from "../data/utils"
+
+describe("check query string utils", () => {
+  const obj1 = {
+    key1: "123",
+    key2: "   ",
+    key3: "333",
+  }
+
+  const obj2 = {
+    key1: "{{ binding.awd }}",
+    key2: "{{ binding.sed }}  ",
+  }
+
+  it("should build a basic query string", () => {
+    const queryString = buildQueryString(obj1)
+    expect(queryString).toBe("key1=123&key2=%20%20%20&key3=333")
+  })
+
+  it("should be able to break a basic query string", () => {
+    const broken = breakQueryString("key1=123&key2=%20%20%20&key3=333")
+    expect(broken.key1).toBe(obj1.key1)
+    expect(broken.key2).toBe(obj1.key2)
+    expect(broken.key3).toBe(obj1.key3)
+  })
+
+  it("should be able to build with a binding", () => {
+    const queryString = buildQueryString(obj2)
+    expect(queryString).toBe("key1={{ binding.awd }}&key2={{ binding.sed }}%20%20")
+  })
+
+  it("should be able to break with a binding", () => {
+    const broken = breakQueryString("key1={{ binding.awd }}&key2={{ binding.sed }}%20%20")
+    expect(broken.key1).toBe(obj2.key1)
+    expect(broken.key2).toBe(obj2.key2)
+  })
+})
\ No newline at end of file
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
index 6691494ac4..1698677b66 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
@@ -347,7 +347,6 @@
     const datasourceUrl = datasource?.config.url
     const qs = query?.fields.queryString
     breakQs = restUtils.breakQueryString(qs)
-    console.log(breakQs)
     breakQs = runtimeToReadableMap(mergedBindings, breakQs)
 
     const path = query.fields.path
diff --git a/packages/builder/src/stores/backend/queries.js b/packages/builder/src/stores/backend/queries.js
index bb456ce405..2046d71d9d 100644
--- a/packages/builder/src/stores/backend/queries.js
+++ b/packages/builder/src/stores/backend/queries.js
@@ -1,7 +1,7 @@
 import { writable, get } from "svelte/store"
 import { datasources, integrations, tables, views } from "./"
 import { API } from "api"
-import { duplicateName } from "../../helpers/duplicate"
+import { duplicateName } from "helpers/duplicate"
 
 const sortQueries = queryList => {
   queryList.sort((q1, q2) => {
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js
index c6362aa3b2..cbbe0bd496 100644
--- a/packages/builder/src/stores/backend/tables.js
+++ b/packages/builder/src/stores/backend/tables.js
@@ -2,7 +2,7 @@ import { get, writable } from "svelte/store"
 import { datasources, queries, views } from "./"
 import { cloneDeep } from "lodash/fp"
 import { API } from "api"
-import { SWITCHABLE_TYPES } from "../../constants/backend"
+import { SWITCHABLE_TYPES } from "constants/backend"
 
 export function createTablesStore() {
   const store = writable({})
diff --git a/packages/builder/src/stores/backend/tests/datasources.spec.js b/packages/builder/src/stores/backend/tests/datasources.spec.js.disabled
similarity index 61%
rename from packages/builder/src/stores/backend/tests/datasources.spec.js
rename to packages/builder/src/stores/backend/tests/datasources.spec.js.disabled
index 46e9568b50..772aaf36a2 100644
--- a/packages/builder/src/stores/backend/tests/datasources.spec.js
+++ b/packages/builder/src/stores/backend/tests/datasources.spec.js.disabled
@@ -1,9 +1,9 @@
-import { get } from 'svelte/store'
-import api from 'builderStore/api'
+import { get } from "svelte/store"
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
 
-import { SOME_DATASOURCE, SAVE_DATASOURCE} from './fixtures/datasources'
+import { SOME_DATASOURCE, SAVE_DATASOURCE } from "./fixtures/datasources"
 
 import { createDatasourcesStore } from "../datasources"
 import { queries } from '../queries'
@@ -12,39 +12,39 @@ describe("Datasources Store", () => {
   let store = createDatasourcesStore()
 
   beforeEach(async () => {
-    api.get.mockReturnValue({ json: () => [SOME_DATASOURCE]})
+    API.getDatasources.mockReturnValue({ json: () => [SOME_DATASOURCE]})
     await store.init()
   })
 
   it("Initialises correctly", async () => {
-    api.get.mockReturnValue({ json: () => [SOME_DATASOURCE]})
-  
+    API.getDatasources.mockReturnValue({ json: () => [SOME_DATASOURCE]})
+
     await store.init()
     expect(get(store)).toEqual({ list: [SOME_DATASOURCE], selected: null})
   })
 
   it("fetches all the datasources and updates the store", async () => {
-    api.get.mockReturnValue({ json: () => [SOME_DATASOURCE] })
+    API.getDatasources.mockReturnValue({ json: () => [SOME_DATASOURCE] })
 
     await store.fetch()
-    expect(get(store)).toEqual({ list: [SOME_DATASOURCE], selected: null })  
+    expect(get(store)).toEqual({ list: [SOME_DATASOURCE], selected: null })
   })
 
   it("selects a datasource", async () => {
     store.select(SOME_DATASOURCE._id)
-  
-    expect(get(store).select).toEqual(SOME_DATASOURCE._id)  
+
+    expect(get(store).select).toEqual(SOME_DATASOURCE._id)
   })
 
   it("resets the queries store when new datasource is selected", async () => {
-    
+
     await store.select(SOME_DATASOURCE._id)
     const queriesValue = get(queries)
-    expect(queriesValue.selected).toEqual(null)  
+    expect(queriesValue.selected).toEqual(null)
   })
 
   it("saves the datasource, updates the store and returns status message", async () => {
-    api.post.mockReturnValue({ status: 200, json: () => SAVE_DATASOURCE})    
+    API.createDatasource.mockReturnValue({ status: 200, json: () => SAVE_DATASOURCE})
 
     await store.save({
       name: 'CoolDB',
@@ -56,13 +56,13 @@ describe("Datasources Store", () => {
     expect(get(store).list).toEqual(expect.arrayContaining([SAVE_DATASOURCE.datasource]))
   })
   it("deletes a datasource, updates the store and returns status message", async () => {
-    api.get.mockReturnValue({ json: () => SOME_DATASOURCE})
+    API.getDatasources.mockReturnValue({ json: () => SOME_DATASOURCE})
 
     await store.fetch()
 
-    api.delete.mockReturnValue({status: 200, message: 'Datasource deleted.'})    
+    API.deleteDatasource.mockReturnValue({status: 200, message: 'Datasource deleted.'})
 
     await store.delete(SOME_DATASOURCE[0])
-    expect(get(store)).toEqual({ list: [], selected: null})  
+    expect(get(store)).toEqual({ list: [], selected: null})
   })
 })
\ No newline at end of file
diff --git a/packages/builder/src/stores/backend/tests/permissions.spec.js b/packages/builder/src/stores/backend/tests/permissions.spec.js.disabled
similarity index 69%
rename from packages/builder/src/stores/backend/tests/permissions.spec.js
rename to packages/builder/src/stores/backend/tests/permissions.spec.js.disabled
index ab5aebb284..d3c19964f2 100644
--- a/packages/builder/src/stores/backend/tests/permissions.spec.js
+++ b/packages/builder/src/stores/backend/tests/permissions.spec.js.disabled
@@ -1,6 +1,6 @@
-import api from 'builderStore/api'
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
 
 const PERMISSIONS_FOR_RESOURCE = {
     "write": "BASIC",
@@ -13,13 +13,12 @@ describe("Permissions Store", () => {
   const store = createPermissionStore()
 
   it("fetches permissions for specific resource", async () => {
-    api.get.mockReturnValueOnce({ json: () => PERMISSIONS_FOR_RESOURCE})
+    API.getPermissionForResource.mockReturnValueOnce({ json: () => PERMISSIONS_FOR_RESOURCE})
 
     const resourceId = "ta_013657543b4043b89dbb17e9d3a4723a"
 
     const permissions = await store.forResource(resourceId)
 
-    expect(api.get).toBeCalledWith(`/api/permission/${resourceId}`)
     expect(permissions).toEqual(PERMISSIONS_FOR_RESOURCE)
   })
 })
\ No newline at end of file
diff --git a/packages/builder/src/stores/backend/tests/queries.spec.js b/packages/builder/src/stores/backend/tests/queries.spec.js.disabled
similarity index 58%
rename from packages/builder/src/stores/backend/tests/queries.spec.js
rename to packages/builder/src/stores/backend/tests/queries.spec.js.disabled
index b4c1805c66..20db8e4a95 100644
--- a/packages/builder/src/stores/backend/tests/queries.spec.js
+++ b/packages/builder/src/stores/backend/tests/queries.spec.js.disabled
@@ -1,9 +1,9 @@
-import { get } from 'svelte/store'
-import api from 'builderStore/api'
+import { get } from "svelte/store"
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
 
-import { SOME_QUERY, SAVE_QUERY_RESPONSE } from './fixtures/queries'
+import { SOME_QUERY, SAVE_QUERY_RESPONSE } from "./fixtures/queries"
 
 import { createQueriesStore } from "../queries"
 
@@ -11,36 +11,36 @@ describe("Queries Store", () => {
   let store = createQueriesStore()
 
   beforeEach(async () => {
-    api.get.mockReturnValue({ json: () => [SOME_QUERY]})
+    API.getQueries.mockReturnValue({ json: () => [SOME_QUERY]})
     await store.init()
   })
 
   it("Initialises correctly", async () => {
-    api.get.mockReturnValue({ json: () => [SOME_QUERY]})
-  
+    API.getQueries.mockReturnValue({ json: () => [SOME_QUERY]})
+
     await store.init()
     expect(get(store)).toEqual({ list: [SOME_QUERY], selected: null})
   })
 
   it("fetches all the queries", async () => {
-    api.get.mockReturnValue({ json: () => [SOME_QUERY]})
+    API.getQueries.mockReturnValue({ json: () => [SOME_QUERY]})
 
     await store.fetch()
-    expect(get(store)).toEqual({ list: [SOME_QUERY], selected: null})  
+    expect(get(store)).toEqual({ list: [SOME_QUERY], selected: null})
   })
 
   it("saves the query, updates the store and returns status message", async () => {
-    api.post.mockReturnValue({ json: () => SAVE_QUERY_RESPONSE})    
+    API.saveQuery.mockReturnValue({ json: () => SAVE_QUERY_RESPONSE})
 
     await store.select(SOME_QUERY.datasourceId, SOME_QUERY)
 
     expect(get(store).list).toEqual(expect.arrayContaining([SOME_QUERY]))
   })
   it("deletes a query, updates the store and returns status message", async () => {
-    
-    api.delete.mockReturnValue({status: 200, message: `Query deleted.`})  
-    
+
+    API.deleteQuery.mockReturnValue({status: 200, message: `Query deleted.`})
+
     await store.delete(SOME_QUERY)
-    expect(get(store)).toEqual({ list: [], selected: null})  
+    expect(get(store)).toEqual({ list: [], selected: null})
   })
 })
\ No newline at end of file
diff --git a/packages/builder/src/stores/backend/tests/roles.spec.js b/packages/builder/src/stores/backend/tests/roles.spec.js.disabled
similarity index 56%
rename from packages/builder/src/stores/backend/tests/roles.spec.js
rename to packages/builder/src/stores/backend/tests/roles.spec.js.disabled
index 13861f6359..b729c27ce6 100644
--- a/packages/builder/src/stores/backend/tests/roles.spec.js
+++ b/packages/builder/src/stores/backend/tests/roles.spec.js.disabled
@@ -1,10 +1,10 @@
-import { get } from 'svelte/store'
-import api from 'builderStore/api'
+import { get } from "svelte/store"
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
 
 import { createRolesStore } from "../roles"
-import { ROLES } from './fixtures/roles'
+import { ROLES } from "./fixtures/roles"
 
 describe("Roles Store", () => {
   let store = createRolesStore()
@@ -14,19 +14,18 @@ describe("Roles Store", () => {
   })
 
   it("fetches roles from backend", async () => {
-    api.get.mockReturnValue({ json: () => ROLES})
+    API.getRoles.mockReturnValue({ json: () => ROLES})
     await store.fetch()
 
-    expect(api.get).toBeCalledWith("/api/roles")
     expect(get(store)).toEqual(ROLES)
   })
 
   it("deletes a role", async () => {
-    api.get.mockReturnValueOnce({ json: () => ROLES})
+    API.getRoles.mockReturnValueOnce({ json: () => ROLES})
     await store.fetch()
-    
-    api.delete.mockReturnValue({status: 200, message: `Role deleted.`})
-    
+
+    API.deleteRole.mockReturnValue({status: 200, message: `Role deleted.`})
+
     const updatedRoles = [...ROLES.slice(1)]
     await store.delete(ROLES[0])
 
diff --git a/packages/builder/src/stores/backend/tests/tables.spec.js b/packages/builder/src/stores/backend/tests/tables.spec.js.disabled
similarity index 56%
rename from packages/builder/src/stores/backend/tests/tables.spec.js
rename to packages/builder/src/stores/backend/tests/tables.spec.js.disabled
index 06f8d3097b..26b4d90229 100644
--- a/packages/builder/src/stores/backend/tests/tables.spec.js
+++ b/packages/builder/src/stores/backend/tests/tables.spec.js.disabled
@@ -1,18 +1,16 @@
-import { get } from 'svelte/store'
-import api from 'builderStore/api'
+import { get } from "svelte/store"
+import { API } from "api"
 
-jest.mock('builderStore/api');
-
-import { SOME_TABLES, SAVE_TABLES_RESPONSE, A_TABLE } from './fixtures/tables'
+jest.mock("api")
 
+import { SOME_TABLES, SAVE_TABLES_RESPONSE, A_TABLE } from "./fixtures/tables"
 import { createTablesStore } from "../tables"
-import { views } from '../views'
 
 describe("Tables Store", () => {
   let store = createTablesStore()
 
   beforeEach(async () => {
-    api.get.mockReturnValue({ json: () => SOME_TABLES})
+    API.getTables.mockReturnValue({ json: () => SOME_TABLES})
     await store.init()
   })
 
@@ -21,46 +19,46 @@ describe("Tables Store", () => {
   })
 
   it("fetches all the tables", async () => {
-    api.get.mockReturnValue({ json: () => SOME_TABLES})
+    API.getTables.mockReturnValue({ json: () => SOME_TABLES})
 
     await store.fetch()
-    expect(get(store)).toEqual({ list: SOME_TABLES, selected: {}, draft: {}})  
+    expect(get(store)).toEqual({ list: SOME_TABLES, selected: {}, draft: {}})
   })
 
   it("selects a table", async () => {
     const tableToSelect = SOME_TABLES[0]
     await store.select(tableToSelect)
-  
-    expect(get(store).selected).toEqual(tableToSelect) 
-    expect(get(store).draft).toEqual(tableToSelect) 
+
+    expect(get(store).selected).toEqual(tableToSelect)
+    expect(get(store).draft).toEqual(tableToSelect)
   })
 
   it("selecting without a param resets the selected property", async () => {
     await store.select()
-  
-    expect(get(store).draft).toEqual({}) 
+
+    expect(get(store).draft).toEqual({})
   })
 
   it("saving a table also selects it", async () => {
-    api.post.mockReturnValue({ status: 200, json: () => SAVE_TABLES_RESPONSE})
+    API.post.mockReturnValue({ status: 200, json: () => SAVE_TABLES_RESPONSE})
 
     await store.save(A_TABLE)
 
-    expect(get(store).selected).toEqual(SAVE_TABLES_RESPONSE) 
+    expect(get(store).selected).toEqual(SAVE_TABLES_RESPONSE)
   })
 
   it("saving the table returns a response", async () => {
-    api.post.mockReturnValue({ status: 200, json: () => SAVE_TABLES_RESPONSE})
+    API.saveTable.mockReturnValue({ status: 200, json: () => SAVE_TABLES_RESPONSE})
 
     const response = await store.save(A_TABLE)
 
-    expect(response).toEqual(SAVE_TABLES_RESPONSE) 
+    expect(response).toEqual(SAVE_TABLES_RESPONSE)
   })
   it("deleting a table removes it from the store", async () => {
-    api.delete.mockReturnValue({status: 200, message: `Table deleted.`})  
-    
+    API.deleteTable.mockReturnValue({status: 200, message: `Table deleted.`})
+
     await store.delete(A_TABLE)
-    expect(get(store).list).toEqual(expect.not.arrayContaining([A_TABLE]))  
+    expect(get(store).list).toEqual(expect.not.arrayContaining([A_TABLE]))
   })
 
   // TODO: Write tests for saving and deleting fields

From 1505dcbc667e317a8b2e721c0621605bb6c68c6e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 16 Sep 2022 11:25:28 +0100
Subject: [PATCH 09/36] Minor fix - datasource hot reloading was working apart
 from the the CJS require caching, need to clear down the cache entry before
 reloading.

---
 packages/server/src/utilities/fileSystem/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index 96d8c85e0b..21a2a550f2 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -412,6 +412,7 @@ exports.getDatasourcePlugin = async (name, url, hash) => {
       return require(filename)
     } else {
       console.log(`Updating plugin: ${name}`)
+      delete require.cache[require.resolve(filename)]
       fs.unlinkSync(filename)
     }
   }

From 463d6238d270324638761183110f61dd0e448508 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 16 Sep 2022 11:33:12 +0000
Subject: [PATCH 10/36] v1.3.20

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  4 ++--
 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, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9ee0748de3..56a29e45c9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.19",
+  "version": "1.3.20",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2cf6c6ddd9..0303028570 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "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.3.19",
+    "@budibase/types": "^1.3.20",
     "@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 43d6e5265d..04e6385492 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.3.19",
+  "version": "1.3.20",
   "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.3.19",
+    "@budibase/string-templates": "^1.3.20",
     "@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 1c9e1f744e..85bd287eaa 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.3.19",
-    "@budibase/client": "^1.3.19",
-    "@budibase/frontend-core": "^1.3.19",
-    "@budibase/string-templates": "^1.3.19",
+    "@budibase/bbui": "^1.3.20",
+    "@budibase/client": "^1.3.20",
+    "@budibase/frontend-core": "^1.3.20",
+    "@budibase/string-templates": "^1.3.20",
     "@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 9dd2793836..bc4181f9a0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,7 +26,7 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^1.3.19",
+    "@budibase/backend-core": "^1.3.20",
     "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 44c5ab1c5f..23ed24b0b5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "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.3.19",
-    "@budibase/frontend-core": "^1.3.19",
-    "@budibase/string-templates": "^1.3.19",
+    "@budibase/bbui": "^1.3.20",
+    "@budibase/frontend-core": "^1.3.20",
+    "@budibase/string-templates": "^1.3.20",
     "@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 44ca48f354..6747b219dc 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.3.19",
+    "@budibase/bbui": "^1.3.20",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 8282a6f235..de2cfc2d48 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "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.3.19",
-    "@budibase/client": "^1.3.19",
+    "@budibase/backend-core": "^1.3.20",
+    "@budibase/client": "^1.3.20",
     "@budibase/pro": "1.3.19",
-    "@budibase/string-templates": "^1.3.19",
-    "@budibase/types": "^1.3.19",
+    "@budibase/string-templates": "^1.3.20",
+    "@budibase/types": "^1.3.20",
     "@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 9eb9245cf0..1d3e969991 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "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 6264e4ca06..6241dd67ab 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "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 7db0e5d68e..d9b4916063 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.3.19",
+    "@budibase/backend-core": "^1.3.20",
     "@budibase/pro": "1.3.19",
-    "@budibase/string-templates": "^1.3.19",
-    "@budibase/types": "^1.3.19",
+    "@budibase/string-templates": "^1.3.20",
+    "@budibase/types": "^1.3.20",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From b86121efe78de689182f6024391eef2e8659dd1a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 16 Sep 2022 11:33:30 +0000
Subject: [PATCH 11/36] v1.3.19-alpha.7

---
 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/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lerna.json b/lerna.json
index 87fc470b92..75bef40f71 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 92ac2acbd1..75f31f4723 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "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.3.19-alpha.6",
+    "@budibase/types": "1.3.19-alpha.7",
     "@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 d19fdaecdd..22b64b2a24 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.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "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.3.19-alpha.6",
+    "@budibase/string-templates": "1.3.19-alpha.7",
     "@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 bd7cb3e881..7a14a65d7f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.3.19-alpha.6",
-    "@budibase/client": "1.3.19-alpha.6",
-    "@budibase/frontend-core": "1.3.19-alpha.6",
-    "@budibase/string-templates": "1.3.19-alpha.6",
+    "@budibase/bbui": "1.3.19-alpha.7",
+    "@budibase/client": "1.3.19-alpha.7",
+    "@budibase/frontend-core": "1.3.19-alpha.7",
+    "@budibase/string-templates": "1.3.19-alpha.7",
     "@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 a034023b82..c37cf83268 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "1.3.19-alpha.6",
-    "@budibase/string-templates": "1.3.19-alpha.6",
-    "@budibase/types": "1.3.19-alpha.6",
+    "@budibase/backend-core": "1.3.19-alpha.7",
+    "@budibase/string-templates": "1.3.19-alpha.7",
+    "@budibase/types": "1.3.19-alpha.7",
     "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 0f2be2d085..1aa3b9dbbc 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "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.3.19-alpha.6",
-    "@budibase/frontend-core": "1.3.19-alpha.6",
-    "@budibase/string-templates": "1.3.19-alpha.6",
+    "@budibase/bbui": "1.3.19-alpha.7",
+    "@budibase/frontend-core": "1.3.19-alpha.7",
+    "@budibase/string-templates": "1.3.19-alpha.7",
     "@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 74429b2136..92f375cc81 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.3.19-alpha.6",
+    "@budibase/bbui": "1.3.19-alpha.7",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 75ddba9035..a75eaaabc1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "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.3.19-alpha.6",
-    "@budibase/client": "1.3.19-alpha.6",
+    "@budibase/backend-core": "1.3.19-alpha.7",
+    "@budibase/client": "1.3.19-alpha.7",
     "@budibase/pro": "1.3.19-alpha.6",
-    "@budibase/string-templates": "1.3.19-alpha.6",
-    "@budibase/types": "1.3.19-alpha.6",
+    "@budibase/string-templates": "1.3.19-alpha.7",
+    "@budibase/types": "1.3.19-alpha.7",
     "@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 003a6d496b..388ca34060 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "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 a5579864cc..ec161a9b63 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "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 226dffe73c..f6b6855761 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.19-alpha.6",
+  "version": "1.3.19-alpha.7",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.3.19-alpha.6",
+    "@budibase/backend-core": "1.3.19-alpha.7",
     "@budibase/pro": "1.3.19-alpha.6",
-    "@budibase/string-templates": "1.3.19-alpha.6",
-    "@budibase/types": "1.3.19-alpha.6",
+    "@budibase/string-templates": "1.3.19-alpha.7",
+    "@budibase/types": "1.3.19-alpha.7",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 096b3ee6fc8c55d0c6d56ff9c97fa5ec23e02e94 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 16 Sep 2022 11:36:42 +0000
Subject: [PATCH 12/36] Update pro version to 1.3.20

---
 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 de2cfc2d48..94a3c99fba 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.3.20",
     "@budibase/client": "^1.3.20",
-    "@budibase/pro": "1.3.19",
+    "@budibase/pro": "1.3.20",
     "@budibase/string-templates": "^1.3.20",
     "@budibase/types": "^1.3.20",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index b0152857ef..f180d23ad4 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.3.19":
-  version "1.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.19.tgz#e931959bd3f27a42fecef4b9f2534d38341186d6"
-  integrity sha512-q6eEVHWyZoWuq0ioguYoMDXUMEqUU1oBcpwlgt3uVNd5qbeiIoXJ01UEWmX7F22jayy/r48hZ2LhgsuK49siPA==
+"@budibase/backend-core@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.20.tgz#eb8202b6b68682a0db8d99779ea4056671b9bec8"
+  integrity sha512-s9z/UgRcuwDGAXjyTD7jsaW8ArbFhoBJkfwX5wTOE/CHsYMtaIARPco2QDiTi5XkmgpQdwWCADaE3n0vha7KsQ==
   dependencies:
-    "@budibase/types" "^1.3.19"
+    "@budibase/types" "^1.3.20"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1179,13 +1179,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.3.19":
-  version "1.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.19.tgz#8779ba80b75dcc58e17ba52e0db5fbea5125b8ea"
-  integrity sha512-FnoZxyS81axaV/7lZMcByzHkXjupCxqKg+DzmfYfIduGY4mxlvWmpR+oXmqUF3GMAGWRfiGAfaNzKbUGi/aTQg==
+"@budibase/pro@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.20.tgz#c6848287fcd0adcb350b90e999f1d4038b025262"
+  integrity sha512-Xp/fgP5B+pxHqVhKukgyMXK7eHlLhsZV9/u0osB7KfOh42sRgst7HSra6ZjMAOmNY/kWQvvtt0KCmER13uYtbA==
   dependencies:
-    "@budibase/backend-core" "1.3.19"
-    "@budibase/types" "1.3.19"
+    "@budibase/backend-core" "1.3.20"
+    "@budibase/types" "1.3.20"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1208,10 +1208,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.3.19", "@budibase/types@^1.3.19":
-  version "1.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.19.tgz#83e68580a7ecfd18c194ade96e23dbe87abc4a33"
-  integrity sha512-8ugQpWl3rPfxBECct8yHiKTM56k/dSrYbOwfGFeaObVQGLOD57sp0TQnbx6upJZmcYBRC0neMR8F+EuTjLKvJQ==
+"@budibase/types@1.3.20", "@budibase/types@^1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.20.tgz#58efe3d10693faa939e6068b95c17f8c2b064729"
+  integrity sha512-LlbqS4JMKtSPbYoTE7BEUDEutvhleUSPd2aLBOYlkMPcPB9hNM4PSwC5UTGZeBJNRaE2nM+iz+5huVYKLzD9cQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d9b4916063..a9f18133f4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.3.20",
-    "@budibase/pro": "1.3.19",
+    "@budibase/pro": "1.3.20",
     "@budibase/string-templates": "^1.3.20",
     "@budibase/types": "^1.3.20",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index e4917b9eb4..690924f961 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.3.19":
-  version "1.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.19.tgz#e931959bd3f27a42fecef4b9f2534d38341186d6"
-  integrity sha512-q6eEVHWyZoWuq0ioguYoMDXUMEqUU1oBcpwlgt3uVNd5qbeiIoXJ01UEWmX7F22jayy/r48hZ2LhgsuK49siPA==
+"@budibase/backend-core@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.20.tgz#eb8202b6b68682a0db8d99779ea4056671b9bec8"
+  integrity sha512-s9z/UgRcuwDGAXjyTD7jsaW8ArbFhoBJkfwX5wTOE/CHsYMtaIARPco2QDiTi5XkmgpQdwWCADaE3n0vha7KsQ==
   dependencies:
-    "@budibase/types" "^1.3.19"
+    "@budibase/types" "^1.3.20"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -326,21 +326,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.3.19":
-  version "1.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.19.tgz#8779ba80b75dcc58e17ba52e0db5fbea5125b8ea"
-  integrity sha512-FnoZxyS81axaV/7lZMcByzHkXjupCxqKg+DzmfYfIduGY4mxlvWmpR+oXmqUF3GMAGWRfiGAfaNzKbUGi/aTQg==
+"@budibase/pro@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.20.tgz#c6848287fcd0adcb350b90e999f1d4038b025262"
+  integrity sha512-Xp/fgP5B+pxHqVhKukgyMXK7eHlLhsZV9/u0osB7KfOh42sRgst7HSra6ZjMAOmNY/kWQvvtt0KCmER13uYtbA==
   dependencies:
-    "@budibase/backend-core" "1.3.19"
-    "@budibase/types" "1.3.19"
+    "@budibase/backend-core" "1.3.20"
+    "@budibase/types" "1.3.20"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.19", "@budibase/types@^1.3.19":
-  version "1.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.19.tgz#83e68580a7ecfd18c194ade96e23dbe87abc4a33"
-  integrity sha512-8ugQpWl3rPfxBECct8yHiKTM56k/dSrYbOwfGFeaObVQGLOD57sp0TQnbx6upJZmcYBRC0neMR8F+EuTjLKvJQ==
+"@budibase/types@1.3.20", "@budibase/types@^1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.20.tgz#58efe3d10693faa939e6068b95c17f8c2b064729"
+  integrity sha512-LlbqS4JMKtSPbYoTE7BEUDEutvhleUSPd2aLBOYlkMPcPB9hNM4PSwC5UTGZeBJNRaE2nM+iz+5huVYKLzD9cQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 269b2841431f2d661489ea03ca04fba67df8b5af Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 16 Sep 2022 11:37:15 +0000
Subject: [PATCH 13/36] Update pro version to 1.3.19-alpha.7

---
 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 a75eaaabc1..0b668d9d9e 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.3.19-alpha.7",
     "@budibase/client": "1.3.19-alpha.7",
-    "@budibase/pro": "1.3.19-alpha.6",
+    "@budibase/pro": "1.3.19-alpha.7",
     "@budibase/string-templates": "1.3.19-alpha.7",
     "@budibase/types": "1.3.19-alpha.7",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index dd95943c3e..e9486e6e57 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.3.19-alpha.6":
-  version "1.3.19-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.19-alpha.6.tgz#12f22db2b09ea7586cafb2eb2c375914c8467188"
-  integrity sha512-Kp9OaU80fZO1fEi/EA45eSz3zFYWzQHBfuy7XKzJ0MBKYPCvPteIXcXaANeUoHJE9rDGVUHM9nxLxnSfRUGy0Q==
+"@budibase/backend-core@1.3.19-alpha.7":
+  version "1.3.19-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.19-alpha.7.tgz#d5bd80676deb03082e186f793f54fe011e6d1e25"
+  integrity sha512-Y8XHjLdfkM1VqHTuxTw0Lpr5uYzhV2+vKnrEIcrXKYZaK94ZTTjP0p2q24Ptm6kyK9Jx69KydAFSTA9Zc+deXQ==
   dependencies:
-    "@budibase/types" "1.3.19-alpha.6"
+    "@budibase/types" "1.3.19-alpha.7"
     "@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@1.3.19-alpha.6":
-  version "1.3.19-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.19-alpha.6.tgz#a30340dbd6aa52658312155a5ce0828d0cfc4621"
-  integrity sha512-ntyjKIoiAcCIPJAjwmZ19kcHOiduIcuia3htd5njzSNYrPerqmAty8g5oiBrjeK5ckMd8J3VQeCUdk0Lq1Mdfw==
+"@budibase/pro@1.3.19-alpha.7":
+  version "1.3.19-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.19-alpha.7.tgz#f69783cd178f355888e30b8fda14bd42588d8eff"
+  integrity sha512-0/uCBVduAtl5JTEo7dvTt8L4yWWWr6Li9hJA9FzITRgQ163A10BofTQxzMW7/JcO6kDz1p1bUW74JlXb02z96w==
   dependencies:
-    "@budibase/backend-core" "1.3.19-alpha.6"
-    "@budibase/types" "1.3.19-alpha.6"
+    "@budibase/backend-core" "1.3.19-alpha.7"
+    "@budibase/types" "1.3.19-alpha.7"
     "@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@1.3.19-alpha.6":
-  version "1.3.19-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.19-alpha.6.tgz#55ee8c67c2d4bc5ddf009ed1b22094e70d38f8ad"
-  integrity sha512-ApDkaWDpD4BmsmmzxqnSBcj2Q4PGBzkh+49MFZb8F+pdzcDHUQzbVwzVgfBVUS2lHhmZSfBM4sGsfGsBMd+Izw==
+"@budibase/types@1.3.19-alpha.7":
+  version "1.3.19-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.19-alpha.7.tgz#81a0d667110e80092e364c53c776949c7a722599"
+  integrity sha512-xgAxtcDnyZLC+Mi1yD3mnVCdg0S+FxYPwd2CMX8Qw98bnJU0LJ6cB9wF8iLafsOjyGmezDOjiuzT977WesTMUw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index f6b6855761..4221dc3937 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.3.19-alpha.7",
-    "@budibase/pro": "1.3.19-alpha.6",
+    "@budibase/pro": "1.3.19-alpha.7",
     "@budibase/string-templates": "1.3.19-alpha.7",
     "@budibase/types": "1.3.19-alpha.7",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index abbc00ae9b..01e12d0ed1 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.3.19-alpha.6":
-  version "1.3.19-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.19-alpha.6.tgz#12f22db2b09ea7586cafb2eb2c375914c8467188"
-  integrity sha512-Kp9OaU80fZO1fEi/EA45eSz3zFYWzQHBfuy7XKzJ0MBKYPCvPteIXcXaANeUoHJE9rDGVUHM9nxLxnSfRUGy0Q==
+"@budibase/backend-core@1.3.19-alpha.7":
+  version "1.3.19-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.19-alpha.7.tgz#d5bd80676deb03082e186f793f54fe011e6d1e25"
+  integrity sha512-Y8XHjLdfkM1VqHTuxTw0Lpr5uYzhV2+vKnrEIcrXKYZaK94ZTTjP0p2q24Ptm6kyK9Jx69KydAFSTA9Zc+deXQ==
   dependencies:
-    "@budibase/types" "1.3.19-alpha.6"
+    "@budibase/types" "1.3.19-alpha.7"
     "@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@1.3.19-alpha.6":
-  version "1.3.19-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.19-alpha.6.tgz#a30340dbd6aa52658312155a5ce0828d0cfc4621"
-  integrity sha512-ntyjKIoiAcCIPJAjwmZ19kcHOiduIcuia3htd5njzSNYrPerqmAty8g5oiBrjeK5ckMd8J3VQeCUdk0Lq1Mdfw==
+"@budibase/pro@1.3.19-alpha.7":
+  version "1.3.19-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.19-alpha.7.tgz#f69783cd178f355888e30b8fda14bd42588d8eff"
+  integrity sha512-0/uCBVduAtl5JTEo7dvTt8L4yWWWr6Li9hJA9FzITRgQ163A10BofTQxzMW7/JcO6kDz1p1bUW74JlXb02z96w==
   dependencies:
-    "@budibase/backend-core" "1.3.19-alpha.6"
-    "@budibase/types" "1.3.19-alpha.6"
+    "@budibase/backend-core" "1.3.19-alpha.7"
+    "@budibase/types" "1.3.19-alpha.7"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.19-alpha.6":
-  version "1.3.19-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.19-alpha.6.tgz#55ee8c67c2d4bc5ddf009ed1b22094e70d38f8ad"
-  integrity sha512-ApDkaWDpD4BmsmmzxqnSBcj2Q4PGBzkh+49MFZb8F+pdzcDHUQzbVwzVgfBVUS2lHhmZSfBM4sGsfGsBMd+Izw==
+"@budibase/types@1.3.19-alpha.7":
+  version "1.3.19-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.19-alpha.7.tgz#81a0d667110e80092e364c53c776949c7a722599"
+  integrity sha512-xgAxtcDnyZLC+Mi1yD3mnVCdg0S+FxYPwd2CMX8Qw98bnJU0LJ6cB9wF8iLafsOjyGmezDOjiuzT977WesTMUw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 95d427cdf7f197a1da5cb8029d3906e46b96f100 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 16 Sep 2022 15:30:27 +0000
Subject: [PATCH 14/36] v1.3.21-alpha.0

---
 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/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lerna.json b/lerna.json
index 56a29e45c9..172a1dbaa4 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 0c3868933f..2bea6f846a 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "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.3.20",
+    "@budibase/types": "1.3.21-alpha.0",
     "@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 04e6385492..a98c76e679 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.3.20",
+  "version": "1.3.21-alpha.0",
   "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.3.20",
+    "@budibase/string-templates": "1.3.21-alpha.0",
     "@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 de949460da..a65f840f3d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.3.20",
-    "@budibase/client": "1.3.20",
-    "@budibase/frontend-core": "1.3.20",
-    "@budibase/string-templates": "1.3.20",
+    "@budibase/bbui": "1.3.21-alpha.0",
+    "@budibase/client": "1.3.21-alpha.0",
+    "@budibase/frontend-core": "1.3.21-alpha.0",
+    "@budibase/string-templates": "1.3.21-alpha.0",
     "@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 58ab707653..b3cfff7525 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "1.3.20",
-    "@budibase/string-templates": "1.3.20",
-    "@budibase/types": "1.3.20",
+    "@budibase/backend-core": "1.3.21-alpha.0",
+    "@budibase/string-templates": "1.3.21-alpha.0",
+    "@budibase/types": "1.3.21-alpha.0",
     "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 d894346187..beb3d87cad 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "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.3.20",
-    "@budibase/frontend-core": "1.3.20",
-    "@budibase/string-templates": "1.3.20",
+    "@budibase/bbui": "1.3.21-alpha.0",
+    "@budibase/frontend-core": "1.3.21-alpha.0",
+    "@budibase/string-templates": "1.3.21-alpha.0",
     "@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 72724e44a6..2729e6cd02 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.3.20",
+    "@budibase/bbui": "1.3.21-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index ef49c93e10..46f3aee4b0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "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.3.20",
-    "@budibase/client": "1.3.20",
+    "@budibase/backend-core": "1.3.21-alpha.0",
+    "@budibase/client": "1.3.21-alpha.0",
     "@budibase/pro": "1.3.20",
-    "@budibase/string-templates": "1.3.20",
-    "@budibase/types": "1.3.20",
+    "@budibase/string-templates": "1.3.21-alpha.0",
+    "@budibase/types": "1.3.21-alpha.0",
     "@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 204772958d..c38060180c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "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 b78aa3a3a8..1ee5368c43 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "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 d329b15b1c..3029555654 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.20",
+  "version": "1.3.21-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.3.20",
+    "@budibase/backend-core": "1.3.21-alpha.0",
     "@budibase/pro": "1.3.20",
-    "@budibase/string-templates": "1.3.20",
-    "@budibase/types": "1.3.20",
+    "@budibase/string-templates": "1.3.21-alpha.0",
+    "@budibase/types": "1.3.21-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From e1c664374674d8f3f66150434da2cf19b98ed8de Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 16 Sep 2022 15:33:56 +0000
Subject: [PATCH 15/36] Update pro version to 1.3.21-alpha.0

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 46f3aee4b0..6a009cc165 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.3.21-alpha.0",
     "@budibase/client": "1.3.21-alpha.0",
-    "@budibase/pro": "1.3.20",
+    "@budibase/pro": "1.3.21-alpha.0",
     "@budibase/string-templates": "1.3.21-alpha.0",
     "@budibase/types": "1.3.21-alpha.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 71d33404fa..1ad9d478c6 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,16 +1094,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.20.tgz#eb8202b6b68682a0db8d99779ea4056671b9bec8"
-  integrity sha512-s9z/UgRcuwDGAXjyTD7jsaW8ArbFhoBJkfwX5wTOE/CHsYMtaIARPco2QDiTi5XkmgpQdwWCADaE3n0vha7KsQ==
+"@budibase/backend-core@1.3.21-alpha.0":
+  version "1.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.0.tgz#f64dc43f38e1ba8d43ae99fdb67f1f052a0af68e"
+  integrity sha512-eVQXs9+ddfjtGYNanXkFCgYYxVwI90To4y1LY3CfUvegcDaJIt26XX9B7uKNwRdWl37XqptwbmaqDfsWlsxIew==
   dependencies:
-    "@budibase/types" "^1.3.20"
+    "@budibase/types" "1.3.21-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
+    bcryptjs "2.4.3"
     dotenv "16.0.1"
     emitter-listener "1.1.2"
     ioredis "4.28.0"
@@ -1179,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.20.tgz#c6848287fcd0adcb350b90e999f1d4038b025262"
-  integrity sha512-Xp/fgP5B+pxHqVhKukgyMXK7eHlLhsZV9/u0osB7KfOh42sRgst7HSra6ZjMAOmNY/kWQvvtt0KCmER13uYtbA==
+"@budibase/pro@1.3.21-alpha.0":
+  version "1.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.0.tgz#e6f3b1b044ff8da0d63fece6b86f10ed076dba6b"
+  integrity sha512-NPKZEo9Pz+XFA2/6KUFMhhPIpNzUBZ1AZzQeyeCyjZtXA88ipVA7xdhiJp0OJg1eXwo/QWB1KM/HY7q1kKDkWg==
   dependencies:
-    "@budibase/backend-core" "1.3.20"
-    "@budibase/types" "1.3.20"
+    "@budibase/backend-core" "1.3.21-alpha.0"
+    "@budibase/types" "1.3.21-alpha.0"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1208,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.3.20", "@budibase/types@^1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.20.tgz#58efe3d10693faa939e6068b95c17f8c2b064729"
-  integrity sha512-LlbqS4JMKtSPbYoTE7BEUDEutvhleUSPd2aLBOYlkMPcPB9hNM4PSwC5UTGZeBJNRaE2nM+iz+5huVYKLzD9cQ==
+"@budibase/types@1.3.21-alpha.0":
+  version "1.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.0.tgz#665d76bfce66f3bdef064ac9e3bef13e6567da6d"
+  integrity sha512-IkNMFfARkRJRzTSeoRJhqI9hxdkwpq7Wodlj6Mk8++zcMm33RD2Yx4htTBAYEWeeTLYPu67hpvEjQ9OhAZUZNA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3029555654..68179dea08 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.3.21-alpha.0",
-    "@budibase/pro": "1.3.20",
+    "@budibase/pro": "1.3.21-alpha.0",
     "@budibase/string-templates": "1.3.21-alpha.0",
     "@budibase/types": "1.3.21-alpha.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 690924f961..0443cddd12 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,16 +291,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.20.tgz#eb8202b6b68682a0db8d99779ea4056671b9bec8"
-  integrity sha512-s9z/UgRcuwDGAXjyTD7jsaW8ArbFhoBJkfwX5wTOE/CHsYMtaIARPco2QDiTi5XkmgpQdwWCADaE3n0vha7KsQ==
+"@budibase/backend-core@1.3.21-alpha.0":
+  version "1.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.0.tgz#f64dc43f38e1ba8d43ae99fdb67f1f052a0af68e"
+  integrity sha512-eVQXs9+ddfjtGYNanXkFCgYYxVwI90To4y1LY3CfUvegcDaJIt26XX9B7uKNwRdWl37XqptwbmaqDfsWlsxIew==
   dependencies:
-    "@budibase/types" "^1.3.20"
+    "@budibase/types" "1.3.21-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
+    bcryptjs "2.4.3"
     dotenv "16.0.1"
     emitter-listener "1.1.2"
     ioredis "4.28.0"
@@ -326,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.20.tgz#c6848287fcd0adcb350b90e999f1d4038b025262"
-  integrity sha512-Xp/fgP5B+pxHqVhKukgyMXK7eHlLhsZV9/u0osB7KfOh42sRgst7HSra6ZjMAOmNY/kWQvvtt0KCmER13uYtbA==
+"@budibase/pro@1.3.21-alpha.0":
+  version "1.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.0.tgz#e6f3b1b044ff8da0d63fece6b86f10ed076dba6b"
+  integrity sha512-NPKZEo9Pz+XFA2/6KUFMhhPIpNzUBZ1AZzQeyeCyjZtXA88ipVA7xdhiJp0OJg1eXwo/QWB1KM/HY7q1kKDkWg==
   dependencies:
-    "@budibase/backend-core" "1.3.20"
-    "@budibase/types" "1.3.20"
+    "@budibase/backend-core" "1.3.21-alpha.0"
+    "@budibase/types" "1.3.21-alpha.0"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.20", "@budibase/types@^1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.20.tgz#58efe3d10693faa939e6068b95c17f8c2b064729"
-  integrity sha512-LlbqS4JMKtSPbYoTE7BEUDEutvhleUSPd2aLBOYlkMPcPB9hNM4PSwC5UTGZeBJNRaE2nM+iz+5huVYKLzD9cQ==
+"@budibase/types@1.3.21-alpha.0":
+  version "1.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.0.tgz#665d76bfce66f3bdef064ac9e3bef13e6567da6d"
+  integrity sha512-IkNMFfARkRJRzTSeoRJhqI9hxdkwpq7Wodlj6Mk8++zcMm33RD2Yx4htTBAYEWeeTLYPu67hpvEjQ9OhAZUZNA==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 2af219cf847fc62059c0e0956fa131500eb9aef3 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Fri, 16 Sep 2022 17:56:06 +0100
Subject: [PATCH 16/36] createComponents Test

Skip test file - these will be replaced with API tests. Leaving them skipped for now to be used as reference for API testing
---
 packages/builder/cypress/integration/createComponents.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/cypress/integration/createComponents.spec.js b/packages/builder/cypress/integration/createComponents.spec.js
index e39ce4a4a8..7f29466258 100644
--- a/packages/builder/cypress/integration/createComponents.spec.js
+++ b/packages/builder/cypress/integration/createComponents.spec.js
@@ -2,7 +2,7 @@ import filterTests from "../support/filterTests"
 const interact = require("../support/interact")
 
 filterTests(["all"], () => {
-  context("Create Components", () => {
+  xcontext("Create Components", () => {
     let headlineId
 
     before(() => {

From 01d92902c4c6a0a63c22d02e3a948bfd80d4ec0b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 16 Sep 2022 17:36:27 +0000
Subject: [PATCH 17/36] v1.3.21-alpha.1

---
 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/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 11 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lerna.json b/lerna.json
index 172a1dbaa4..8c8f8a9dd8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2bea6f846a..360383fe3e 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "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.3.21-alpha.0",
+    "@budibase/types": "1.3.21-alpha.1",
     "@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 a98c76e679..3abef9c24c 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.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "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.3.21-alpha.0",
+    "@budibase/string-templates": "1.3.21-alpha.1",
     "@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 a65f840f3d..608e84c1f8 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.3.21-alpha.0",
-    "@budibase/client": "1.3.21-alpha.0",
-    "@budibase/frontend-core": "1.3.21-alpha.0",
-    "@budibase/string-templates": "1.3.21-alpha.0",
+    "@budibase/bbui": "1.3.21-alpha.1",
+    "@budibase/client": "1.3.21-alpha.1",
+    "@budibase/frontend-core": "1.3.21-alpha.1",
+    "@budibase/string-templates": "1.3.21-alpha.1",
     "@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 b3cfff7525..7b29966fb7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "1.3.21-alpha.0",
-    "@budibase/string-templates": "1.3.21-alpha.0",
-    "@budibase/types": "1.3.21-alpha.0",
+    "@budibase/backend-core": "1.3.21-alpha.1",
+    "@budibase/string-templates": "1.3.21-alpha.1",
+    "@budibase/types": "1.3.21-alpha.1",
     "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 beb3d87cad..aa263e8fec 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "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.3.21-alpha.0",
-    "@budibase/frontend-core": "1.3.21-alpha.0",
-    "@budibase/string-templates": "1.3.21-alpha.0",
+    "@budibase/bbui": "1.3.21-alpha.1",
+    "@budibase/frontend-core": "1.3.21-alpha.1",
+    "@budibase/string-templates": "1.3.21-alpha.1",
     "@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 2729e6cd02..d62ce52e01 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.3.21-alpha.0",
+    "@budibase/bbui": "1.3.21-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 6a009cc165..2a7f744ffe 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "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.3.21-alpha.0",
-    "@budibase/client": "1.3.21-alpha.0",
+    "@budibase/backend-core": "1.3.21-alpha.1",
+    "@budibase/client": "1.3.21-alpha.1",
     "@budibase/pro": "1.3.21-alpha.0",
-    "@budibase/string-templates": "1.3.21-alpha.0",
-    "@budibase/types": "1.3.21-alpha.0",
+    "@budibase/string-templates": "1.3.21-alpha.1",
+    "@budibase/types": "1.3.21-alpha.1",
     "@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 c38060180c..1f775ddfb6 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "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 1ee5368c43..de53f9677d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "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 68179dea08..e82ebf7d48 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.21-alpha.0",
+  "version": "1.3.21-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.3.21-alpha.0",
+    "@budibase/backend-core": "1.3.21-alpha.1",
     "@budibase/pro": "1.3.21-alpha.0",
-    "@budibase/string-templates": "1.3.21-alpha.0",
-    "@budibase/types": "1.3.21-alpha.0",
+    "@budibase/string-templates": "1.3.21-alpha.1",
+    "@budibase/types": "1.3.21-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From fd29e61c1d7d92d5c169e4fbb13dbf7755b49e65 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 16 Sep 2022 17:39:34 +0000
Subject: [PATCH 18/36] Update pro version to 1.3.21-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 2a7f744ffe..ee817727b6 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.3.21-alpha.1",
     "@budibase/client": "1.3.21-alpha.1",
-    "@budibase/pro": "1.3.21-alpha.0",
+    "@budibase/pro": "1.3.21-alpha.1",
     "@budibase/string-templates": "1.3.21-alpha.1",
     "@budibase/types": "1.3.21-alpha.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 1ad9d478c6..8bf15a7dc0 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.3.21-alpha.0":
-  version "1.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.0.tgz#f64dc43f38e1ba8d43ae99fdb67f1f052a0af68e"
-  integrity sha512-eVQXs9+ddfjtGYNanXkFCgYYxVwI90To4y1LY3CfUvegcDaJIt26XX9B7uKNwRdWl37XqptwbmaqDfsWlsxIew==
+"@budibase/backend-core@1.3.21-alpha.1":
+  version "1.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.1.tgz#066ec3673e07daf1ad6571281a01bcfee8cd89ce"
+  integrity sha512-UE7ucWKp0Z+z1EappACAxvuXSWLgUY/mkl98GSbrkg7SsDXpjaymC1HTH16Bc0eFzAEy6j4Ehjlg00yKRIIdJw==
   dependencies:
-    "@budibase/types" "1.3.21-alpha.0"
+    "@budibase/types" "1.3.21-alpha.1"
     "@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@1.3.21-alpha.0":
-  version "1.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.0.tgz#e6f3b1b044ff8da0d63fece6b86f10ed076dba6b"
-  integrity sha512-NPKZEo9Pz+XFA2/6KUFMhhPIpNzUBZ1AZzQeyeCyjZtXA88ipVA7xdhiJp0OJg1eXwo/QWB1KM/HY7q1kKDkWg==
+"@budibase/pro@1.3.21-alpha.1":
+  version "1.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.1.tgz#46a4492297b6efcd61821e6b3c24675954943b20"
+  integrity sha512-LkGKS9EuHI+is4kHzMVZjx8Ye00rLlqS66bOsutjDofpujaZBgA6hjIeh8RXYZ+C4DIexRczWLttX7+K3cm9Rw==
   dependencies:
-    "@budibase/backend-core" "1.3.21-alpha.0"
-    "@budibase/types" "1.3.21-alpha.0"
+    "@budibase/backend-core" "1.3.21-alpha.1"
+    "@budibase/types" "1.3.21-alpha.1"
     "@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@1.3.21-alpha.0":
-  version "1.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.0.tgz#665d76bfce66f3bdef064ac9e3bef13e6567da6d"
-  integrity sha512-IkNMFfARkRJRzTSeoRJhqI9hxdkwpq7Wodlj6Mk8++zcMm33RD2Yx4htTBAYEWeeTLYPu67hpvEjQ9OhAZUZNA==
+"@budibase/types@1.3.21-alpha.1":
+  version "1.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.1.tgz#2004f79ad6128f7058e92d06db64ede0e04a4e46"
+  integrity sha512-Kg/XNDu4bVKbPzIx3zHVf/Zo+JN0Qi1/W60WajVQMJFVZQQsVMbKqqJYV3dNW1FR9pnfCnuIe0nya5BEPmWgZQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e82ebf7d48..b102e075ad 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.3.21-alpha.1",
-    "@budibase/pro": "1.3.21-alpha.0",
+    "@budibase/pro": "1.3.21-alpha.1",
     "@budibase/string-templates": "1.3.21-alpha.1",
     "@budibase/types": "1.3.21-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 0443cddd12..679f8c791c 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.3.21-alpha.0":
-  version "1.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.0.tgz#f64dc43f38e1ba8d43ae99fdb67f1f052a0af68e"
-  integrity sha512-eVQXs9+ddfjtGYNanXkFCgYYxVwI90To4y1LY3CfUvegcDaJIt26XX9B7uKNwRdWl37XqptwbmaqDfsWlsxIew==
+"@budibase/backend-core@1.3.21-alpha.1":
+  version "1.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.1.tgz#066ec3673e07daf1ad6571281a01bcfee8cd89ce"
+  integrity sha512-UE7ucWKp0Z+z1EappACAxvuXSWLgUY/mkl98GSbrkg7SsDXpjaymC1HTH16Bc0eFzAEy6j4Ehjlg00yKRIIdJw==
   dependencies:
-    "@budibase/types" "1.3.21-alpha.0"
+    "@budibase/types" "1.3.21-alpha.1"
     "@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@1.3.21-alpha.0":
-  version "1.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.0.tgz#e6f3b1b044ff8da0d63fece6b86f10ed076dba6b"
-  integrity sha512-NPKZEo9Pz+XFA2/6KUFMhhPIpNzUBZ1AZzQeyeCyjZtXA88ipVA7xdhiJp0OJg1eXwo/QWB1KM/HY7q1kKDkWg==
+"@budibase/pro@1.3.21-alpha.1":
+  version "1.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.1.tgz#46a4492297b6efcd61821e6b3c24675954943b20"
+  integrity sha512-LkGKS9EuHI+is4kHzMVZjx8Ye00rLlqS66bOsutjDofpujaZBgA6hjIeh8RXYZ+C4DIexRczWLttX7+K3cm9Rw==
   dependencies:
-    "@budibase/backend-core" "1.3.21-alpha.0"
-    "@budibase/types" "1.3.21-alpha.0"
+    "@budibase/backend-core" "1.3.21-alpha.1"
+    "@budibase/types" "1.3.21-alpha.1"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.21-alpha.0":
-  version "1.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.0.tgz#665d76bfce66f3bdef064ac9e3bef13e6567da6d"
-  integrity sha512-IkNMFfARkRJRzTSeoRJhqI9hxdkwpq7Wodlj6Mk8++zcMm33RD2Yx4htTBAYEWeeTLYPu67hpvEjQ9OhAZUZNA==
+"@budibase/types@1.3.21-alpha.1":
+  version "1.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.1.tgz#2004f79ad6128f7058e92d06db64ede0e04a4e46"
+  integrity sha512-Kg/XNDu4bVKbPzIx3zHVf/Zo+JN0Qi1/W60WajVQMJFVZQQsVMbKqqJYV3dNW1FR9pnfCnuIe0nya5BEPmWgZQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 8bb51113bc8a97d76e294421e984a401cb076e86 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Sat, 17 Sep 2022 10:45:44 +0100
Subject: [PATCH 19/36] Fix for #7811 - Fixing an issue with the query binding
 builder - when executing the query you could no longer enrich the value
 binding.

---
 .../integration/QueryBindingBuilder.svelte    | 90 +++++++++++++------
 .../components/integration/QueryViewer.svelte |  2 +-
 .../QueryViewerBindingBuilder.svelte          | 69 ++++++++++++++
 3 files changed, 132 insertions(+), 29 deletions(-)
 create mode 100644 packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte

diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index 64736e5f78..255bee21dd 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -1,20 +1,31 @@
 <script>
-  import { Body, Button, Heading, Layout } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { getUserBindings } from "builderStore/dataBinding"
+  import { Body, Button, Heading, Icon, Input, Layout } from "@budibase/bbui"
+  import {
+    readableToRuntimeBinding,
+    runtimeToReadableBinding,
+  } from "builderStore/dataBinding"
+  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+
   export let bindable = true
   export let queryBindings = []
-
-  const userBindings = getUserBindings()
-
-  let internalBindings = queryBindings.reduce((acc, binding) => {
-    acc[binding.name] = binding.default
-    return acc
-  }, {})
+  export let bindings = []
+  export let customParams = {}
 
   function newQueryBinding() {
     queryBindings = [...queryBindings, {}]
   }
+
+  function deleteQueryBinding(idx) {
+    queryBindings.splice(idx, 1)
+    queryBindings = queryBindings
+  }
+
+  // This is necessary due to the way readable and writable bindings are stored.
+  // The readable binding in the UI gets converted to a UUID value that the client understands
+  // for parsing, then converted back so we can display it the readable form in the UI
+  function onBindingChange(param, valueToParse) {
+    customParams[param] = readableToRuntimeBinding(bindings, valueToParse)
+  }
 </script>
 
 <Layout noPadding={bindable} gap="S">
@@ -35,34 +46,57 @@
     {/if}
   </Body>
   <div class="bindings" class:bindable>
-    <KeyValueBuilder
-      bind:object={internalBindings}
-      tooltip="Set the name of the binding which can be used in Handlebars statements throughout your query"
-      name="binding"
-      headings
-      keyPlaceholder="Binding name"
-      valuePlaceholder="Default"
-      bindings={[...userBindings]}
-      bindingDrawerLeft="260px"
-      on:change={e => {
-        queryBindings = e.detail.map(binding => {
-          return {
-            name: binding.name,
-            default: binding.value,
-          }
-        })
-      }}
-    />
+    {#each queryBindings as binding, idx}
+      <Input
+        placeholder="Binding Name"
+        thin
+        disabled={bindable}
+        bind:value={binding.name}
+      />
+      <Input
+        placeholder="Default"
+        thin
+        disabled={bindable}
+        on:change={evt => onBindingChange(binding.name, evt.detail)}
+        bind:value={binding.default}
+      />
+      {#if bindable}
+        <DrawerBindableInput
+          title={`Query binding "${binding.name}"`}
+          placeholder="Value"
+          thin
+          on:change={evt => onBindingChange(binding.name, evt.detail)}
+          value={runtimeToReadableBinding(
+            bindings,
+            customParams?.[binding.name]
+          )}
+          {bindings}
+        />
+      {:else}
+        <Icon hoverable name="Close" on:click={() => deleteQueryBinding(idx)} />
+      {/if}
+    {/each}
   </div>
 </Layout>
 
 <style>
+  .bindings.bindable {
+    grid-template-columns: 1fr 1fr 1fr;
+  }
+
   .controls {
     display: flex;
     align-items: center;
     justify-content: space-between;
   }
 
+  .bindings {
+    display: grid;
+    grid-template-columns: 1fr 1fr 5%;
+    grid-gap: 10px;
+    align-items: center;
+  }
+
   .height {
     height: 40px;
   }
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 49b9b38d86..87b3dee45d 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -17,7 +17,7 @@
   import ExtraQueryConfig from "./ExtraQueryConfig.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import ExternalDataSourceTable from "components/backend/DataTable/ExternalDataSourceTable.svelte"
-  import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
+  import BindingBuilder from "components/integration/QueryViewerBindingBuilder.svelte"
   import { datasources, integrations, queries } from "stores/backend"
   import { capitalise } from "../../helpers"
   import CodeMirrorEditor from "components/common/CodeMirrorEditor.svelte"
diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
new file mode 100644
index 0000000000..64736e5f78
--- /dev/null
+++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
@@ -0,0 +1,69 @@
+<script>
+  import { Body, Button, Heading, Layout } from "@budibase/bbui"
+  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import { getUserBindings } from "builderStore/dataBinding"
+  export let bindable = true
+  export let queryBindings = []
+
+  const userBindings = getUserBindings()
+
+  let internalBindings = queryBindings.reduce((acc, binding) => {
+    acc[binding.name] = binding.default
+    return acc
+  }, {})
+
+  function newQueryBinding() {
+    queryBindings = [...queryBindings, {}]
+  }
+</script>
+
+<Layout noPadding={bindable} gap="S">
+  <div class="controls" class:height={!bindable}>
+    <Heading size="XS">Bindings</Heading>
+    {#if !bindable}
+      <Button secondary on:click={newQueryBinding}>Add Binding</Button>
+    {/if}
+  </div>
+  <Body size="S">
+    {#if !bindable}
+      Bindings come in two parts: the binding name, and a default/fallback
+      value. These bindings can be used as Handlebars expressions throughout the
+      query.
+    {:else}
+      Enter a value for each binding. The default values will be used for any
+      values left blank.
+    {/if}
+  </Body>
+  <div class="bindings" class:bindable>
+    <KeyValueBuilder
+      bind:object={internalBindings}
+      tooltip="Set the name of the binding which can be used in Handlebars statements throughout your query"
+      name="binding"
+      headings
+      keyPlaceholder="Binding name"
+      valuePlaceholder="Default"
+      bindings={[...userBindings]}
+      bindingDrawerLeft="260px"
+      on:change={e => {
+        queryBindings = e.detail.map(binding => {
+          return {
+            name: binding.name,
+            default: binding.value,
+          }
+        })
+      }}
+    />
+  </div>
+</Layout>
+
+<style>
+  .controls {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .height {
+    height: 40px;
+  }
+</style>

From 19ed43cb817a650c859e9d237c5053cd3ee54526 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Sat, 17 Sep 2022 10:41:13 +0000
Subject: [PATCH 20/36] v1.3.21

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  4 ++--
 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, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 56a29e45c9..9a21166025 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.20",
+  "version": "1.3.21",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 0303028570..e2a9d25dce 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "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.3.20",
+    "@budibase/types": "^1.3.21",
     "@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 04e6385492..8e41e3773f 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.3.20",
+  "version": "1.3.21",
   "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.3.20",
+    "@budibase/string-templates": "^1.3.21",
     "@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 85bd287eaa..11c96159c3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.3.20",
-    "@budibase/client": "^1.3.20",
-    "@budibase/frontend-core": "^1.3.20",
-    "@budibase/string-templates": "^1.3.20",
+    "@budibase/bbui": "^1.3.21",
+    "@budibase/client": "^1.3.21",
+    "@budibase/frontend-core": "^1.3.21",
+    "@budibase/string-templates": "^1.3.21",
     "@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 bc4181f9a0..c3d3c3f76d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,7 +26,7 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^1.3.20",
+    "@budibase/backend-core": "^1.3.21",
     "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 23ed24b0b5..75fc9d3ef4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "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.3.20",
-    "@budibase/frontend-core": "^1.3.20",
-    "@budibase/string-templates": "^1.3.20",
+    "@budibase/bbui": "^1.3.21",
+    "@budibase/frontend-core": "^1.3.21",
+    "@budibase/string-templates": "^1.3.21",
     "@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 6747b219dc..d5a3103ded 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.3.20",
+    "@budibase/bbui": "^1.3.21",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 94a3c99fba..b7153ee61b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "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.3.20",
-    "@budibase/client": "^1.3.20",
+    "@budibase/backend-core": "^1.3.21",
+    "@budibase/client": "^1.3.21",
     "@budibase/pro": "1.3.20",
-    "@budibase/string-templates": "^1.3.20",
-    "@budibase/types": "^1.3.20",
+    "@budibase/string-templates": "^1.3.21",
+    "@budibase/types": "^1.3.21",
     "@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 1d3e969991..2f27472439 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "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 6241dd67ab..071bead230 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "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 a9f18133f4..36b4138eb4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.3.20",
+    "@budibase/backend-core": "^1.3.21",
     "@budibase/pro": "1.3.20",
-    "@budibase/string-templates": "^1.3.20",
-    "@budibase/types": "^1.3.20",
+    "@budibase/string-templates": "^1.3.21",
+    "@budibase/types": "^1.3.21",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 9297be8b4180c776a054398af2a9da35a4892844 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Sat, 17 Sep 2022 10:44:20 +0000
Subject: [PATCH 21/36] Update pro version to 1.3.21

---
 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 b7153ee61b..c598fc8403 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.3.21",
     "@budibase/client": "^1.3.21",
-    "@budibase/pro": "1.3.20",
+    "@budibase/pro": "1.3.21",
     "@budibase/string-templates": "^1.3.21",
     "@budibase/types": "^1.3.21",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index f180d23ad4..f0a601b932 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.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.20.tgz#eb8202b6b68682a0db8d99779ea4056671b9bec8"
-  integrity sha512-s9z/UgRcuwDGAXjyTD7jsaW8ArbFhoBJkfwX5wTOE/CHsYMtaIARPco2QDiTi5XkmgpQdwWCADaE3n0vha7KsQ==
+"@budibase/backend-core@1.3.21":
+  version "1.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21.tgz#a23d2e50bc938257284ac531eaf24d6c37539234"
+  integrity sha512-myZbVLc2bOJaOeRzxUxojd/Z4BvKN3nce//xDFoc1g7YcVpsc5oiW8/i4DWpgrE9ITmSCDXTb+kQMV2lcE8/6Q==
   dependencies:
-    "@budibase/types" "^1.3.20"
+    "@budibase/types" "^1.3.21"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1179,13 +1179,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.20.tgz#c6848287fcd0adcb350b90e999f1d4038b025262"
-  integrity sha512-Xp/fgP5B+pxHqVhKukgyMXK7eHlLhsZV9/u0osB7KfOh42sRgst7HSra6ZjMAOmNY/kWQvvtt0KCmER13uYtbA==
+"@budibase/pro@1.3.21":
+  version "1.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21.tgz#2be86caecdc812339225d9f450df96993aa3e982"
+  integrity sha512-kjFg/Hi+8MF/Q2CmnD+Dz0o1sRiQq68K4TUazdo+EXqH0dAuaaAVvtqWE71karrfMs3pEB7QcYa9AJBF+nuhkg==
   dependencies:
-    "@budibase/backend-core" "1.3.20"
-    "@budibase/types" "1.3.20"
+    "@budibase/backend-core" "1.3.21"
+    "@budibase/types" "1.3.21"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1208,10 +1208,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.3.20", "@budibase/types@^1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.20.tgz#58efe3d10693faa939e6068b95c17f8c2b064729"
-  integrity sha512-LlbqS4JMKtSPbYoTE7BEUDEutvhleUSPd2aLBOYlkMPcPB9hNM4PSwC5UTGZeBJNRaE2nM+iz+5huVYKLzD9cQ==
+"@budibase/types@1.3.21", "@budibase/types@^1.3.21":
+  version "1.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21.tgz#02467dc661454e73747e28f9687837d712950228"
+  integrity sha512-fW/CjiwA7Fyl6X/e3/TZ1qYacQoYTHIlsHgqoyhf76E3dO3AsnYLxk7YTt3FC6nAUgpegr/9Oyle7Wi9b1EEJg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 36b4138eb4..66d747d2e2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.3.21",
-    "@budibase/pro": "1.3.20",
+    "@budibase/pro": "1.3.21",
     "@budibase/string-templates": "^1.3.21",
     "@budibase/types": "^1.3.21",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 690924f961..80f1282819 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.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.20.tgz#eb8202b6b68682a0db8d99779ea4056671b9bec8"
-  integrity sha512-s9z/UgRcuwDGAXjyTD7jsaW8ArbFhoBJkfwX5wTOE/CHsYMtaIARPco2QDiTi5XkmgpQdwWCADaE3n0vha7KsQ==
+"@budibase/backend-core@1.3.21":
+  version "1.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21.tgz#a23d2e50bc938257284ac531eaf24d6c37539234"
+  integrity sha512-myZbVLc2bOJaOeRzxUxojd/Z4BvKN3nce//xDFoc1g7YcVpsc5oiW8/i4DWpgrE9ITmSCDXTb+kQMV2lcE8/6Q==
   dependencies:
-    "@budibase/types" "^1.3.20"
+    "@budibase/types" "^1.3.21"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -326,21 +326,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.20.tgz#c6848287fcd0adcb350b90e999f1d4038b025262"
-  integrity sha512-Xp/fgP5B+pxHqVhKukgyMXK7eHlLhsZV9/u0osB7KfOh42sRgst7HSra6ZjMAOmNY/kWQvvtt0KCmER13uYtbA==
+"@budibase/pro@1.3.21":
+  version "1.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21.tgz#2be86caecdc812339225d9f450df96993aa3e982"
+  integrity sha512-kjFg/Hi+8MF/Q2CmnD+Dz0o1sRiQq68K4TUazdo+EXqH0dAuaaAVvtqWE71karrfMs3pEB7QcYa9AJBF+nuhkg==
   dependencies:
-    "@budibase/backend-core" "1.3.20"
-    "@budibase/types" "1.3.20"
+    "@budibase/backend-core" "1.3.21"
+    "@budibase/types" "1.3.21"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.20", "@budibase/types@^1.3.20":
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.20.tgz#58efe3d10693faa939e6068b95c17f8c2b064729"
-  integrity sha512-LlbqS4JMKtSPbYoTE7BEUDEutvhleUSPd2aLBOYlkMPcPB9hNM4PSwC5UTGZeBJNRaE2nM+iz+5huVYKLzD9cQ==
+"@budibase/types@1.3.21", "@budibase/types@^1.3.21":
+  version "1.3.21"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21.tgz#02467dc661454e73747e28f9687837d712950228"
+  integrity sha512-fW/CjiwA7Fyl6X/e3/TZ1qYacQoYTHIlsHgqoyhf76E3dO3AsnYLxk7YTt3FC6nAUgpegr/9Oyle7Wi9b1EEJg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 361cc7577c50217c516da563f1fb726b65acf639 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Sun, 18 Sep 2022 09:48:19 +0000
Subject: [PATCH 22/36] v1.3.21-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              |  8 ++++----
 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, 31 insertions(+), 31 deletions(-)

diff --git a/lerna.json b/lerna.json
index 8c8f8a9dd8..501a6e0e7b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 360383fe3e..033fecfce1 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-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.3.21-alpha.1",
+    "@budibase/types": "1.3.21-alpha.2",
     "@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 3abef9c24c..2377ea954e 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.3.21-alpha.1",
+  "version": "1.3.21-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.3.21-alpha.1",
+    "@budibase/string-templates": "1.3.21-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 608e84c1f8..ffb86d6ab7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.3.21-alpha.1",
-    "@budibase/client": "1.3.21-alpha.1",
-    "@budibase/frontend-core": "1.3.21-alpha.1",
-    "@budibase/string-templates": "1.3.21-alpha.1",
+    "@budibase/bbui": "1.3.21-alpha.2",
+    "@budibase/client": "1.3.21-alpha.2",
+    "@budibase/frontend-core": "1.3.21-alpha.2",
+    "@budibase/string-templates": "1.3.21-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 7b29966fb7..2b49fde54e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "1.3.21-alpha.1",
-    "@budibase/string-templates": "1.3.21-alpha.1",
-    "@budibase/types": "1.3.21-alpha.1",
+    "@budibase/backend-core": "1.3.21-alpha.2",
+    "@budibase/string-templates": "1.3.21-alpha.2",
+    "@budibase/types": "1.3.21-alpha.2",
     "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 aa263e8fec..7dbee49dcb 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-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.3.21-alpha.1",
-    "@budibase/frontend-core": "1.3.21-alpha.1",
-    "@budibase/string-templates": "1.3.21-alpha.1",
+    "@budibase/bbui": "1.3.21-alpha.2",
+    "@budibase/frontend-core": "1.3.21-alpha.2",
+    "@budibase/string-templates": "1.3.21-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 d62ce52e01..cb934ed010 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-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.3.21-alpha.1",
+    "@budibase/bbui": "1.3.21-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index ee817727b6..57c629693d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-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.3.21-alpha.1",
-    "@budibase/client": "1.3.21-alpha.1",
+    "@budibase/backend-core": "1.3.21-alpha.2",
+    "@budibase/client": "1.3.21-alpha.2",
     "@budibase/pro": "1.3.21-alpha.1",
-    "@budibase/string-templates": "1.3.21-alpha.1",
-    "@budibase/types": "1.3.21-alpha.1",
+    "@budibase/string-templates": "1.3.21-alpha.2",
+    "@budibase/types": "1.3.21-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 1f775ddfb6..25ba134930 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-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 de53f9677d..304ea73ace 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-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 b102e075ad..4dd8c4808d 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.21-alpha.1",
+  "version": "1.3.21-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.3.21-alpha.1",
+    "@budibase/backend-core": "1.3.21-alpha.2",
     "@budibase/pro": "1.3.21-alpha.1",
-    "@budibase/string-templates": "1.3.21-alpha.1",
-    "@budibase/types": "1.3.21-alpha.1",
+    "@budibase/string-templates": "1.3.21-alpha.2",
+    "@budibase/types": "1.3.21-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 91b678223ccdf4949527b5d20d9619073036b1bb Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Sun, 18 Sep 2022 09:52:17 +0000
Subject: [PATCH 23/36] Update pro version to 1.3.21-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 57c629693d..ff519de1ef 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.3.21-alpha.2",
     "@budibase/client": "1.3.21-alpha.2",
-    "@budibase/pro": "1.3.21-alpha.1",
+    "@budibase/pro": "1.3.21-alpha.2",
     "@budibase/string-templates": "1.3.21-alpha.2",
     "@budibase/types": "1.3.21-alpha.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 8bf15a7dc0..b297b66df5 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.3.21-alpha.1":
-  version "1.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.1.tgz#066ec3673e07daf1ad6571281a01bcfee8cd89ce"
-  integrity sha512-UE7ucWKp0Z+z1EappACAxvuXSWLgUY/mkl98GSbrkg7SsDXpjaymC1HTH16Bc0eFzAEy6j4Ehjlg00yKRIIdJw==
+"@budibase/backend-core@1.3.21-alpha.2":
+  version "1.3.21-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.2.tgz#5587d6df6e85549faadb8c44cba523b495cca8ce"
+  integrity sha512-ofUgKViGc738+9waRs7RnIadbOz/BsNZ21U9wEcpYeO9w9U0UXVY2E8PhYN30xZrK+gsy/8JLhst3GcnpHIGIg==
   dependencies:
-    "@budibase/types" "1.3.21-alpha.1"
+    "@budibase/types" "1.3.21-alpha.2"
     "@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@1.3.21-alpha.1":
-  version "1.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.1.tgz#46a4492297b6efcd61821e6b3c24675954943b20"
-  integrity sha512-LkGKS9EuHI+is4kHzMVZjx8Ye00rLlqS66bOsutjDofpujaZBgA6hjIeh8RXYZ+C4DIexRczWLttX7+K3cm9Rw==
+"@budibase/pro@1.3.21-alpha.2":
+  version "1.3.21-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.2.tgz#d3e61802029688d87942612b5d80adb79ed69fd7"
+  integrity sha512-HGmZ7WutsiUCLdEFbYYlaQG150UbLPNFtyeVgCwCRYa8saXuo3p/hYqCxL1OLMJWuSZovJpkDy80NaRW6FIGew==
   dependencies:
-    "@budibase/backend-core" "1.3.21-alpha.1"
-    "@budibase/types" "1.3.21-alpha.1"
+    "@budibase/backend-core" "1.3.21-alpha.2"
+    "@budibase/types" "1.3.21-alpha.2"
     "@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@1.3.21-alpha.1":
-  version "1.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.1.tgz#2004f79ad6128f7058e92d06db64ede0e04a4e46"
-  integrity sha512-Kg/XNDu4bVKbPzIx3zHVf/Zo+JN0Qi1/W60WajVQMJFVZQQsVMbKqqJYV3dNW1FR9pnfCnuIe0nya5BEPmWgZQ==
+"@budibase/types@1.3.21-alpha.2":
+  version "1.3.21-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.2.tgz#595f67b6b736206c8d19b9167ca22b2b2291e3be"
+  integrity sha512-OE2Pi5MRo/nZSygeqozqu+OGSNZHRr8za6ArZA0ZKYOHV0uIh0vDhuqTvd3eLgOcEuasteNW74Ye/3KrGOpD8A==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 4dd8c4808d..f4deef0a90 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.3.21-alpha.2",
-    "@budibase/pro": "1.3.21-alpha.1",
+    "@budibase/pro": "1.3.21-alpha.2",
     "@budibase/string-templates": "1.3.21-alpha.2",
     "@budibase/types": "1.3.21-alpha.2",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 679f8c791c..77e4cc188b 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.3.21-alpha.1":
-  version "1.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.1.tgz#066ec3673e07daf1ad6571281a01bcfee8cd89ce"
-  integrity sha512-UE7ucWKp0Z+z1EappACAxvuXSWLgUY/mkl98GSbrkg7SsDXpjaymC1HTH16Bc0eFzAEy6j4Ehjlg00yKRIIdJw==
+"@budibase/backend-core@1.3.21-alpha.2":
+  version "1.3.21-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21-alpha.2.tgz#5587d6df6e85549faadb8c44cba523b495cca8ce"
+  integrity sha512-ofUgKViGc738+9waRs7RnIadbOz/BsNZ21U9wEcpYeO9w9U0UXVY2E8PhYN30xZrK+gsy/8JLhst3GcnpHIGIg==
   dependencies:
-    "@budibase/types" "1.3.21-alpha.1"
+    "@budibase/types" "1.3.21-alpha.2"
     "@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@1.3.21-alpha.1":
-  version "1.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.1.tgz#46a4492297b6efcd61821e6b3c24675954943b20"
-  integrity sha512-LkGKS9EuHI+is4kHzMVZjx8Ye00rLlqS66bOsutjDofpujaZBgA6hjIeh8RXYZ+C4DIexRczWLttX7+K3cm9Rw==
+"@budibase/pro@1.3.21-alpha.2":
+  version "1.3.21-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21-alpha.2.tgz#d3e61802029688d87942612b5d80adb79ed69fd7"
+  integrity sha512-HGmZ7WutsiUCLdEFbYYlaQG150UbLPNFtyeVgCwCRYa8saXuo3p/hYqCxL1OLMJWuSZovJpkDy80NaRW6FIGew==
   dependencies:
-    "@budibase/backend-core" "1.3.21-alpha.1"
-    "@budibase/types" "1.3.21-alpha.1"
+    "@budibase/backend-core" "1.3.21-alpha.2"
+    "@budibase/types" "1.3.21-alpha.2"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.21-alpha.1":
-  version "1.3.21-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.1.tgz#2004f79ad6128f7058e92d06db64ede0e04a4e46"
-  integrity sha512-Kg/XNDu4bVKbPzIx3zHVf/Zo+JN0Qi1/W60WajVQMJFVZQQsVMbKqqJYV3dNW1FR9pnfCnuIe0nya5BEPmWgZQ==
+"@budibase/types@1.3.21-alpha.2":
+  version "1.3.21-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21-alpha.2.tgz#595f67b6b736206c8d19b9167ca22b2b2291e3be"
+  integrity sha512-OE2Pi5MRo/nZSygeqozqu+OGSNZHRr8za6ArZA0ZKYOHV0uIh0vDhuqTvd3eLgOcEuasteNW74Ye/3KrGOpD8A==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From a3ecd6c8bd5acee4c08441dd61d5331115bc3c6e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Sun, 18 Sep 2022 12:43:54 +0000
Subject: [PATCH 24/36] v1.3.22-alpha.0

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

diff --git a/lerna.json b/lerna.json
index 9900ba718c..90ebdd366f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
@@ -15,4 +15,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index c2d24ccc2b..eed29f485c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "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.3.21",
+    "@budibase/types": "1.3.22-alpha.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
@@ -82,4 +82,4 @@
     "typescript": "4.7.3"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
\ No newline at end of file
+}
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 068d31f30a..5542e9ebac 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.3.21",
+  "version": "1.3.22-alpha.0",
   "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.3.21",
+    "@budibase/string-templates": "1.3.22-alpha.0",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
@@ -86,4 +86,4 @@
     "svelte-portal": "^1.0.0"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
\ No newline at end of file
+}
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1cb5642dcb..bd6555d3d4 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.3.21",
-    "@budibase/client": "^1.3.21",
-    "@budibase/frontend-core": "^1.3.21",
-    "@budibase/string-templates": "^1.3.21",
+    "@budibase/bbui": "1.3.22-alpha.0",
+    "@budibase/client": "1.3.22-alpha.0",
+    "@budibase/frontend-core": "1.3.22-alpha.0",
+    "@budibase/string-templates": "1.3.22-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
@@ -123,4 +123,4 @@
     "vite": "^3.0.8"
   },
   "gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
-}
\ No newline at end of file
+}
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 57ce4f3755..507ba164cc 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,7 +26,7 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^1.3.21",
+    "@budibase/backend-core": "1.3.22-alpha.0",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
@@ -50,4 +50,4 @@
     "eslint": "^7.20.0",
     "renamer": "^4.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/client/package.json b/packages/client/package.json
index 552372fe72..0f9f599971 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "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.3.21",
-    "@budibase/frontend-core": "^1.3.21",
-    "@budibase/string-templates": "^1.3.21",
+    "@budibase/bbui": "1.3.22-alpha.0",
+    "@budibase/frontend-core": "1.3.22-alpha.0",
+    "@budibase/string-templates": "1.3.22-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
@@ -59,4 +59,4 @@
     "rollup-plugin-visualizer": "^5.5.4"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
\ No newline at end of file
+}
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 63886c8eb0..2405618c85 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.3.21",
+    "@budibase/bbui": "1.3.22-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/server/package.json b/packages/server/package.json
index 1b073512ac..185bbcf278 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "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.3.21",
-    "@budibase/client": "^1.3.21",
+    "@budibase/backend-core": "1.3.22-alpha.0",
+    "@budibase/client": "1.3.22-alpha.0",
     "@budibase/pro": "1.3.21",
-    "@budibase/string-templates": "^1.3.21",
-    "@budibase/types": "^1.3.21",
+    "@budibase/string-templates": "1.3.22-alpha.0",
+    "@budibase/types": "1.3.22-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -200,4 +200,4 @@
     "oracledb": "5.3.0"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
\ No newline at end of file
+}
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index ccb03c93b3..c0714240dc 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
@@ -47,4 +47,4 @@
     "typescript": "^4.5.5"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
\ No newline at end of file
+}
diff --git a/packages/types/package.json b/packages/types/package.json
index 78e1147bb8..f5c099dca7 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,4 +18,4 @@
     "rimraf": "3.0.2",
     "typescript": "4.7.3"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d88834fa2f..6890e23374 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.21",
+  "version": "1.3.22-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.3.21",
+    "@budibase/backend-core": "1.3.22-alpha.0",
     "@budibase/pro": "1.3.21",
-    "@budibase/string-templates": "^1.3.21",
-    "@budibase/types": "^1.3.21",
+    "@budibase/string-templates": "1.3.22-alpha.0",
+    "@budibase/types": "1.3.22-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -105,4 +105,4 @@
     ]
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
\ No newline at end of file
+}

From 058ae96e0f4c15f15bf89a8d57fdfbf31c5c6dda Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Sun, 18 Sep 2022 12:47:20 +0000
Subject: [PATCH 25/36] Update pro version to 1.3.22-alpha.0

---
 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 185bbcf278..b0bcb8d5c9 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.3.22-alpha.0",
     "@budibase/client": "1.3.22-alpha.0",
-    "@budibase/pro": "1.3.21",
+    "@budibase/pro": "1.3.22-alpha.0",
     "@budibase/string-templates": "1.3.22-alpha.0",
     "@budibase/types": "1.3.22-alpha.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 29e9567945..ac1c098b6d 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.3.21":
-  version "1.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21.tgz#a23d2e50bc938257284ac531eaf24d6c37539234"
-  integrity sha512-myZbVLc2bOJaOeRzxUxojd/Z4BvKN3nce//xDFoc1g7YcVpsc5oiW8/i4DWpgrE9ITmSCDXTb+kQMV2lcE8/6Q==
+"@budibase/backend-core@1.3.22-alpha.0":
+  version "1.3.22-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.0.tgz#a215b8680e004db310b2f576b74a748acd294d9c"
+  integrity sha512-dxPP3M1tVdE5bJ5W1dUqg7HikQ0rcGaDfl9ZMUeJfmsq72iavDmDl2pyou9e9Xq4L2T6SBakx6JJfsdGpe1PUg==
   dependencies:
-    "@budibase/types" "^1.3.21"
+    "@budibase/types" "1.3.22-alpha.0"
     "@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@1.3.21":
-  version "1.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21.tgz#2be86caecdc812339225d9f450df96993aa3e982"
-  integrity sha512-kjFg/Hi+8MF/Q2CmnD+Dz0o1sRiQq68K4TUazdo+EXqH0dAuaaAVvtqWE71karrfMs3pEB7QcYa9AJBF+nuhkg==
+"@budibase/pro@1.3.22-alpha.0":
+  version "1.3.22-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.0.tgz#cb555f6528fad1f3954e67bf1254f8b93518ffe6"
+  integrity sha512-FoemVf8g+cYE7b7IP7MM7Z+i+FTTJnZMzoFcRPPnoLm8NLhQUvwFnnRyjwtjwRKLbefYpNh/gMcRj+RqjoKFww==
   dependencies:
-    "@budibase/backend-core" "1.3.21"
-    "@budibase/types" "1.3.21"
+    "@budibase/backend-core" "1.3.22-alpha.0"
+    "@budibase/types" "1.3.22-alpha.0"
     "@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@1.3.21", "@budibase/types@^1.3.21":
-  version "1.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21.tgz#02467dc661454e73747e28f9687837d712950228"
-  integrity sha512-fW/CjiwA7Fyl6X/e3/TZ1qYacQoYTHIlsHgqoyhf76E3dO3AsnYLxk7YTt3FC6nAUgpegr/9Oyle7Wi9b1EEJg==
+"@budibase/types@1.3.22-alpha.0":
+  version "1.3.22-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.0.tgz#0cd00421f9e3d2367d047aec96bccad9bb0dd179"
+  integrity sha512-QQrVf27kDz+03Y0GTdUm2izG+grKT6hnS7RkCvx7iTkNt5U7Zep3sNIicifMbmxNPWWRgXbi2NVaTKznCRSFlw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6890e23374..de1b128fce 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.3.22-alpha.0",
-    "@budibase/pro": "1.3.21",
+    "@budibase/pro": "1.3.22-alpha.0",
     "@budibase/string-templates": "1.3.22-alpha.0",
     "@budibase/types": "1.3.22-alpha.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index dfc3d10d8a..fbdcdcb3ca 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.3.21":
-  version "1.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.21.tgz#a23d2e50bc938257284ac531eaf24d6c37539234"
-  integrity sha512-myZbVLc2bOJaOeRzxUxojd/Z4BvKN3nce//xDFoc1g7YcVpsc5oiW8/i4DWpgrE9ITmSCDXTb+kQMV2lcE8/6Q==
+"@budibase/backend-core@1.3.22-alpha.0":
+  version "1.3.22-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.0.tgz#a215b8680e004db310b2f576b74a748acd294d9c"
+  integrity sha512-dxPP3M1tVdE5bJ5W1dUqg7HikQ0rcGaDfl9ZMUeJfmsq72iavDmDl2pyou9e9Xq4L2T6SBakx6JJfsdGpe1PUg==
   dependencies:
-    "@budibase/types" "^1.3.21"
+    "@budibase/types" "1.3.22-alpha.0"
     "@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@1.3.21":
-  version "1.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.21.tgz#2be86caecdc812339225d9f450df96993aa3e982"
-  integrity sha512-kjFg/Hi+8MF/Q2CmnD+Dz0o1sRiQq68K4TUazdo+EXqH0dAuaaAVvtqWE71karrfMs3pEB7QcYa9AJBF+nuhkg==
+"@budibase/pro@1.3.22-alpha.0":
+  version "1.3.22-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.0.tgz#cb555f6528fad1f3954e67bf1254f8b93518ffe6"
+  integrity sha512-FoemVf8g+cYE7b7IP7MM7Z+i+FTTJnZMzoFcRPPnoLm8NLhQUvwFnnRyjwtjwRKLbefYpNh/gMcRj+RqjoKFww==
   dependencies:
-    "@budibase/backend-core" "1.3.21"
-    "@budibase/types" "1.3.21"
+    "@budibase/backend-core" "1.3.22-alpha.0"
+    "@budibase/types" "1.3.22-alpha.0"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.21", "@budibase/types@^1.3.21":
-  version "1.3.21"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.21.tgz#02467dc661454e73747e28f9687837d712950228"
-  integrity sha512-fW/CjiwA7Fyl6X/e3/TZ1qYacQoYTHIlsHgqoyhf76E3dO3AsnYLxk7YTt3FC6nAUgpegr/9Oyle7Wi9b1EEJg==
+"@budibase/types@1.3.22-alpha.0":
+  version "1.3.22-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.0.tgz#0cd00421f9e3d2367d047aec96bccad9bb0dd179"
+  integrity sha512-QQrVf27kDz+03Y0GTdUm2izG+grKT6hnS7RkCvx7iTkNt5U7Zep3sNIicifMbmxNPWWRgXbi2NVaTKznCRSFlw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 8825edd093ff67a06322d890c149860be73e92cb Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Sun, 18 Sep 2022 16:00:51 +0100
Subject: [PATCH 26/36] re-add missing reference to name variable in plugins

---
 packages/server/src/api/controllers/plugin/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/plugin/index.ts b/packages/server/src/api/controllers/plugin/index.ts
index a674c5892e..868d2689fd 100644
--- a/packages/server/src/api/controllers/plugin/index.ts
+++ b/packages/server/src/api/controllers/plugin/index.ts
@@ -129,6 +129,6 @@ export async function processUploadedPlugin(
   }
 
   const doc = await plugins.storePlugin(metadata, directory, source)
-  ClientAppSocket.emit("plugins-update", { name, hash: doc.hash })
+  ClientAppSocket.emit("plugins-update", { name: doc.name, hash: doc.hash })
   return doc
 }

From db762e7c2d25e6b39b73d0c99ce883bda863ed39 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Sun, 18 Sep 2022 17:07:07 +0000
Subject: [PATCH 27/36] v1.3.22-alpha.1

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  4 ++--
 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, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 90ebdd366f..da9412ae61 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index eed29f485c..6ef35cb392 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "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.3.22-alpha.0",
+    "@budibase/types": "1.3.22-alpha.1",
     "@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 5542e9ebac..a2fcb3a39b 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.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "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.3.22-alpha.0",
+    "@budibase/string-templates": "1.3.22-alpha.1",
     "@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 bd6555d3d4..277c1cfed5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.3.22-alpha.0",
-    "@budibase/client": "1.3.22-alpha.0",
-    "@budibase/frontend-core": "1.3.22-alpha.0",
-    "@budibase/string-templates": "1.3.22-alpha.0",
+    "@budibase/bbui": "1.3.22-alpha.1",
+    "@budibase/client": "1.3.22-alpha.1",
+    "@budibase/frontend-core": "1.3.22-alpha.1",
+    "@budibase/string-templates": "1.3.22-alpha.1",
     "@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 507ba164cc..ae9e50eacd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,7 +26,7 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "1.3.22-alpha.0",
+    "@budibase/backend-core": "1.3.22-alpha.1",
     "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 0f9f599971..6166f40605 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "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.3.22-alpha.0",
-    "@budibase/frontend-core": "1.3.22-alpha.0",
-    "@budibase/string-templates": "1.3.22-alpha.0",
+    "@budibase/bbui": "1.3.22-alpha.1",
+    "@budibase/frontend-core": "1.3.22-alpha.1",
+    "@budibase/string-templates": "1.3.22-alpha.1",
     "@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 2405618c85..13b7250dd6 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.3.22-alpha.0",
+    "@budibase/bbui": "1.3.22-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index b0bcb8d5c9..ebb25c7e74 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "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.3.22-alpha.0",
-    "@budibase/client": "1.3.22-alpha.0",
+    "@budibase/backend-core": "1.3.22-alpha.1",
+    "@budibase/client": "1.3.22-alpha.1",
     "@budibase/pro": "1.3.22-alpha.0",
-    "@budibase/string-templates": "1.3.22-alpha.0",
-    "@budibase/types": "1.3.22-alpha.0",
+    "@budibase/string-templates": "1.3.22-alpha.1",
+    "@budibase/types": "1.3.22-alpha.1",
     "@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 c0714240dc..fdb2a16c34 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "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 f5c099dca7..432fc69a67 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "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 de1b128fce..3579f20e4b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.22-alpha.0",
+  "version": "1.3.22-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.3.22-alpha.0",
+    "@budibase/backend-core": "1.3.22-alpha.1",
     "@budibase/pro": "1.3.22-alpha.0",
-    "@budibase/string-templates": "1.3.22-alpha.0",
-    "@budibase/types": "1.3.22-alpha.0",
+    "@budibase/string-templates": "1.3.22-alpha.1",
+    "@budibase/types": "1.3.22-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 1963382d79a61a67540da46b146aaa364d6e030e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Sun, 18 Sep 2022 17:10:37 +0000
Subject: [PATCH 28/36] Update pro version to 1.3.22-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 ebb25c7e74..701f6eb82b 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.3.22-alpha.1",
     "@budibase/client": "1.3.22-alpha.1",
-    "@budibase/pro": "1.3.22-alpha.0",
+    "@budibase/pro": "1.3.22-alpha.1",
     "@budibase/string-templates": "1.3.22-alpha.1",
     "@budibase/types": "1.3.22-alpha.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index ac1c098b6d..cd3d2cfb5f 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.3.22-alpha.0":
-  version "1.3.22-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.0.tgz#a215b8680e004db310b2f576b74a748acd294d9c"
-  integrity sha512-dxPP3M1tVdE5bJ5W1dUqg7HikQ0rcGaDfl9ZMUeJfmsq72iavDmDl2pyou9e9Xq4L2T6SBakx6JJfsdGpe1PUg==
+"@budibase/backend-core@1.3.22-alpha.1":
+  version "1.3.22-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.1.tgz#00a00562aa6ce79eb7472304123ad3cc2786d455"
+  integrity sha512-IQIb+hDA0AULdsLiezenBkNwvE0mteUguoOjP+lRgKqJxM6MhGyt1ssWusUt4ZD0hbMyKOkSP3dGEsDt4cxgkg==
   dependencies:
-    "@budibase/types" "1.3.22-alpha.0"
+    "@budibase/types" "1.3.22-alpha.1"
     "@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@1.3.22-alpha.0":
-  version "1.3.22-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.0.tgz#cb555f6528fad1f3954e67bf1254f8b93518ffe6"
-  integrity sha512-FoemVf8g+cYE7b7IP7MM7Z+i+FTTJnZMzoFcRPPnoLm8NLhQUvwFnnRyjwtjwRKLbefYpNh/gMcRj+RqjoKFww==
+"@budibase/pro@1.3.22-alpha.1":
+  version "1.3.22-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.1.tgz#e4c80f4cb0de9a6da7181ddaca60673e8b5bdd66"
+  integrity sha512-vYJZ31orK96HvJCtgrpZ9iclL5/geNr/OlMqX/FkwiwHN2Y9bgWUll/LBpEwuHIb651bS4Uy8laVKAfWC0d6lA==
   dependencies:
-    "@budibase/backend-core" "1.3.22-alpha.0"
-    "@budibase/types" "1.3.22-alpha.0"
+    "@budibase/backend-core" "1.3.22-alpha.1"
+    "@budibase/types" "1.3.22-alpha.1"
     "@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@1.3.22-alpha.0":
-  version "1.3.22-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.0.tgz#0cd00421f9e3d2367d047aec96bccad9bb0dd179"
-  integrity sha512-QQrVf27kDz+03Y0GTdUm2izG+grKT6hnS7RkCvx7iTkNt5U7Zep3sNIicifMbmxNPWWRgXbi2NVaTKznCRSFlw==
+"@budibase/types@1.3.22-alpha.1":
+  version "1.3.22-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.1.tgz#5f621aa20feafbb091f4cd1f8d3ac199402f024c"
+  integrity sha512-jrHZFJWqLK+awIepTaKtcDzkj2ZAfIIJaDGCzMVqTHNqS9kovFq4Bv/qeAUCPXxDq2EPDO3R4l3WKBC1QiIQZQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3579f20e4b..86b3415927 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.3.22-alpha.1",
-    "@budibase/pro": "1.3.22-alpha.0",
+    "@budibase/pro": "1.3.22-alpha.1",
     "@budibase/string-templates": "1.3.22-alpha.1",
     "@budibase/types": "1.3.22-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index fbdcdcb3ca..9397ab292e 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.3.22-alpha.0":
-  version "1.3.22-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.0.tgz#a215b8680e004db310b2f576b74a748acd294d9c"
-  integrity sha512-dxPP3M1tVdE5bJ5W1dUqg7HikQ0rcGaDfl9ZMUeJfmsq72iavDmDl2pyou9e9Xq4L2T6SBakx6JJfsdGpe1PUg==
+"@budibase/backend-core@1.3.22-alpha.1":
+  version "1.3.22-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.1.tgz#00a00562aa6ce79eb7472304123ad3cc2786d455"
+  integrity sha512-IQIb+hDA0AULdsLiezenBkNwvE0mteUguoOjP+lRgKqJxM6MhGyt1ssWusUt4ZD0hbMyKOkSP3dGEsDt4cxgkg==
   dependencies:
-    "@budibase/types" "1.3.22-alpha.0"
+    "@budibase/types" "1.3.22-alpha.1"
     "@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@1.3.22-alpha.0":
-  version "1.3.22-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.0.tgz#cb555f6528fad1f3954e67bf1254f8b93518ffe6"
-  integrity sha512-FoemVf8g+cYE7b7IP7MM7Z+i+FTTJnZMzoFcRPPnoLm8NLhQUvwFnnRyjwtjwRKLbefYpNh/gMcRj+RqjoKFww==
+"@budibase/pro@1.3.22-alpha.1":
+  version "1.3.22-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.1.tgz#e4c80f4cb0de9a6da7181ddaca60673e8b5bdd66"
+  integrity sha512-vYJZ31orK96HvJCtgrpZ9iclL5/geNr/OlMqX/FkwiwHN2Y9bgWUll/LBpEwuHIb651bS4Uy8laVKAfWC0d6lA==
   dependencies:
-    "@budibase/backend-core" "1.3.22-alpha.0"
-    "@budibase/types" "1.3.22-alpha.0"
+    "@budibase/backend-core" "1.3.22-alpha.1"
+    "@budibase/types" "1.3.22-alpha.1"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.22-alpha.0":
-  version "1.3.22-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.0.tgz#0cd00421f9e3d2367d047aec96bccad9bb0dd179"
-  integrity sha512-QQrVf27kDz+03Y0GTdUm2izG+grKT6hnS7RkCvx7iTkNt5U7Zep3sNIicifMbmxNPWWRgXbi2NVaTKznCRSFlw==
+"@budibase/types@1.3.22-alpha.1":
+  version "1.3.22-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.1.tgz#5f621aa20feafbb091f4cd1f8d3ac199402f024c"
+  integrity sha512-jrHZFJWqLK+awIepTaKtcDzkj2ZAfIIJaDGCzMVqTHNqS9kovFq4Bv/qeAUCPXxDq2EPDO3R4l3WKBC1QiIQZQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 96adb0b595418ea06cfebb3427758a3d452355e4 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Mon, 19 Sep 2022 12:19:49 +0100
Subject: [PATCH 29/36] Create epic.md

---
 .github/ISSUE_TEMPLATE/epic.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/epic.md

diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md
new file mode 100644
index 0000000000..1a1bb8e864
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/epic.md
@@ -0,0 +1,18 @@
+---
+name: Epic
+about: Plan a new project
+title: ''
+labels: epic
+assignees: ''
+
+---
+
+## Description
+Brief summary of what this Epic is, whether it's a larger project, goal, or user story. Describe the job to be done, which persona this Epic is mainly for, or if more multiple, break it down by user and job story.
+
+## Spec
+Link to confluence spec
+
+### Teams and Stakeholders
+Describe who needs to be kept up-to-date about this Epic, included in discussions, or updated along the way. Stakeholders can be both in Product/Engineering, as well as other teams like Customer Success who might want to keep customers updated on the Epic project.
+

From 3510233820f6ee626229df653b675101873ea12e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Mon, 19 Sep 2022 12:22:40 +0100
Subject: [PATCH 30/36] Update epic.md

---
 .github/ISSUE_TEMPLATE/epic.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md
index 1a1bb8e864..0a9a00af43 100644
--- a/.github/ISSUE_TEMPLATE/epic.md
+++ b/.github/ISSUE_TEMPLATE/epic.md
@@ -16,3 +16,9 @@ Link to confluence spec
 ### Teams and Stakeholders
 Describe who needs to be kept up-to-date about this Epic, included in discussions, or updated along the way. Stakeholders can be both in Product/Engineering, as well as other teams like Customer Success who might want to keep customers updated on the Epic project.
 
+
+### Workflow
+- [ ]  Spec Created and pasted above
+- [ ]  Product Review
+- [ ]  Designs created
+- [ ]  Individual Tasks created and assigned to Epic

From 8edca6929b44723ea8371fff2a4c16a346c710c4 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Mon, 19 Sep 2022 12:24:20 +0100
Subject: [PATCH 31/36] Update epic.md

---
 .github/ISSUE_TEMPLATE/epic.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/epic.md b/.github/ISSUE_TEMPLATE/epic.md
index 0a9a00af43..b8cf652125 100644
--- a/.github/ISSUE_TEMPLATE/epic.md
+++ b/.github/ISSUE_TEMPLATE/epic.md
@@ -13,11 +13,11 @@ Brief summary of what this Epic is, whether it's a larger project, goal, or user
 ## Spec
 Link to confluence spec
 
-### Teams and Stakeholders
+## Teams and Stakeholders
 Describe who needs to be kept up-to-date about this Epic, included in discussions, or updated along the way. Stakeholders can be both in Product/Engineering, as well as other teams like Customer Success who might want to keep customers updated on the Epic project.
 
 
-### Workflow
+## Workflow
 - [ ]  Spec Created and pasted above
 - [ ]  Product Review
 - [ ]  Designs created

From 5073d086cae17b5e73bb17bd6fa47c03adf8b827 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 19 Sep 2022 11:47:32 +0000
Subject: [PATCH 32/36] v1.3.22-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              |  4 ++--
 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, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index da9412ae61..2aabf5e8bc 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 6ef35cb392..3d52ba7ecd 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-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.3.22-alpha.1",
+    "@budibase/types": "1.3.22-alpha.2",
     "@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 a2fcb3a39b..bfe94cbb62 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.3.22-alpha.1",
+  "version": "1.3.22-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.3.22-alpha.1",
+    "@budibase/string-templates": "1.3.22-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 277c1cfed5..ffacb1d331 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.3.22-alpha.1",
-    "@budibase/client": "1.3.22-alpha.1",
-    "@budibase/frontend-core": "1.3.22-alpha.1",
-    "@budibase/string-templates": "1.3.22-alpha.1",
+    "@budibase/bbui": "1.3.22-alpha.2",
+    "@budibase/client": "1.3.22-alpha.2",
+    "@budibase/frontend-core": "1.3.22-alpha.2",
+    "@budibase/string-templates": "1.3.22-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 ae9e50eacd..b3ecc2057e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,7 +26,7 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "1.3.22-alpha.1",
+    "@budibase/backend-core": "1.3.22-alpha.2",
     "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 6166f40605..8bd2382b3b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-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.3.22-alpha.1",
-    "@budibase/frontend-core": "1.3.22-alpha.1",
-    "@budibase/string-templates": "1.3.22-alpha.1",
+    "@budibase/bbui": "1.3.22-alpha.2",
+    "@budibase/frontend-core": "1.3.22-alpha.2",
+    "@budibase/string-templates": "1.3.22-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 13b7250dd6..7177bbd755 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-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.3.22-alpha.1",
+    "@budibase/bbui": "1.3.22-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 701f6eb82b..60544d9971 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-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.3.22-alpha.1",
-    "@budibase/client": "1.3.22-alpha.1",
+    "@budibase/backend-core": "1.3.22-alpha.2",
+    "@budibase/client": "1.3.22-alpha.2",
     "@budibase/pro": "1.3.22-alpha.1",
-    "@budibase/string-templates": "1.3.22-alpha.1",
-    "@budibase/types": "1.3.22-alpha.1",
+    "@budibase/string-templates": "1.3.22-alpha.2",
+    "@budibase/types": "1.3.22-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 fdb2a16c34..f37e33ef5b 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-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 432fc69a67..01c03681b0 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-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 86b3415927..dce247cccb 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.22-alpha.1",
+  "version": "1.3.22-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.3.22-alpha.1",
+    "@budibase/backend-core": "1.3.22-alpha.2",
     "@budibase/pro": "1.3.22-alpha.1",
-    "@budibase/string-templates": "1.3.22-alpha.1",
-    "@budibase/types": "1.3.22-alpha.1",
+    "@budibase/string-templates": "1.3.22-alpha.2",
+    "@budibase/types": "1.3.22-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 4777c7ddb0c7ddcd080346b0cc335a7205fee51e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 19 Sep 2022 11:50:41 +0000
Subject: [PATCH 33/36] Update pro version to 1.3.22-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 60544d9971..aac10fed41 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.3.22-alpha.2",
     "@budibase/client": "1.3.22-alpha.2",
-    "@budibase/pro": "1.3.22-alpha.1",
+    "@budibase/pro": "1.3.22-alpha.2",
     "@budibase/string-templates": "1.3.22-alpha.2",
     "@budibase/types": "1.3.22-alpha.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index cd3d2cfb5f..f4f7abec9c 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.3.22-alpha.1":
-  version "1.3.22-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.1.tgz#00a00562aa6ce79eb7472304123ad3cc2786d455"
-  integrity sha512-IQIb+hDA0AULdsLiezenBkNwvE0mteUguoOjP+lRgKqJxM6MhGyt1ssWusUt4ZD0hbMyKOkSP3dGEsDt4cxgkg==
+"@budibase/backend-core@1.3.22-alpha.2":
+  version "1.3.22-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.2.tgz#6ae1e42e4163f8ffaa9a7d5891145419f7484279"
+  integrity sha512-bzBpsq6LmpbwVe6UScgLUcN59pYq0nokzq32VA6rXWfTuPz+Y0jKGJuIY3JkPOuTsVAoqlwQH2XLOs6BZlZ7Ag==
   dependencies:
-    "@budibase/types" "1.3.22-alpha.1"
+    "@budibase/types" "1.3.22-alpha.2"
     "@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@1.3.22-alpha.1":
-  version "1.3.22-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.1.tgz#e4c80f4cb0de9a6da7181ddaca60673e8b5bdd66"
-  integrity sha512-vYJZ31orK96HvJCtgrpZ9iclL5/geNr/OlMqX/FkwiwHN2Y9bgWUll/LBpEwuHIb651bS4Uy8laVKAfWC0d6lA==
+"@budibase/pro@1.3.22-alpha.2":
+  version "1.3.22-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.2.tgz#9c0a91d664af9e6cac90d9e4e0bc8cc1d9bdb06c"
+  integrity sha512-3tVyaXskgMqDFLLPwTa5JgA4OrjIAxrflB8p6jknofQd0UwxHckuInz5BfJVVDqSHi65jif1+YHE0XqSJDuDrg==
   dependencies:
-    "@budibase/backend-core" "1.3.22-alpha.1"
-    "@budibase/types" "1.3.22-alpha.1"
+    "@budibase/backend-core" "1.3.22-alpha.2"
+    "@budibase/types" "1.3.22-alpha.2"
     "@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@1.3.22-alpha.1":
-  version "1.3.22-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.1.tgz#5f621aa20feafbb091f4cd1f8d3ac199402f024c"
-  integrity sha512-jrHZFJWqLK+awIepTaKtcDzkj2ZAfIIJaDGCzMVqTHNqS9kovFq4Bv/qeAUCPXxDq2EPDO3R4l3WKBC1QiIQZQ==
+"@budibase/types@1.3.22-alpha.2":
+  version "1.3.22-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.2.tgz#4b207cca8f9a897b7d95a074a240fbf8a05b2bd6"
+  integrity sha512-zZLhm9q9pZci0R+7EAwYUqkGQ2K+3Dwc5SI9kpQTaWEecLuAmujFERcd6K5wZfWCAzjcb2LsB6lvADxcW6rj3Q==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index dce247cccb..3e0a16933d 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.3.22-alpha.2",
-    "@budibase/pro": "1.3.22-alpha.1",
+    "@budibase/pro": "1.3.22-alpha.2",
     "@budibase/string-templates": "1.3.22-alpha.2",
     "@budibase/types": "1.3.22-alpha.2",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 9397ab292e..aa65272167 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.3.22-alpha.1":
-  version "1.3.22-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.1.tgz#00a00562aa6ce79eb7472304123ad3cc2786d455"
-  integrity sha512-IQIb+hDA0AULdsLiezenBkNwvE0mteUguoOjP+lRgKqJxM6MhGyt1ssWusUt4ZD0hbMyKOkSP3dGEsDt4cxgkg==
+"@budibase/backend-core@1.3.22-alpha.2":
+  version "1.3.22-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.2.tgz#6ae1e42e4163f8ffaa9a7d5891145419f7484279"
+  integrity sha512-bzBpsq6LmpbwVe6UScgLUcN59pYq0nokzq32VA6rXWfTuPz+Y0jKGJuIY3JkPOuTsVAoqlwQH2XLOs6BZlZ7Ag==
   dependencies:
-    "@budibase/types" "1.3.22-alpha.1"
+    "@budibase/types" "1.3.22-alpha.2"
     "@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@1.3.22-alpha.1":
-  version "1.3.22-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.1.tgz#e4c80f4cb0de9a6da7181ddaca60673e8b5bdd66"
-  integrity sha512-vYJZ31orK96HvJCtgrpZ9iclL5/geNr/OlMqX/FkwiwHN2Y9bgWUll/LBpEwuHIb651bS4Uy8laVKAfWC0d6lA==
+"@budibase/pro@1.3.22-alpha.2":
+  version "1.3.22-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.2.tgz#9c0a91d664af9e6cac90d9e4e0bc8cc1d9bdb06c"
+  integrity sha512-3tVyaXskgMqDFLLPwTa5JgA4OrjIAxrflB8p6jknofQd0UwxHckuInz5BfJVVDqSHi65jif1+YHE0XqSJDuDrg==
   dependencies:
-    "@budibase/backend-core" "1.3.22-alpha.1"
-    "@budibase/types" "1.3.22-alpha.1"
+    "@budibase/backend-core" "1.3.22-alpha.2"
+    "@budibase/types" "1.3.22-alpha.2"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.3.22-alpha.1":
-  version "1.3.22-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.1.tgz#5f621aa20feafbb091f4cd1f8d3ac199402f024c"
-  integrity sha512-jrHZFJWqLK+awIepTaKtcDzkj2ZAfIIJaDGCzMVqTHNqS9kovFq4Bv/qeAUCPXxDq2EPDO3R4l3WKBC1QiIQZQ==
+"@budibase/types@1.3.22-alpha.2":
+  version "1.3.22-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.2.tgz#4b207cca8f9a897b7d95a074a240fbf8a05b2bd6"
+  integrity sha512-zZLhm9q9pZci0R+7EAwYUqkGQ2K+3Dwc5SI9kpQTaWEecLuAmujFERcd6K5wZfWCAzjcb2LsB6lvADxcW6rj3Q==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 92a190024fa9becb1fdb301350042f6feceff8dc Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 20 Sep 2022 10:30:30 +0100
Subject: [PATCH 34/36] adding madge dep and script for detecting circular
 dependencies

---
 package.json |   2 +
 yarn.lock    | 645 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 624 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 71acd886d3..d9b78368ba 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "js-yaml": "^4.1.0",
     "kill-port": "^1.6.1",
     "lerna": "3.14.1",
+    "madge": "^5.0.1",
     "prettier": "^2.3.1",
     "prettier-plugin-svelte": "^2.3.0",
     "rimraf": "^3.0.2",
@@ -25,6 +26,7 @@
     "bootstrap": "lerna bootstrap && lerna link && ./scripts/link-dependencies.sh",
     "build": "lerna run build",
     "build:dev": "lerna run prebuild && tsc --build --watch --preserveWatchOutput",
+    "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular",
     "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish && yarn release:pro",
     "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact && yarn release:pro:develop",
     "release:pro": "bash scripts/pro/release.sh",
diff --git a/yarn.lock b/yarn.lock
index 50ebbbebe8..340aad3f08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -85,6 +85,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/parser@^7.0.0":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.1.tgz#6f6d6c2e621aad19a92544cc217ed13f1aac5b4c"
+  integrity sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==
+
 "@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.7.0":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
@@ -993,6 +998,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
@@ -1044,6 +1054,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz#a33504e1ce7ac51fc39035f5fe6f15079d4dafb0"
   integrity sha512-p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA==
 
+"@typescript-eslint/types@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
+  integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
+
 "@typescript-eslint/typescript-estree@4.28.0":
   version "4.28.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz#e66d4e5aa2ede66fec8af434898fe61af10c71cf"
@@ -1057,6 +1072,19 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@^4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
+  integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==
+  dependencies:
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/visitor-keys" "4.33.0"
+    debug "^4.3.1"
+    globby "^11.0.3"
+    is-glob "^4.0.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/visitor-keys@4.28.0":
   version "4.28.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz#255c67c966ec294104169a6939d96f91c8a89434"
@@ -1065,6 +1093,14 @@
     "@typescript-eslint/types" "4.28.0"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
+  integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==
+  dependencies:
+    "@typescript-eslint/types" "4.33.0"
+    eslint-visitor-keys "^2.0.0"
+
 JSONStream@^1.0.4, JSONStream@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -1173,6 +1209,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+app-module-path@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5"
+  integrity sha512-gkco+qxENJV+8vFcDiiFhuoSvRXb2a/QPqpSoWhVz829VNJfOTnELbBmPmNKFxf3xdNnw4DWCkzkDaavcX/1YQ==
+
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1293,6 +1334,16 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
+ast-module-types@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/ast-module-types/-/ast-module-types-2.7.1.tgz#3f7989ef8dfa1fdb82dfe0ab02bdfc7c77a57dd3"
+  integrity sha512-Rnnx/4Dus6fn7fTqdeLEAn5vUll5w7/vts0RN608yFa6si/rDOUonlIIiwugHBFWjylHjxm9owoSZn71KwG4gw==
+
+ast-module-types@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ast-module-types/-/ast-module-types-3.0.0.tgz#9a6d8a80f438b6b8fe4995699d700297f398bf81"
+  integrity sha512-CMxMCOCS+4D+DkOQfuZf+vLrSEmY/7xtORwdxs4wtcC1wVgvk2MqFFTwQCFhvWsI4KPU9lcWXPI8DgRiz+xetQ==
+
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -1370,6 +1421,15 @@ before-after-hook@^2.0.0:
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
   integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
 
+bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -1423,7 +1483,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.6.0:
+buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -1594,7 +1654,7 @@ chalk@^2.0.0, chalk@^2.3.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -1634,6 +1694,18 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.5.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
+  integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
+
 cli-width@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
@@ -1693,7 +1765,7 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@~1.1.4:
+color-name@^1.1.4, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -1713,6 +1785,21 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^2.16.0, commander@^2.20.3, commander@^2.8.1:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
+
 compare-func@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
@@ -1955,6 +2042,13 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.0.0, debug@^4.3.1, debug@^4.3.3:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
@@ -1962,13 +2056,6 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "2.1.2"
 
-debug@^4.3.1:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -1997,7 +2084,12 @@ dedent@^0.7.0:
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
 
-deep-is@^0.1.3:
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -2049,6 +2141,17 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
+dependency-tree@^8.1.1:
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/dependency-tree/-/dependency-tree-8.1.2.tgz#c9e652984f53bd0239bc8a3e50cbd52f05b2e770"
+  integrity sha512-c4CL1IKxkKng0oT5xrg4uNiiMVFqTGOXqHSFx7XEFdgSsp6nw3AGGruICppzJUrfad/r7GLqt26rmWU4h4j39A==
+  dependencies:
+    commander "^2.20.3"
+    debug "^4.3.1"
+    filing-cabinet "^3.0.1"
+    precinct "^8.0.0"
+    typescript "^3.9.7"
+
 deprecation@^2.0.0, deprecation@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
@@ -2059,6 +2162,90 @@ detect-indent@^5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==
 
+detective-amd@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/detective-amd/-/detective-amd-3.1.2.tgz#bf55eb5291c218b76d6224a3d07932ef13a9a357"
+  integrity sha512-jffU26dyqJ37JHR/o44La6CxtrDf3Rt9tvd2IbImJYxWKTMdBjctp37qoZ6ZcY80RHg+kzWz4bXn39e4P7cctQ==
+  dependencies:
+    ast-module-types "^3.0.0"
+    escodegen "^2.0.0"
+    get-amd-module-type "^3.0.0"
+    node-source-walk "^4.2.0"
+
+detective-cjs@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/detective-cjs/-/detective-cjs-3.1.3.tgz#50e107d67b37f459b0ec02966ceb7e20a73f268b"
+  integrity sha512-ljs7P0Yj9MK64B7G0eNl0ThWSYjhAaSYy+fQcpzaKalYl/UoQBOzOeLCSFEY1qEBhziZ3w7l46KG/nH+s+L7BQ==
+  dependencies:
+    ast-module-types "^3.0.0"
+    node-source-walk "^4.0.0"
+
+detective-es6@^2.2.0, detective-es6@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/detective-es6/-/detective-es6-2.2.2.tgz#ee5f880981d9fecae9a694007029a2f6f26d8d28"
+  integrity sha512-eZUKCUsbHm8xoeoCM0z6JFwvDfJ5Ww5HANo+jPR7AzkFpW9Mun3t/TqIF2jjeWa2TFbAiGaWESykf2OQp3oeMw==
+  dependencies:
+    node-source-walk "^4.0.0"
+
+detective-less@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/detective-less/-/detective-less-1.0.2.tgz#a68af9ca5f69d74b7d0aa190218b211d83b4f7e3"
+  integrity sha512-Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA==
+  dependencies:
+    debug "^4.0.0"
+    gonzales-pe "^4.2.3"
+    node-source-walk "^4.0.0"
+
+detective-postcss@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detective-postcss/-/detective-postcss-4.0.0.tgz#24e69b465e5fefe7a6afd05f7e894e34595dbf51"
+  integrity sha512-Fwc/g9VcrowODIAeKRWZfVA/EufxYL7XfuqJQFroBKGikKX83d2G7NFw6kDlSYGG3LNQIyVa+eWv1mqre+v4+A==
+  dependencies:
+    debug "^4.1.1"
+    is-url "^1.2.4"
+    postcss "^8.1.7"
+    postcss-values-parser "^2.0.1"
+
+detective-postcss@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/detective-postcss/-/detective-postcss-5.1.1.tgz#ec23ac3818f8be95ac3a38a8b9f3b6d43103ef87"
+  integrity sha512-YJMsvA0Y6/ST9abMNcQytl9iFQ2bfu4I7B74IUiAvyThfaI9Y666yipL+SrqfReoIekeIEwmGH72oeqX63mwUw==
+  dependencies:
+    is-url "^1.2.4"
+    postcss "^8.4.6"
+    postcss-values-parser "^5.0.0"
+
+detective-sass@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/detective-sass/-/detective-sass-3.0.2.tgz#e0f35aac79a4d2f6409c284d95b8f7ecd5973afd"
+  integrity sha512-DNVYbaSlmti/eztFGSfBw4nZvwsTaVXEQ4NsT/uFckxhJrNRFUh24d76KzoCC3aarvpZP9m8sC2L1XbLej4F7g==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    node-source-walk "^4.0.0"
+
+detective-scss@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/detective-scss/-/detective-scss-2.0.2.tgz#7d2a642616d44bf677963484fa8754d9558b8235"
+  integrity sha512-hDWnWh/l0tht/7JQltumpVea/inmkBaanJUcXRB9kEEXVwVUMuZd6z7eusQ6GcBFrfifu3pX/XPyD7StjbAiBg==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    node-source-walk "^4.0.0"
+
+detective-stylus@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detective-stylus/-/detective-stylus-1.0.3.tgz#20a702936c9fd7d4203fd7a903314b5dd43ac713"
+  integrity sha512-4/bfIU5kqjwugymoxLXXLltzQNeQfxGoLm2eIaqtnkWxqbhap9puDVpJPVDx96hnptdERzS5Cy6p9N8/08A69Q==
+
+detective-typescript@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/detective-typescript/-/detective-typescript-7.0.2.tgz#c6e00b4c28764741ef719662250e6b014a5f3c8e"
+  integrity sha512-unqovnhxzvkCz3m1/W4QW4qGsvXCU06aU2BAm8tkza+xLnp9SOFnob2QsTxUv5PdnQKfDvWcv9YeOeFckWejwA==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "^4.33.0"
+    ast-module-types "^2.7.1"
+    node-source-walk "^4.2.0"
+    typescript "^3.9.10"
+
 dezalgo@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
@@ -2145,6 +2332,14 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+enhanced-resolve@^5.8.3:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
+  integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
 enquirer@^2.3.5:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -2229,6 +2424,18 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escodegen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^5.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-plugin-cypress@^2.11.3:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz#9aeee700708ca8c058e00cdafe215199918c2632"
@@ -2321,7 +2528,7 @@ espree@^7.3.0, espree@^7.3.1:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -2482,7 +2689,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -2513,6 +2720,25 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+filing-cabinet@^3.0.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/filing-cabinet/-/filing-cabinet-3.3.0.tgz#365294d2d3d6ab01b4273e62fb6d23388a70cc0f"
+  integrity sha512-Tnbpbme1ONaHXV5DGcw0OFpcfP3p2itRf5VXO1bguBXdIewDbK6ZFBK//DGKM0BuCzaQLQNY4f5gljzxY1VCUw==
+  dependencies:
+    app-module-path "^2.2.0"
+    commander "^2.20.3"
+    debug "^4.3.3"
+    enhanced-resolve "^5.8.3"
+    is-relative-path "^1.0.2"
+    module-definition "^3.3.1"
+    module-lookup-amd "^7.0.1"
+    resolve "^1.21.0"
+    resolve-dependency-path "^2.0.0"
+    sass-lookup "^3.0.0"
+    stylus-lookup "^3.0.1"
+    tsconfig-paths "^3.10.1"
+    typescript "^3.9.7"
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -2578,6 +2804,11 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
+flatten@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
+  integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
+
 flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -2695,6 +2926,14 @@ genfun@^5.0.0:
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
   integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
+get-amd-module-type@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/get-amd-module-type/-/get-amd-module-type-3.0.2.tgz#46550cee2b8e1fa4c3f2c8a5753c36990aa49ab0"
+  integrity sha512-PcuKwB8ouJnKuAPn6Hk3UtdfKoUV3zXRqVEvj8XGIXqjWfgd1j7QGdXy5Z9OdQfzVt1Sk29HVe/P+X74ccOuqw==
+  dependencies:
+    ast-module-types "^3.0.0"
+    node-source-walk "^4.2.2"
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -2718,6 +2957,11 @@ get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-own-enumerable-property-symbols@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
+  integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
+
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -2840,7 +3084,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -2889,11 +3133,25 @@ globby@^8.0.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+gonzales-pe@^4.2.3, gonzales-pe@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
+  integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
+  dependencies:
+    minimist "^1.2.5"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+graphviz@0.0.9:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/graphviz/-/graphviz-0.0.9.tgz#0bbf1df588c6a92259282da35323622528c4bbc4"
+  integrity sha512-SmoY2pOtcikmMCqCSy2NO1YsRfu9OO0wpTlOYW++giGjfX1a6gax/m1Fo8IdUd0/3H15cTOfR1SMKwohj4LKsg==
+  dependencies:
+    temp "~0.4.0"
+
 handlebars@^4.7.6:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
@@ -3147,6 +3405,11 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  integrity sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==
+
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -3165,7 +3428,7 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^1.3.2, ini@^1.3.4:
+ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
@@ -3377,6 +3640,11 @@ is-glob@^4.0.0, is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -3401,7 +3669,7 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.0:
+is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==
@@ -3436,6 +3704,16 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
+
+is-relative-path@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-relative-path/-/is-relative-path-1.0.2.tgz#091b46a0d67c1ed0fe85f1f8cfdde006bb251d46"
+  integrity sha512-i1h+y50g+0hRbBD+dbnInl3JlJ702aar58snAeX+MxBAPvzXGej7sYoPMhlnykabt0ZzCJNBEyzMlekuQZN7fA==
+
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -3481,6 +3759,21 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+is-url-superb@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-url-superb/-/is-url-superb-4.0.0.tgz#b54d1d2499bb16792748ac967aa3ecb41a33a8c2"
+  integrity sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA==
+
+is-url@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
+  integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
+
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -3590,6 +3883,13 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -3682,6 +3982,14 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 libnpmaccess@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.2.tgz#8b2d72345ba3bef90d3b4f694edd5c0417f58923"
@@ -3821,6 +4129,14 @@ lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.5, lodash@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -3848,6 +4164,34 @@ macos-release@^2.2.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.5.0.tgz#067c2c88b5f3fb3c56a375b2ec93826220fa1ff2"
   integrity sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==
 
+madge@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/madge/-/madge-5.0.1.tgz#2096d9006558ea0669b3ade89c2cda708a24e22b"
+  integrity sha512-krmSWL9Hkgub74bOjnjWRoFPAJvPwSG6Dbta06qhWOq6X/n/FPzO3ESZvbFYVIvG2g4UHXvCJN1b+RZLaSs9nA==
+  dependencies:
+    chalk "^4.1.1"
+    commander "^7.2.0"
+    commondir "^1.0.1"
+    debug "^4.3.1"
+    dependency-tree "^8.1.1"
+    detective-amd "^3.1.0"
+    detective-cjs "^3.1.1"
+    detective-es6 "^2.2.0"
+    detective-less "^1.0.2"
+    detective-postcss "^5.0.0"
+    detective-sass "^3.0.1"
+    detective-scss "^2.0.1"
+    detective-stylus "^1.0.0"
+    detective-typescript "^7.0.0"
+    graphviz "0.0.9"
+    ora "^5.4.1"
+    pluralize "^8.0.0"
+    precinct "^8.1.0"
+    pretty-ms "^7.0.1"
+    rc "^1.2.7"
+    typescript "^3.9.5"
+    walkdir "^0.4.1"
+
 magic-string@^0.25.2:
   version "0.25.7"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
@@ -4036,7 +4380,7 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.0.0:
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -4126,6 +4470,25 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
+module-definition@^3.3.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/module-definition/-/module-definition-3.4.0.tgz#953a3861f65df5e43e80487df98bb35b70614c2b"
+  integrity sha512-XxJ88R1v458pifaSkPNLUTdSPNVGMP2SXVncVmApGO+gAfrLANiYe6JofymCzVceGOMwQE2xogxBSc8uB7XegA==
+  dependencies:
+    ast-module-types "^3.0.0"
+    node-source-walk "^4.0.0"
+
+module-lookup-amd@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/module-lookup-amd/-/module-lookup-amd-7.0.1.tgz#d67c1a93f2ff8e38b8774b99a638e9a4395774b2"
+  integrity sha512-w9mCNlj0S8qviuHzpakaLVc+/7q50jl9a/kmJ/n8bmXQZgDPkQHnPBb8MUOYh3WpAYkXuNc2c+khsozhIp/amQ==
+  dependencies:
+    commander "^2.8.1"
+    debug "^4.1.0"
+    glob "^7.1.6"
+    requirejs "^2.3.5"
+    requirejs-config-file "^4.0.0"
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -4173,6 +4536,11 @@ mute-stream@~0.0.4:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -4238,6 +4606,13 @@ node-gyp@^4.0.0:
     tar "^4.4.8"
     which "1"
 
+node-source-walk@^4.0.0, node-source-walk@^4.2.0, node-source-walk@^4.2.2:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-4.3.0.tgz#8336b56cfed23ac5180fe98f1e3bb6b11fd5317c"
+  integrity sha512-8Q1hXew6ETzqKRAs3jjLioSxNfT1cx74ooiF8RlAONwVMcfq+UdzLC2eB5qcPldUxaE5w3ytLkrmV1TGddhZTA==
+  dependencies:
+    "@babel/parser" "^7.0.0"
+
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -4453,6 +4828,25 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -4465,6 +4859,21 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
+ora@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+  dependencies:
+    bl "^4.1.0"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -4678,6 +5087,11 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
+parse-ms@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-2.1.0.tgz#348565a753d4391fa524029956b172cb7753097d"
+  integrity sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==
+
 parse-path@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.4.tgz#4bf424e6b743fb080831f03b536af9fc43f0ffea"
@@ -4771,6 +5185,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
 picomatch@^2.2.2, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -4805,16 +5224,72 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+pluralize@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
+  integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
+postcss-values-parser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
+  integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-values-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-5.0.0.tgz#10c61ac3f488e4de25746b829ea8d8894e9ac3d2"
+  integrity sha512-2viDDjMMrt21W2izbeiJxl3kFuD/+asgB0CBwPEgSyhCmBnDIa/y+pLaoyX+q3I3DHH0oPPL3cgjVTQvlS1Maw==
+  dependencies:
+    color-name "^1.1.4"
+    is-url-superb "^4.0.0"
+    quote-unquote "^1.0.0"
+
+postcss@^8.1.7, postcss@^8.4.6:
+  version "8.4.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
+  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+precinct@^8.0.0, precinct@^8.1.0:
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/precinct/-/precinct-8.3.1.tgz#94b99b623df144eed1ce40e0801c86078466f0dc"
+  integrity sha512-pVppfMWLp2wF68rwHqBIpPBYY8Kd12lDhk8LVQzOwqllifVR15qNFyod43YLyFpurKRZQKnE7E4pofAagDOm2Q==
+  dependencies:
+    commander "^2.20.3"
+    debug "^4.3.3"
+    detective-amd "^3.1.0"
+    detective-cjs "^3.1.1"
+    detective-es6 "^2.2.1"
+    detective-less "^1.0.2"
+    detective-postcss "^4.0.0"
+    detective-sass "^3.0.1"
+    detective-scss "^2.0.1"
+    detective-stylus "^1.0.0"
+    detective-typescript "^7.0.0"
+    module-definition "^3.3.1"
+    node-source-walk "^4.2.0"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+
 prettier-plugin-svelte@^2.3.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-2.6.0.tgz#0e845b560b55cd1d951d6c50431b4949f8591746"
@@ -4825,6 +5300,13 @@ prettier@^2.3.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
   integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
 
+pretty-ms@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-7.0.1.tgz#7d903eaab281f7d8e03c66f867e239dc32fb73e8"
+  integrity sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==
+  dependencies:
+    parse-ms "^2.1.0"
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -4954,6 +5436,21 @@ quick-lru@^4.0.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
+quote-unquote@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/quote-unquote/-/quote-unquote-1.0.0.tgz#67a9a77148effeaf81a4d428404a710baaac8a0b"
+  integrity sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg==
+
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 read-cmd-shim@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
@@ -5053,7 +5550,7 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2:
+"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -5176,6 +5673,19 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==
 
+requirejs-config-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/requirejs-config-file/-/requirejs-config-file-4.0.0.tgz#4244da5dd1f59874038cc1091d078d620abb6ebc"
+  integrity sha512-jnIre8cbWOyvr8a5F2KuqBnY+SDA4NXr/hzEZJG79Mxm2WiFQz2dzhC8ibtPJS7zkmBEl1mxSwp5HhC1W4qpxw==
+  dependencies:
+    esprima "^4.0.0"
+    stringify-object "^3.2.1"
+
+requirejs@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
+  integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -5183,6 +5693,11 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
+resolve-dependency-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-dependency-path/-/resolve-dependency-path-2.0.0.tgz#11700e340717b865d216c66cabeb4a2a3c696736"
+  integrity sha512-DIgu+0Dv+6v2XwRaNWnumKu7GPufBBOr5I1gRPJHkvghrfCGOooJODFvgFimX/KRxk9j0whD2MnKHzM1jYvk9w==
+
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -5198,7 +5713,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve@^1.10.0:
+resolve@^1.10.0, resolve@^1.21.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -5224,6 +5739,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -5316,6 +5839,13 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sass-lookup@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/sass-lookup/-/sass-lookup-3.0.0.tgz#3b395fa40569738ce857bc258e04df2617c48cac"
+  integrity sha512-TTsus8CfFRn1N44bvdEai1no6PqdmDiQUiqW5DlpmtT+tYnIt1tXtDIph5KA1efC+LmioJXSnCtUVpcK9gaKIg==
+  dependencies:
+    commander "^2.16.0"
+
 "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -5485,6 +6015,11 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -5506,7 +6041,7 @@ source-map@^0.5.0, source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.1:
+source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -5686,6 +6221,15 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-object@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
+  dependencies:
+    get-own-enumerable-property-symbols "^3.0.0"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -5755,6 +6299,11 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
+
 strong-log-transformer@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
@@ -5764,6 +6313,14 @@ strong-log-transformer@^2.0.0:
     minimist "^1.2.0"
     through "^2.3.4"
 
+stylus-lookup@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stylus-lookup/-/stylus-lookup-3.0.2.tgz#c9eca3ff799691020f30b382260a67355fefdddd"
+  integrity sha512-oEQGHSjg/AMaWlKe7gqsnYzan8DLcGIHe0dUaFkucZZ14z4zjENRlQMCHT4FNsiWnJf17YN9OvrCfCoi7VvOyg==
+  dependencies:
+    commander "^2.8.1"
+    debug "^4.1.0"
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -5799,6 +6356,11 @@ table@^6.0.9:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
+tapable@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
 tar@^4.4.10, tar@^4.4.8:
   version "4.4.19"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
@@ -5829,6 +6391,11 @@ temp-write@^3.4.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
+temp@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.4.0.tgz#671ad63d57be0fe9d7294664b3fc400636678a60"
+  integrity sha512-IsFisGgDKk7qzK9erMIkQe/XwiSUdac7z3wYOsjcLkhPBy3k1SlvLoIh2dAHIlEpgA971CgguMrx9z8fFg7tSA==
+
 text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
@@ -5946,6 +6513,16 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
+tsconfig-paths@^3.10.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -5977,6 +6554,13 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-fest@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
@@ -6007,6 +6591,11 @@ typescript@4.5.5:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
   integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
+typescript@^3.9.10, typescript@^3.9.5, typescript@^3.9.7:
+  version "3.9.10"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
+  integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
+
 uglify-js@^3.1.4:
   version "3.16.1"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.16.1.tgz#0e7ec928b3d0b1e1d952bce634c384fd56377317"
@@ -6042,6 +6631,11 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==
+
 unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
@@ -6144,7 +6738,12 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-wcwidth@^1.0.0:
+walkdir@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.4.1.tgz#dc119f83f4421df52e3061e514228a2db20afa39"
+  integrity sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ==
+
+wcwidth@^1.0.0, wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
   integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
@@ -6222,7 +6821,7 @@ windows-release@^3.1.0:
   dependencies:
     execa "^1.0.0"
 
-word-wrap@^1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==

From 9a6670cc54d396da92852b8aab433d93998fa03f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 20 Sep 2022 09:52:49 +0000
Subject: [PATCH 35/36] v1.3.22-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              |  4 ++--
 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, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2aabf5e8bc..fc02925725 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 3d52ba7ecd..d8f7f2eda2 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-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.3.22-alpha.2",
+    "@budibase/types": "1.3.22-alpha.3",
     "@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 bfe94cbb62..fa0eca5609 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.3.22-alpha.2",
+  "version": "1.3.22-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.3.22-alpha.2",
+    "@budibase/string-templates": "1.3.22-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 ffacb1d331..3290560fae 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.3.22-alpha.2",
-    "@budibase/client": "1.3.22-alpha.2",
-    "@budibase/frontend-core": "1.3.22-alpha.2",
-    "@budibase/string-templates": "1.3.22-alpha.2",
+    "@budibase/bbui": "1.3.22-alpha.3",
+    "@budibase/client": "1.3.22-alpha.3",
+    "@budibase/frontend-core": "1.3.22-alpha.3",
+    "@budibase/string-templates": "1.3.22-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 b3ecc2057e..5b4807b2ea 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-alpha.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,7 +26,7 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "1.3.22-alpha.2",
+    "@budibase/backend-core": "1.3.22-alpha.3",
     "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 8bd2382b3b..e57d11646a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-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.3.22-alpha.2",
-    "@budibase/frontend-core": "1.3.22-alpha.2",
-    "@budibase/string-templates": "1.3.22-alpha.2",
+    "@budibase/bbui": "1.3.22-alpha.3",
+    "@budibase/frontend-core": "1.3.22-alpha.3",
+    "@budibase/string-templates": "1.3.22-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 7177bbd755..311e6ae77e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-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.3.22-alpha.2",
+    "@budibase/bbui": "1.3.22-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index aac10fed41..51b72e4416 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-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.3.22-alpha.2",
-    "@budibase/client": "1.3.22-alpha.2",
+    "@budibase/backend-core": "1.3.22-alpha.3",
+    "@budibase/client": "1.3.22-alpha.3",
     "@budibase/pro": "1.3.22-alpha.2",
-    "@budibase/string-templates": "1.3.22-alpha.2",
-    "@budibase/types": "1.3.22-alpha.2",
+    "@budibase/string-templates": "1.3.22-alpha.3",
+    "@budibase/types": "1.3.22-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 f37e33ef5b..6d97849cbb 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-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 01c03681b0..5f91d6f4ae 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-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 3e0a16933d..750c0166c6 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.3.22-alpha.2",
+  "version": "1.3.22-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.3.22-alpha.2",
+    "@budibase/backend-core": "1.3.22-alpha.3",
     "@budibase/pro": "1.3.22-alpha.2",
-    "@budibase/string-templates": "1.3.22-alpha.2",
-    "@budibase/types": "1.3.22-alpha.2",
+    "@budibase/string-templates": "1.3.22-alpha.3",
+    "@budibase/types": "1.3.22-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From e71197d8d870006de12836699561172c6d856e50 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 20 Sep 2022 09:54:59 +0000
Subject: [PATCH 36/36] Update pro version to 1.3.22-alpha.3

---
 packages/server/package.json | 2 +-
 packages/worker/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 51b72e4416..671cb564af 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.3.22-alpha.3",
     "@budibase/client": "1.3.22-alpha.3",
-    "@budibase/pro": "1.3.22-alpha.2",
+    "@budibase/pro": "1.3.22-alpha.3",
     "@budibase/string-templates": "1.3.22-alpha.3",
     "@budibase/types": "1.3.22-alpha.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 750c0166c6..a28b3b5fa9 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "1.3.22-alpha.3",
-    "@budibase/pro": "1.3.22-alpha.2",
+    "@budibase/pro": "1.3.22-alpha.3",
     "@budibase/string-templates": "1.3.22-alpha.3",
     "@budibase/types": "1.3.22-alpha.3",
     "@koa/router": "8.0.8",