277th Commit

Shyam-Chen · Feb 29, 2024 · b5cdb0a · b5cdb0a
1 parent 8f20d9c
commit b5cdb0a
Show file tree

Hide file tree

Showing 77 changed files with 518 additions and 405 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,8 +18,6 @@ jobs:
         run: docker compose exec --no-TTY ci pnpm build
       - name: pnpm preview
         run: docker compose exec --detach --no-TTY ci pnpm preview
-      - name: pnpm lint
-        run: docker compose exec --no-TTY ci pnpm lint
       - name: pnpm check
         run: docker compose exec --no-TTY ci pnpm check
       - name: pnpm test

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
 FROM node:20.11-bullseye-slim
 
-ENV HOME /fastify-starter
+ENV HOME /app
 
 WORKDIR ${HOME}
-ADD . $HOME
+ADD ./app $HOME
 
 RUN npm install -g pnpm
 RUN pnpm install
 
 RUN apt-get update && \
-    apt-get install -y libcurl4
+  apt-get install -y libcurl4
diff --git a/README.md b/README.md
@@ -71,10 +71,17 @@ $ pnpm preview
 
 ### Lints and fixes files
 
-Files: `src/**/*.ts`
+Biome CLI
 
 ```sh
-$ pnpm lint
+# format
+$ pnpm biome format ./app ./db ./mock ./e2e --write
+
+# lint
+$ pnpm biome lint ./app ./mock ./e2e
+
+# format, lint & sort
+$ pnpm biome check --apply ./app ./mock ./e2e
 ```
 
 ### Check types
@@ -217,24 +224,24 @@ The structure follows the LIFT Guidelines.
 ```coffee
 .
 ├── .github/workflows/ci.yml
+├── app
+│   ├── public -> not handled by vite, copy it to dist
+│   └── src
+│       ├── assets -> wasm, onnx
+│       ├── components -> shared module
+│       ├── composables -> shared module
+│       ├── locales -> core module
+│       ├── middleware -> core module
+│       ├── plugins -> root module
+│       ├── routes -> feature modules
+│       ├── templates -> email templates with nunjucks
+│       ├── utilities -> shared module
+│       ├── app.ts
+│       ├── main.ts
+│       └── shims.d.ts
 ├── db -> set up local data for testing and initializing the database
-├── e2e
+├── e2e -> api end-to-end testing
 ├── mock -> mock a third-party/private api calls
-├── public -> not handled by vite, copy it to dist
-├── src
-│   ├── assets -> wasm
-│   ├── components -> shared module
-│   ├── composables -> shared module
-│   ├── locales -> core module
-│   ├── middleware -> core module
-│   ├── plugins -> root module
-│   ├── routes -> feature modules
-│   ├── templates -> email templates with nunjucks
-│   ├── utilities -> shared module
-│   ├── app.ts
-│   ├── error.ts
-│   ├── main.ts
-│   └── shims.d.ts
 ├── .editorconfig
 ├── .gitignore
 ├── biome.json
@@ -243,8 +250,7 @@ The structure follows the LIFT Guidelines.
 ├── Dockerfile
 ├── package.json
 ├── pnpm-lock.yaml
+├── pnpm-workspace.yaml
 ├── README.md
-├── render.yaml
-├── tsconfig.json
-└── vite.config.ts
+└── render.yaml
 ```
diff --git a/app/package.json b/app/package.json
@@ -0,0 +1,59 @@
+{
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite-node -w src/main.ts",
+    "build": "vite build",
+    "preview": "vite preview",
+    "check": "tsc --noEmit",
+    "test": "vitest --dir src --coverage --run"
+  },
+  "dependencies": {
+    "@fastify/cors": "^9.0.1",
+    "@fastify/helmet": "^11.1.1",
+    "@fastify/jwt": "^8.0.0",
+    "@fastify/mongodb": "^8.0.0",
+    "@fastify/multipart": "^8.1.0",
+    "@fastify/one-line-logger": "^1.2.0",
+    "@fastify/rate-limit": "^9.1.0",
+    "@fastify/redis": "^6.1.1",
+    "@fastify/sensible": "^5.5.0",
+    "@fastify/type-provider-typebox": "^4.0.0",
+    "@fastify/under-pressure": "^8.3.0",
+    "@fastify/websocket": "^9.0.0",
+    "@sinclair/typebox": "^0.32.14",
+    "@tirke/node-cache-manager-ioredis": "^3.6.0",
+    "async-cache-dedupe": "^2.1.0",
+    "bullmq": "^5.3.2",
+    "cache-manager": "^5.4.0",
+    "exceljs": "^4.4.0",
+    "fastify": "^4.26.1",
+    "fastify-cloudinary": "^1.2.0",
+    "fastify-i18n": "^1.2.0",
+    "fastify-plugin": "^4.5.1",
+    "fastify-sse-v2": "^3.1.2",
+    "generate-password": "^1.7.1",
+    "ioredis": "^5.3.2",
+    "nodemailer": "^6.9.10",
+    "nunjucks": "^3.2.4",
+    "ofetch": "^1.3.3",
+    "otplib": "^12.0.1",
+    "pbkdf2-passworder": "^1.0.1"
+  },
+  "devDependencies": {
+    "@types/ioredis-mock": "^8.2.5",
+    "@types/nodemailer": "^6.4.14",
+    "@types/nunjucks": "^3.2.6",
+    "@vitest/coverage-v8": "^1.3.1",
+    "concurrently": "^8.2.2",
+    "ioredis-mock": "^8.9.0",
+    "mongodb-memory-server": "^9.1.6",
+    "process-envify": "^2.0.0",
+    "typescript": "^5.3.3",
+    "vite": "^5.1.4",
+    "vite-node": "^1.3.1",
+    "vite-plugin-fastify": "^1.2.5",
+    "vite-plugin-fastify-routes": "^1.1.1",
+    "vitest": "^1.3.1"
+  }
+}
diff --git a/public/libm.wasm → app/public/libm.wasm b/public/libm.wasm → app/public/libm.wasm
diff --git a/public/model.onnx → app/public/model.onnx b/public/model.onnx → app/public/model.onnx
diff --git a/src/app.ts → app/src/app.ts b/src/app.ts → app/src/app.ts
diff --git a/src/assets/libm.wasm → app/src/assets/libm.wasm b/src/assets/libm.wasm → app/src/assets/libm.wasm
diff --git a/src/assets/model.onnx → app/src/assets/model.onnx b/src/assets/model.onnx → app/src/assets/model.onnx
diff --git a/src/components/CollectionData.ts → app/src/components/CollectionData.ts b/src/components/CollectionData.ts → app/src/components/CollectionData.ts
diff --git a/src/components/CrudOperations.ts → app/src/components/CrudOperations.ts b/src/components/CrudOperations.ts → app/src/components/CrudOperations.ts
diff --git a/src/composables/useAssets.ts → app/src/composables/useAssets.ts b/src/composables/useAssets.ts → app/src/composables/useAssets.ts
diff --git a/src/composables/useMailer.ts → app/src/composables/useMailer.ts b/src/composables/useMailer.ts → app/src/composables/useMailer.ts
diff --git a/src/composables/usePublic.ts → app/src/composables/usePublic.ts b/src/composables/usePublic.ts → app/src/composables/usePublic.ts
diff --git a/src/composables/useQueue.ts → app/src/composables/useQueue.ts b/src/composables/useQueue.ts → app/src/composables/useQueue.ts
diff --git a/src/composables/useTableControl.ts → app/src/composables/useTableControl.ts b/src/composables/useTableControl.ts → app/src/composables/useTableControl.ts
diff --git a/src/composables/useWorker.ts → app/src/composables/useWorker.ts b/src/composables/useWorker.ts → app/src/composables/useWorker.ts
diff --git a/src/locales/en-US.ts → app/src/locales/en-US.ts b/src/locales/en-US.ts → app/src/locales/en-US.ts
diff --git a/src/locales/ja-JP.ts → app/src/locales/ja-JP.ts b/src/locales/ja-JP.ts → app/src/locales/ja-JP.ts
diff --git a/src/locales/ko-KR.ts → app/src/locales/ko-KR.ts b/src/locales/ko-KR.ts → app/src/locales/ko-KR.ts
diff --git a/src/locales/zh-TW.ts → app/src/locales/zh-TW.ts b/src/locales/zh-TW.ts → app/src/locales/zh-TW.ts
diff --git a/src/main.ts → app/src/main.ts b/src/main.ts → app/src/main.ts
diff --git a/src/middleware/admin.ts → app/src/middleware/admin.ts b/src/middleware/admin.ts → app/src/middleware/admin.ts
diff --git a/src/middleware/auth.ts → app/src/middleware/auth.ts b/src/middleware/auth.ts → app/src/middleware/auth.ts
diff --git a/src/plugins/error.ts → app/src/plugins/error.ts b/src/plugins/error.ts → app/src/plugins/error.ts
diff --git a/src/plugins/i18n.ts → app/src/plugins/i18n.ts b/src/plugins/i18n.ts → app/src/plugins/i18n.ts
diff --git a/src/plugins/router.ts → app/src/plugins/router.ts b/src/plugins/router.ts → app/src/plugins/router.ts
diff --git a/src/routes/assets-public/+handler.ts → app/src/routes/assets-public/+handler.ts b/src/routes/assets-public/+handler.ts → app/src/routes/assets-public/+handler.ts
diff --git a/src/routes/auth/+handler.ts → app/src/routes/auth/+handler.ts b/src/routes/auth/+handler.ts → app/src/routes/auth/+handler.ts
diff --git a/src/routes/auth/otp/+handler.ts → app/src/routes/auth/otp/+handler.ts b/src/routes/auth/otp/+handler.ts → app/src/routes/auth/otp/+handler.ts
diff --git a/src/routes/echo/+handler.ts → app/src/routes/echo/+handler.ts b/src/routes/echo/+handler.ts → app/src/routes/echo/+handler.ts
diff --git a/src/routes/echo/__tests__/+handler.spec.ts → ...rc/routes/echo/__tests__/+handler.spec.ts b/src/routes/echo/__tests__/+handler.spec.ts → ...rc/routes/echo/__tests__/+handler.spec.ts
diff --git a/src/routes/email/+handler.ts → app/src/routes/email/+handler.ts b/src/routes/email/+handler.ts → app/src/routes/email/+handler.ts
diff --git a/src/routes/file-uploads/+handler.ts → app/src/routes/file-uploads/+handler.ts b/src/routes/file-uploads/+handler.ts → app/src/routes/file-uploads/+handler.ts
diff --git a/...utes/file-uploads/import-data/+handler.ts → ...utes/file-uploads/import-data/+handler.ts b/...utes/file-uploads/import-data/+handler.ts → ...utes/file-uploads/import-data/+handler.ts
diff --git a/src/routes/hello-i18n/+handler.ts → app/src/routes/hello-i18n/+handler.ts b/src/routes/hello-i18n/+handler.ts → app/src/routes/hello-i18n/+handler.ts
diff --git a/...tes/hello-i18n/__tests__/+handler.spec.ts → ...tes/hello-i18n/__tests__/+handler.spec.ts b/...tes/hello-i18n/__tests__/+handler.spec.ts → ...tes/hello-i18n/__tests__/+handler.spec.ts
diff --git a/src/routes/hello-i18n/locales/en-US.ts → app/src/routes/hello-i18n/locales/en-US.ts b/src/routes/hello-i18n/locales/en-US.ts → app/src/routes/hello-i18n/locales/en-US.ts
diff --git a/src/routes/hello-i18n/locales/ja-JP.ts → app/src/routes/hello-i18n/locales/ja-JP.ts b/src/routes/hello-i18n/locales/ja-JP.ts → app/src/routes/hello-i18n/locales/ja-JP.ts
diff --git a/src/routes/hello-i18n/locales/ko-KR.ts → app/src/routes/hello-i18n/locales/ko-KR.ts b/src/routes/hello-i18n/locales/ko-KR.ts → app/src/routes/hello-i18n/locales/ko-KR.ts
diff --git a/src/routes/hello-i18n/locales/zh-TW.ts → app/src/routes/hello-i18n/locales/zh-TW.ts b/src/routes/hello-i18n/locales/zh-TW.ts → app/src/routes/hello-i18n/locales/zh-TW.ts
diff --git a/src/routes/hello-world/+handler.ts → app/src/routes/hello-world/+handler.ts b/src/routes/hello-world/+handler.ts → app/src/routes/hello-world/+handler.ts
diff --git a/...es/hello-world/__tests__/+handler.spec.ts → ...es/hello-world/__tests__/+handler.spec.ts b/...es/hello-world/__tests__/+handler.spec.ts → ...es/hello-world/__tests__/+handler.spec.ts
diff --git a/...ld/caching-dedupe/[id]-memory/+handler.ts → ...ld/caching-dedupe/[id]-memory/+handler.ts b/...ld/caching-dedupe/[id]-memory/+handler.ts → ...ld/caching-dedupe/[id]-memory/+handler.ts
diff --git a/...rld/caching-dedupe/[id]-redis/+handler.ts → ...rld/caching-dedupe/[id]-redis/+handler.ts b/...rld/caching-dedupe/[id]-redis/+handler.ts → ...rld/caching-dedupe/[id]-redis/+handler.ts
diff --git a/...es/hello-world/caching-memory/+handler.ts → ...es/hello-world/caching-memory/+handler.ts b/...es/hello-world/caching-memory/+handler.ts → ...es/hello-world/caching-memory/+handler.ts
diff --git a/...tes/hello-world/caching-redis/+handler.ts → ...tes/hello-world/caching-redis/+handler.ts b/...tes/hello-world/caching-redis/+handler.ts → ...tes/hello-world/caching-redis/+handler.ts
diff --git a/src/routes/queues/+handler.ts → app/src/routes/queues/+handler.ts b/src/routes/queues/+handler.ts → app/src/routes/queues/+handler.ts
diff --git a/src/routes/queues/cron/+handler.ts → app/src/routes/queues/cron/+handler.ts b/src/routes/queues/cron/+handler.ts → app/src/routes/queues/cron/+handler.ts
diff --git a/src/routes/queues/drain/+handler.ts → app/src/routes/queues/drain/+handler.ts b/src/routes/queues/drain/+handler.ts → app/src/routes/queues/drain/+handler.ts
diff --git a/src/routes/sse/+handler.ts → app/src/routes/sse/+handler.ts b/src/routes/sse/+handler.ts → app/src/routes/sse/+handler.ts
diff --git a/src/routes/suggestions/+handler.ts → app/src/routes/suggestions/+handler.ts b/src/routes/suggestions/+handler.ts → app/src/routes/suggestions/+handler.ts
diff --git a/src/routes/todos/+handler.ts → app/src/routes/todos/+handler.ts b/src/routes/todos/+handler.ts → app/src/routes/todos/+handler.ts
diff --git a/src/routes/todos/[id]/+handler.ts → app/src/routes/todos/[id]/+handler.ts b/src/routes/todos/[id]/+handler.ts → app/src/routes/todos/[id]/+handler.ts
diff --git a/...tes/todos/[id]/__tests__/+handler.spec.ts → ...tes/todos/[id]/__tests__/+handler.spec.ts b/...tes/todos/[id]/__tests__/+handler.spec.ts → ...tes/todos/[id]/__tests__/+handler.spec.ts
diff --git a/src/routes/todos/__tests__/+handler.spec.ts → ...c/routes/todos/__tests__/+handler.spec.ts b/src/routes/todos/__tests__/+handler.spec.ts → ...c/routes/todos/__tests__/+handler.spec.ts
@@ -1,6 +1,6 @@
-import { MongoMemoryServer } from 'mongodb-memory-server';
-import fastify from 'fastify';
 import mongodb from '@fastify/mongodb';
+import fastify from 'fastify';
+import { MongoMemoryServer } from 'mongodb-memory-server';
 
 import todos from '../+handler';
 

diff --git a/src/routes/todos/schema.ts → app/src/routes/todos/schema.ts b/src/routes/todos/schema.ts → app/src/routes/todos/schema.ts
diff --git a/src/routes/todos/types.ts → app/src/routes/todos/types.ts b/src/routes/todos/types.ts → app/src/routes/todos/types.ts
diff --git a/src/routes/user-list/+handler.ts → app/src/routes/user-list/+handler.ts b/src/routes/user-list/+handler.ts → app/src/routes/user-list/+handler.ts
diff --git a/src/routes/user-list/+hook.ts → app/src/routes/user-list/+hook.ts b/src/routes/user-list/+hook.ts → app/src/routes/user-list/+hook.ts
diff --git a/src/routes/user-list/[id]/+handler.ts → app/src/routes/user-list/[id]/+handler.ts b/src/routes/user-list/[id]/+handler.ts → app/src/routes/user-list/[id]/+handler.ts
diff --git a/src/routes/user-list/schema.ts → app/src/routes/user-list/schema.ts b/src/routes/user-list/schema.ts → app/src/routes/user-list/schema.ts
diff --git a/src/shims.d.ts → app/src/shims.d.ts b/src/shims.d.ts → app/src/shims.d.ts
diff --git a/src/templates/hello-world.html → app/src/templates/hello-world.html b/src/templates/hello-world.html → app/src/templates/hello-world.html
diff --git a/src/utilities/redisCache.ts → app/src/utilities/redisCache.ts b/src/utilities/redisCache.ts → app/src/utilities/redisCache.ts
diff --git a/src/utilities/redisInstance.ts → app/src/utilities/redisInstance.ts b/src/utilities/redisInstance.ts → app/src/utilities/redisInstance.ts
diff --git a/tsconfig.json → app/tsconfig.json b/tsconfig.json → app/tsconfig.json
diff --git a/vite.config.ts → app/vite.config.ts b/vite.config.ts → app/vite.config.ts
@@ -1,9 +1,9 @@
 import { resolve } from 'path';
+import nodemailer from 'nodemailer';
+import envify from 'process-envify';
 import { defineConfig } from 'vite';
 import fastify from 'vite-plugin-fastify';
 import fastifyRoutes from 'vite-plugin-fastify-routes';
-import envify from 'process-envify';
-import nodemailer from 'nodemailer';
 
 const { user, pass } = await nodemailer.createTestAccount();
 

diff --git a/biome.json b/biome.json
@@ -1,5 +1,8 @@
 {
   "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
+  "files": {
+    "ignore": ["dist", "coverage"]
+  },
   "formatter": {
     "indentStyle": "space",
     "lineWidth": 100

diff --git a/e2e/src/hello-world.spec.ts b/e2e/src/hello-world.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '@playwright/test';
+import { expect, test } from '@playwright/test';
 
 test('GET /api/hello-world', async ({ request }) => {
   const response = await request.get('/api/hello-world');

diff --git a/e2e/src/todos.spec.ts b/e2e/src/todos.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '@playwright/test';
+import { expect, test } from '@playwright/test';
 
 test('POST /api/todos', async ({ request }) => {
   const response = await request.post('/api/todos', { data: {} });

diff --git a/mock/vite.config.ts b/mock/vite.config.ts
@@ -1,8 +1,8 @@
 import { resolve } from 'path';
+import envify from 'process-envify';
 import { defineConfig } from 'vite';
 import fastify from 'vite-plugin-fastify';
 import fastifyRoutes from 'vite-plugin-fastify-routes';
-import envify from 'process-envify';
 
 export default defineConfig({
   define: envify({

diff --git a/package.json b/package.json
@@ -2,62 +2,15 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite-node -w src/main.ts",
-    "mock": "cd mock && pnpm mock",
-    "build": "vite build",
-    "preview": "vite preview",
-    "lint": "biome check --apply ./src",
-    "check": "tsc --noEmit",
-    "test": "vitest --dir src --coverage --run",
-    "e2e": "cd e2e && pnpm e2e"
-  },
-  "dependencies": {
-    "@fastify/cors": "^9.0.1",
-    "@fastify/helmet": "^11.1.1",
-    "@fastify/jwt": "^8.0.0",
-    "@fastify/mongodb": "^8.0.0",
-    "@fastify/multipart": "^8.1.0",
-    "@fastify/one-line-logger": "^1.2.0",
-    "@fastify/rate-limit": "^9.1.0",
-    "@fastify/redis": "^6.1.1",
-    "@fastify/sensible": "^5.5.0",
-    "@fastify/type-provider-typebox": "^4.0.0",
-    "@fastify/under-pressure": "^8.3.0",
-    "@fastify/websocket": "^9.0.0",
-    "@sinclair/typebox": "^0.32.14",
-    "@tirke/node-cache-manager-ioredis": "^3.6.0",
-    "async-cache-dedupe": "^2.1.0",
-    "bullmq": "^5.3.2",
-    "cache-manager": "^5.4.0",
-    "exceljs": "^4.4.0",
-    "fastify": "^4.26.1",
-    "fastify-cloudinary": "^1.2.0",
-    "fastify-i18n": "^1.2.0",
-    "fastify-plugin": "^4.5.1",
-    "fastify-sse-v2": "^3.1.2",
-    "generate-password": "^1.7.1",
-    "ioredis": "^5.3.2",
-    "nodemailer": "^6.9.10",
-    "nunjucks": "^3.2.4",
-    "ofetch": "^1.3.3",
-    "otplib": "^12.0.1",
-    "pbkdf2-passworder": "^1.0.1"
+    "dev": "pnpm -C app dev",
+    "mock": "pnpm -C mock mock",
+    "build": "pnpm -C app build",
+    "preview": "pnpm -C app preview",
+    "check": "pnpm -C app check",
+    "test": "pnpm -C app test",
+    "e2e": "pnpm -C e2e e2e"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.5.3",
-    "@types/ioredis-mock": "^8.2.5",
-    "@types/nodemailer": "^6.4.14",
-    "@types/nunjucks": "^3.2.6",
-    "@vitest/coverage-v8": "^1.3.1",
-    "concurrently": "^8.2.2",
-    "ioredis-mock": "^8.9.0",
-    "mongodb-memory-server": "^9.1.6",
-    "process-envify": "^2.0.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.1.4",
-    "vite-node": "^1.3.1",
-    "vite-plugin-fastify": "^1.2.5",
-    "vite-plugin-fastify-routes": "^1.1.1",
-    "vitest": "^1.3.1"
+    "@biomejs/biome": "^1.5.3"
   }
 }