From 6f2fe3d81ba7bb01841dac537fe4c1e7d669f4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Sat, 31 Jul 2021 15:11:33 +0200 Subject: [PATCH 1/3] adds the Spectrum divider component to the standard components --- .../design/AppPreview/componentStructure.json | 1 + packages/standard-components/manifest.json | 37 +++++++++++++++++++ packages/standard-components/package.json | 1 + .../standard-components/src/Divider.svelte | 18 +++++++++ packages/standard-components/yarn.lock | 10 ++--- 5 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 packages/standard-components/src/Divider.svelte diff --git a/packages/builder/src/components/design/AppPreview/componentStructure.json b/packages/builder/src/components/design/AppPreview/componentStructure.json index 81962cd849..c83686158f 100644 --- 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", diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json index c18d85d835..52cb821bea 100644 --- a/packages/standard-components/manifest.json +++ b/packages/standard-components/manifest.json @@ -312,6 +312,43 @@ } ] }, + "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" + }, + { + "label": "Extra large", + "value": "XL" + } + ], + "defaultValue": "M" + }, + { + "type": "boolean", + "label": "Vertical", + "key": "vertical" + } + ] + }, "repeater": { "name": "Repeater", "description": "A configurable data list that attaches to your backend tables.", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index c6a5c3c9fb..0a42925ef4 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -35,6 +35,7 @@ "dependencies": { "@budibase/bbui": "^0.9.87-alpha.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", diff --git a/packages/standard-components/src/Divider.svelte b/packages/standard-components/src/Divider.svelte new file mode 100644 index 0000000000..97ec9b620c --- /dev/null +++ b/packages/standard-components/src/Divider.svelte @@ -0,0 +1,18 @@ + + +
diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock index 7b18f0efd5..9a4eef6bb4 100644 --- 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== From b94f40dea4e5de824dda844e0050042d57fa3fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Sat, 31 Jul 2021 15:12:24 +0200 Subject: [PATCH 2/3] remove option that was not valid --- packages/standard-components/manifest.json | 4 ---- packages/standard-components/src/index.js | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json index 52cb821bea..e9c1a6ae30 100644 --- a/packages/standard-components/manifest.json +++ b/packages/standard-components/manifest.json @@ -334,10 +334,6 @@ { "label": "Large", "value": "L" - }, - { - "label": "Extra large", - "value": "XL" } ], "defaultValue": "M" diff --git a/packages/standard-components/src/index.js b/packages/standard-components/src/index.js index a137c8c3dc..ace3b907c6 100644 --- 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" From 22db140dcf4b9ffe12fbacd5c2b9436d48d65d5b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 2 Aug 2021 13:02:24 +0000 Subject: [PATCH 3/3] v0.9.87-alpha.4 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/server/package.json | 10 +++++----- packages/standard-components/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lerna.json b/lerna.json index 0ee92c01b0..e4286051f4 100644 --- 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/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index 6898b2ab8c..63d5961358 100644 --- 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", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6b8bc2e96d..7ac993a892 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": "0.9.87-alpha.3", + "version": "0.9.87-alpha.4", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 19a0d1e0fd..9fbf288e23 100644 --- 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", diff --git a/packages/cli/package.json b/packages/cli/package.json index 64b5541666..e7f7019fd4 100644 --- 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": { diff --git a/packages/client/package.json b/packages/client/package.json index 148e48ec5b..1e1f94e933 100644 --- 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" diff --git a/packages/server/package.json b/packages/server/package.json index 83fb3177a1..5ca4f5f0d9 100644 --- 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", diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 0a42925ef4..79d119f2d7 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,11 +29,11 @@ "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", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c6f6c9c061..61329d8ef1 100644 --- 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", diff --git a/packages/worker/package.json b/packages/worker/package.json index e42eae0480..ba5d90bcb5 100644 --- 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",