Skip to content

[WIP] Monorepo ify #17

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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 .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ S3_BUCKET=hoof-storage
POSTGRES_USER=postgres
POSTGRES_PASSWORD=unicorn
POSTGRES_URL="postgresql://postgres:unicorn@localhost:5432/postgres"
REDIS_URL="redis://localhost:6379"
REDIS_URL="redis://localhost:6379"
25 changes: 0 additions & 25 deletions .github/workflows/fly.yml

This file was deleted.

6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/.env
/.env.local
/.data
/.idea
/.vscode
Expand All @@ -20,4 +21,7 @@
**/.eslintcache
**/.puppeteer

/drizzle
/drizzle

.nx/cache
.nx/workspace-data
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.13.1
v22.15.0
6 changes: 0 additions & 6 deletions .prettierignore

This file was deleted.

42 changes: 0 additions & 42 deletions Dockerfile

This file was deleted.

126 changes: 0 additions & 126 deletions README.md

This file was deleted.

4 changes: 2 additions & 2 deletions drizzle.config.ts → apps/api/drizzle.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { defineConfig } from "drizzle-kit";

export default defineConfig({
out: "./drizzle",
schema: "./src/db/schema/index.ts",
schema: "../../packages/db/src/schema/index.ts",
dialect: "postgresql",
casing: "snake_case",
dbCredentials: {
url: process.env.POSTGRES_URL,
url: process.env.POSTGRES_URL!,
},
});
5 changes: 5 additions & 0 deletions apps/api/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @ts-check

import rootConfig from "../../eslint.config.mjs";

export default [...rootConfig];
31 changes: 31 additions & 0 deletions apps/api/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "@playfulprogramming/api",
"private": true,
"version": "0.0.1",
"type": "module",
"main": "src/index.ts",
"scripts": {
"start": "node --env-file=../../.env --experimental-strip-types src/app.ts",
"debug": "node --inspect-brk --env-file=../../.env --experimental-strip-types src/app.ts",
"test:eslint": "eslint ./src",
"test:build": "publint --strict",
"build": "tsc --noEmit"
},
"dependencies": {
"@playfulprogramming/common": "workspace:*",
"@playfulprogramming/db": "workspace:*",
"@fastify/cors": "^10.0.2",
"@fastify/csrf-protection": "^7.0.2",
"@fastify/env": "^5.0.2",
"@fastify/etag": "^6.0.3",
"@fastify/sensible": "^6.0.0",
"@fastify/swagger": "^9.4.2",
"@fastify/swagger-ui": "^5.2.1",
"fastify": "^5.0.0",
"fastify-plugin": "^5.0.0",
"drizzle-orm": "catalog:"
},
"devDependencies": {
"fastify-tsconfig": "^2.0.0"
}
}
File renamed without changes.
2 changes: 1 addition & 1 deletion src/api/plugins/env.ts → apps/api/src/plugins/env.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fp from "fastify-plugin";
import fastifyEnv from "@fastify/env";
import { EnvSchema, EnvType } from "src/common/env.ts";
import { EnvSchema, EnvType } from "@playfulprogramming/common";

declare module "fastify" {
interface FastifyInstance {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { eq } from "drizzle-orm";
import {
UrlMetadataInput,
UrlMetadataInputSchema,
} from "src/common/tasks/url-metadata.ts";
import { db } from "src/db/client.ts";
import { queues } from "src/common/tasks/queues.ts";
queues,
} from "@playfulprogramming/common";
import { db } from "@playfulprogramming/db";

const urlMetadataRoutes: FastifyPluginAsync = async (fastify) => {
fastify.post<{ Body: UrlMetadataInput }>(
Expand Down
8 changes: 8 additions & 0 deletions apps/api/src/types/environment.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import type { EnvType } from "@playfulprogramming/common";

declare global {
namespace NodeJS {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ProcessEnv extends EnvType {}
}
}
2 changes: 1 addition & 1 deletion src/types/fastify.d.ts → apps/api/src/types/fastify.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { EnvType } from "src/common/env.ts";
import type { EnvType } from "@playfulprogramming/common";

declare module "fastify" {
interface FastifyInstance {
Expand Down
4 changes: 4 additions & 0 deletions apps/api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src", "eslint.config.js"]
}
11 changes: 11 additions & 0 deletions apps/worker/drizzle.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { defineConfig } from "drizzle-kit";

export default defineConfig({
out: "./drizzle",
schema: "../../packages/db/src/schema/index.ts",
dialect: "postgresql",
casing: "snake_case",
dbCredentials: {
url: process.env.POSTGRES_URL!,
},
});
5 changes: 5 additions & 0 deletions apps/worker/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// @ts-check

import rootConfig from "../../eslint.config.mjs";

export default [...rootConfig];
26 changes: 26 additions & 0 deletions apps/worker/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "@playfulprogramming/worker",
"private": true,
"version": "0.0.1",
"type": "module",
"main": "src/index.ts",
"scripts": {
"start": "node --env-file=../../.env --experimental-strip-types src/app.ts",
"debug": "node --inspect-brk --env-file=../../.env --experimental-strip-types src/app.ts",
"test:eslint": "eslint ./src",
"test:build": "publint --strict",
"build": "tsc --noEmit"
},
"dependencies": {
"@playfulprogramming/common": "workspace:*",
"@playfulprogramming/db": "workspace:*",
"bullmq": "catalog:",
"hast-util-from-html": "^2.0.3",
"sharp": "^0.33.5",
"svgo": "^3.3.2",
"unist-util-find": "^3.0.0"
},
"devDependencies": {
"@types/hast": "^3.0.4"
}
}
4 changes: 2 additions & 2 deletions src/worker/app.ts → apps/worker/src/app.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { processUrlMetadata } from "./tasks/url-metadata/processor.ts";
import { createWorker } from "src/worker/createWorker.ts";
import { Tasks } from "src/common/tasks/index.ts";
import { createWorker } from "./createWorker.ts";
import { Tasks } from "@playfulprogramming/common";

createWorker(Tasks.URL_METADATA, processUrlMetadata);
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Job, Worker } from "bullmq";
import { TaskInputs, Tasks } from "src/common/tasks/index.ts";
import { redis } from "../common/redis/client.ts";
import { TaskInputs, redis, TasksValues } from "@playfulprogramming/common";

export function createWorker<T extends Tasks>(
export function createWorker<T extends TasksValues>(
task: T,
callback: (job: Job<TaskInputs[T]>) => Promise<void>,
): Worker {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ import {
} from "./utils/html.ts";
import { fetchPageIcon } from "./utils/icons.ts";
import { processImage } from "./utils/images.ts";
import { UrlMetadataInput } from "src/common/tasks/url-metadata.ts";
import { createBucket } from "src/common/s3/client.ts";
import { db } from "src/db/client.ts";
import { urlMetadata } from "src/db/schema/url-metadata.ts";
import { UrlMetadataInput, createBucket } from "@playfulprogramming/common";
import { db, urlMetadata } from "@playfulprogramming/db";

export async function processUrlMetadata(job: {
data: UrlMetadataInput;
Expand Down
Loading