Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/billets server router #26

Merged
merged 16 commits into from
Feb 2, 2024
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 3 additions & 3 deletions packages/accounts-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
35 changes: 32 additions & 3 deletions packages/accounts-schema/package.json
Original file line number Diff line number Diff line change
@@ -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": {
".": {
Expand All @@ -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",
Expand All @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/accounts-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
13 changes: 10 additions & 3 deletions packages/billets-admin-server/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
7 changes: 4 additions & 3 deletions packages/billets-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}\"",
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
concertListHandler,
concertRecentListHandler,
concertSearchHandler,
} from './concertHandlers'
} from './concert.ctrl'

const concertRoute: FastifyPluginCallback = (fastify, opts, done) => {
// concert list
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
6 changes: 3 additions & 3 deletions packages/billets-server/vercel/api/serverless.ts
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
2 changes: 1 addition & 1 deletion packages/cloudinary-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/coldsurf-website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/hotsurf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/mailer-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/metronome-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/notion-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/notion-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/store-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/store-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/subcultures-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/surflog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/wamuseum-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/wamuseum-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
16 changes: 3 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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==
Expand Down
Loading