Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,5 @@ jobs:
- name: Install JS dependencies
run: npm ci

- name: Run Vitest (admin SPA)
- name: Run Vitest (docs theme + site Worker)
run: npm test

- name: Run svelte-check
run: npm run check
9 changes: 0 additions & 9 deletions .github/workflows/site-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
- "cloudflare_site/**"
- "package.json"
- "package-lock.json"
- "vite.config.ts"
- "experiments"
- "experiments/**"
- ".gitmodules"
Expand All @@ -22,7 +21,6 @@ on:
- "cloudflare_site/**"
- "package.json"
- "package-lock.json"
- "vite.config.ts"
- "experiments"
- "experiments/**"
- ".gitmodules"
Expand Down Expand Up @@ -54,9 +52,6 @@ jobs:
- name: Install JS dependencies
run: npm ci

- name: Build web SPAs
run: npm run build

- name: Build documentation site
run: npm run docs:build

Expand All @@ -66,10 +61,6 @@ jobs:
mkdir -p _bundle/public
cp web/public/index.html _bundle/public/index.html
cp web/public/graph.html _bundle/public/graph.html
mkdir -p _bundle/public/assets
cp -a web/dist/assets/. _bundle/public/assets/
mkdir -p _bundle/public/admin
cp -a web/dist/admin/. _bundle/public/admin/
mkdir -p _bundle/public/docs
cp -a docs/.vitepress/dist/. _bundle/public/docs/
cp -a cloudflare_site/public/. _bundle/public/
Expand Down
39 changes: 1 addition & 38 deletions .github/workflows/site-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ jobs:
cp -a _bundle/public/. cloudflare_site/public/
cp -a _bundle/worker/. cloudflare_site/worker/

- name: Patch wrangler.toml for CI (worker name + rate limit namespaces)
env:
CLOUDFLARE_PROJECT_NAME: ${{ vars.CLOUDFLARE_PROJECT_NAME }}
run: node cloudflare_site/scripts/patch-wrangler-rate-limit-namespace-ids.mjs

- name: Resolve preview context (PR number + preview alias)
id: preview-context
if: success()
Expand Down Expand Up @@ -122,17 +117,7 @@ jobs:
core.setOutput('preview_alias', previewAlias);
core.setOutput('pr_number', prNumber != null ? String(prNumber) : '');

# Same 10214 issue as previews: wrangler-action runs script-level `wrangler secret bulk`
# before `deploy` when `secrets:` is set. Use `wrangler versions secret bulk` in preCommands
# instead (cloudflare/wrangler-action#374).
# preCommands run under `/bin/sh` (dash on Ubuntu): no `pipefail` (bash-only).
# Each newline in preCommands is a separate shell invocation — no line continuations or
# multi-line printf; keep the secret bulk prep on one line so mktemp and the file path match.
# Bare `wrangler` in preCommands doesn't work: wrangler-action's execCommands() only
# rewrites a line to `npx wrangler ...` when it starts with the literal "wrangler"
# (verified against wrangler-action@9acf94a dist/index.mjs — re-check if pin is bumped).
# This compound line starts with `set`, so use `npx --no-install wrangler` to invoke
# the copy already installed by wranglerVersion (see #4861).
# The site Worker is a static-asset passthrough: no vars or secrets are required.
- name: Deploy to production (Workers + static assets)
id: cf-prod
if: github.event.workflow_run.event == 'push'
Expand All @@ -143,24 +128,8 @@ jobs:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
packageManager: npm
preCommands: set -eu; secrets_file="$(mktemp)"; trap 'rm -f "$secrets_file"' EXIT; printf '%s\n' "GITHUB_APP_CLIENT_SECRET=${GITHUB_APP_CLIENT_SECRET}" "TURNSTILE_SECRET_KEY=${TURNSTILE_SECRET_KEY}" >"$secrets_file"; npx --no-install wrangler versions secret bulk "$secrets_file" --message "Production secrets (workflow-run ${{ github.event.workflow_run.id }})"
command: deploy --name="${{ vars.CLOUDFLARE_PROJECT_NAME }}"
vars: |
GITHUB_APP_CLIENT_ID
TURNSTILE_SITE_KEY
env:
GITHUB_APP_CLIENT_ID: ${{ vars.FULLSEND_GITHUB_APP_CLIENT_ID }}
GITHUB_APP_CLIENT_SECRET: ${{ secrets.FULLSEND_GITHUB_APP_CLIENT_SECRET }}
TURNSTILE_SITE_KEY: ${{ vars.FULLSEND_TURNSTILE_SITE_KEY }}
TURNSTILE_SECRET_KEY: ${{ secrets.FULLSEND_TURNSTILE_SECRET_KEY }}

# PR previews: wrangler-action runs script-level `wrangler secret bulk` *before* the main command.
# That conflicts with `versions upload` (API 10214: latest version isn't deployed). Apply secrets
# with `wrangler versions secret bulk` in preCommands instead (cloudflare/wrangler-action#374).
# Plain `vars` are only auto-injected for deploy/publish, so pass `--var` on `versions upload`.
# preCommands run under `/bin/sh` (dash on Ubuntu): no `pipefail` (bash-only).
# Each newline in preCommands is a separate shell invocation — keep secret bulk prep on one line.
# Bare `wrangler` in preCommands doesn't work — see the prod deploy step above for why (#4861).
- name: Upload preview version (Workers + static assets)
id: cf-preview
if: github.event.workflow_run.event == 'pull_request'
Expand All @@ -171,16 +140,10 @@ jobs:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
packageManager: npm
preCommands: set -eu; secrets_file="$(mktemp)"; trap 'rm -f "$secrets_file"' EXIT; printf '%s\n' "GITHUB_APP_CLIENT_SECRET=${GITHUB_APP_CLIENT_SECRET}" "TURNSTILE_SECRET_KEY=${TURNSTILE_SECRET_KEY}" >"$secrets_file"; npx --no-install wrangler versions secret bulk "$secrets_file" --message "PR preview secrets (workflow-run ${{ github.event.workflow_run.id }})"
command: >-
versions upload
--name="${{ vars.CLOUDFLARE_PROJECT_NAME }}"
--preview-alias ${{ steps.preview-context.outputs.preview_alias }}
--var GITHUB_APP_CLIENT_ID:${{ vars.FULLSEND_GITHUB_APP_CLIENT_ID }}
--var TURNSTILE_SITE_KEY:${{ vars.FULLSEND_TURNSTILE_SITE_KEY }}
env:
GITHUB_APP_CLIENT_SECRET: ${{ secrets.FULLSEND_GITHUB_APP_CLIENT_SECRET }}
TURNSTILE_SECRET_KEY: ${{ secrets.FULLSEND_TURNSTILE_SECRET_KEY }}

- name: Resolve deployment URL
id: meta
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.env.local
node_modules/
.vite/
web/dist
web/admin/dist
.dev.vars
.wrangler
.worktrees/
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,5 +180,5 @@ repos:
name: lint-staged (web)
entry: npx lint-staged --allow-empty
language: system
files: ^(web/admin/src/|docs/\.vitepress/)
files: ^docs/\.vitepress/
pass_filenames: false
7 changes: 1 addition & 6 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"plugins": ["prettier-plugin-svelte"],
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
"singleQuote": false,
"trailingComma": "all",
"printWidth": 100,
"tabWidth": 2,
"semi": true,
"svelteSortOrder": "options-scripts-markup-styles",
"svelteIndentScriptAndStyle": true,
"svelteAllowShorthand": true
"semi": true
}
2 changes: 1 addition & 1 deletion .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["stylelint-config-standard", "stylelint-config-html/svelte", "stylelint-config-html/vue"],
"extends": ["stylelint-config-standard", "stylelint-config-html/vue"],
"rules": {
"custom-property-pattern": null,
"selector-class-pattern": null
Expand Down
142 changes: 0 additions & 142 deletions cloudflare_site/scripts/patch-wrangler-rate-limit-namespace-ids.mjs

This file was deleted.

Loading
Loading