diff --git a/package.json b/package.json index 643b3c71a80..5c02ce39200 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "collect-i18n": "pnpm exec playwright test --config=playwright.i18n.config.ts", "dev:cloud": "cross-env DEV_SERVER_COMFYUI_URL='https://testcloud.comfy.org/' nx serve", "dev:desktop": "nx dev @comfyorg/desktop-ui", - "dev:electron": "nx serve --config vite.electron.config.mts", + "dev:electron": "cross-env DISTRIBUTION=desktop nx serve --config vite.electron.config.mts", "dev:no-vue": "cross-env DISABLE_VUE_PLUGINS=true nx serve", "dev": "nx serve", "devtools:pycheck": "python3 -m compileall -q tools/devtools", diff --git a/src/platform/cloud/subscription/components/PricingTableWorkspace.vue b/src/platform/cloud/subscription/components/PricingTableWorkspace.vue index 3a0f97f1154..5c1226421b8 100644 --- a/src/platform/cloud/subscription/components/PricingTableWorkspace.vue +++ b/src/platform/cloud/subscription/components/PricingTableWorkspace.vue @@ -285,7 +285,6 @@ import { useI18n } from 'vue-i18n' import Button from '@/components/ui/button/Button.vue' import { useBillingContext } from '@/composables/billing/useBillingContext' -import { t } from '@/i18n' import { TIER_PRICING, TIER_TO_KEY @@ -315,6 +314,7 @@ const emit = defineEmits<{ subscribe: [payload: { tierKey: CheckoutTierKey; billingCycle: BillingCycle }] resubscribe: [] }>() +const { t, n } = useI18n() interface BillingCycleOption { label: string @@ -369,8 +369,6 @@ const tiers: PricingTierConfig[] = [ isPopular: false } ] - -const { n } = useI18n() const { plans: apiPlans, currentPlanSlug, diff --git a/src/platform/distribution/types.ts b/src/platform/distribution/types.ts index 53ba95beaf8..ba9e39390ba 100644 --- a/src/platform/distribution/types.ts +++ b/src/platform/distribution/types.ts @@ -1,5 +1,3 @@ -import { isElectron } from '@/utils/envUtil' - /** * Distribution types and compile-time constants for managing * multi-distribution builds (Desktop, Localhost, Cloud) @@ -16,7 +14,7 @@ declare global { const DISTRIBUTION: Distribution = __DISTRIBUTION__ /** Distribution type checks */ -export const isDesktop = DISTRIBUTION === 'desktop' || isElectron() // TODO: replace with build var +export const isDesktop = DISTRIBUTION === 'desktop' export const isCloud = DISTRIBUTION === 'cloud' // export const isLocalhost = DISTRIBUTION === 'localhost' || (!isDesktop && !isCloud)