Merge pull request #69 from atridadl/dev

4.1.1

app/routes/api.room.create.tsx

@@ -3,7 +3,7 @@ import { ActionFunctionArgs, json } from "@remix-run/node";
 import { createId } from "@paralleldrive/cuid2";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 import { invalidateCache } from "~/services/redis.server";
 
 export async function action({ request, params, context }: ActionFunctionArgs) {

app/routes/api.room.delete.$roomId.tsx

@@ -4,7 +4,7 @@ import { eq } from "drizzle-orm";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
 import { invalidateCache } from "~/services/redis.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 
 export async function action({ request, params, context }: ActionFunctionArgs) {
   const { userId } = await getAuth({ context, params, request });

app/routes/api.room.get.$roomId.tsx

@@ -4,7 +4,7 @@ import { eq } from "drizzle-orm";
 import { eventStream } from "remix-utils/sse/server";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 
 // Get Room List
 export async function loader({ context, params, request }: LoaderFunctionArgs) {

app/routes/api.room.get.all.tsx

@@ -5,7 +5,7 @@ import { eventStream } from "remix-utils/sse/server";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
 import { fetchCache, setCache } from "~/services/redis.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 
 // Get Room List
 export async function loader({ context, params, request }: LoaderFunctionArgs) {

app/routes/api.room.presence.get.$roomId.tsx

@@ -4,7 +4,7 @@ import { and, eq } from "drizzle-orm";
 import { eventStream } from "remix-utils/sse/server";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { presence } from "~/services/schema";
+import { presence } from "~/services/schema.server";
 import { createId } from "@paralleldrive/cuid2";
 
 export async function loader({ context, params, request }: LoaderFunctionArgs) {

app/routes/api.room.set.$roomId.tsx

@@ -3,7 +3,7 @@ import { ActionFunctionArgs, json } from "@remix-run/node";
 import { createId } from "@paralleldrive/cuid2";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { logs, rooms, votes } from "~/services/schema";
+import { logs, rooms, votes } from "~/services/schema.server";
 import { eq } from "drizzle-orm";
 
 export async function action({ request, params, context }: ActionFunctionArgs) {

app/routes/api.vote.set.$roomId.tsx

@@ -3,7 +3,7 @@ import { ActionFunctionArgs, json } from "@remix-run/node";
 import { createId } from "@paralleldrive/cuid2";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { votes } from "~/services/schema";
+import { votes } from "~/services/schema.server";
 
 export async function action({ request, params, context }: ActionFunctionArgs) {
   const { userId } = await getAuth({ context, params, request });

app/routes/api.votes.get.$roomId.tsx

@@ -4,7 +4,7 @@ import { eq } from "drizzle-orm";
 import { eventStream } from "remix-utils/sse/server";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { votes } from "~/services/schema";
+import { votes } from "~/services/schema.server";
 
 // Get Room List
 export async function loader({ context, params, request }: LoaderFunctionArgs) {

app/routes/room.$roomId.tsx

@@ -25,7 +25,7 @@ import {
 import { isAdmin, jsonToCsv } from "~/services/helpers.client";
 import { ClerkLoaded, ClerkLoading, useUser } from "@clerk/remix";
 import { db } from "~/services/db.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 import { eq } from "drizzle-orm";
 import ErrorPage from "~/components/ErrorPage";
 import { isShit } from "~/services/helpers.server";

app/services/db.server.ts

@@ -1,6 +1,6 @@
 import { drizzle } from "drizzle-orm/libsql";
 import { createClient } from "@libsql/client";
-import * as schema from "./schema";
+import * as schema from "./schema.server";
 
 const client = createClient({
   url: process.env.DATABASE_URL!,

app/services/webhookhelpers.server.ts

@@ -1,6 +1,6 @@
 import { eq } from "drizzle-orm";
 import { db } from "./db.server";
-import { rooms } from "./schema";
+import { rooms } from "./schema.server";
 
 export const onUserDeletedHandler = async (userId: string | undefined) => {
   if (!userId) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sprintpadawan",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "private": true,
   "sideEffects": false,
   "type": "module",
@@ -11,7 +11,7 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@clerk/remix": "^3.1.6",
+    "@clerk/remix": "^3.1.10",
     "@libsql/client": "0.4.0-pre.5",
     "@paralleldrive/cuid2": "^2.2.2",
     "@remix-run/css-bundle": "^2.3.1",
@@ -26,23 +26,23 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "remix-utils": "^7.3.0",
-    "svix": "^1.14.0"
+    "svix": "^1.15.0"
   },
   "devDependencies": {
     "@flydotio/dockerfile": "^0.4.11",
     "@remix-run/dev": "^2.3.1",
     "@remix-run/eslint-config": "^2.3.1",
-    "@types/react": "^18.2.39",
+    "@types/react": "^18.2.43",
     "@types/react-dom": "^18.2.17",
     "autoprefixer": "^10.4.16",
-    "better-sqlite3": "^9.1.1",
-    "daisyui": "^4.4.17",
+    "better-sqlite3": "^9.2.2",
+    "daisyui": "^4.4.19",
     "dotenv": "^16.3.1",
     "drizzle-kit": "^0.20.6",
-    "eslint": "^8.54.0",
-    "postcss": "^8.4.31",
-    "tailwindcss": "^3.3.5",
-    "typescript": "^5.3.2"
+    "eslint": "^8.55.0",
+    "postcss": "^8.4.32",
+    "tailwindcss": "^3.3.6",
+    "typescript": "^5.3.3"
   },
   "engines": {
     "node": ">=18.0.0"