diff --git a/packages/builder/package.json b/packages/builder/package.json
index 0c240baf2c..3159400080 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -59,7 +59,6 @@
},
"dependencies": {
"@budibase/bbui": "2.5.6-alpha.32",
- "@budibase/client": "2.5.6-alpha.32",
"@budibase/frontend-core": "2.5.6-alpha.32",
"@budibase/shared-core": "2.5.6-alpha.32",
"@budibase/string-templates": "2.5.6-alpha.32",
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 3fc0eb769e..e264dc099b 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -134,6 +134,7 @@ export const getFrontendStore = () => {
previousTopNavPath: {},
version: application.version,
revertableVersion: application.revertableVersion,
+ upgradableVersion: application.upgradableVersion,
navigation: application.navigation || {},
usedPlugins: application.usedPlugins || [],
}))
diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte
index f357cc7820..75acc974ce 100644
--- a/packages/builder/src/components/deploy/VersionModal.svelte
+++ b/packages/builder/src/components/deploy/VersionModal.svelte
@@ -9,7 +9,6 @@
} from "@budibase/bbui"
import { store } from "builderStore"
import { API } from "api"
- import clientPackage from "@budibase/client/package.json"
export function show() {
updateModal.show()
@@ -25,9 +24,9 @@
$: appId = $store.appId
$: updateAvailable =
- clientPackage.version &&
+ $store.upgradableVersion &&
$store.version &&
- clientPackage.version !== $store.version
+ $store.upgradableVersion !== $store.version
$: revertAvailable = $store.revertableVersion != null
const refreshAppPackage = async () => {
@@ -46,7 +45,7 @@
// Don't wait for the async refresh, since this causes modal flashing
refreshAppPackage()
notifications.success(
- `App updated successfully to version ${clientPackage.version}`
+ `App updated successfully to version ${$store.upgradableVersion}`
)
} catch (err) {
notifications.error(`Error updating app: ${err}`)
@@ -91,7 +90,7 @@
{#if updateAvailable}
This app is currently using version {$store.version}, but version
- {clientPackage.version} is available. Updates can contain new features,
+ {$store.upgradableVersion} is available. Updates can contain new features,
performance improvements and bug fixes.
{:else}
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte
index 2d2b6775fb..c049a610b6 100644
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte
@@ -13,7 +13,6 @@
notifications,
} from "@budibase/bbui"
import { store } from "builderStore"
- import clientPackage from "@budibase/client/package.json"
import { processStringSync } from "@budibase/string-templates"
import { users, auth, apps, groups, overview } from "stores/portal"
import { fetchData } from "@budibase/frontend-core"
@@ -40,7 +39,7 @@
},
},
})
- $: updateAvailable = clientPackage.version !== $store.version
+ $: updateAvailable = $store.upgradableVersion !== $store.version
$: isPublished = app?.status === AppStatus.DEPLOYED
$: appEditorId = !app?.updatedBy ? $auth.user._id : app?.updatedBy
$: appEditorText = appEditor?.firstName || appEditor?.email
@@ -172,8 +171,8 @@
{$store.version}
{#if updateAvailable}
- New version {clientPackage.version} is available
- -
+ New version {$store.upgradableVersion} is
+ available -
{
$goto("./version")
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte
index 676d0b4f59..723e32984d 100644
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte
@@ -1,12 +1,11 @@
@@ -18,7 +17,7 @@
{#if updateAvailable}
The app is currently using version {$store.version}
- but version {clientPackage.version} is available.
+ but version {$store.upgradableVersion} is available.
Updates can contain new features, performance improvements and bug fixes.
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index ec68ca4c72..ff0dbe015b 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -223,7 +223,7 @@ export async function fetchAppPackage(ctx: UserCtx) {
)
ctx.body = {
- application,
+ application: { ...application, upgradableVersion: envCore.VERSION },
screens,
layouts,
clientLibPath,
diff --git a/yarn.lock b/yarn.lock
index 653c549ffd..404952f815 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
pouchdb-promise "^6.0.4"
through2 "^2.0.0"
-"@budibase/pro@2.5.6-alpha.31":
- version "2.5.6-alpha.31"
- resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.31.tgz#e711fed348c64bffac5eb3b4dfed6be15c2253c9"
- integrity sha512-gIpq5uICd0tQP+RB1Dv+v9m9EPG//HJJb95qFXv1rjuXT2ANT7rAmhJrOoQpqhTGwB0aPFsz00/wqFQVQVGzPQ==
+"@budibase/pro@2.5.6-alpha.32":
+ version "2.5.6-alpha.32"
+ resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.32.tgz#6d52da231efcacbb163a5af0cfe8284199ff659e"
+ integrity sha512-XzM55VcxpxTXCxYhLUOYvYqlCAPRPASJBbNonuRV6qUtXZxE5xSSEDnHQehhD8TrNP3QQ94DlCJ5DQCm/f3yJQ==
dependencies:
- "@budibase/backend-core" "2.5.6-alpha.31"
+ "@budibase/backend-core" "2.5.6-alpha.32"
"@budibase/shared-core" "2.4.44-alpha.1"
"@budibase/string-templates" "2.4.44-alpha.1"
- "@budibase/types" "2.5.6-alpha.31"
+ "@budibase/types" "2.5.6-alpha.32"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"