Merge branch 'develop' of github.com:Budibase/budibase into peek-screen

2024-07-04 05:50:57 +12:00 · 2021-08-02 15:12:45 +01:00 · 2021-08-02 15:12:45 +01:00 · 53e399f6c1
parent 473ccd27fa 9b66b6090f
commit 53e399f6c1
15 changed files with 82 additions and 28 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- 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": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "license": "AGPL-3.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.87-alpha.3",
-    "@budibase/client": "^0.9.87-alpha.3",
+    "@budibase/bbui": "^0.9.87-alpha.4",
+    "@budibase/client": "^0.9.87-alpha.4",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.87-alpha.3",
+    "@budibase/string-templates": "^0.9.87-alpha.4",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/components/design/AppPreview/componentStructure.json
+++ b/packages/builder/src/components/design/AppPreview/componentStructure.json
@ -49,6 +49,7 @@
    "children": [
      "heading",
      "text",
+      "divider",
      "image",
      "backgroundimage",
      "link",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -18,9 +18,9 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.87-alpha.3",
-    "@budibase/standard-components": "^0.9.87-alpha.3",
-    "@budibase/string-templates": "^0.9.87-alpha.3",
+    "@budibase/bbui": "^0.9.87-alpha.4",
+    "@budibase/standard-components": "^0.9.87-alpha.4",
+    "@budibase/string-templates": "^0.9.87-alpha.4",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "description": "Budibase Web Server",
  "main": "src/index.js",
  "repository": {
@ -60,9 +60,9 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.87-alpha.3",
-    "@budibase/client": "^0.9.87-alpha.3",
-    "@budibase/string-templates": "^0.9.87-alpha.3",
+    "@budibase/auth": "^0.9.87-alpha.4",
+    "@budibase/client": "^0.9.87-alpha.4",
+    "@budibase/string-templates": "^0.9.87-alpha.4",
    "@elastic/elasticsearch": "7.10.0",
    "@koa/router": "8.0.0",
    "@sendgrid/mail": "7.1.1",
@ -115,7 +115,7 @@
  "devDependencies": {
    "@babel/core": "^7.14.3",
    "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.87-alpha.3",
+    "@budibase/standard-components": "^0.9.87-alpha.4",
    "@jest/test-sequencer": "^24.8.0",
    "@types/bull": "^3.15.1",
    "@types/jest": "^26.0.23",
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@ -312,6 +312,39 @@
      }
    ]
  },
+  "divider": {
+    "name": "Divider",
+    "description": "A basic divider",
+    "icon": "Separator",
+    "illegalChildren": ["section"],
+    "settings": [
+      {
+        "type": "select",
+        "label": "Size",
+        "key": "size",
+        "options": [
+          {
+            "label": "Small",
+            "value": "S"
+          },
+          {
+            "label": "Medium",
+            "value": "M"
+          },
+          {
+            "label": "Large",
+            "value": "L"
+          }
+        ],
+        "defaultValue": "M"
+      },
+      {
+        "type": "boolean",
+        "label": "Vertical",
+        "key": "vertical"
+      }
+    ]
+  },
  "repeater": {
    "name": "Repeater",
    "description": "A configurable data list that attaches to your backend tables.",
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@ -29,12 +29,13 @@
  "keywords": [
    "svelte"
  ],
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "license": "MIT",
  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
  "dependencies": {
-    "@budibase/bbui": "^0.9.87-alpha.3",
+    "@budibase/bbui": "^0.9.87-alpha.4",
    "@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",
--- a/packages/standard-components/src/Divider.svelte
+++ b/packages/standard-components/src/Divider.svelte
@ -0,0 +1,18 @@
+<script>
+  import { getContext } from "svelte"
+  import "@spectrum-css/divider/dist/index-vars.css"
+
+  const { styleable } = getContext("sdk")
+  const component = getContext("component")
+
+  export let size = "M"
+
+  export let vertical = false
+</script>
+
+<hr
+  use:styleable={$component.styles}
+  class="spectrum-Divider spectrum-Divider--{vertical
+    ? 'vertical'
+    : 'horizontal'} spectrum-Dialog-divider spectrum-Divider--size{size}"
+/>
--- a/packages/standard-components/src/index.js
+++ b/packages/standard-components/src/index.js
@ -17,6 +17,7 @@ export { default as Placeholder } from "./Placeholder.svelte"
 export { default as container } from "./Container.svelte"
 export { default as section } from "./Section.svelte"
 export { default as dataprovider } from "./DataProvider.svelte"
+export { default as divider } from "./Divider.svelte"
 export { default as screenslot } from "./ScreenSlot.svelte"
 export { default as button } from "./Button.svelte"
 export { default as repeater } from "./Repeater.svelte"
--- a/packages/standard-components/yarn.lock
+++ b/packages/standard-components/yarn.lock
@ -7,10 +7,10 @@
  resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4"
  integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w==

-"@budibase/bbui@^0.9.82":
-  version "0.9.82"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.82.tgz#bb5a75a6a2a173e32ae0173485a6518be44ae99b"
-  integrity sha512-1wAACi04qjl/8o/X7U+RFcCFUMTSRCUiJybfM/9DzOGcKhechQOVZZZ/V7N3boSDiwbVjHWDEem0k5dYTk5rXw==
+"@budibase/bbui@^0.9.87-alpha.3":
+  version "0.9.88"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.88.tgz#4adf11405af063997deb933fabd20c528b74976b"
+  integrity sha512-kc/4OTJmLjAojODpXpfLpvgDZs4KaquNEFTDLsDwwuvsFtH/PRQd7K577pHk7qsnl97oSUnqN7OC0gL5S4B1Zw==
  dependencies:
    "@adobe/spectrum-css-workflow-icons" "^1.2.1"
    "@spectrum-css/actionbutton" "^1.0.1"
@ -103,7 +103,7 @@
  resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.3.tgz#7715a4ea435e753afb623d99ca5917ed1bcd6f34"
  integrity sha512-AhmKgfRIVyTe3ABiJ8lLUQL34VB/H6fN16na2LlbDRJvyRMzkdN1Xf2i6U3f4OMd3qQ8Gm5xat4BvMxIQPBAUQ==

-"@spectrum-css/divider@^1.0.1":
+"@spectrum-css/divider@^1.0.1", "@spectrum-css/divider@^1.0.3":
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385"
  integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA==
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "0.9.87-alpha.3",
+  "version": "0.9.87-alpha.4",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -21,8 +21,8 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.87-alpha.3",
-    "@budibase/string-templates": "^0.9.87-alpha.3",
+    "@budibase/auth": "^0.9.87-alpha.4",
+    "@budibase/string-templates": "^0.9.87-alpha.4",
    "@koa/router": "^8.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
    "aws-sdk": "^2.811.0",