diff --git a/lerna.json b/lerna.json index 4974a78682..1601047fab 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.59-alpha.0", + "version": "1.3.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1b0304cb91..d0a283b6c3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "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.59-alpha.0", + "@budibase/types": "^1.3.3", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 13c695d015..1af78bb1af 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": "1.2.59-alpha.0", + "version": "1.3.3", "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.59-alpha.0", + "@budibase/string-templates": "^1.3.3", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index e437ec44d0..ba52c71e16 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.2.59-alpha.0", - "@budibase/client": "1.2.59-alpha.0", - "@budibase/frontend-core": "1.2.59-alpha.0", - "@budibase/string-templates": "1.2.59-alpha.0", + "@budibase/bbui": "^1.3.3", + "@budibase/client": "^1.3.3", + "@budibase/frontend-core": "^1.3.3", + "@budibase/string-templates": "^1.3.3", "@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 ac89be6edf..18380d371a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "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.2.58-alpha.7", - "@budibase/string-templates": "1.2.58-alpha.7", - "@budibase/types": "1.2.58-alpha.7", + "@budibase/backend-core": "^1.3.3", + "@budibase/string-templates": "^1.3.3", + "@budibase/types": "^1.3.3", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/cli/yarn.lock b/packages/cli/yarn.lock index e65c195d04..4377da0fb0 100644 --- a/packages/cli/yarn.lock +++ b/packages/cli/yarn.lock @@ -1129,9 +1129,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2" - integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== follow-redirects@^1.14.0: version "1.15.1" @@ -2314,6 +2314,11 @@ query-string@^5.0.1: object-assign "^4.1.0" strict-uri-encode "^1.0.0" +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -2431,6 +2436,11 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -2852,13 +2862,14 @@ to-regex-range@^5.0.1: is-number "^7.0.0" "tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" - integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== dependencies: psl "^1.1.33" punycode "^2.1.1" - universalify "^0.1.2" + universalify "^0.2.0" + url-parse "^1.5.3" tr46@~0.0.3: version "0.0.3" @@ -2931,10 +2942,10 @@ unbzip2-stream@^1.0.9: buffer "^5.2.1" through "^2.3.8" -universalify@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== universalify@^2.0.0: version "2.0.0" @@ -2960,6 +2971,14 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" diff --git a/packages/client/package.json b/packages/client/package.json index 0c00c1a702..a3d1178c0e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "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.59-alpha.0", - "@budibase/frontend-core": "1.2.59-alpha.0", - "@budibase/string-templates": "1.2.59-alpha.0", + "@budibase/bbui": "^1.3.3", + "@budibase/frontend-core": "^1.3.3", + "@budibase/string-templates": "^1.3.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/client/src/components/Screen.svelte b/packages/client/src/components/Screen.svelte index 3ec8d1ea52..af895c6b82 100644 --- a/packages/client/src/components/Screen.svelte +++ b/packages/client/src/components/Screen.svelte @@ -3,7 +3,7 @@ import Component from "./Component.svelte" import Provider from "./context/Provider.svelte" import { onMount, getContext } from "svelte" - import { enrichButtonActions } from "utils/buttonActions.js" + import { enrichButtonActions } from "../utils/buttonActions.js" export let params = {} @@ -29,7 +29,9 @@ ...$context, url: params, }) - actions() + if (actions != null) { + actions() + } } }) diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 8403e5034e..cbcf83561f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "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.59-alpha.0", + "@budibase/bbui": "^1.3.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index e46c6cf9b8..1f126b79eb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "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.59-alpha.0", - "@budibase/client": "1.2.59-alpha.0", - "@budibase/pro": "1.2.59-alpha.0", - "@budibase/string-templates": "1.2.59-alpha.0", - "@budibase/types": "1.2.59-alpha.0", + "@budibase/backend-core": "^1.3.3", + "@budibase/client": "^1.3.3", + "@budibase/pro": "1.3.3", + "@budibase/string-templates": "^1.3.3", + "@budibase/types": "^1.3.3", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f76cd51ff2..03160e0173 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -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.59-alpha.0": - version "1.2.59-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.59-alpha.0.tgz#34330175c26e31ec4838891e8ed561d5f75f1158" - integrity sha512-dXVX+IKeNMUIQUAH52E/9D73s+PSkXeU5m7dGjGeiWZQ2m3CALX0XhdL64NVEmpwmKwJVEvagi26lQSYwVrSyQ== +"@budibase/backend-core@1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.3.tgz#092f5be5277048efd7719a2b0eb995485f6cc446" + integrity sha512-nl2RPKNIMSfDEcj8i09iIbnPzkz9wcLLUvWgK1VXoRt4aI7r6a/OBucCv3+QtbJP5hfG7BJ4ThcunLgttP1IrA== dependencies: - "@budibase/types" "1.2.59-alpha.0" + "@budibase/types" "^1.3.3" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1178,13 +1178,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.2.59-alpha.0": - version "1.2.59-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.59-alpha.0.tgz#191865bf170832b17566336b047d3461f6036009" - integrity sha512-nP8LL0eZdWpLZ4NViou31dE3uY1dQPJDzvFE9r71OsSLG6KGHS7fkkMA+4hq3gfrsPzAIp729m6RroksqnnKGw== +"@budibase/pro@1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.3.tgz#90068258b902b5151633636c0a1131d3e5e3bb01" + integrity sha512-SWbvsS1Ebz5KIgK07YuLR+hWtk0jXUP6rm6koyWebOVJSEudiWUyj839XJzVZxdJsvx9mJIorlHT1aDo0nZCRw== dependencies: - "@budibase/backend-core" "1.2.59-alpha.0" - "@budibase/types" "1.2.59-alpha.0" + "@budibase/backend-core" "1.3.3" + "@budibase/types" "1.3.3" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1207,10 +1207,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.2.59-alpha.0": - version "1.2.59-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.59-alpha.0.tgz#7d77598607865a0f5b9a7c9063e0f7a774ebd2a1" - integrity sha512-ddoqBxRKYl3biVmg3l3jFE/eB8DvL1VqMA/sIaVYU16Js913pU0jauT9Z/y2uqiGescfoZReCabBjD7qhr6L7w== +"@budibase/types@1.3.3", "@budibase/types@^1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.3.tgz#4a0d7e3e50e864aca4fc8c1ef6cc2299e6a68448" + integrity sha512-/Q6iDDSBp002wvkx2wuGcV6hC7/0fRdHApNujOf9QPNdKadO4e1l5BDe3wEvPKrZj0InVnfO48ONDIM864R5ew== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6034e76a32..d3543f1f2a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 8e9f4c2391..7f91d4118b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e9708628a1..563693bf39 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.2.59-alpha.0", + "version": "1.3.3", "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.59-alpha.0", - "@budibase/pro": "1.2.59-alpha.0", - "@budibase/string-templates": "1.2.59-alpha.0", - "@budibase/types": "1.2.59-alpha.0", + "@budibase/backend-core": "^1.3.3", + "@budibase/pro": "1.3.3", + "@budibase/string-templates": "^1.3.3", + "@budibase/types": "^1.3.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f5cb949c22..e278668c1b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -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.59-alpha.0": - version "1.2.59-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.59-alpha.0.tgz#34330175c26e31ec4838891e8ed561d5f75f1158" - integrity sha512-dXVX+IKeNMUIQUAH52E/9D73s+PSkXeU5m7dGjGeiWZQ2m3CALX0XhdL64NVEmpwmKwJVEvagi26lQSYwVrSyQ== +"@budibase/backend-core@1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.3.tgz#092f5be5277048efd7719a2b0eb995485f6cc446" + integrity sha512-nl2RPKNIMSfDEcj8i09iIbnPzkz9wcLLUvWgK1VXoRt4aI7r6a/OBucCv3+QtbJP5hfG7BJ4ThcunLgttP1IrA== dependencies: - "@budibase/types" "1.2.59-alpha.0" + "@budibase/types" "^1.3.3" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -325,21 +325,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.2.59-alpha.0": - version "1.2.59-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.59-alpha.0.tgz#191865bf170832b17566336b047d3461f6036009" - integrity sha512-nP8LL0eZdWpLZ4NViou31dE3uY1dQPJDzvFE9r71OsSLG6KGHS7fkkMA+4hq3gfrsPzAIp729m6RroksqnnKGw== +"@budibase/pro@1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.3.tgz#90068258b902b5151633636c0a1131d3e5e3bb01" + integrity sha512-SWbvsS1Ebz5KIgK07YuLR+hWtk0jXUP6rm6koyWebOVJSEudiWUyj839XJzVZxdJsvx9mJIorlHT1aDo0nZCRw== dependencies: - "@budibase/backend-core" "1.2.59-alpha.0" - "@budibase/types" "1.2.59-alpha.0" + "@budibase/backend-core" "1.3.3" + "@budibase/types" "1.3.3" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.2.59-alpha.0": - version "1.2.59-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.59-alpha.0.tgz#7d77598607865a0f5b9a7c9063e0f7a774ebd2a1" - integrity sha512-ddoqBxRKYl3biVmg3l3jFE/eB8DvL1VqMA/sIaVYU16Js913pU0jauT9Z/y2uqiGescfoZReCabBjD7qhr6L7w== +"@budibase/types@1.3.3", "@budibase/types@^1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.3.tgz#4a0d7e3e50e864aca4fc8c1ef6cc2299e6a68448" + integrity sha512-/Q6iDDSBp002wvkx2wuGcV6hC7/0fRdHApNujOf9QPNdKadO4e1l5BDe3wEvPKrZj0InVnfO48ONDIM864R5ew== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0"