diff --git a/.github/workflows/build-code.yml b/.github/workflows/build-code.yml index 0c3f292ba3..2a3f277143 100644 --- a/.github/workflows/build-code.yml +++ b/.github/workflows/build-code.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: node_version: - - 22.23.2 + - 22.23.4 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 09abcbf1f5..d30a6d2225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Upgraded `prettier` from version `3.9.9` to `3.9.10` + +## 3.90.0 - 2026-10-21 + +### Changed + +- Extended the variations of the interstitials for the subscription by a trial - Deprecated the `api/v1/auth-device` endpoint in favor of the `api/v1/auth-devices` endpoint - Deprecated the `api/v1/exchange-rate` endpoint in favor of the `api/v1/exchange-rates` endpoint +- Upgraded the `Node.js` engine from version `>=22.22.3` to `>=22.23.4` (`package.json`) - Upgraded `@modelcontextprotocol/core` and `@modelcontextprotocol/server` from version `2.0.0` to `2.3.1` - Upgraded `@modelcontextprotocol/node` from version `2.0.0` to `2.1.1` - Upgraded `@rekog/mcp-nest` from version `2.0.7` to `2.0.8` -- Upgraded `prettier` from version `3.9.9` to `3.9.10` +- Upgraded `undici` from version `8.11.2` to `8.12.2` ## 3.89.0 - 2026-10-20 diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 5b1b36afbb..0d43b42fbd 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -5,7 +5,7 @@ ### Prerequisites - [Docker](https://www.docker.com/products/docker-desktop) -- [Node.js](https://nodejs.org/en/download) (version `>=22.18.0`) +- [Node.js](https://nodejs.org/en/download) (version `>=22.23.4`) - Create a local copy of this Git repository (clone) - Copy the file `.env.dev` to `.env` and populate it with your data (`cp .env.dev .env`) diff --git a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts index d10be10bd0..08f4d203e3 100644 --- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts +++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts @@ -1,3 +1,5 @@ +import { TRY_SUBSCRIPTION_MAIL_HREF } from '@ghostfolio/common/config'; +import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { publicRoutes } from '@ghostfolio/common/routes/routes'; import { GfMembershipCardComponent } from '@ghostfolio/ui/membership-card'; import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator'; @@ -51,6 +53,7 @@ export class GfSubscriptionInterstitialDialogComponent implements OnInit { public remainingSkipButtonDelay = GfSubscriptionInterstitialDialogComponent.SKIP_BUTTON_DELAY_IN_SECONDS; public routerLinkPricing = publicRoutes.pricing.routerLink; + public trySubscriptionMailHref = TRY_SUBSCRIPTION_MAIL_HREF; public variantIndex: number; public constructor( @@ -59,9 +62,18 @@ export class GfSubscriptionInterstitialDialogComponent implements OnInit { private destroyRef: DestroyRef, public dialogRef: MatDialogRef ) { - this.variantIndex = Math.floor( - Math.random() * GfSubscriptionInterstitialDialogComponent.VARIANTS_COUNT - ); + const isEligibleForTrial = + !this.data.user?.subscription?.subscribedAt && + hasPermission( + this.data.user?.permissions, + permissions.updateUserSettings + ); + + const variantsCount = isEligibleForTrial + ? GfSubscriptionInterstitialDialogComponent.VARIANTS_COUNT + 1 + : GfSubscriptionInterstitialDialogComponent.VARIANTS_COUNT; + + this.variantIndex = Math.floor(Math.random() * variantsCount); addIcons({ arrowForwardOutline, checkmarkCircleOutline }); } diff --git a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html index 8280067a87..5bac0e9baa 100644 --- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html +++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html @@ -195,4 +195,46 @@ } + @case (4) { +
+
+
+
+
+
+
+
+ Ghostfolio Premium + +
+
+ Request a free trial +
+

+ No credit card required. The trial ends automatically. +

+
+
+
+ + + Try Premium + + +
+ } } diff --git a/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts b/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts index defe751ee8..20425d831e 100644 --- a/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts +++ b/apps/client/src/app/components/user-account-membership/user-account-membership.component.ts @@ -1,5 +1,5 @@ import { UserService } from '@ghostfolio/client/services/user/user.service'; -import { E_MAIL_LINE_BREAK } from '@ghostfolio/common/config'; +import { TRY_SUBSCRIPTION_MAIL_HREF } from '@ghostfolio/common/config'; import { ConfirmationDialogType } from '@ghostfolio/common/enums'; import { getDateFormatString } from '@ghostfolio/common/helper'; import { User } from '@ghostfolio/common/interfaces'; @@ -49,13 +49,7 @@ export class GfUserAccountMembershipComponent { protected hasPermissionToCreateApiKey: boolean; protected hasPermissionToUpdateUserSettings: boolean; protected price: number; - protected readonly trySubscriptionMailHref = `mailto:hi@ghostfol.io?subject=Ghostfolio Premium Trial&body=${[ - 'Hello', - '', - 'I am interested in Ghostfolio Premium. Can you please send me a coupon code to try it for some time?', - '', - 'Kind regards' - ].join(E_MAIL_LINE_BREAK)}`; + protected readonly trySubscriptionMailHref = TRY_SUBSCRIPTION_MAIL_HREF; protected user: User; private couponId: string | undefined; diff --git a/apps/client/src/app/components/user-account-membership/user-account-membership.html b/apps/client/src/app/components/user-account-membership/user-account-membership.html index f18da13ed9..336f386139 100644 --- a/apps/client/src/app/components/user-account-membership/user-account-membership.html +++ b/apps/client/src/app/components/user-account-membership/user-account-membership.html @@ -50,7 +50,10 @@ } }
- @if (!user?.subscription?.subscribedAt) { + @if ( + !user?.subscription?.subscribedAt && + hasPermissionToUpdateUserSettings + ) { { + return encodeURIComponent(line); + }) + .join(E_MAIL_LINE_BREAK)}`; + export const UNKNOWN_KEY = 'UNKNOWN'; diff --git a/package-lock.json b/package-lock.json index 3d4a185e5d..bc07aafd78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ghostfolio", - "version": "3.89.0", + "version": "3.90.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ghostfolio", - "version": "3.89.0", + "version": "3.90.0", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { @@ -104,7 +104,7 @@ "svgmap": "2.21.0", "tablemark": "4.1.0", "twitter-api-v2": "1.29.1", - "undici": "8.11.2", + "undici": "8.12.2", "uuid": "14.0.2", "yahoo-finance2": "4.0.2", "zod": "4.6.5", @@ -149,7 +149,7 @@ "@types/jest": "30.0.0", "@types/jsonpath": "0.2.4", "@types/lodash-es": "4.17.12", - "@types/node": "22.20.1", + "@types/node": "22.20.5", "@types/papaparse": "5.5.2", "@types/passport-google-oauth20": "2.0.17", "@types/passport-openidconnect": "0.1.3", @@ -180,7 +180,7 @@ "webpack-cli": "7.1.0" }, "engines": { - "node": ">=22.22.3" + "node": ">=22.23.4" } }, "node_modules/@adobe/css-tools": { @@ -14306,9 +14306,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.20.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.1.tgz", - "integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==", + "version": "22.20.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.5.tgz", + "integrity": "sha512-U2+DNr+wSjpsTS/wZGYHq7GcwfuSmKiKvoPvK22zwTlRhU91yOniN4qRR5KhIjvif7ysw/dz/hKmfDH0Ris4aA==", "license": "MIT", "dependencies": { "undici-types": "~6.21.0" @@ -33913,9 +33913,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/undici/-/undici-8.11.2.tgz", - "integrity": "sha512-u4UB2/IrKdU6lFxumHmmo1a3fCQO5tzQllRorfoRS63txhrB7xTpSn1PftwC4qEHkOaqP95fCWW4lJzwErwzhQ==", + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/undici/-/undici-8.12.2.tgz", + "integrity": "sha512-XtuDWVdqTLr3NAxm2ly9/hU6kUsJOgGh1RASzMBbsw6aWCOaQzHdW+QQDfdERjfJ2V5vL5pRPa4RetO9UfivDg==", "license": "MIT", "engines": { "node": ">=22.19.0" diff --git a/package.json b/package.json index 629d43969c..b3f01f0303 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghostfolio", - "version": "3.89.0", + "version": "3.90.0", "homepage": "https://ghostfol.io", "license": "AGPL-3.0", "repository": "https://github.com/ghostfolio/ghostfolio", @@ -148,7 +148,7 @@ "svgmap": "2.21.0", "tablemark": "4.1.0", "twitter-api-v2": "1.29.1", - "undici": "8.11.2", + "undici": "8.12.2", "uuid": "14.0.2", "yahoo-finance2": "4.0.2", "zod": "4.6.5", @@ -193,7 +193,7 @@ "@types/jest": "30.0.0", "@types/jsonpath": "0.2.4", "@types/lodash-es": "4.17.12", - "@types/node": "22.20.1", + "@types/node": "22.20.5", "@types/papaparse": "5.5.2", "@types/passport-google-oauth20": "2.0.17", "@types/passport-openidconnect": "0.1.3", @@ -224,6 +224,6 @@ "webpack-cli": "7.1.0" }, "engines": { - "node": ">=22.22.3" + "node": ">=22.23.4" } }