diff --git a/.github/workflows/release-pages.yml b/.github/workflows/release-pages.yml index 4de7f51b3..3fc445d70 100644 --- a/.github/workflows/release-pages.yml +++ b/.github/workflows/release-pages.yml @@ -1,4 +1,5 @@ name: Deploy to GitHub Pages +description: Build and deploy to GitHub Pages and Vercel on successful completion of tests and builds on: # Triggers when any of these workflows complete on main branch @@ -65,7 +66,7 @@ jobs: uses: actions/download-artifact@v4 with: name: vitest-reports - path: ./.gh-pages-cache/vitest-reports + path: ./.pages/vitest-reports run-id: ${{ github.event.workflow_run.id }} github-token: ${{ secrets.GITHUB_TOKEN }} @@ -79,7 +80,7 @@ jobs: name: vitest-reports branch: main workflow_conclusion: success - path: ./.gh-pages-cache/vitest-reports + path: ./.pages/vitest-reports - name: Build static assets (with artifact reuse) run: ./scripts/build-pages.sh @@ -91,20 +92,7 @@ jobs: uses: actions/upload-pages-artifact@v3 with: name: built-pages - path: './docs/pages' - - # deploy-for-sno-deploy-ghpage-branch: - # runs-on: ubuntu-latest - # needs: build - # if: github.ref == 'refs/heads/sno-deploy-ghpage' - # steps: - # - name: Debug deployment - # run: | - # echo "Contents of ./docs/pages:" - # ls -la ./docs/pages - # echo "Contents of ./docs/pages/vitest-reports (if exists):" - # ls -la ./docs/pages/vitest-reports || echo "No vitest-reports directory" - # echo "Preview URL: https://comfyorg-comfyui-frontend.vercel.app" + path: '.pages' incremental-deploy-github-pages: permissions: @@ -139,7 +127,7 @@ jobs: uses: actions/download-artifact@v3 with: name: built-pages - path: ./docs/pages + path: ./.pages - name: Deploy to Vercel uses: amondnet/vercel-action@v20 @@ -147,6 +135,6 @@ jobs: vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required vercel-org-id: ${{ secrets.VERCEL_ORG_ID }} # Required vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }} # Required - working-directory: ./docs/pages + working-directory: .pages env: VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }} # Required for Vercel Action diff --git a/.pages/vite.config.ts b/.pages/vite.config.ts index 101dd063a..1a90484ee 100644 --- a/.pages/vite.config.ts +++ b/.pages/vite.config.ts @@ -21,7 +21,7 @@ const discoverHtmlEntries = () => { export default defineConfig({ root: rootDir, - base: '/ComfyUI_frontend', + base: '/ComfyUI_frontend/', appType: 'mpa', logLevel: 'info', publicDir: false, diff --git a/knip.config.ts b/knip.config.ts index 127c1c947..945dd6b72 100644 --- a/knip.config.ts +++ b/knip.config.ts @@ -32,7 +32,11 @@ const config: KnipConfig = { '@primeuix/utils', '@primevue/icons', // Dev - '@trivago/prettier-plugin-sort-imports' + '@trivago/prettier-plugin-sort-imports', + // 3D and collaboration libraries + 'three', + '@types/three', + 'yjs' ], ignore: [ // Auto generated manager types @@ -40,7 +44,15 @@ const config: KnipConfig = { 'packages/registry-types/src/comfyRegistryTypes.ts', // Used by a custom node (that should move off of this) 'src/scripts/ui/components/splitButton.ts', - '.pages/vite.config.ts' + '.pages/vite.config.ts', + // Utility files with exports that may be used by extensions or future features + 'src/constants/uvMirrors.ts', + 'src/lib/litegraph/src/measure.ts', + 'src/lib/litegraph/src/widgets/DisconnectedWidget.ts', + 'src/renderer/extensions/vueNodes/widgets/utils/audioUtils.ts', + 'src/utils/electronMirrorCheck.ts', + 'src/renderer/extensions/vueNodes/composables/slotLinkDragContext.ts', + 'src/types/spatialIndex.ts' ], compilers: { // https://github.com/webpro-nl/knip/issues/1008#issuecomment-3207756199