merge with master

.github/workflows/release.yml

@@ -42,9 +42,9 @@ jobs:
           echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
           yarn release
 
-      - name: Get Previous tag
+      - name: 'Get Previous tag'
-          id: previoustag
+        id: previoustag
-          uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
 
       - name: Build/release Docker images
         run: | 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.116-alpha.3",
+  "version": "0.9.116",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/auth/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@budibase/auth",
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@budibase/builder",
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +69,17 @@
     }
   },
   "dependencies": {
+<<<<<<< HEAD
     "@budibase/bbui": "^0.9.116-alpha.3",
     "@budibase/client": "^0.9.116-alpha.3",
     "@budibase/colorpicker": "1.1.2",
     "@budibase/string-templates": "^0.9.116-alpha.3",
+=======
+    "@budibase/bbui": "^0.9.116",
+    "@budibase/client": "^0.9.116",
+    "@budibase/colorpicker": "1.1.2",
+    "@budibase/string-templates": "^0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/cli/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@budibase/cli",
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@budibase/client",
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +22,15 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@budibase/bbui": "^0.9.116-alpha.3",
     "@budibase/standard-components": "^0.9.116-alpha.3",
     "@budibase/string-templates": "^0.9.116-alpha.3",
+=======
+    "@budibase/bbui": "^0.9.116",
+    "@budibase/standard-components": "^0.9.116",
+    "@budibase/string-templates": "^0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -62,9 +66,15 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
+<<<<<<< HEAD
     "@budibase/auth": "^0.9.116-alpha.3",
     "@budibase/client": "^0.9.116-alpha.3",
     "@budibase/string-templates": "^0.9.116-alpha.3",
+=======
+    "@budibase/auth": "^0.9.116",
+    "@budibase/client": "^0.9.116",
+    "@budibase/string-templates": "^0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -117,7 +127,11 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
+<<<<<<< HEAD
     "@budibase/standard-components": "^0.9.116-alpha.3",
+=======
+    "@budibase/standard-components": "^0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",

packages/standard-components/package.json

@@ -29,11 +29,19 @@
   "keywords": [
     "svelte"
   ],
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
     "@budibase/bbui": "^0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+  "license": "MIT",
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
+  "dependencies": {
+    "@budibase/bbui": "^0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/string-templates/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@budibase/string-templates",
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
+<<<<<<< HEAD
   "version": "0.9.116-alpha.3",
+=======
+  "version": "0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -23,8 +27,13 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
+<<<<<<< HEAD
     "@budibase/auth": "^0.9.116-alpha.3",
     "@budibase/string-templates": "^0.9.116-alpha.3",
+=======
+    "@budibase/auth": "^0.9.116",
+    "@budibase/string-templates": "^0.9.116",
+>>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",