MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pc/automation-fix

This commit is contained in:
Peter Clement 2022-09-23 15:37:04 +01:00
parent 334ac0d512 1959acd4c1
commit cd2d5a7c7c
17 changed files with 2288 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.4", "version": "1.4.10",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "1.4.4", "version": "1.4.10",
"description": "Budibase backend core libraries used in server and worker", "description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js", "main": "dist/src/index.js",
"types": "dist/src/index.d.ts", "types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll" "test:watch": "jest --watchAll"
}, },
"dependencies": { "dependencies": {
"@budibase/types": "^1.4.4", "@budibase/types": "^1.4.10",
"@shopify/jest-koa-mocks": "5.0.1", "@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0", "aws-sdk": "2.1030.0",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "description": "A UI solution used in the different Budibase projects.",
"version": "1.4.4", "version": "1.4.10",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1", "@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "^1.4.4", "@budibase/string-templates": "^1.4.10",
"@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2", "@spectrum-css/avatar": "^3.0.2",

5
packages/bbui/src/Form/Core/Dropzone.svelte
View File

@ -65,6 +65,9 @@
} }
} }
$: showDropzone =
(!maximum || (maximum && value?.length < maximum)) && !disabled
async function processFileList(fileList) { async function processFileList(fileList) {
if ( if (
handleFileTooLarge && handleFileTooLarge &&
@ -211,7 +214,7 @@
{/each} {/each}
{/if} {/if}
{/if} {/if}
{#if !maximum || (maximum && value?.length < maximum)} {#if showDropzone}
<div <div
class="spectrum-Dropzone" class="spectrum-Dropzone"
class:is-invalid={!!error} class:is-invalid={!!error}

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "1.4.4", "version": "1.4.10",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -71,10 +71,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.4.4", "@budibase/bbui": "^1.4.10",
"@budibase/client": "^1.4.4", "@budibase/client": "^1.4.10",
"@budibase/frontend-core": "^1.4.4", "@budibase/frontend-core": "^1.4.10",
"@budibase/string-templates": "^1.4.4", "@budibase/string-templates": "^1.4.10",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",

3
packages/builder/src/stores/portal/plugins.js
View File

@ -34,8 +34,7 @@ export function createPluginsStore() {
} }
let res = await API.createPlugin(pluginData) let res = await API.createPlugin(pluginData)
let newPlugin = res.plugin
let newPlugin = res.plugins[0]
update(state => { update(state => {
const currentIdx = state.findIndex(plugin => plugin._id === newPlugin._id) const currentIdx = state.findIndex(plugin => plugin._id === newPlugin._id)
if (currentIdx >= 0) { if (currentIdx >= 0) {

6
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "1.4.4", "version": "1.4.10",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js", "main": "src/index.js",
"bin": { "bin": {
@ -26,7 +26,9 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "^1.4.4", "@budibase/backend-core": "^1.4.10",
"@budibase/string-templates": "^1.4.10",
"@budibase/types": "^1.4.10",
"axios": "0.21.2", "axios": "0.21.2",
"chalk": "4.1.0", "chalk": "4.1.0",
"cli-progress": "3.11.2", "cli-progress": "3.11.2",

2239
packages/cli/yarn.lock
View File

File diff suppressed because it is too large Load Diff

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "1.4.4", "version": "1.4.10",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.4.4", "@budibase/bbui": "^1.4.10",
"@budibase/frontend-core": "^1.4.4", "@budibase/frontend-core": "^1.4.10",
"@budibase/string-templates": "^1.4.4", "@budibase/string-templates": "^1.4.10",
"@spectrum-css/button": "^3.0.3", "@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3", "@spectrum-css/divider": "^1.0.3",

13
packages/client/src/websocket.js
View File

@ -1,12 +1,13 @@
import { builderStore } from "./stores/index.js" import { builderStore, environmentStore } from "./stores/index.js"
import { get } from "svelte/store" import { get } from "svelte/store"
import { io } from "socket.io-client" import { io } from "socket.io-client"
export const initWebsocket = () => { export const initWebsocket = () => {
const { inBuilder, location } = get(builderStore) const { inBuilder, location } = get(builderStore)
const { cloud } = get(environmentStore)
// Only connect when we're inside the builder preview, for now // Only connect when we're inside the builder preview, for now
if (!inBuilder || !location) { if (!inBuilder || !location || cloud) {
return return
} }
@ -17,6 +18,14 @@ export const initWebsocket = () => {
const port = location.port || (tls ? 443 : 80) const port = location.port || (tls ? 443 : 80)
const socket = io(`${proto}//${host}:${port}`, { const socket = io(`${proto}//${host}:${port}`, {
path: "/socket/client", path: "/socket/client",
// Cap reconnection attempts to 10 (total of 95 seconds before giving up)
reconnectionAttempts: 10,
// Delay initial reconnection attempt by 5 seconds
reconnectionDelay: 5000,
// Then decrease to 10 second intervals
reconnectionDelayMax: 10000,
// Timeout after 5 seconds so we never stack requests
timeout: 5000,
}) })
// Event handlers // Event handlers

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "1.4.4", "version": "1.4.10",
"description": "Budibase frontend core libraries used in builder and client", "description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.4.4", "@budibase/bbui": "^1.4.10",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"svelte": "^3.46.2" "svelte": "^3.46.2"
} }

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "1.4.4", "version": "1.4.10",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@apidevtools/swagger-parser": "10.0.3", "@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "^1.4.4", "@budibase/backend-core": "^1.4.10",
"@budibase/client": "^1.4.4", "@budibase/client": "^1.4.10",
"@budibase/pro": "1.4.4", "@budibase/pro": "1.4.10",
"@budibase/string-templates": "^1.4.4", "@budibase/string-templates": "^1.4.10",
"@budibase/types": "^1.4.4", "@budibase/types": "^1.4.10",
"@bull-board/api": "3.7.0", "@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4", "@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",

30
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.4": "@budibase/backend-core@1.4.10":
version "1.4.4" version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.4.tgz#de7f3457e24aa1b91e2135b007753c69a358bb78" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.10.tgz#880b58ebfb8a0489fb15266bd8e2930ac097d8d1"
integrity sha512-FoLqxq7XFzRvqWJ61l/1QGGUIOzfc6GpNXhjLnHfiPvzHsn74qXO5WiS/dFZXdoWvmHPqz/D+jNBEEPx0q/lKQ== integrity sha512-w18Gwjp9IqIf6W1bAKG7FcVjUfq76yv0DGebK2FFYDEKIijhxGU7+URyHiqQi5Cdve8PRJ13+krPir38kUKH9w==
dependencies: dependencies:
"@budibase/types" "^1.4.4" "@budibase/types" "^1.4.10"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0" aws-sdk "2.1030.0"
@ -1180,13 +1180,13 @@
svelte-flatpickr "^3.2.3" svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0" svelte-portal "^1.0.0"
"@budibase/pro@1.4.4": "@budibase/pro@1.4.10":
version "1.4.4" version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.4.tgz#ed990dfe59afc2b75bb4a621c00bf1a4739aff05" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.10.tgz#676d81472df8d600b91a9c4dd25b826ea3adde06"
integrity sha512-DPuFJKWLPvKrm3a4rTUwOygtEmnm5QWSRPtEBJG3xLC6WeWF4yoNlK+QwRyb0zLxYENcN8Hk++ydU3MA5x+CFg== integrity sha512-vTr37tf6T0FEZOngCI9vJBxvxfmMgpsRP8+HmncVswgxIk3RbRWYF2Th1enemMe/X+lohWqhreTTy1RPQ6dzeA==
dependencies: dependencies:
"@budibase/backend-core" "1.4.4" "@budibase/backend-core" "1.4.10"
"@budibase/types" "1.4.4" "@budibase/types" "1.4.10"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
@ -1209,10 +1209,10 @@
svelte-apexcharts "^1.0.2" svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0" svelte-flatpickr "^3.1.0"
"@budibase/types@1.4.4", "@budibase/types@^1.4.4": "@budibase/types@1.4.10", "@budibase/types@^1.4.10":
version "1.4.4" version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.4.tgz#936f3659060345751ed2fa5071fef73ba6d95732" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.10.tgz#6c1ba3859f3d9452f21cea3bffa51541d76afaa0"
integrity sha512-ss2LNuj2ObTMwS3mfLevTiLS2N0cZz25LhdNOEKzdIdCnm/Zq1cj2Ldi0SRcpO358aU+c3co/lCgA938GNY0qQ== integrity sha512-MtHT1GHEMV+fE2Kd64Y21Ut9+HPhE1ScyGTMeNciFEFhSODOy7VEoRXcbEZSk39N5vj3w8lfXGRYNb7zTzrUZw==
"@bull-board/api@3.7.0": "@bull-board/api@3.7.0":
version "3.7.0" version "3.7.0"

2
packages/string-templates/package.json
View File

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

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/types", "name": "@budibase/types",
"version": "1.4.4", "version": "1.4.10",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "1.4.4", "version": "1.4.10",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -36,10 +36,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "^1.4.4", "@budibase/backend-core": "^1.4.10",
"@budibase/pro": "1.4.4", "@budibase/pro": "1.4.10",
"@budibase/string-templates": "^1.4.4", "@budibase/string-templates": "^1.4.10",
"@budibase/types": "^1.4.4", "@budibase/types": "^1.4.10",
"@koa/router": "8.0.8", "@koa/router": "8.0.8",
"@sentry/node": "6.17.7", "@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.4": "@budibase/backend-core@1.4.10":
version "1.4.4" version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.4.tgz#de7f3457e24aa1b91e2135b007753c69a358bb78" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.10.tgz#880b58ebfb8a0489fb15266bd8e2930ac097d8d1"
integrity sha512-FoLqxq7XFzRvqWJ61l/1QGGUIOzfc6GpNXhjLnHfiPvzHsn74qXO5WiS/dFZXdoWvmHPqz/D+jNBEEPx0q/lKQ== integrity sha512-w18Gwjp9IqIf6W1bAKG7FcVjUfq76yv0DGebK2FFYDEKIijhxGU7+URyHiqQi5Cdve8PRJ13+krPir38kUKH9w==
dependencies: dependencies:
"@budibase/types" "^1.4.4" "@budibase/types" "^1.4.10"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0" aws-sdk "2.1030.0"
@ -327,21 +327,21 @@
uuid "8.3.2" uuid "8.3.2"
zlib "1.0.5" zlib "1.0.5"
"@budibase/pro@1.4.4": "@budibase/pro@1.4.10":
version "1.4.4" version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.4.tgz#ed990dfe59afc2b75bb4a621c00bf1a4739aff05" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.10.tgz#676d81472df8d600b91a9c4dd25b826ea3adde06"
integrity sha512-DPuFJKWLPvKrm3a4rTUwOygtEmnm5QWSRPtEBJG3xLC6WeWF4yoNlK+QwRyb0zLxYENcN8Hk++ydU3MA5x+CFg== integrity sha512-vTr37tf6T0FEZOngCI9vJBxvxfmMgpsRP8+HmncVswgxIk3RbRWYF2Th1enemMe/X+lohWqhreTTy1RPQ6dzeA==
dependencies: dependencies:
"@budibase/backend-core" "1.4.4" "@budibase/backend-core" "1.4.10"
"@budibase/types" "1.4.4" "@budibase/types" "1.4.10"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
"@budibase/types@1.4.4", "@budibase/types@^1.4.4": "@budibase/types@1.4.10", "@budibase/types@^1.4.10":
version "1.4.4" version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.4.tgz#936f3659060345751ed2fa5071fef73ba6d95732" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.10.tgz#6c1ba3859f3d9452f21cea3bffa51541d76afaa0"
integrity sha512-ss2LNuj2ObTMwS3mfLevTiLS2N0cZz25LhdNOEKzdIdCnm/Zq1cj2Ldi0SRcpO358aU+c3co/lCgA938GNY0qQ== integrity sha512-MtHT1GHEMV+fE2Kd64Y21Ut9+HPhE1ScyGTMeNciFEFhSODOy7VEoRXcbEZSk39N5vj3w8lfXGRYNb7zTzrUZw==
"@cspotcode/source-map-consumer@0.8.0": "@cspotcode/source-map-consumer@0.8.0":
version "0.8.0" version "0.8.0"