Merge branch 'master' into develop
This commit is contained in:
commit
37fdad7cd9
17 changed files with 72 additions and 66 deletions
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
"packages/*"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/backend-core",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"description": "Budibase backend core libraries used in server and worker",
|
||||
"main": "dist/src/index.js",
|
||||
"types": "dist/src/index.d.ts",
|
||||
|
@ -20,7 +20,7 @@
|
|||
"test:watch": "jest --watchAll"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/types": "1.4.3-alpha.3",
|
||||
"@budibase/types": "^1.4.7",
|
||||
"@shopify/jest-koa-mocks": "5.0.1",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
"aws-sdk": "2.1030.0",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/bbui",
|
||||
"description": "A UI solution used in the different Budibase projects.",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"module": "dist/bbui.es.js",
|
||||
|
@ -38,7 +38,7 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
|
||||
"@budibase/string-templates": "1.4.3-alpha.3",
|
||||
"@budibase/string-templates": "^1.4.7",
|
||||
"@spectrum-css/actionbutton": "^1.0.1",
|
||||
"@spectrum-css/actiongroup": "^1.0.1",
|
||||
"@spectrum-css/avatar": "^3.0.2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/builder",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"license": "GPL-3.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
@ -71,10 +71,10 @@
|
|||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "1.4.3-alpha.3",
|
||||
"@budibase/client": "1.4.3-alpha.3",
|
||||
"@budibase/frontend-core": "1.4.3-alpha.3",
|
||||
"@budibase/string-templates": "1.4.3-alpha.3",
|
||||
"@budibase/bbui": "^1.4.7",
|
||||
"@budibase/client": "^1.4.7",
|
||||
"@budibase/frontend-core": "^1.4.7",
|
||||
"@budibase/string-templates": "^1.4.7",
|
||||
"@sentry/browser": "5.19.1",
|
||||
"@spectrum-css/page": "^3.0.1",
|
||||
"@spectrum-css/vars": "^3.0.1",
|
||||
|
|
|
@ -34,8 +34,7 @@ export function createPluginsStore() {
|
|||
}
|
||||
|
||||
let res = await API.createPlugin(pluginData)
|
||||
|
||||
let newPlugin = res.plugins[0]
|
||||
let newPlugin = res.plugin
|
||||
update(state => {
|
||||
const currentIdx = state.findIndex(plugin => plugin._id === newPlugin._id)
|
||||
if (currentIdx >= 0) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/cli",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"description": "Budibase CLI, for developers, self hosting and migrations.",
|
||||
"main": "src/index.js",
|
||||
"bin": {
|
||||
|
@ -26,7 +26,9 @@
|
|||
"outputPath": "build"
|
||||
},
|
||||
"dependencies": {
|
||||
"@budibase/backend-core": "1.4.3-alpha.3",
|
||||
"@budibase/backend-core": "^1.4.7",
|
||||
"@budibase/string-templates": "^1.4.7",
|
||||
"@budibase/types": "^1.4.7",
|
||||
"axios": "0.21.2",
|
||||
"chalk": "4.1.0",
|
||||
"cli-progress": "3.11.2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/client",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"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": "1.4.3-alpha.3",
|
||||
"@budibase/frontend-core": "1.4.3-alpha.3",
|
||||
"@budibase/string-templates": "1.4.3-alpha.3",
|
||||
"@budibase/bbui": "^1.4.7",
|
||||
"@budibase/frontend-core": "^1.4.7",
|
||||
"@budibase/string-templates": "^1.4.7",
|
||||
"@spectrum-css/button": "^3.0.3",
|
||||
"@spectrum-css/card": "^3.0.3",
|
||||
"@spectrum-css/divider": "^1.0.3",
|
||||
|
|
|
@ -374,6 +374,11 @@
|
|||
min-height: 180px;
|
||||
min-width: 200px;
|
||||
}
|
||||
.embedded-map :global(a.map-svg-button) {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
.embedded-map :global(.leaflet-top),
|
||||
.embedded-map :global(.leaflet-bottom) {
|
||||
z-index: 998;
|
||||
|
|
|
@ -37,7 +37,7 @@ const FullScreenControl = L.Control.extend({
|
|||
this._fullScreenButton = this._createButton(
|
||||
options.fullScreenContent,
|
||||
options.fullScreenTitle,
|
||||
"map-fullscreen",
|
||||
"map-fullscreen map-svg-button",
|
||||
container,
|
||||
this._fullScreen
|
||||
)
|
||||
|
@ -87,7 +87,7 @@ const LocationControl = L.Control.extend({
|
|||
this._locationButton = this._createButton(
|
||||
options.locationContent,
|
||||
options.locationTitle,
|
||||
"map-location",
|
||||
"map-location map-svg-button",
|
||||
container,
|
||||
this._location
|
||||
)
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "@budibase/frontend-core",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"description": "Budibase frontend core libraries used in builder and client",
|
||||
"author": "Budibase",
|
||||
"license": "MPL-2.0",
|
||||
"svelte": "src/index.js",
|
||||
"dependencies": {
|
||||
"@budibase/bbui": "1.4.3-alpha.3",
|
||||
"@budibase/bbui": "^1.4.7",
|
||||
"lodash": "^4.17.21",
|
||||
"svelte": "^3.46.2"
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/server",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"description": "Budibase Web Server",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
@ -77,11 +77,11 @@
|
|||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@apidevtools/swagger-parser": "10.0.3",
|
||||
"@budibase/backend-core": "1.4.3-alpha.3",
|
||||
"@budibase/client": "1.4.3-alpha.3",
|
||||
"@budibase/pro": "1.4.3-alpha.3",
|
||||
"@budibase/string-templates": "1.4.3-alpha.3",
|
||||
"@budibase/types": "1.4.3-alpha.3",
|
||||
"@budibase/backend-core": "^1.4.7",
|
||||
"@budibase/client": "^1.4.7",
|
||||
"@budibase/pro": "1.4.7",
|
||||
"@budibase/string-templates": "^1.4.7",
|
||||
"@budibase/types": "^1.4.7",
|
||||
"@bull-board/api": "3.7.0",
|
||||
"@bull-board/koa": "3.9.4",
|
||||
"@elastic/elasticsearch": "7.10.0",
|
||||
|
|
|
@ -129,6 +129,6 @@ export async function processUploadedPlugin(
|
|||
}
|
||||
|
||||
const doc = await plugins.storePlugin(metadata, directory, source)
|
||||
ClientAppSocket.emit("plugins-update", { name: doc.name, hash: doc.hash })
|
||||
ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash })
|
||||
return doc
|
||||
}
|
||||
|
|
|
@ -1094,12 +1094,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||
|
||||
"@budibase/backend-core@1.4.3-alpha.3":
|
||||
version "1.4.3-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3-alpha.3.tgz#35932304cfa5a5c09a7bbff723cc21ea6e8ac475"
|
||||
integrity sha512-qWsW8Y7Pk3AOTnKZOIDqRO63+4rNnZzkJgpDC65K6aMw06fuQoQ0Hoq6EIWkzx1+B3cOsDJcwjonEhR4rpGHzQ==
|
||||
"@budibase/backend-core@1.4.7":
|
||||
version "1.4.7"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.7.tgz#964019383fd3d7e0acc98cc025dbb85d060c4288"
|
||||
integrity sha512-2o3WYFssVFCnSTx8JyEGRGEqGwExrKm5Ab+z44sREjFHIv3NgFXbde65D66U1tzi5vWD+gB3SfDKxNeyg+xqLQ==
|
||||
dependencies:
|
||||
"@budibase/types" "1.4.3-alpha.3"
|
||||
"@budibase/types" "^1.4.7"
|
||||
"@shopify/jest-koa-mocks" "5.0.1"
|
||||
"@techpass/passport-openidconnect" "0.3.2"
|
||||
aws-sdk "2.1030.0"
|
||||
|
@ -1180,13 +1180,13 @@
|
|||
svelte-flatpickr "^3.2.3"
|
||||
svelte-portal "^1.0.0"
|
||||
|
||||
"@budibase/pro@1.4.3-alpha.3":
|
||||
version "1.4.3-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3-alpha.3.tgz#e07643b55e78696ae82d021c55640796d5e32e2c"
|
||||
integrity sha512-qiSQX9tUILBgzO6fCYP13t7VJfoYOg1iTkEgBnxBitW5So0JT8vqHB4ecNfgcsIsR4XAsGNzKVXTctca78sTHQ==
|
||||
"@budibase/pro@1.4.7":
|
||||
version "1.4.7"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.7.tgz#05d0aac81a7a5e57226e6d7c80db83a3f1095ec1"
|
||||
integrity sha512-a/l+Dfs8AlLWjVZ9MN7f5HzeczWZbiPJGjzeLHEjPdbjXZ/52RZfz1M8oR1FVo/Ph+XpJALck+B1ai9rDzOyXg==
|
||||
dependencies:
|
||||
"@budibase/backend-core" "1.4.3-alpha.3"
|
||||
"@budibase/types" "1.4.3-alpha.3"
|
||||
"@budibase/backend-core" "1.4.7"
|
||||
"@budibase/types" "1.4.7"
|
||||
"@koa/router" "8.0.8"
|
||||
joi "17.6.0"
|
||||
node-fetch "^2.6.1"
|
||||
|
@ -1209,10 +1209,10 @@
|
|||
svelte-apexcharts "^1.0.2"
|
||||
svelte-flatpickr "^3.1.0"
|
||||
|
||||
"@budibase/types@1.4.3-alpha.3":
|
||||
version "1.4.3-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3-alpha.3.tgz#2529e7e38292592b9525081c023c3aad1c4c645a"
|
||||
integrity sha512-hvlxEKI1qPQqf6fr66qArNKzHDPPw+xeSTxzWwHozOSAc2RXvgh8vulGo8iRdmLQtmm2hcwcNRdOHo7ExO09LA==
|
||||
"@budibase/types@1.4.7", "@budibase/types@^1.4.7":
|
||||
version "1.4.7"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.7.tgz#6d352516e26c416a47bcf82915c9f92af3f6fce7"
|
||||
integrity sha512-lBU0gfRwZCwssKJKo3rCq4kyfW/BAed8zrH40j/KJIrdcw28Jh0WSrr/wOynOgMdCBoh1oHZsRJr1SfZp/wh4g==
|
||||
|
||||
"@bull-board/api@3.7.0":
|
||||
version "3.7.0"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/string-templates",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"description": "Handlebars wrapper for Budibase templating.",
|
||||
"main": "src/index.cjs",
|
||||
"module": "dist/bundle.mjs",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@budibase/types",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"description": "Budibase types",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@budibase/worker",
|
||||
"email": "hi@budibase.com",
|
||||
"version": "1.4.3-alpha.3",
|
||||
"version": "1.4.7",
|
||||
"description": "Budibase background service",
|
||||
"main": "src/index.ts",
|
||||
"repository": {
|
||||
|
@ -36,10 +36,10 @@
|
|||
"author": "Budibase",
|
||||
"license": "GPL-3.0",
|
||||
"dependencies": {
|
||||
"@budibase/backend-core": "1.4.3-alpha.3",
|
||||
"@budibase/pro": "1.4.3-alpha.3",
|
||||
"@budibase/string-templates": "1.4.3-alpha.3",
|
||||
"@budibase/types": "1.4.3-alpha.3",
|
||||
"@budibase/backend-core": "^1.4.7",
|
||||
"@budibase/pro": "1.4.7",
|
||||
"@budibase/string-templates": "^1.4.7",
|
||||
"@budibase/types": "^1.4.7",
|
||||
"@koa/router": "8.0.8",
|
||||
"@sentry/node": "6.17.7",
|
||||
"@techpass/passport-openidconnect": "0.3.2",
|
||||
|
|
|
@ -291,12 +291,12 @@
|
|||
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||
|
||||
"@budibase/backend-core@1.4.3-alpha.3":
|
||||
version "1.4.3-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3-alpha.3.tgz#35932304cfa5a5c09a7bbff723cc21ea6e8ac475"
|
||||
integrity sha512-qWsW8Y7Pk3AOTnKZOIDqRO63+4rNnZzkJgpDC65K6aMw06fuQoQ0Hoq6EIWkzx1+B3cOsDJcwjonEhR4rpGHzQ==
|
||||
"@budibase/backend-core@1.4.7":
|
||||
version "1.4.7"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.7.tgz#964019383fd3d7e0acc98cc025dbb85d060c4288"
|
||||
integrity sha512-2o3WYFssVFCnSTx8JyEGRGEqGwExrKm5Ab+z44sREjFHIv3NgFXbde65D66U1tzi5vWD+gB3SfDKxNeyg+xqLQ==
|
||||
dependencies:
|
||||
"@budibase/types" "1.4.3-alpha.3"
|
||||
"@budibase/types" "^1.4.7"
|
||||
"@shopify/jest-koa-mocks" "5.0.1"
|
||||
"@techpass/passport-openidconnect" "0.3.2"
|
||||
aws-sdk "2.1030.0"
|
||||
|
@ -327,21 +327,21 @@
|
|||
uuid "8.3.2"
|
||||
zlib "1.0.5"
|
||||
|
||||
"@budibase/pro@1.4.3-alpha.3":
|
||||
version "1.4.3-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3-alpha.3.tgz#e07643b55e78696ae82d021c55640796d5e32e2c"
|
||||
integrity sha512-qiSQX9tUILBgzO6fCYP13t7VJfoYOg1iTkEgBnxBitW5So0JT8vqHB4ecNfgcsIsR4XAsGNzKVXTctca78sTHQ==
|
||||
"@budibase/pro@1.4.7":
|
||||
version "1.4.7"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.7.tgz#05d0aac81a7a5e57226e6d7c80db83a3f1095ec1"
|
||||
integrity sha512-a/l+Dfs8AlLWjVZ9MN7f5HzeczWZbiPJGjzeLHEjPdbjXZ/52RZfz1M8oR1FVo/Ph+XpJALck+B1ai9rDzOyXg==
|
||||
dependencies:
|
||||
"@budibase/backend-core" "1.4.3-alpha.3"
|
||||
"@budibase/types" "1.4.3-alpha.3"
|
||||
"@budibase/backend-core" "1.4.7"
|
||||
"@budibase/types" "1.4.7"
|
||||
"@koa/router" "8.0.8"
|
||||
joi "17.6.0"
|
||||
node-fetch "^2.6.1"
|
||||
|
||||
"@budibase/types@1.4.3-alpha.3":
|
||||
version "1.4.3-alpha.3"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3-alpha.3.tgz#2529e7e38292592b9525081c023c3aad1c4c645a"
|
||||
integrity sha512-hvlxEKI1qPQqf6fr66qArNKzHDPPw+xeSTxzWwHozOSAc2RXvgh8vulGo8iRdmLQtmm2hcwcNRdOHo7ExO09LA==
|
||||
"@budibase/types@1.4.7", "@budibase/types@^1.4.7":
|
||||
version "1.4.7"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.7.tgz#6d352516e26c416a47bcf82915c9f92af3f6fce7"
|
||||
integrity sha512-lBU0gfRwZCwssKJKo3rCq4kyfW/BAed8zrH40j/KJIrdcw28Jh0WSrr/wOynOgMdCBoh1oHZsRJr1SfZp/wh4g==
|
||||
|
||||
"@cspotcode/source-map-consumer@0.8.0":
|
||||
version "0.8.0"
|
||||
|
|
Loading…
Reference in a new issue