fix: rebase master

Author: Yourz

src/platform/cloud/subscription/components/PricingTable.vue

@@ -257,10 +257,9 @@ import type {
   TierKey,
   TierPricing
 } from '@/platform/cloud/subscription/constants/tierPricing'
+import { performSubscriptionCheckout } from '@/platform/cloud/subscription/utils/subscriptionCheckoutUtil'
 import { isPlanDowngrade } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
 import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
-import { performSubscriptionCheckout } from '@/platform/cloud/subscription/utils/subscriptionCheckoutUtil'
-import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionCheckoutUtil'
 import { isCloud } from '@/platform/distribution/types'
 import type { components } from '@/types/comfyRegistryTypes'
 

src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.ts

@@ -6,8 +6,8 @@ import {
   useFirebaseAuthStore
 } from '@/stores/firebaseAuthStore'
 import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import type { BillingCycle } from './subscriptionTierRank'
 
-export type BillingCycle = 'monthly' | 'yearly'
 type CheckoutTier = TierKey | `${TierKey}-yearly`
 
 const getCheckoutTier = (

tests-ui/tests/platform/cloud/onboarding/previousFullPath.test.ts

@@ -1,35 +1,35 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, test } from 'vitest'
 import type { LocationQuery } from 'vue-router'
 
 import { getSafePreviousFullPath } from '@/platform/cloud/onboarding/utils/previousFullPath'
 
 describe('getSafePreviousFullPath', () => {
-  it('returns null when missing', () => {
+  test('returns null when missing', () => {
     expect(getSafePreviousFullPath({})).toBeNull()
   })
 
-  it('decodes and returns internal relative paths', () => {
+  test('decodes and returns internal relative paths', () => {
     const query: LocationQuery = {
       previousFullPath: encodeURIComponent('/some/path?x=1')
     }
     expect(getSafePreviousFullPath(query)).toBe('/some/path?x=1')
   })
 
-  it('rejects protocol-relative urls', () => {
+  test('rejects protocol-relative urls', () => {
     const query: LocationQuery = {
       previousFullPath: encodeURIComponent('//evil.com')
     }
     expect(getSafePreviousFullPath(query)).toBeNull()
   })
 
-  it('rejects absolute external urls', () => {
+  test('rejects absolute external urls', () => {
     const query: LocationQuery = {
       previousFullPath: encodeURIComponent('https://evil.com/path')
     }
     expect(getSafePreviousFullPath(query)).toBeNull()
   })
 
-  it('rejects malformed encodings', () => {
+  test('rejects malformed encodings', () => {
     const query: LocationQuery = {
       previousFullPath: '%E0%A4%A'
     }