Skip to content

Commit

Permalink
fix: broken ci (#100)
Browse files Browse the repository at this point in the history
  • Loading branch information
QuiiBz authored Aug 31, 2024
1 parent 70d5fbd commit ec33033
Show file tree
Hide file tree
Showing 10 changed files with 460 additions and 650 deletions.
7 changes: 3 additions & 4 deletions apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@libsql/client": "^0.6.0",
"@ogstudio/auth": "workspace:*",
"@ogstudio/db": "workspace:*",
"@radix-ui/themes": "^3.0.3",
Expand All @@ -25,12 +24,12 @@
"@vercel/kv": "^1.0.1",
"@vercel/speed-insights": "^1.0.10",
"clsx": "^2.1.1",
"next": "14.2.3",
"next": "14.2.7",
"next-themes": "^0.3.0",
"react": "^18",
"react-colorful": "^5.6.1",
"react-dom": "^18",
"satori": "^0.10.13",
"satori": "^0.10.14",
"sonner": "^1.4.41",
"zundo": "^2.1.0",
"zustand": "^4.5.2"
Expand All @@ -47,7 +46,7 @@
"postcss": "^8.4.38",
"postcss-import": "^16.1.0",
"tailwindcss": "^3.4.3",
"tsx": "^4.9.3",
"tsx": "^4.19.0",
"vitest": "^1.6.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4609,4 +4609,4 @@ Uint8Array [
]
`;

exports[`renderToImg > should render to a base64 data url 1`] = `"data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIwMCIgaGVpZ2h0PSI2MzAiIHZpZXdCb3g9IjAgMCAxMjAwIDYzMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48bWFzayBpZD0ic2F0b3JpX29tLWlkIj48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTIwMCIgaGVpZ2h0PSI2MzAiIGZpbGw9IiNmZmYiLz48L21hc2s+PG1hc2sgaWQ9InNhdG9yaV9vbS1pZC0wIj48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwIiBoZWlnaHQ9IjUwIiBmaWxsPSIjZmZmIi8+PC9tYXNrPjxwYXRoIGZpbGw9InJnYmEoMCwgMCwgMCwgMSkiIGQ9Ik0xMy44IDEyLjZMMi40IDEyLjZMMi40IDguNUwyOS45IDguNUwyOS45IDEyLjZMMTguNSAxMi42TDE4LjUgNDQuOUwxMy44IDQ0LjlMMTMuOCAxMi42Wk00Ny42IDQ1LjVMNDcuNiA0NS41UTQzLjcgNDUuNSA0MC44IDQzLjdRMzcuOSA0MS45IDM2LjQgMzguOFEzNC44IDM1LjYgMzQuOCAzMS40UTM0LjggMjcuMiAzNi4zIDI0LjBRMzcuOCAyMC44IDQwLjYgMTkuMFE0My40IDE3LjIgNDcuMSAxNy4yTDQ3LjEgMTcuMlE0OS4zIDE3LjIgNTEuNCAxOC4wUTUzLjUgMTguNyA1NS4yIDIwLjNRNTYuOSAyMS45IDU4LjAgMjQuNVE1OS4wIDI3LjEgNTkuMCAzMC45TDU5LjAgMzAuOUw1OS4wIDMyLjdMMzkuMyAzMi43UTM5LjQgMzUuMyA0MC4zIDM3LjNMNDAuMyAzNy4zUTQxLjQgMzkuNCA0My4yIDQwLjVRNDUuMSA0MS41IDQ3LjYgNDEuNUw0Ny42IDQxLjVRNDkuMiA0MS41IDUwLjYgNDEuMVE1MS45IDQwLjYgNTIuOCAzOS43UTUzLjggMzguNyA1NC4zIDM3LjRMNTQuMyAzNy40TDU4LjUgMzguNVE1Ny45IDQwLjYgNTYuNCA0Mi4xUTU0LjkgNDMuNyA1Mi42IDQ0LjZRNTAuNCA0NS41IDQ3LjYgNDUuNVpNMzkuMyAyOS4wTDM5LjMgMjkuMEw1NC41IDI5LjBRNTQuMyAyNy4xIDUzLjcgMjUuNkw1My43IDI1LjZRNTIuOSAyMy41IDUxLjIgMjIuM1E0OS42IDIxLjEgNDcuMSAyMS4xUTQ0LjYgMjEuMSA0Mi45IDIyLjNRNDEuMSAyMy42IDQwLjIgMjUuNUw0MC4yIDI1LjVRMzkuNCAyNy4xIDM5LjMgMjkuMFpNNjguMSA0NC45TDYzLjAgNDQuOUw3Mi42IDMwLjlMNjMuNiAxNy42TDY4LjcgMTcuNkw3Mi4xIDIyLjlRNzMuNCAyNC45IDc0LjQgMjYuN0w3NC40IDI2LjdRNzQuOCAyNy41IDc1LjIgMjguMkw3NS4yIDI4LjJRNzUuNiAyNy41IDc2LjAgMjYuN0w3Ni4wIDI2LjdRNzYuOSAyNC45IDc4LjIgMjIuOUw3OC4yIDIyLjlMODEuNyAxNy42TDg2LjcgMTcuNkw3Ny42IDMxLjFMODcuMSA0NC45TDgyLjAgNDQuOUw3OC4wIDM4LjdRNzYuNyAzNi43IDc1LjggMzUuMEw3NS44IDM1LjBRNzUuNCAzNC4zIDc1LjAgMzMuN0w3NS4wIDMzLjdRNzQuNyAzNC4zIDc0LjMgMzUuMEw3NC4zIDM1LjBRNzMuNSAzNi43IDcyLjEgMzguN0w3Mi4xIDM4LjdMNjguMSA0NC45Wk05Ny43IDE3LjZMMTAzLjMgMTcuNkwxMDMuMyAyMS4zTDk3LjcgMjEuM0w5Ny43IDM3LjhROTcuNyAzOS42IDk4LjQgNDAuNVE5OS4yIDQxLjMgMTAwLjkgNDEuM0wxMDAuOSA0MS4zUTEwMS4zIDQxLjMgMTAyLjAgNDEuMlExMDIuNiA0MS4xIDEwMy4yIDQxLjBMMTAzLjIgNDEuMEwxMDQuMSA0NC43UTEwMy40IDQ1LjAgMTAyLjUgNDUuMVExMDEuNyA0NS4yIDEwMC44IDQ1LjJMMTAwLjggNDUuMlE5Ny4zIDQ1LjIgOTUuMyA0My4zUTkzLjMgNDEuNSA5My4zIDM4LjFMOTMuMyAzOC4xTDkzLjMgMjEuM0w4OS4yIDIxLjNMODkuMiAxNy42TDkzLjMgMTcuNkw5My4zIDExLjFMOTcuNyAxMS4xTDk3LjcgMTcuNlogIi8+PC9zdmc+"`;
exports[`renderToImg > should render to a base64 data url 1`] = `"data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIwMCIgaGVpZ2h0PSI2MzAiIHZpZXdCb3g9IjAgMCAxMjAwIDYzMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48bWFzayBpZD0ic2F0b3JpX29tLWlkIj48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTIwMCIgaGVpZ2h0PSI2MzAiIGZpbGw9IiNmZmYiLz48L21hc2s+PG1hc2sgaWQ9InNhdG9yaV9vbS1pZC0wIj48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwIiBoZWlnaHQ9IjUwIiBmaWxsPSIjZmZmIi8+PC9tYXNrPjxwYXRoIGZpbGw9InJnYmEoMCwgMCwgMCwgMSkiIGQ9Ik0xMy44IDEwLjlMMi40IDEwLjlMMi40IDYuOEwyOS45IDYuOEwyOS45IDEwLjlMMTguNSAxMC45TDE4LjUgNDMuMkwxMy44IDQzLjJMMTMuOCAxMC45Wk00Ny42IDQzLjhMNDcuNiA0My44UTQzLjcgNDMuOCA0MC44IDQyLjBRMzcuOSA0MC4zIDM2LjQgMzcuMVEzNC44IDM0LjAgMzQuOCAyOS44UTM0LjggMjUuNiAzNi4zIDIyLjRRMzcuOCAxOS4yIDQwLjYgMTcuNFE0My40IDE1LjYgNDcuMSAxNS42TDQ3LjEgMTUuNlE0OS4zIDE1LjYgNTEuNCAxNi4zUTUzLjUgMTcuMCA1NS4yIDE4LjZRNTYuOSAyMC4yIDU4LjAgMjIuOFE1OS4wIDI1LjQgNTkuMCAyOS4yTDU5LjAgMjkuMkw1OS4wIDMxLjBMMzkuMyAzMS4wUTM5LjQgMzMuNyA0MC4zIDM1LjZMNDAuMyAzNS42UTQxLjQgMzcuNyA0My4yIDM4LjhRNDUuMSAzOS45IDQ3LjYgMzkuOUw0Ny42IDM5LjlRNDkuMiAzOS45IDUwLjYgMzkuNFE1MS45IDM4LjkgNTIuOCAzOC4wUTUzLjggMzcuMSA1NC4zIDM1LjdMNTQuMyAzNS43TDU4LjUgMzYuOFE1Ny45IDM4LjkgNTYuNCA0MC41UTU0LjkgNDIuMCA1Mi42IDQyLjlRNTAuNCA0My44IDQ3LjYgNDMuOFpNMzkuMyAyNy4zTDM5LjMgMjcuM0w1NC41IDI3LjNRNTQuMyAyNS41IDUzLjcgMjMuOUw1My43IDIzLjlRNTIuOSAyMS44IDUxLjIgMjAuNlE0OS42IDE5LjUgNDcuMSAxOS41UTQ0LjYgMTkuNSA0Mi45IDIwLjdRNDEuMSAyMS45IDQwLjIgMjMuOEw0MC4yIDIzLjhRMzkuNCAyNS41IDM5LjMgMjcuM1pNNjguMSA0My4yTDYzLjAgNDMuMkw3Mi42IDI5LjJMNjMuNiAxNS45TDY4LjcgMTUuOUw3Mi4xIDIxLjJRNzMuNCAyMy4yIDc0LjQgMjUuMEw3NC40IDI1LjBRNzQuOCAyNS44IDc1LjIgMjYuNUw3NS4yIDI2LjVRNzUuNiAyNS44IDc2LjAgMjUuMEw3Ni4wIDI1LjBRNzYuOSAyMy4yIDc4LjIgMjEuMkw3OC4yIDIxLjJMODEuNyAxNS45TDg2LjcgMTUuOUw3Ny42IDI5LjRMODcuMSA0My4yTDgyLjAgNDMuMkw3OC4wIDM3LjFRNzYuNyAzNS4xIDc1LjggMzMuM0w3NS44IDMzLjNRNzUuNCAzMi42IDc1LjAgMzIuMEw3NS4wIDMyLjBRNzQuNyAzMi42IDc0LjMgMzMuM0w3NC4zIDMzLjNRNzMuNSAzNS4xIDcyLjEgMzcuMUw3Mi4xIDM3LjFMNjguMSA0My4yWk05Ny43IDE1LjlMMTAzLjMgMTUuOUwxMDMuMyAxOS43TDk3LjcgMTkuN0w5Ny43IDM2LjFROTcuNyAzNy45IDk4LjQgMzguOFE5OS4yIDM5LjYgMTAwLjkgMzkuNkwxMDAuOSAzOS42UTEwMS4zIDM5LjYgMTAyLjAgMzkuNVExMDIuNiAzOS40IDEwMy4yIDM5LjNMMTAzLjIgMzkuM0wxMDQuMSA0My4wUTEwMy40IDQzLjMgMTAyLjUgNDMuNFExMDEuNyA0My41IDEwMC44IDQzLjVMMTAwLjggNDMuNVE5Ny4zIDQzLjUgOTUuMyA0MS43UTkzLjMgMzkuOCA5My4zIDM2LjVMOTMuMyAzNi41TDkzLjMgMTkuN0w4OS4yIDE5LjdMODkuMiAxNS45TDkzLjMgMTUuOUw5My4zIDkuNEw5Ny43IDkuNEw5Ny43IDE1LjlaICIvPjwvc3ZnPg=="`;
9 changes: 1 addition & 8 deletions apps/dashboard/src/lib/fonts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,30 +68,23 @@ export async function loadFonts(elements: OGElement[]): Promise<FontData[]> {
elements
.filter((element) => element.tag === "p" || element.tag === "span")
.map(async (element) => {
// @ts-expect-error -- wrong inference
const cacheKey = `${element.fontFamily}-${element.fontWeight}`;
const fontCache = fontsCache.get(cacheKey);

if (fontCache) {
return fontCache;
}

// @ts-expect-error -- wrong inference
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access -- wrong inference
const fontName = element.fontFamily.toLowerCase().replace(" ", "-");
const data = await fetch(
// @ts-expect-error -- wrong inference
`https://fonts.bunny.net/${fontName}/files/${fontName}-latin-${element.fontWeight}-normal.woff`,
{ cache: "no-store" },
).then((response) => response.arrayBuffer());

const fontData: FontData = {
// @ts-expect-error -- wrong inference
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- wrong inference
name: element.fontFamily,
data,
// @ts-expect-error -- wrong inference
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- wrong inference

weight: element.fontWeight,
};

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"devDependencies": {
"prettier": "^3.2.5",
"turbo": "^2.1.1",
"typescript": "^5.4.5"
"typescript": "^5.5.4"
},
"packageManager": "[email protected]",
"engines": {
Expand Down
1 change: 1 addition & 0 deletions packages/auth/lucia.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { DrizzleSQLiteAdapter } from "@lucia-auth/adapter-drizzle";
import { sessionTable, userTable } from "@ogstudio/db/schema";
import { db } from "@ogstudio/db/db";

// @ts-ignore not sure what happens here
const adapter = new DrizzleSQLiteAdapter(db, sessionTable, userTable);

export const lucia = new Lucia(adapter, {
Expand Down
6 changes: 3 additions & 3 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@lucia-auth/adapter-drizzle": "^1.0.7",
"arctic": "^1.8.0",
"@lucia-auth/adapter-drizzle": "^1.1.0",
"arctic": "^1.9.2",
"lucia": "^3.2.0",
"@ogstudio/db": "workspace:*"
},
"peerDependencies": {
"next": "14.2.3",
"next": "14.2.7",
"react": "^18"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/db/drizzle.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default {
schema: "./schema.ts",
out: "./drizzle",
driver: "turso",
dialect: "sqlite",
dbCredentials: {
url: process.env.DATABASE_URL ?? "",
authToken: process.env.DATABASE_AUTH_TOKEN,
Expand Down
15 changes: 7 additions & 8 deletions packages/db/drizzle/meta/0000_snapshot.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"version": "5",
"version": "6",
"dialect": "sqlite",
"id": "d223f266-e035-4d41-89f1-af0ac7c1007a",
"prevId": "00000000-0000-0000-0000-000000000000",
"tables": {
"user_session": {
"name": "user_session",
Expand Down Expand Up @@ -34,15 +32,15 @@
"user_session_user_id_user_id_fk": {
"name": "user_session_user_id_user_id_fk",
"tableFrom": "user_session",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"tableTo": "user",
"columnsTo": [
"id"
],
"onDelete": "no action",
"onUpdate": "no action"
"onUpdate": "no action",
"onDelete": "no action"
}
},
"compositePrimaryKeys": {},
Expand Down Expand Up @@ -111,8 +109,9 @@
},
"enums": {},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
}
},
"id": "d223f266-e035-4d41-89f1-af0ac7c1007a",
"prevId": "00000000-0000-0000-0000-000000000000"
}
10 changes: 5 additions & 5 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"scripts": {
"lint": "eslint --cache",
"typecheck": "tsc --noEmit",
"generate": "drizzle-kit generate:sqlite",
"generate": "drizzle-kit generate",
"migrate": "tsx drizzle/migrate.ts",
"studio": "drizzle-kit studio",
"dev": "turso dev --db-file ./db.sqlite"
},
"dependencies": {
"@libsql/client": "^0.6.0",
"drizzle-orm": "^0.30.10"
"@libsql/client": "^0.10.0",
"drizzle-orm": "^0.33.0"
},
"devDependencies": {
"@ogstudio/eslint": "workspace:*",
"@ogstudio/typescript": "workspace:*",
"dotenv": "^16.4.5",
"drizzle-kit": "^0.20.17",
"tsx": "^4.9.3"
"drizzle-kit": "^0.24.2",
"tsx": "^4.19.0"
}
}
Loading

0 comments on commit ec33033

Please sign in to comment.