Merge pull request #26 from coldsurfers/refactor/billets-server-router

Refactor/billets server router
coldsurfers · Feb 2, 2024 · 3554576 · 3554576
2 parents 8711a71 + b07f065
commit 3554576
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 51 deletions.
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "lint-staged": "^15.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.2.4",
-    "typescript": "^5.3.3",
+    "typescript": "5.3.3",
     "nx": "17.3.0"
   }
 }
diff --git a/packages/accounts-kit/package.json b/packages/accounts-kit/package.json
@@ -16,10 +16,10 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@coldsurfers/accounts-schema": "1.0.0"
+    "@coldsurfers/accounts-schema": "1.0.1-rc.4"
   },
   "devDependencies": {
-    "@coldsurfers/accounts-schema": "1.0.0",
+    "@coldsurfers/accounts-schema": "1.0.1-rc.4",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "eslint": "^8.56.0",
@@ -31,6 +31,6 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^2.8.1",
-    "typescript": "^5.3.3"
+    "typescript": "5.3.3"
   }
 }
diff --git a/packages/accounts-schema/package.json b/packages/accounts-schema/package.json
@@ -1,12 +1,13 @@
 {
   "name": "@coldsurfers/accounts-schema",
-  "version": "1.0.0",
+  "version": "1.0.1-rc.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "source": "src/",
   "files": [
     "src",
-    "dist"
+    "dist",
+    "prisma"
   ],
   "exports": {
     ".": {
@@ -17,10 +18,37 @@
   "license": "MIT",
   "scripts": {
     "build": "rm -rf dist && tsc --project ./tsconfig.build.json",
+    "prerelease": "yarn build",
+    "prerelease:rc": "yarn build",
+    "release": "release-it minor --ci",
+    "release:rc": "release-it --ci --preRelease=rc",
+    "lint": "eslint --cache \"src/**/*.{js,jsx,ts,tsx}\" --fix",
+    "lint:fix": "yarn lint --fix",
     "prisma:copy": "mkdir -p ./prisma && cp ../../prisma/schema.prisma ./prisma/schema.prisma",
     "prisma:generate": "yarn prisma generate --schema ./prisma/schema.prisma",
     "postinstall": "yarn prisma:copy && yarn prisma:generate"
   },
+  "publishConfig": {
+    "registry": "https://npm.pkg.github.com"
+  },
+  "release-it": {
+    "git": {
+      "commitMessage": "chore: release @coldsurfers/accounts-schema v${version}",
+      "tagName": "accounts-schema-v${version}"
+    },
+    "github": {
+      "release": true
+    },
+    "hooks": {
+      "after:git:release": "git reset --hard HEAD"
+    },
+    "npm": {
+      "versionArgs": [
+        "--allow-same-version",
+        "--workspaces-update=false"
+      ]
+    }
+  },
   "peerDependencies": {
     "zod": "^3.22.4",
     "prisma": "^5.7.1",
@@ -40,6 +68,7 @@
     "prettier": "^2.8.1",
     "zod": "^3.22.4",
     "prisma": "^5.7.1",
-    "@prisma/client": "5.8.0"
+    "@prisma/client": "5.8.0",
+    "release-it": "^17.0.1"
   }
 }
diff --git a/packages/accounts-server/package.json b/packages/accounts-server/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@coldsurfers/mailer-utils": "1.0.0",
     "@coldsurfers/shared-utils": "^1.0.1-rc.0",
-    "@coldsurfers/accounts-schema": "1.0.0",
+    "@coldsurfers/accounts-schema": "1.0.1-rc.4",
     "@fastify/autoload": "^5.8.0",
     "@fastify/cors": "^8.5.0",
     "@fastify/jwt": "^7.2.4",
@@ -51,6 +51,6 @@
     "prettier": "^2.8.1",
     "prisma": "^5.7.1",
     "ts-node": "11.0.0-beta.1",
-    "typescript": "^5.3.3"
+    "typescript": "5.3.3"
   }
 }
diff --git a/packages/billets-admin-server/package.json b/packages/billets-admin-server/package.json
@@ -1,8 +1,14 @@
 {
   "name": "@coldsurfers/billets-admin-server",
+  "private": true,
   "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",
+  "workspaces": {
+    "nohoist": [
+      "**"
+    ]
+  },
   "devDependencies": {
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
@@ -25,7 +31,7 @@
     "lint-staged": "^13.1.0",
     "prettier": "2.8.1",
     "prisma": "^5.7.1",
-    "typescript": "^4.9.4"
+    "typescript": "5.3.3"
   },
   "scripts": {
     "debug": "vercel dev --listen 3001",
@@ -39,14 +45,15 @@
     "codegen": "graphql-codegen --config ./gql/codegen.yml",
     "prisma:db-push": "yarn prisma db push --schema ./prisma/schema.prisma",
     "prisma:generate": "yarn prisma generate --schema ./prisma/schema.prisma",
-    "vercel:sync-env": "vercel env pull"
+    "vercel:sync-env": "vercel env pull",
+    "unlink:coldsurfers": "unlink node_modules/@coldsurfers/accounts-schema && cp -R ../accounts-schema node_modules/@coldsurfers/accounts-schema"
   },
   "dependencies": {
     "@apollo/server": "^4.3.0",
     "@as-integrations/fastify": "^1.2.0",
     "@aws-sdk/client-s3": "^3.254.0",
     "@aws-sdk/s3-presigned-post": "^3.254.0",
-    "@coldsurfers/accounts-schema": "1.0.0",
+    "@coldsurfers/accounts-schema": "1.0.1-rc.4",
     "@prisma/client": "5.8.0",
     "@vercel/node": "^2.8.2",
     "crypto-js": "^4.1.1",

diff --git a/packages/billets-server/package.json b/packages/billets-server/package.json
@@ -19,16 +19,17 @@
     "lint-staged": "^13.1.0",
     "prettier": "2.8.3",
     "prisma": "^5.7.1",
-    "typescript": "^4.9.5"
+    "typescript": "5.3.3"
   },
   "dependencies": {
-    "@prisma/client": "^5.8.0",
+    "@prisma/client": "5.8.0",
     "@vercel/node": "^2.9.0",
     "crypto-js": "^4.1.1",
     "dotenv": "^16.0.3",
     "fastify": "^4.12.0",
     "jsonwebtoken": "^9.0.0",
-    "jwt-decode": "^3.1.2"
+    "jwt-decode": "^3.1.2",
+    "@coldsurfers/accounts-schema": "1.0.1-rc.4"
   },
   "scripts": {
     "lint": "eslint --cache \"src/**/*.{js,jsx,ts,tsx}\" \"vercel/**/*.{js,jsx,ts,tsx}\"",

diff --git a/...billets-server/src/routes/authHandlers.ts → ...es/billets-server/src/routes/auth.ctrl.ts b/...billets-server/src/routes/authHandlers.ts → ...es/billets-server/src/routes/auth.ctrl.ts
diff --git a/packages/billets-server/src/routes/auth.ts → ...s/billets-server/src/routes/auth.route.ts b/packages/billets-server/src/routes/auth.ts → ...s/billets-server/src/routes/auth.route.ts
@@ -1,5 +1,5 @@
 import { FastifyPluginCallback } from 'fastify'
-import { signinHandler, signupHandler } from './authHandlers'
+import { signinHandler, signupHandler } from './auth.ctrl'
 
 const authRoute: FastifyPluginCallback = (fastify, opts, done) => {
   fastify.post(

diff --git a/...lets-server/src/routes/concertHandlers.ts → ...billets-server/src/routes/concert.ctrl.ts b/...lets-server/src/routes/concertHandlers.ts → ...billets-server/src/routes/concert.ctrl.ts
diff --git a/...ages/billets-server/src/routes/concert.ts → ...illets-server/src/routes/concert.route.ts b/...ages/billets-server/src/routes/concert.ts → ...illets-server/src/routes/concert.route.ts
@@ -5,7 +5,7 @@ import {
   concertListHandler,
   concertRecentListHandler,
   concertSearchHandler,
-} from './concertHandlers'
+} from './concert.ctrl'
 
 const concertRoute: FastifyPluginCallback = (fastify, opts, done) => {
   // concert list

diff --git a/.../billets-server/src/routes/userHandler.ts → ...es/billets-server/src/routes/user.ctrl.ts b/.../billets-server/src/routes/userHandler.ts → ...es/billets-server/src/routes/user.ctrl.ts
diff --git a/packages/billets-server/src/routes/user.ts → ...s/billets-server/src/routes/user.route.ts b/packages/billets-server/src/routes/user.ts → ...s/billets-server/src/routes/user.route.ts
@@ -1,6 +1,6 @@
 import { FastifyPluginCallback } from 'fastify'
 import { decodeToken } from '../lib/jwt'
-import { userHandler } from './userHandler'
+import { userHandler } from './user.ctrl'
 
 const userRoute: FastifyPluginCallback = (fastify, opts, done) => {
   fastify.get(

diff --git a/packages/billets-server/vercel/api/serverless.ts b/packages/billets-server/vercel/api/serverless.ts
@@ -1,9 +1,9 @@
 import dotenv from 'dotenv'
 import Fastify from 'fastify'
 import { VercelApiHandler, VercelRequest, VercelResponse } from '@vercel/node'
-import authRoute from '../../src/routes/auth'
-import concertRoute from '../../src/routes/concert'
-import userRoute from '../../src/routes/user'
+import authRoute from '../../src/routes/auth.route'
+import concertRoute from '../../src/routes/concert.route'
+import userRoute from '../../src/routes/user.route'
 
 dotenv.config()
 

diff --git a/packages/cloudinary-utils/package.json b/packages/cloudinary-utils/package.json
@@ -34,7 +34,7 @@
     "release-it": "^17.0.1",
     "sha1": "^1.1.1",
     "stream": "^0.0.2",
-    "typescript": "^5.3.3",
+    "typescript": "5.3.3",
     "util": "^0.12.5"
   },
   "scripts": {

diff --git a/packages/coldsurf-website/package.json b/packages/coldsurf-website/package.json
@@ -27,6 +27,6 @@
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-prettier": "^4.0.0",
         "prettier": "2.6.1",
-        "typescript": "4.6.3"
+        "typescript": "5.3.3"
     }
 }
diff --git a/packages/hotsurf/package.json b/packages/hotsurf/package.json
@@ -48,7 +48,7 @@
     "styled-components": "6.1.8",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "typescript": "^4.8.3"
+    "typescript": "5.3.3"
   },
   "peerDependencies": {
     "react": ">= 18.2.0",

diff --git a/packages/mailer-utils/package.json b/packages/mailer-utils/package.json
@@ -31,7 +31,7 @@
     "nodemailer": "^6.9.8",
     "nodemailer-smtp-transport": "^2.7.4",
     "prettier": "^2.8.1",
-    "typescript": "^5.3.3"
+    "typescript": "5.3.3"
   },
   "scripts": {
     "build": "rm -rf dist && tsc",

diff --git a/packages/metronome-web/package.json b/packages/metronome-web/package.json
@@ -33,6 +33,6 @@
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "prettier": "^3.2.4",
-    "typescript": "4.6.3"
+    "typescript": "5.3.3"
   }
 }
diff --git a/packages/notion-renderer/package.json b/packages/notion-renderer/package.json
@@ -39,7 +39,7 @@
     "prettier": "^2.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "typescript": "^5.3.3",
+    "typescript": "5.3.3",
     "typescript-plugin-css-modules": "^5.0.2"
   },
   "peerDependencies": {

diff --git a/packages/notion-utils/package.json b/packages/notion-utils/package.json
@@ -33,7 +33,7 @@
     "prettier": "2.8.1",
     "release-it": "^17.0.1",
     "sha1": "^1.1.1",
-    "typescript": "^5.3.3"
+    "typescript": "5.3.3"
   },
   "peerDependencies": {
     "@notionhq/client": "^2.2.14",

diff --git a/packages/shared-utils/package.json b/packages/shared-utils/package.json
@@ -37,7 +37,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^2.8.1",
     "release-it": "^17.0.1",
-    "typescript": "^5.3.3"
+    "typescript": "5.3.3"
   },
   "publishConfig": {
     "registry": "https://npm.pkg.github.com"

diff --git a/packages/store-client/package.json b/packages/store-client/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@coldsurfers/accounts-kit": "1.0.0",
-    "@coldsurfers/accounts-schema": "1.0.0",
+    "@coldsurfers/accounts-schema": "1.0.1-rc.4",
     "@coldsurfers/notion-renderer": "1.0.0",
     "@coldsurfers/notion-utils": "1.0.1-rc.10",
     "@coldsurfers/ocean-road": "1.5.1-rc.4",
@@ -47,7 +47,7 @@
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "ts-node": "^10.9.2",
-    "typescript": "^5",
+    "typescript": "5.3.3",
     "typescript-plugin-css-modules": "^5.0.2",
     "react-native": "^0.70.6"
   }

diff --git a/packages/store-server/package.json b/packages/store-server/package.json
@@ -16,13 +16,13 @@
     "@types/node": "^20",
     "pm2": "^5.3.0",
     "prisma": "^5.7.1",
-    "typescript": "^5"
+    "typescript": "5.3.3"
   },
   "dependencies": {
     "@fastify/autoload": "^5.8.0",
     "@fastify/cors": "^8.4.2",
     "@fastify/jwt": "^7.2.4",
-    "@prisma/client": "^5.7.1",
+    "@prisma/client": "5.8.0",
     "fastify": "^4.24.3",
     "google-auth-library": "^9.4.1",
     "nconf": "^0.12.1",

diff --git a/packages/subcultures-server/package.json b/packages/subcultures-server/package.json
@@ -27,7 +27,7 @@
     "serverless-offline": "^6.8.0",
     "serverless-webpack": "5.3.1",
     "ts-loader": "6.2.1",
-    "typescript": "^4.2.2",
+    "typescript": "5.3.3",
     "webpack": "4.41.5",
     "webpack-node-externals": "1.7.2"
   },

diff --git a/packages/surflog/package.json b/packages/surflog/package.json
@@ -50,6 +50,6 @@
     "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-react-hooks": "^4.3.0",
     "prettier": "2.8.1",
-    "typescript": "^5.1.3"
+    "typescript": "5.3.3"
   }
 }
diff --git a/packages/wamuseum-client/package.json b/packages/wamuseum-client/package.json
@@ -34,6 +34,6 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^2.8.1",
-    "typescript": "^5"
+    "typescript": "5.3.3"
   }
 }
diff --git a/packages/wamuseum-server/package.json b/packages/wamuseum-server/package.json
@@ -19,7 +19,7 @@
     "@aws-sdk/s3-presigned-post": "^3.484.0",
     "@coldsurfers/mailer-utils": "1.0.0",
     "@coldsurfers/shared-utils": "^1.0.1-rc.0",
-    "@coldsurfers/accounts-schema": "1.0.0",
+    "@coldsurfers/accounts-schema": "1.0.1-rc.4",
     "@fastify/autoload": "^5.8.0",
     "@fastify/cors": "^8.5.0",
     "@fastify/jwt": "^7.2.4",
@@ -54,6 +54,6 @@
     "prettier": "^2.8.1",
     "prisma": "^5.7.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3"
+    "typescript": "5.3.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -5200,16 +5200,11 @@
     "@pnpm/network.ca-file" "^1.0.1"
     config-chain "^1.1.11"
 
-"@prisma/[email protected]", "@prisma/client@^5.7.1":
+"@prisma/[email protected]":
   version "5.8.0"
   resolved "https://registry.npmjs.org/@prisma/client/-/client-5.8.0.tgz"
   integrity sha512-QxO6C4MaA/ysTIbC+EcAH1aX/YkpymhXtO6zPdk+FvA7+59tNibIYpd+7koPdViLg2iKES4ojsxWNUGNJaEcbA==
 
-"@prisma/client@^5.8.0":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.8.1.tgz#7815ec51c0ca2a6de219c02e7846701ae3baf240"
-  integrity sha512-xQtMPfbIwLlbm0VVIVQY2yqQVOxPwRQhvIp7Z3m2900g1bu/zRHKhYZJQWELqmjl6d8YwBy0K2NvMqh47v1ubw==
-
 "@prisma/[email protected]":
   version "5.8.0"
   resolved "https://registry.npmjs.org/@prisma/debug/-/debug-5.8.0.tgz"
@@ -20305,17 +20300,12 @@ typescript-plugin-css-modules@^5.0.2:
     stylus "^0.59.0"
     tsconfig-paths "^4.1.2"
 
-[email protected]:
-  version "4.6.3"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz"
-  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
-
-[email protected], typescript@^4.2.2, typescript@^4.8.3, typescript@^4.9.4, typescript@^4.9.5:
+[email protected]:
   version "4.9.5"
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-[email protected], "typescript@^4.6.4 || ^5.2.2", typescript@^5, typescript@^5.1.3, typescript@^5.3.3:
+[email protected], "typescript@^4.6.4 || ^5.2.2":
   version "5.3.3"
   resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==