From 185ed81ff2e7a5a37755caec0bbeae64309241a3 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Thu, 6 Feb 2025 20:10:34 +0000 Subject: [PATCH] move wrangler, rename cf_worker -> backend (#41) --- .github/workflows/ci.yml | 3 +++ .gitignore | 2 +- package-lock.json | 6 +++--- package.json | 4 ++-- src/backend/package.json | 14 ++++++++++++++ src/{cf_worker => backend}/src/api.ts | 0 src/{cf_worker => backend}/src/index.ts | 0 src/{cf_worker => backend}/src/new.ts | 0 src/{cf_worker => backend}/tsconfig.json | 0 src/backend/worker-configuration.d.ts | 7 +++++++ wrangler.toml => src/backend/wrangler.toml | 8 ++++---- src/cf_worker/package.json | 12 ------------ src/cf_worker/worker-configuration.d.ts | 7 ------- 13 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 src/backend/package.json rename src/{cf_worker => backend}/src/api.ts (100%) rename src/{cf_worker => backend}/src/index.ts (100%) rename src/{cf_worker => backend}/src/new.ts (100%) rename src/{cf_worker => backend}/tsconfig.json (100%) create mode 100644 src/backend/worker-configuration.d.ts rename wrangler.toml => src/backend/wrangler.toml (72%) delete mode 100644 src/cf_worker/package.json delete mode 100644 src/cf_worker/worker-configuration.d.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75fa60b..9e27ffd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,7 @@ jobs: name: Test deploy with: command: deploy --dry-run + workingDirectory: src/backend check: if: always() @@ -70,6 +71,7 @@ jobs: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} environment: previews command: deploy --var GITHUB_SHA:${{ github.sha }} + workingDirectory: src/backend - name: get preview URL id: get_preview_url @@ -95,3 +97,4 @@ jobs: with: apiToken: ${{ secrets.cloudflare_api_token }} command: deploy --var GITHUB_SHA:${{ github.sha }} + workingDirectory: src/backend diff --git a/.gitignore b/.gitignore index 9b378f6..566450f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ dist-ssr *.local # cloudflare -/.wrangler/ +.wrangler/ .dev.vars # Editor directories and files diff --git a/package-lock.json b/package-lock.json index 7cf6ba1..c69e5e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1918,8 +1918,8 @@ "tslib": "^2.2.0" } }, - "node_modules/cf_worker": { - "resolved": "src/cf_worker", + "node_modules/backend": { + "resolved": "src/backend", "link": true }, "node_modules/chalk": { @@ -4778,7 +4778,7 @@ "url": "https://github.com/sponsors/colinhacks" } }, - "src/cf_worker": { + "src/backend": { "version": "0.0.0", "dependencies": { "zod": "^3.24.1" diff --git a/package.json b/package.json index 579c2ac..0fb3bd9 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "typecheck": "npm run --workspaces typecheck", "build": "npm run --workspace=frontend build", "dev": "npm run --workspace=frontend dev", - "cf-typegen": "wrangler types src/cf_worker/worker-configuration.d.ts && prettier --write -- src/cf_worker/worker-configuration.d.ts", - "cf-dev": "wrangler dev" + "cf-typegen": "npm run --workspace=backend cf-typegen", + "dev-backend": "npm run --workspace=backend dev" }, "prettier": { "singleQuote": true, diff --git a/src/backend/package.json b/src/backend/package.json new file mode 100644 index 0000000..4941d4d --- /dev/null +++ b/src/backend/package.json @@ -0,0 +1,14 @@ +{ + "name": "backend", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "typecheck": "tsc --noEmit", + "cf-typegen": "wrangler types worker-configuration.d.ts && prettier --write -- worker-configuration.d.ts", + "dev": "wrangler dev" + }, + "dependencies": { + "zod": "^3.24.1" + } +} diff --git a/src/cf_worker/src/api.ts b/src/backend/src/api.ts similarity index 100% rename from src/cf_worker/src/api.ts rename to src/backend/src/api.ts diff --git a/src/cf_worker/src/index.ts b/src/backend/src/index.ts similarity index 100% rename from src/cf_worker/src/index.ts rename to src/backend/src/index.ts diff --git a/src/cf_worker/src/new.ts b/src/backend/src/new.ts similarity index 100% rename from src/cf_worker/src/new.ts rename to src/backend/src/new.ts diff --git a/src/cf_worker/tsconfig.json b/src/backend/tsconfig.json similarity index 100% rename from src/cf_worker/tsconfig.json rename to src/backend/tsconfig.json diff --git a/src/backend/worker-configuration.d.ts b/src/backend/worker-configuration.d.ts new file mode 100644 index 0000000..fb48eb5 --- /dev/null +++ b/src/backend/worker-configuration.d.ts @@ -0,0 +1,7 @@ +// Generated by Wrangler by running `wrangler types worker-configuration.d.ts` + +interface Env { + GITHUB_SHA: string + BUCKET: R2Bucket + ASSETS: Fetcher +} diff --git a/wrangler.toml b/src/backend/wrangler.toml similarity index 72% rename from wrangler.toml rename to src/backend/wrangler.toml index 0fc8f99..d999e6a 100644 --- a/wrangler.toml +++ b/src/backend/wrangler.toml @@ -1,20 +1,20 @@ #:schema node_modules/wrangler/config-schema.json name = "pydantic-run" compatibility_date = "2025-01-09" -main = "src/cf_worker/src/index.ts" +main = "src/index.ts" routes = ["pydantic.run/*"] workers_dev = false [build] -command = "npm run build" -watch_dir = ["src/frontend/src", "src/cf_worker/src"] +command = "cd ../frontend && npm run build" +watch_dir = ["../frontend/src", "src"] [[r2_buckets]] bucket_name = "pydantic-run" binding = "BUCKET" [assets] -directory = "src/frontend/dist" +directory = "../frontend/dist" binding = "ASSETS" [env.previews] diff --git a/src/cf_worker/package.json b/src/cf_worker/package.json deleted file mode 100644 index dc6f419..0000000 --- a/src/cf_worker/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "cf_worker", - "private": true, - "version": "0.0.0", - "type": "module", - "scripts": { - "typecheck": "tsc --noEmit" - }, - "dependencies": { - "zod": "^3.24.1" - } -} diff --git a/src/cf_worker/worker-configuration.d.ts b/src/cf_worker/worker-configuration.d.ts deleted file mode 100644 index f01f19b..0000000 --- a/src/cf_worker/worker-configuration.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by Wrangler by running `wrangler types src/cf_worker/worker-configuration.d.ts` - -interface Env { - GITHUB_SHA: string - BUCKET: R2Bucket - ASSETS: Fetcher -}