merge with master

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.123-alpha.7",
+  "version": "0.9.124",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.123-alpha.7",
+  "version": "0.9.124",
   "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.123-alpha.7",
+  "version": "0.9.124",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.123-alpha.7",
+  "version": "0.9.124",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.123-alpha.7",
+    "@budibase/bbui": "^0.9.124",
-    "@budibase/client": "^0.9.123-alpha.7",
+    "@budibase/client": "^0.9.124",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.123-alpha.7",
+    "@budibase/string-templates": "^0.9.124",
     "@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.123-alpha.7",
+  "version": "0.9.124",
   "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.123-alpha.7",
+  "version": "0.9.124",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,8 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.123-alpha.7",
+    "@budibase/bbui": "^0.9.124",
-    "@budibase/string-templates": "^0.9.123-alpha.7",
+    "@budibase/standard-components": "^0.9.124",
+    "@budibase/string-templates": "^0.9.124",
     "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.123-alpha.7",
+  "version": "0.9.124",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -61,9 +61,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.123-alpha.7",
+    "@budibase/auth": "^0.9.124",
-    "@budibase/client": "^0.9.123-alpha.7",
+    "@budibase/client": "^0.9.124",
-    "@budibase/string-templates": "^0.9.123-alpha.7",
+    "@budibase/string-templates": "^0.9.124",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -116,7 +116,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/client": "^0.9.123-alpha.1",
+    "@budibase/standard-components": "^0.9.124",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",

packages/standard-components/package.json

@@ -0,0 +1,49 @@
+{
+  "name": "@budibase/standard-components",
+  "module": "dist/standard-components.es.js",
+  "main": "dist/standard-components.es.js",
+  "svelte": "src/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/standard-components.es.js",
+      "require": "./dist/standard-components.es.js"
+    },
+    "./package.json": "./package.json",
+    "./manifest.json": "./manifest.json"
+  },
+  "scripts": {
+    "build": "vite build",
+    "prepublishOnly": "yarn run build",
+    "postpublish": "node scripts/deploy.js"
+  },
+  "files": [
+    "manifest.json",
+    "package.json",
+    "dist"
+  ],
+  "devDependencies": {
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.5",
+    "svelte": "^3.38.2",
+    "vite": "^2.1.5"
+  },
+  "keywords": [
+    "svelte"
+  ],
+  "version": "0.9.124",
+  "license": "MIT",
+  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
+  "dependencies": {
+    "@budibase/bbui": "^0.9.124",
+    "@spectrum-css/button": "^3.0.3",
+    "@spectrum-css/card": "^3.0.3",
+    "@spectrum-css/divider": "^1.0.3",
+    "@spectrum-css/link": "^3.1.3",
+    "@spectrum-css/page": "^3.0.1",
+    "@spectrum-css/typography": "^3.0.2",
+    "@spectrum-css/vars": "^3.0.1",
+    "apexcharts": "^3.22.1",
+    "dayjs": "^1.10.5",
+    "svelte-apexcharts": "^1.0.2",
+    "svelte-flatpickr": "^3.1.0"
+  }
+}

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.123-alpha.7",
+  "version": "0.9.124",
   "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.123-alpha.7",
+  "version": "0.9.124",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -23,8 +23,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.123-alpha.7",
+    "@budibase/auth": "^0.9.124",
-    "@budibase/string-templates": "^0.9.123-alpha.7",
+    "@budibase/string-templates": "^0.9.124",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

packages/worker/src/api/routes/global/auth.js

@@ -61,6 +61,9 @@ router
     updateTenant,
     authController.googlePreAuth
   )
+  // single tenancy endpoint
+  .get("/api/global/auth/google/callback", authController.googleAuth)
+  // multi-tenancy endpoint
   .get(
     "/api/global/auth/:tenantId/google/callback",
     updateTenant,
@@ -71,6 +74,9 @@ router
     updateTenant,
     authController.oidcPreAuth
   )
+  // single tenancy endpoint
+  .get("/api/global/auth/oidc/callback", authController.oidcAuth)
+  // multi-tenancy endpoint
   .get(
     "/api/global/auth/:tenantId/oidc/callback",
     updateTenant,