diff --git a/lerna.json b/lerna.json index c27dac0362..4a716b4ca8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.0", + "version": "2.6.1", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a9811a66c5..ee5a62eb0c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.6.0", + "version": "2.6.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.6.0", + "@budibase/types": "^2.6.1", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4cfad5cced..0964dffb3b 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": "2.6.0", + "version": "2.6.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "^2.6.0", - "@budibase/string-templates": "^2.6.0", + "@budibase/shared-core": "^2.6.1", + "@budibase/string-templates": "^2.6.1", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 4808196d7c..ce9d5bcfdf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.6.0", + "version": "2.6.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.6.0", - "@budibase/frontend-core": "^2.6.0", - "@budibase/shared-core": "^2.6.0", - "@budibase/string-templates": "^2.6.0", + "@budibase/bbui": "^2.6.1", + "@budibase/frontend-core": "^2.6.1", + "@budibase/shared-core": "^2.6.1", + "@budibase/string-templates": "^2.6.1", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js index 41c6585b02..dafa8cfaed 100644 --- a/packages/builder/src/components/portal/licensing/licensingBanners.js +++ b/packages/builder/src/components/portal/licensing/licensingBanners.js @@ -147,6 +147,9 @@ const buildUsersAboveLimitBanner = EXPIRY_KEY => { return { key: EXPIRY_KEY, type: BANNER_TYPES.WARNING, + onChange: () => { + defaultCacheFn(EXPIRY_KEY) + }, criteria: () => { return userLicensing.warnUserLimit }, diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index 984ecd46ff..8006ae0294 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -261,7 +261,7 @@ header={`Users will soon be limited to ${staticUserLimit}`} message={`Our free plan is going to be limited to ${staticUserLimit} users in ${$licensing.userLimitDays}. - This means any users exceeding the limit have been de-activated. + This means any users exceeding the limit will be de-activated. De-activated users will not able to access the builder or any published apps until you upgrade to one of our paid plans. `} diff --git a/packages/cli/package.json b/packages/cli/package.json index cf40fff35c..016d91c63f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.6.0", + "version": "2.6.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.6.0", - "@budibase/string-templates": "^2.6.0", - "@budibase/types": "^2.6.0", + "@budibase/backend-core": "^2.6.1", + "@budibase/string-templates": "^2.6.1", + "@budibase/types": "^2.6.1", "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 f2ee5fe215..f7df964b19 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.6.0", + "version": "2.6.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.6.0", - "@budibase/frontend-core": "^2.6.0", - "@budibase/shared-core": "^2.6.0", - "@budibase/string-templates": "^2.6.0", - "@budibase/types": "^2.6.0", + "@budibase/bbui": "^2.6.1", + "@budibase/frontend-core": "^2.6.1", + "@budibase/shared-core": "^2.6.1", + "@budibase/string-templates": "^2.6.1", + "@budibase/types": "^2.6.1", "@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 fad1de2c94..9fe490f0d9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.6.0", + "version": "2.6.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.6.0", - "@budibase/shared-core": "^2.6.0", + "@budibase/bbui": "^2.6.1", + "@budibase/shared-core": "^2.6.1", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1a4297153e..0562aef2f0 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.6.0", + "version": "2.6.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 8c27d3fd68..3029ff9b63 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.6.0", + "version": "2.6.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.6.0", - "@budibase/client": "^2.6.0", - "@budibase/pro": "2.6.0", - "@budibase/shared-core": "^2.6.0", - "@budibase/string-templates": "^2.6.0", - "@budibase/types": "^2.6.0", + "@budibase/backend-core": "^2.6.1", + "@budibase/client": "^2.6.1", + "@budibase/pro": "2.6.1", + "@budibase/shared-core": "^2.6.1", + "@budibase/string-templates": "^2.6.1", + "@budibase/types": "^2.6.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index ee57d001da..e34cb2f79a 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.6.0", + "version": "2.6.1", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "^2.6.0" + "@budibase/types": "^2.6.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 096c7772cf..d7bfd47c05 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.6.0", + "version": "2.6.1", "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 ae46a0485d..0fb3ba19ec 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.6.0", + "version": "2.6.1", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 09eff55365..d794854093 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.6.0", + "version": "2.6.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.6.0", - "@budibase/pro": "2.6.0", - "@budibase/string-templates": "^2.6.0", - "@budibase/types": "^2.6.0", + "@budibase/backend-core": "^2.6.1", + "@budibase/pro": "2.6.1", + "@budibase/string-templates": "^2.6.1", + "@budibase/types": "^2.6.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/yarn.lock b/yarn.lock index 918a974b7d..c3e31e6ee6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.10": - version "2.5.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10.tgz#b7d81c1615df7ba51a199c29d5c87dadad3f004e" - integrity sha512-c3uAYPyn3BXZyZc1940kIAbNoFOxWVJHQOCz+4AQLRUmMDznSNsOZGhzhdqlc2IL7xL51Oz3Ry5eAVhdPJWb7A== +"@budibase/pro@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.0.tgz#ac93023ac4b3a5f8c7f39b2ed6240091b084c625" + integrity sha512-SBIh/TtT40XAUiF7b+9gEkShzbsWJWvCoti7w4YqrujsvVdbYsrwV8yY/FqaCAiHN4hlAXOEcYmF6lgK2g1Rjg== dependencies: - "@budibase/backend-core" "2.5.10" + "@budibase/backend-core" "2.6.0" "@budibase/shared-core" "2.5.9" "@budibase/string-templates" "2.5.9" - "@budibase/types" "2.5.10" + "@budibase/types" "2.6.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0"