refactor(api): Merge api into edge package (#2038)

kriasoft · Feb 25, 2023 · 2cb8d92 · 2cb8d92
1 parent 34033e5
commit 2cb8d92
Show file tree

Hide file tree

Showing 42 changed files with 391 additions and 446 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -67,7 +67,6 @@ module.exports = {
     "import/resolver": {
       typescript: {
         project: [
-          "api/tsconfig.json",
           "app/tsconfig.json",
           "edge/tsconfig.json",
           "scripts/tsconfig.json",

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -28,7 +28,6 @@ jobs:
       - run: yarn tsc --build
 
       # Test
-      - run: yarn workspace api test
       - run: yarn workspace app test
       - run: yarn workspace edge test
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -66,6 +66,7 @@
     "reactstarter",
     "refetch",
     "refetchable",
+    "sendgrid",
     "signup",
     "sourcemap",
     "spdx",

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -2,4 +2,9 @@ enableGlobalCache: true
 
 nodeLinker: pnp
 
+packageExtensions:
+  "@miniflare/r2@*":
+    dependencies:
+      "@miniflare/core": ^2.12.1
+
 yarnPath: .yarn/releases/yarn-4.0.0-rc.39.cjs
diff --git a/README.md b/README.md
@@ -30,7 +30,6 @@ Be sure to join our [Discord channel](https://discord.com/invite/2nKEnKq) for as
 
 `├──`[`.github`](.github) — GitHub configuration including CI/CD workflows<br>
 `├──`[`.vscode`](.vscode) — VSCode settings including code snippets, recommended extensions etc.<br>
-`├──`[`api`](./api) — The API edge endpoint<br>
 `├──`[`app`](./app) — Web application front-end built with [React](https://reactjs.org/) and [Material UI](https://mui.com/core/)<br>
 `├──`[`edge`](./edge) — Cloudflare Workers (CDN) edge endpoint<br>
 `├──`[`env`](./env) — Application settings, API keys, etc.<br>

diff --git a/api/README.md b/api/README.md
diff --git a/api/core/app.ts b/api/core/app.ts
diff --git a/api/global.d.ts b/api/global.d.ts
diff --git a/api/index.ts b/api/index.ts
diff --git a/api/package.json b/api/package.json
diff --git a/api/routes/login.test.ts b/api/routes/login.test.ts
diff --git a/api/routes/swapi.test.ts b/api/routes/swapi.test.ts
diff --git a/api/routes/swapi.ts b/api/routes/swapi.ts
diff --git a/api/tsconfig.json b/api/tsconfig.json
diff --git a/api/vite.config.ts b/api/vite.config.ts
diff --git a/api/wrangler.toml b/api/wrangler.toml
diff --git a/app/package.json b/app/package.json
@@ -40,6 +40,6 @@
     "envars": "^0.4.0",
     "typescript": "^4.9.5",
     "vite": "^4.1.4",
-    "vitest": "^0.28.5"
+    "vitest": "^0.29.1"
   }
 }
diff --git a/edge/README.md b/edge/README.md
@@ -4,9 +4,10 @@ CDN edge endpoint powered by [Cloudflare Workers](https://workers.cloudflare.com
 
 ## Directory Structure
 
-`├──`[`dist`](./dist) — The compiled output<br>
+`├──`[`core`](./core) — Core application modules<br>
+`├──`[`routes`](./routes) — API routes (endpoints)<br>
 `├──`[`global.d.ts`](./global.d.ts) — Global TypeScript declarations<br>
-`├──`[`index.ts`](./index.tsx) — API entry point<br>
+`├──`[`index.ts`](./index.tsx) — Cloudflare Worker entry point<br>
 `├──`[`package.json`](./package.json) — The list of dependencies<br>
 `├──`[`tsconfig.ts`](./tsconfig.json) — TypeScript configuration ([docs](https://www.typescriptlang.org/tsconfig))<br>
 `├──`[`vite.config.ts`](./vite.config.ts) — JavaScript bundler configuration ([docs](https://vitejs.dev/config/))<br>

diff --git a/edge/core/app.ts b/edge/core/app.ts
@@ -0,0 +1,10 @@
+/* SPDX-FileCopyrightText: 2014-present Kriasoft */
+/* SPDX-License-Identifier: MIT */
+
+import { Hono } from "hono";
+
+/**
+ * Application router for Cloudflare Workers
+ * @see https://honojs.dev/
+ */
+export const app = new Hono<Env>();