diff --git a/lerna.json b/lerna.json index 48f820c169..5bca2d4f87 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.3.22-alpha.5", + "version": "1.4.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d48c706311..be291c5adc 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "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.3.22-alpha.5", + "@budibase/types": "^1.4.2", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a0fd207436..8c39d95424 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.3.22-alpha.5", + "version": "1.4.2", "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.3.22-alpha.5", + "@budibase/string-templates": "^1.4.2", "@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 17680e76c4..dae011ed3e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.3.22-alpha.5", - "@budibase/client": "1.3.22-alpha.5", - "@budibase/frontend-core": "1.3.22-alpha.5", - "@budibase/string-templates": "1.3.22-alpha.5", + "@budibase/bbui": "^1.4.2", + "@budibase/client": "^1.4.2", + "@budibase/frontend-core": "^1.4.2", + "@budibase/string-templates": "^1.4.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte index 5d73447710..c03232d091 100644 --- a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte @@ -10,7 +10,7 @@ Search, } from "@budibase/bbui" import { onMount } from "svelte" - import { plugins } from "stores/portal" + import { plugins, admin } from "stores/portal" import PluginRow from "./_components/PluginRow.svelte" import AddPluginModal from "./_components/AddPluginModal.svelte" @@ -20,9 +20,12 @@ let filterOptions = [ { label: "All plugins", value: "all" }, { label: "Components", value: "component" }, - { label: "Datasources", value: "datasource" }, ] + if (!$admin.cloud) { + filterOptions.push({ label: "Datasources", value: "datasource" }) + } + $: filteredPlugins = $plugins .filter(plugin => { return filter === "all" || plugin.schema.type === filter diff --git a/packages/cli/package.json b/packages/cli/package.json index fc810e2b75..1e86c279ab 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,7 +26,7 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "1.3.22-alpha.5", + "@budibase/backend-core": "^1.4.2", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 31c259c370..1a43dd9a7a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "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.3.22-alpha.5", - "@budibase/frontend-core": "1.3.22-alpha.5", - "@budibase/string-templates": "1.3.22-alpha.5", + "@budibase/bbui": "^1.4.2", + "@budibase/frontend-core": "^1.4.2", + "@budibase/string-templates": "^1.4.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 4a5bcb9476..8943634086 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.3.22-alpha.5", + "@budibase/bbui": "^1.4.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 05511ef9a3..a171a7be86 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "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.3.22-alpha.5", - "@budibase/client": "1.3.22-alpha.5", - "@budibase/pro": "1.3.22-alpha.5", - "@budibase/string-templates": "1.3.22-alpha.5", - "@budibase/types": "1.3.22-alpha.5", + "@budibase/backend-core": "^1.4.2", + "@budibase/client": "^1.4.2", + "@budibase/pro": "1.4.2", + "@budibase/string-templates": "^1.4.2", + "@budibase/types": "^1.4.2", "@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 0845739f2d..b272208257 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.3.22-alpha.5": - version "1.3.22-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.5.tgz#f34a1fceaafb9b971a60c3469f96a96694d1125b" - integrity sha512-87PNdexFmf5fby66HzGM33LTLwbHmIob4RnUBKnzkEZxCLHeitQJd1yO5Fg5yD81X7TLZ+PwewMLCwTyXMxerg== +"@budibase/backend-core@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.2.tgz#9c0a40f5c4a1693fd24048f6f130547b0f08e76e" + integrity sha512-htXj7V5mLdf+IqATBlgjABknbT6n/5qRwArlsawYYZzDRTod3rK+W7dIGHDr0JOPJJ8272SuAcJbF80gd65Z+w== dependencies: - "@budibase/types" "1.3.22-alpha.5" + "@budibase/types" "^1.4.2" "@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.3.22-alpha.5": - version "1.3.22-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.5.tgz#fa8b360630ed2d926af0ec568472e959a293bacc" - integrity sha512-WQhqs6Ple6Ny1ecC+NPjlcAhdLkprlmqCYYDG48BXdnnpHYHDtvtjJgRhdwSe4r+fanjhiY3uAjaVFg6aEDG7g== +"@budibase/pro@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.2.tgz#fdcb50f1f4da59dab2c7b0095bb37b684bf50c78" + integrity sha512-yj3nQ0dn+qlSxl3LEnzaizhBPQxKZqcmgi1GdLMh5bwd0xXquD2f7pXMSY0/ygJ7+lZtTlqqu0EG4LNJh/aeRA== dependencies: - "@budibase/backend-core" "1.3.22-alpha.5" - "@budibase/types" "1.3.22-alpha.5" + "@budibase/backend-core" "1.4.2" + "@budibase/types" "1.4.2" "@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.3.22-alpha.5": - version "1.3.22-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.5.tgz#0d8ff8cb8050f9f09f2b98d45117cfa39eb285cf" - integrity sha512-s3bvELXoq/s8UOi8DShVTcpT3XvWjQ7UKC+mvd0DGiX4YoV3IruWHj2bBql/7hZY8AGtivXp2cI8heh2vCijrw== +"@budibase/types@1.4.2", "@budibase/types@^1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.2.tgz#5f5f7c5dabc5c3b1cca8325693f4257233fd2fa4" + integrity sha512-YeNQ7HzYiltn/YNZNdrX0lkxLJ6G9fTxfiQEPiDeFJnhZLZWJf8PliopGTj3t2IALFzIK9j1PuONexlj2yfcOw== "@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 352a6f7d99..63c498e03d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "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 b9de5dba2c..e9aa59664e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "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 b0f14dc846..22354b0347 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.3.22-alpha.5", + "version": "1.4.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.3.22-alpha.5", - "@budibase/pro": "1.3.22-alpha.5", - "@budibase/string-templates": "1.3.22-alpha.5", - "@budibase/types": "1.3.22-alpha.5", + "@budibase/backend-core": "^1.4.2", + "@budibase/pro": "1.4.2", + "@budibase/string-templates": "^1.4.2", + "@budibase/types": "^1.4.2", "@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 8e576e7fdf..ee53b3c817 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.3.22-alpha.5": - version "1.3.22-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.22-alpha.5.tgz#f34a1fceaafb9b971a60c3469f96a96694d1125b" - integrity sha512-87PNdexFmf5fby66HzGM33LTLwbHmIob4RnUBKnzkEZxCLHeitQJd1yO5Fg5yD81X7TLZ+PwewMLCwTyXMxerg== +"@budibase/backend-core@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.2.tgz#9c0a40f5c4a1693fd24048f6f130547b0f08e76e" + integrity sha512-htXj7V5mLdf+IqATBlgjABknbT6n/5qRwArlsawYYZzDRTod3rK+W7dIGHDr0JOPJJ8272SuAcJbF80gd65Z+w== dependencies: - "@budibase/types" "1.3.22-alpha.5" + "@budibase/types" "^1.4.2" "@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.3.22-alpha.5": - version "1.3.22-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.22-alpha.5.tgz#fa8b360630ed2d926af0ec568472e959a293bacc" - integrity sha512-WQhqs6Ple6Ny1ecC+NPjlcAhdLkprlmqCYYDG48BXdnnpHYHDtvtjJgRhdwSe4r+fanjhiY3uAjaVFg6aEDG7g== +"@budibase/pro@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.2.tgz#fdcb50f1f4da59dab2c7b0095bb37b684bf50c78" + integrity sha512-yj3nQ0dn+qlSxl3LEnzaizhBPQxKZqcmgi1GdLMh5bwd0xXquD2f7pXMSY0/ygJ7+lZtTlqqu0EG4LNJh/aeRA== dependencies: - "@budibase/backend-core" "1.3.22-alpha.5" - "@budibase/types" "1.3.22-alpha.5" + "@budibase/backend-core" "1.4.2" + "@budibase/types" "1.4.2" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.3.22-alpha.5": - version "1.3.22-alpha.5" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.22-alpha.5.tgz#0d8ff8cb8050f9f09f2b98d45117cfa39eb285cf" - integrity sha512-s3bvELXoq/s8UOi8DShVTcpT3XvWjQ7UKC+mvd0DGiX4YoV3IruWHj2bBql/7hZY8AGtivXp2cI8heh2vCijrw== +"@budibase/types@1.4.2", "@budibase/types@^1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.2.tgz#5f5f7c5dabc5c3b1cca8325693f4257233fd2fa4" + integrity sha512-YeNQ7HzYiltn/YNZNdrX0lkxLJ6G9fTxfiQEPiDeFJnhZLZWJf8PliopGTj3t2IALFzIK9j1PuONexlj2yfcOw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0"