diff --git a/.github/workflows/ci-oss-assets-validation.yaml b/.github/workflows/ci-oss-assets-validation.yaml index b698526eb99..fcc0f566112 100644 --- a/.github/workflows/ci-oss-assets-validation.yaml +++ b/.github/workflows/ci-oss-assets-validation.yaml @@ -117,7 +117,7 @@ jobs: if pnpx license-checker-rseidelsohn@4 \ --production \ --summary \ - --excludePackages '@comfyorg/comfyui-frontend;@comfyorg/account;@comfyorg/account-ui;@comfyorg/design-system;@comfyorg/ingest-types;@comfyorg/registry-types;@comfyorg/shared-frontend-utils;@comfyorg/tailwind-utils;@comfyorg/comfyui-electron-types;@comfyorg/comfy-multi-player' \ + --excludePackages '@comfyorg/comfyui-frontend;@comfyorg/account;@comfyorg/account-ui;@comfyorg/billing-contract;@comfyorg/design-system;@comfyorg/ingest-types;@comfyorg/registry-types;@comfyorg/shared-frontend-utils;@comfyorg/tailwind-utils;@comfyorg/comfyui-electron-types;@comfyorg/comfy-multi-player' \ --clarificationsFile .github/license-clarifications.json \ --onlyAllow 'MIT;MIT*;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;0BSD;BlueOak-1.0.0;Python-2.0;CC0-1.0;Unlicense;(MIT OR Apache-2.0);(MIT OR GPL-3.0);(Apache-2.0 OR MIT);(MPL-2.0 OR Apache-2.0);MPL-2.0;CC-BY-4.0;CC-BY-3.0;GPL-3.0-only'; then echo '' diff --git a/.github/workflows/ci-tests-unit.yaml b/.github/workflows/ci-tests-unit.yaml index 71f3f1e4d66..dd5a11514c9 100644 --- a/.github/workflows/ci-tests-unit.yaml +++ b/.github/workflows/ci-tests-unit.yaml @@ -42,7 +42,7 @@ jobs: - name: Run package unit tests with coverage run: | rc=0 - for pkg in account account-ui object-info-parser shared-frontend-utils design-system; do + for pkg in account account-ui billing-contract object-info-parser shared-frontend-utils design-system; do pnpm --filter "@comfyorg/$pkg" exec vitest run --coverage || rc=1 done exit $rc @@ -60,7 +60,7 @@ jobs: if: always() uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 with: - files: coverage/lcov.info,packages/account/coverage/lcov.info,packages/account-ui/coverage/lcov.info,packages/object-info-parser/coverage/lcov.info,packages/shared-frontend-utils/coverage/lcov.info,packages/design-system/coverage/lcov.info + files: coverage/lcov.info,packages/account/coverage/lcov.info,packages/account-ui/coverage/lcov.info,packages/billing-contract/coverage/lcov.info,packages/object-info-parser/coverage/lcov.info,packages/shared-frontend-utils/coverage/lcov.info,packages/design-system/coverage/lcov.info flags: unit token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: false diff --git a/apps/billing-web/package.json b/apps/billing-web/package.json index d6e775ff0e3..44befdaccd9 100644 --- a/apps/billing-web/package.json +++ b/apps/billing-web/package.json @@ -15,6 +15,7 @@ "dependencies": { "@comfyorg/account": "workspace:*", "@comfyorg/account-ui": "workspace:*", + "@comfyorg/billing-contract": "workspace:*", "@comfyorg/design-system": "workspace:*", "@comfyorg/tailwind-utils": "workspace:*", "@vueuse/core": "catalog:", diff --git a/apps/billing-web/src/App.test.ts b/apps/billing-web/src/App.test.ts index ede45127c8e..342616804a9 100644 --- a/apps/billing-web/src/App.test.ts +++ b/apps/billing-web/src/App.test.ts @@ -28,24 +28,4 @@ describe('billing app', () => { screen.getByRole('button', { name: 'Pay and subscribe' }) ).toBeDisabled() }) - - it('recovers unknown static-host paths to the app entry route', async () => { - const router = createBillingRouter( - createMemoryHistory(), - () => 'authenticated' - ) - - await router.push('/unknown-path') - await router.isReady() - - render(App, { - global: { - plugins: [createBillingI18n(), router] - } - }) - - expect( - await screen.findByRole('heading', { name: 'Confirm your payment' }) - ).toBeInTheDocument() - }) }) diff --git a/apps/billing-web/src/App.vue b/apps/billing-web/src/App.vue index 6cabb914036..a256856ba7a 100644 --- a/apps/billing-web/src/App.vue +++ b/apps/billing-web/src/App.vue @@ -2,8 +2,11 @@ import { computed } from 'vue' import BillingShell from '@/components/BillingShell.vue' +import { useBillingEntry } from '@/entry/billingEntry' import { useBillingWebSession } from '@/session/billingWebSession' +import EntryErrorView from '@/views/EntryErrorView.vue' +const { error } = useBillingEntry() const { session } = useBillingWebSession() /** A new key is a new scope, so the shell remounts with a fresh client. */ @@ -15,7 +18,9 @@ const scopeKey = computed(() =>