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

merge

pull/7522/head
Martin McKeaveney 4 years ago
parent
0089a07096 197085ffcc
commit
e8db6aebb8
13 changed files with 60 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lerna.json
  2. 4
      packages/backend-core/package.json
  3. 4
      packages/bbui/package.json
  4. 10
      packages/builder/package.json
  5. 2
      packages/cli/package.json
  6. 8
      packages/client/package.json
  7. 4
      packages/frontend-core/package.json
  8. 12
      packages/server/package.json
  9. 67
      packages/server/yarn.lock
  10. 2
      packages/string-templates/package.json
  11. 2
      packages/types/package.json
  12. 10
      packages/worker/package.json
  13. 67
      packages/worker/yarn.lock

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.2.43",
"version": "1.2.44-alpha.10",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.2.52",
"version": "1.2.44-alpha.11",
"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.2.52",
"@budibase/types": "1.2.44-alpha.11",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",
"bcrypt": "5.0.1",

4
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.2.52",
"version": "1.2.44-alpha.11",
"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.2.52",
"@budibase/string-templates": "1.2.44-alpha.11",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

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

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.2.52",
"version": "1.2.44-alpha.11",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.2.52",
"version": "1.2.44-alpha.11",
"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.2.52",
"@budibase/frontend-core": "^1.2.52",
"@budibase/string-templates": "^1.2.52",
"@budibase/bbui": "1.2.44-alpha.11",
"@budibase/frontend-core": "1.2.44-alpha.11",
"@budibase/string-templates": "1.2.44-alpha.11",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

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

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

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.2.52",
"version": "1.2.44-alpha.11",
"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.2.52",
"@budibase/client": "^1.2.52",
"@budibase/pro": "1.2.52",
"@budibase/string-templates": "^1.2.52",
"@budibase/types": "^1.2.52",
"@budibase/backend-core": "1.2.44-alpha.11",
"@budibase/client": "1.2.44-alpha.11",
"@budibase/pro": "1.2.44-alpha.11",
"@budibase/string-templates": "1.2.44-alpha.11",
"@budibase/types": "1.2.44-alpha.11",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

67
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"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.2.52":
version "1.2.52"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.52.tgz#0fb41c42081224e513781a9deee23cfbbe40477d"
integrity sha512-e4RguuyYih4pP2lg62Qro5LPa4zGYYafaH5VvZvpZ/YrGsZxcnf0vweE5WZVUKtX3ZQhVtrW5gzvrAaqQUOIbQ==
"@budibase/backend-core@1.2.44-alpha.11":
version "1.2.44-alpha.11"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.11.tgz#6dc33219c343776f9142d3d6938513cebe267f58"
integrity sha512-47snLRBA9gU3EjhyskKetKeM35fDHkgzflme/VfFFBBTEjl5WuRMEg2I7Vg9ZCWjiY7VQbkYX1yzxuXtw+zf3w==
dependencies:
"@budibase/types" "^1.2.52"
"@budibase/types" "1.2.44-alpha.11"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -1177,38 +1177,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/handlebars-helpers@^0.11.8":
version "0.11.8"
resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
"@budibase/pro@1.2.44-alpha.11":
version "1.2.44-alpha.11"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.11.tgz#27dd5b1f5083bd69406357063dd111ab5810e476"
integrity sha512-xKKuSjo9NznmA2BRN6EGsklp+Eegta5bIInpUJS0K5OGoUBQ9rBD9HTLYVBei6irQ0eZAig9iNW+LF/Qy07P/A==
dependencies:
array-sort "^1.0.0"
define-property "^2.0.2"
extend-shallow "^3.0.2"
for-in "^1.0.2"
get-object "^0.2.0"
get-value "^3.0.1"
handlebars "^4.7.7"
handlebars-utils "^1.0.6"
has-value "^2.0.2"
helper-md "^0.2.2"
html-tag "^2.0.0"
is-even "^1.0.0"
is-glob "^4.0.1"
kind-of "^6.0.3"
micromatch "^3.1.5"
relative "^3.0.2"
striptags "^3.1.1"
to-gfm-code-block "^0.1.1"
year "^0.2.1"
"@budibase/pro@1.2.52":
version "1.2.52"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.52.tgz#585789af03cb1440a7edbab06fb197c77141b887"
integrity sha512-ehVC4dle5/yEMKG8etEzD7cxWDEGsMoaigpf1iseY1S+EbV4MHvkku1oSB64fekDc211UD5jMXQx8lLVgoZQDw==
dependencies:
"@budibase/backend-core" "1.2.52"
"@budibase/types" "1.2.52"
"@budibase/backend-core" "1.2.44-alpha.11"
"@budibase/types" "1.2.44-alpha.11"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1231,22 +1206,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/string-templates@^1.2.52":
version "1.2.52"
resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.2.52.tgz#955233f35037b48e8d1287aedae58bedbcdbaf79"
integrity sha512-LoaIBWqhD9VQ6+IH2h1/+CN9Pjdsmcy8sOzZmgldsYKzjvDkbk4vHk51Cp30FYHHTTTnYvHE562Lppz9vB1K5A==
dependencies:
"@budibase/handlebars-helpers" "^0.11.8"
dayjs "^1.10.4"
handlebars "^4.7.6"
handlebars-utils "^1.0.6"
lodash "^4.17.20"
vm2 "^3.9.4"
"@budibase/types@1.2.52", "@budibase/types@^1.2.52":
version "1.2.52"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.52.tgz#11d35cdaf1b88bd9f4e12677dc3e34a74e80bf74"
integrity sha512-i9bZC59THo+BXssF1eCln2wouj3esFY8fWqqmjPN+Bo1l078LBMXTF0q+BjdSkf5jf6SR1TrT0uXj5AN0e6xWA==
"@budibase/types@1.2.44-alpha.11":
version "1.2.44-alpha.11"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.11.tgz#f6c3312d0392f8561509ca4649ca553917df6492"
integrity sha512-22sFDaHqS8+Oc9DhgGN6upITA/F/XZNONlpF4s15Lrc6rQg9Ou0RkXJ6z1Zr0LrrhhjJhslg4179/xJ0irGoPA==
"@bull-board/api@3.7.0":
version "3.7.0"

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

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

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.2.52",
"version": "1.2.44-alpha.11",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View File

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

67
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.2.52":
version "1.2.52"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.52.tgz#0fb41c42081224e513781a9deee23cfbbe40477d"
integrity sha512-e4RguuyYih4pP2lg62Qro5LPa4zGYYafaH5VvZvpZ/YrGsZxcnf0vweE5WZVUKtX3ZQhVtrW5gzvrAaqQUOIbQ==
"@budibase/backend-core@1.2.44-alpha.11":
version "1.2.44-alpha.11"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.11.tgz#6dc33219c343776f9142d3d6938513cebe267f58"
integrity sha512-47snLRBA9gU3EjhyskKetKeM35fDHkgzflme/VfFFBBTEjl5WuRMEg2I7Vg9ZCWjiY7VQbkYX1yzxuXtw+zf3w==
dependencies:
"@budibase/types" "^1.2.52"
"@budibase/types" "1.2.44-alpha.11"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -324,58 +324,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/handlebars-helpers@^0.11.8":
version "0.11.8"
resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
"@budibase/pro@1.2.44-alpha.11":
version "1.2.44-alpha.11"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.11.tgz#27dd5b1f5083bd69406357063dd111ab5810e476"
integrity sha512-xKKuSjo9NznmA2BRN6EGsklp+Eegta5bIInpUJS0K5OGoUBQ9rBD9HTLYVBei6irQ0eZAig9iNW+LF/Qy07P/A==
dependencies:
array-sort "^1.0.0"
define-property "^2.0.2"
extend-shallow "^3.0.2"
for-in "^1.0.2"
get-object "^0.2.0"
get-value "^3.0.1"
handlebars "^4.7.7"
handlebars-utils "^1.0.6"
has-value "^2.0.2"
helper-md "^0.2.2"
html-tag "^2.0.0"
is-even "^1.0.0"
is-glob "^4.0.1"
kind-of "^6.0.3"
micromatch "^3.1.5"
relative "^3.0.2"
striptags "^3.1.1"
to-gfm-code-block "^0.1.1"
year "^0.2.1"
"@budibase/pro@1.2.52":
version "1.2.52"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.52.tgz#585789af03cb1440a7edbab06fb197c77141b887"
integrity sha512-ehVC4dle5/yEMKG8etEzD7cxWDEGsMoaigpf1iseY1S+EbV4MHvkku1oSB64fekDc211UD5jMXQx8lLVgoZQDw==
dependencies:
"@budibase/backend-core" "1.2.52"
"@budibase/types" "1.2.52"
"@budibase/backend-core" "1.2.44-alpha.11"
"@budibase/types" "1.2.44-alpha.11"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/string-templates@^1.2.52":
version "1.2.52"
resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.2.52.tgz#955233f35037b48e8d1287aedae58bedbcdbaf79"
integrity sha512-LoaIBWqhD9VQ6+IH2h1/+CN9Pjdsmcy8sOzZmgldsYKzjvDkbk4vHk51Cp30FYHHTTTnYvHE562Lppz9vB1K5A==
dependencies:
"@budibase/handlebars-helpers" "^0.11.8"
dayjs "^1.10.4"
handlebars "^4.7.6"
handlebars-utils "^1.0.6"
lodash "^4.17.20"
vm2 "^3.9.4"
"@budibase/types@1.2.52", "@budibase/types@^1.2.52":
version "1.2.52"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.52.tgz#11d35cdaf1b88bd9f4e12677dc3e34a74e80bf74"
integrity sha512-i9bZC59THo+BXssF1eCln2wouj3esFY8fWqqmjPN+Bo1l078LBMXTF0q+BjdSkf5jf6SR1TrT0uXj5AN0e6xWA==
"@budibase/types@1.2.44-alpha.11":
version "1.2.44-alpha.11"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.11.tgz#f6c3312d0392f8561509ca4649ca553917df6492"
integrity sha512-22sFDaHqS8+Oc9DhgGN6upITA/F/XZNONlpF4s15Lrc6rQg9Ou0RkXJ6z1Zr0LrrhhjJhslg4179/xJ0irGoPA==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"

Write Preview
Loading…
Cancel
Save