Merge pull request #3619 from Budibase/merge-master-to-develop

Merge master to develop

.github/workflows/release-selfhost.yml

@@ -14,6 +14,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - uses: actions/setup-node@v1
         with:
           node-version: 14.x

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.2",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.2",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.190-alpha.12",
-    "@budibase/client": "^0.9.190-alpha.12",
+    "@budibase/bbui": "^1.0.2",
+    "@budibase/client": "^1.0.2",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.190-alpha.12",
+    "@budibase/string-templates": "^1.0.2",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.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": "^0.9.190-alpha.12",
+    "@budibase/bbui": "^1.0.2",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.190-alpha.12",
+    "@budibase/string-templates": "^1.0.2",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -69,9 +69,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/auth": "^0.9.190-alpha.12",
-    "@budibase/client": "^0.9.190-alpha.12",
-    "@budibase/string-templates": "^0.9.190-alpha.12",
+    "@budibase/auth": "^1.0.2",
+    "@budibase/client": "^1.0.2",
+    "@budibase/string-templates": "^1.0.2",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/server/src/api/controllers/user.js

@@ -81,7 +81,7 @@ exports.syncUser = async function (ctx) {
       throw err
     }
   }
-  const roles = user.roles
+  const roles = deleting ? {} : user.roles
   // remove props which aren't useful to metadata
   delete user.password
   delete user.forceResetPassword

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.190-alpha.12",
+  "version": "1.0.2",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/auth": "^0.9.190-alpha.12",
-    "@budibase/string-templates": "^0.9.190-alpha.12",
+    "@budibase/auth": "^1.0.2",
+    "@budibase/string-templates": "^1.0.2",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",