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

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

This commit is contained in:
Martin McKeaveney 2022-09-26 18:29:01 +01:00
parent f7cfd9f0b3 739ede0a30
commit 6a7bc23674
14 changed files with 75 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"npmClient": "yarn",
"packages": [
"packages/*"
@ -15,4 +15,4 @@
]
}
}
}
}

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"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.17",
"@budibase/types": "1.4.18-alpha.0",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",
@ -82,4 +82,4 @@
"typescript": "4.7.3"
},
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
}
}

6
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"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.17",
"@budibase/string-templates": "1.4.18-alpha.0",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",
@ -86,4 +86,4 @@
"svelte-portal": "^1.0.0"
},
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
}
}

12
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -71,10 +71,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.4.17",
"@budibase/client": "^1.4.17",
"@budibase/frontend-core": "^1.4.17",
"@budibase/string-templates": "^1.4.17",
"@budibase/bbui": "1.4.18-alpha.0",
"@budibase/client": "1.4.18-alpha.0",
"@budibase/frontend-core": "1.4.18-alpha.0",
"@budibase/string-templates": "1.4.18-alpha.0",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",
@ -123,4 +123,4 @@
"vite": "^3.0.8"
},
"gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
}
}

10
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,9 +26,9 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "^1.4.17",
"@budibase/string-templates": "^1.4.17",
"@budibase/types": "^1.4.17",
"@budibase/backend-core": "1.4.18-alpha.0",
"@budibase/string-templates": "1.4.18-alpha.0",
"@budibase/types": "1.4.18-alpha.0",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",
@ -52,4 +52,4 @@
"eslint": "^7.20.0",
"renamer": "^4.0.0"
}
}
}

10
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"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.17",
"@budibase/frontend-core": "^1.4.17",
"@budibase/string-templates": "^1.4.17",
"@budibase/bbui": "1.4.18-alpha.0",
"@budibase/frontend-core": "1.4.18-alpha.0",
"@budibase/string-templates": "1.4.18-alpha.0",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",
@ -59,4 +59,4 @@
"rollup-plugin-visualizer": "^5.5.4"
},
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
}
}

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

@ -1,13 +1,13 @@
{
"name": "@budibase/frontend-core",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"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.17",
"@budibase/bbui": "1.4.18-alpha.0",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}
}
}

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/sdk",
"version": "1.4.8-alpha.13",
"version": "1.4.18-alpha.0",
"description": "Budibase Public API SDK",
"author": "Budibase",
"license": "MPL-2.0",

14
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"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.17",
"@budibase/client": "^1.4.17",
"@budibase/pro": "1.4.17",
"@budibase/string-templates": "^1.4.17",
"@budibase/types": "^1.4.17",
"@budibase/backend-core": "1.4.18-alpha.0",
"@budibase/client": "1.4.18-alpha.0",
"@budibase/pro": "1.4.18-alpha.0",
"@budibase/string-templates": "1.4.18-alpha.0",
"@budibase/types": "1.4.18-alpha.0",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",
@ -200,4 +200,4 @@
"oracledb": "5.3.0"
},
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
}
}

56
packages/server/yarn.lock
View File

@ -1094,21 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
<<<<<<< HEAD
"@budibase/backend-core@1.4.8-alpha.13":
version "1.4.8-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.13.tgz#961c177f3e9a9cdc035916cfceffebcfb4070126"
integrity sha512-zsRcCkiuDFw+uON5jKFxD/S0ecF2hX1zmPFeOa2Jq77QaIT8dkRxlye1jT4fjacRQ9iIf6tYoUUOYFTVFWP8Rw==
"@budibase/backend-core@1.4.18-alpha.0":
version "1.4.18-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.18-alpha.0.tgz#27c77d0c28a17a2ee67ad0ada1431f4f03e34747"
integrity sha512-eP7v7MaULTi8ieWo0qHuXH8E2wv+8C+2FOdc4ah/af+MFP2lslfhlwF5X6aSkzODV9KbaQr1by0ytM7QS+nH6A==
dependencies:
"@budibase/types" "1.4.8-alpha.13"
=======
"@budibase/backend-core@1.4.17":
version "1.4.17"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.17.tgz#680e2de7cc4cb598c29438cc00207cb0f8750555"
integrity sha512-e4ahZnPnRXTFohD17pkDO1uxP44elbH2RFpvHodQ+jzOQPwi3NWAKi7+3BbagRzoLv7Q9Mq8IhIBZrYLntKS6g==
dependencies:
"@budibase/types" "^1.4.17"
>>>>>>> 3689ab331c6a401647111b0d1d6f9c0f2bb9fa3b
"@budibase/types" "1.4.18-alpha.0"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -1189,23 +1180,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
<<<<<<< HEAD
"@budibase/pro@1.4.8-alpha.13":
version "1.4.8-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.13.tgz#09162f9afe7d517765933f8b340b51955ccbd7e9"
integrity sha512-l4mDyTTYSP8FapBuT5YPPiDZ1IX6d11Ra+joRWkKcrtPLIsXnigyNEf+ZCtb5CNL+zrOdnNyWmXQZvAvg3DJxg==
"@budibase/pro@1.4.18-alpha.0":
version "1.4.18-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.18-alpha.0.tgz#e9910569a769e5ce107f8200ccba5295dc365fa0"
integrity sha512-GsWDZb1H3Cm3vhY8n5+eekS14pjJRI7SRDt838ff4ECLpTp6YSVnOkIwms8g7uQUuXa8HbSBDl50W93wTR4QdQ==
dependencies:
"@budibase/backend-core" "1.4.8-alpha.13"
"@budibase/types" "1.4.8-alpha.13"
=======
"@budibase/pro@1.4.17":
version "1.4.17"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.17.tgz#0648965741e77597a216806aa7e1b71212c87cc1"
integrity sha512-2ug6e8dKntOW9Fmxnr++76eV/n7CXlEfUnbVyQM8vixofCPTFBQ1mL6nAg1Cc4dx6x8grhb2o5OIydhgv0bVSQ==
dependencies:
"@budibase/backend-core" "1.4.17"
"@budibase/types" "1.4.17"
>>>>>>> 3689ab331c6a401647111b0d1d6f9c0f2bb9fa3b
"@budibase/backend-core" "1.4.18-alpha.0"
"@budibase/types" "1.4.18-alpha.0"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1228,17 +1209,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
<<<<<<< HEAD
"@budibase/types@1.4.8-alpha.13":
version "1.4.8-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.13.tgz#471c8c2a438bf05552b54bd1fd9c4254c0a41f08"
integrity sha512-YGPxfCc8h3JZY1/OgXZgn7h2r3IM0OJtruwslzdSseLwxtpQm8f1pYFP5IADQygg3mbXa7ZHsOE8Fcx64lOtJw==
=======
"@budibase/types@1.4.17", "@budibase/types@^1.4.17":
version "1.4.17"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.17.tgz#ca71fcfe202856d15fe25110edf76d81978a7dd1"
integrity sha512-JDJVx/OkvfZmH2z4rqc7qx/XyDiL/DfgGS5U+pHqQXdxO+OapfoT/Lj/X3afnvlzN/lg2h8IERLU2Ns81D2DIw==
>>>>>>> 3689ab331c6a401647111b0d1d6f9c0f2bb9fa3b
"@budibase/types@1.4.18-alpha.0":
version "1.4.18-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.18-alpha.0.tgz#f1abbef32395659ba53176fdd485557fb0f66487"
integrity sha512-UIjVotIUzu4v9IVzqEzwQdusyr5bxfET89bZ2+mTeUIj5xzWmS6z4vlBlDv2nfZThFKvXDXE5YFgzSGdESBIrA==
"@bull-board/api@3.7.0":
version "3.7.0"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",
@ -47,4 +47,4 @@
"typescript": "^4.5.5"
},
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
}
}

4
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",
@ -18,4 +18,4 @@
"rimraf": "3.0.2",
"typescript": "4.7.3"
}
}
}

12
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.4.17",
"version": "1.4.18-alpha.0",
"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.17",
"@budibase/pro": "1.4.17",
"@budibase/string-templates": "^1.4.17",
"@budibase/types": "^1.4.17",
"@budibase/backend-core": "1.4.18-alpha.0",
"@budibase/pro": "1.4.18-alpha.0",
"@budibase/string-templates": "1.4.18-alpha.0",
"@budibase/types": "1.4.18-alpha.0",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",
@ -105,4 +105,4 @@
]
},
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
}
}

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"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.17":
version "1.4.17"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.17.tgz#680e2de7cc4cb598c29438cc00207cb0f8750555"
integrity sha512-e4ahZnPnRXTFohD17pkDO1uxP44elbH2RFpvHodQ+jzOQPwi3NWAKi7+3BbagRzoLv7Q9Mq8IhIBZrYLntKS6g==
"@budibase/backend-core@1.4.18-alpha.0":
version "1.4.18-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.18-alpha.0.tgz#27c77d0c28a17a2ee67ad0ada1431f4f03e34747"
integrity sha512-eP7v7MaULTi8ieWo0qHuXH8E2wv+8C+2FOdc4ah/af+MFP2lslfhlwF5X6aSkzODV9KbaQr1by0ytM7QS+nH6A==
dependencies:
"@budibase/types" "^1.4.17"
"@budibase/types" "1.4.18-alpha.0"
"@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.17":
version "1.4.17"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.17.tgz#0648965741e77597a216806aa7e1b71212c87cc1"
integrity sha512-2ug6e8dKntOW9Fmxnr++76eV/n7CXlEfUnbVyQM8vixofCPTFBQ1mL6nAg1Cc4dx6x8grhb2o5OIydhgv0bVSQ==
"@budibase/pro@1.4.18-alpha.0":
version "1.4.18-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.18-alpha.0.tgz#e9910569a769e5ce107f8200ccba5295dc365fa0"
integrity sha512-GsWDZb1H3Cm3vhY8n5+eekS14pjJRI7SRDt838ff4ECLpTp6YSVnOkIwms8g7uQUuXa8HbSBDl50W93wTR4QdQ==
dependencies:
"@budibase/backend-core" "1.4.17"
"@budibase/types" "1.4.17"
"@budibase/backend-core" "1.4.18-alpha.0"
"@budibase/types" "1.4.18-alpha.0"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.4.17", "@budibase/types@^1.4.17":
version "1.4.17"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.17.tgz#ca71fcfe202856d15fe25110edf76d81978a7dd1"
integrity sha512-JDJVx/OkvfZmH2z4rqc7qx/XyDiL/DfgGS5U+pHqQXdxO+OapfoT/Lj/X3afnvlzN/lg2h8IERLU2Ns81D2DIw==
"@budibase/types@1.4.18-alpha.0":
version "1.4.18-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.18-alpha.0.tgz#f1abbef32395659ba53176fdd485557fb0f66487"
integrity sha512-UIjVotIUzu4v9IVzqEzwQdusyr5bxfET89bZ2+mTeUIj5xzWmS6z4vlBlDv2nfZThFKvXDXE5YFgzSGdESBIrA==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"