Merge branch 'main' into main

apps/api/app/v1/[[...route]]/project.ts

@@ -45,7 +45,7 @@ const app = new Hono()
       const project = await prisma.project.create({
         data: {
           name: body.name,
-          ownerId: session.user.id,
+          userId: session.user.id,
           slug: nanoid(),
           workspaceId: body.workspaceId,
         },
@@ -71,7 +71,7 @@ const app = new Hono()
     const existingProject = await prisma.project.findUnique({
       where: {
         id: projectId,
-        ownerId: session.user.id,
+        userId: session.user.id,
       },
     });
     if (!existingProject) {
@@ -81,7 +81,7 @@ const app = new Hono()
     const project = await prisma.project.delete({
       where: {
         id: projectId,
-        ownerId: session.user.id,
+        userId: session.user.id,
       },
     });
 

apps/api/package.json

@@ -23,15 +23,13 @@
     "@plura/mail": "workspace:*",
     "@prisma/client": "^5.22.0",
     "@repo/types": "workspace:*",
-    "@plura/cache": "workspace:*",
-    "@plura/crypt":"workspace:*",
     "@plura/mor":"workspace:*",
     "@upstash/ratelimit": "^2.0.5",
     "@upstash/redis": "^1.34.3",
     "hono": "^4.6.9",
 
     "nanoid": "^5.0.9",
-    "next": "15.1.3",
+    "next": "15.1.4",
 
     "prisma": "^5.22.0",
     "react": "19.0.0-rc-02c0e824-20241028",

apps/app/actions/project.ts

@@ -4,6 +4,11 @@ import { betterFetch } from "@better-fetch/fetch";
 import { getSession } from "./session";
 import { headers } from "next/headers";
 
+const API_ENDPOINT =
+  process.env.NODE_ENV === "production"
+    ? "https://api.plura.pro/"
+    : "http://localhost:3001";
+
 export const createProject = async ({
   workspaceId,
   name,
@@ -15,7 +20,7 @@ export const createProject = async ({
   if (!user) {
     return;
   }
-  const project = await betterFetch("http://localhost:3001/v1/project", {
+  const project = await betterFetch(`${API_ENDPOINT}/v1/project`, {
     method: "POST",
     body: {
       workspaceId: workspaceId,
@@ -36,7 +41,7 @@ export const getProjectOfUser = async (workspaceId: string) => {
   }
   try {
     const project: any = await betterFetch(
-      "http://localhost:3001/v1/project/workspace/" + workspaceId,
+      `${API_ENDPOINT}/v1/project/workspace/` + workspaceId,
       {
         method: "GET",
         headers: {

apps/app/actions/workspace.ts

@@ -3,14 +3,19 @@ import { headers } from "next/headers";
 import { getSession } from "./session";
 import { betterFetch } from "@better-fetch/fetch";
 
+const API_ENDPOINT =
+  process.env.NODE_ENV === "production"
+    ? "https://api.plura.pro/"
+    : "http://localhost:3001";
+
 export const createWorkspace = async (workspaceName: string) => {
   const user = await getSession();
   if (!user) {
     return;
   }
   try {
     console.log("workspaceName", workspaceName);
-    const workspace = await betterFetch("http://localhost:3001/v1/workspace", {
+    const workspace = await betterFetch(`${API_ENDPOINT}/v1/workspace`, {
       method: "POST",
       body: {
         name: workspaceName,
@@ -34,7 +39,7 @@ export const getFirstWorkspaceOfUser = async () => {
 
   try {
     const workspace: any = await betterFetch(
-      "http://localhost:3001/v1/workspace/user/" + user.session.userId,
+      `${API_ENDPOINT}/v1/workspace/user/` + user.session.userId,
       {
         method: "GET",
         headers: {

apps/app/package.json

@@ -55,7 +55,7 @@
     "input-otp": "^1.4.1",
     "lucide-react": "^0.454.0",
     "motion": "^11.12.0",
-    "next": "15.1.3",
+    "next": "15.1.4",
     "next-themes": "^0.4.3",
     "react": "19.0.0-rc-02c0e824-20241028",
     "react-beautiful-dnd": "^13.1.1",

apps/api/triggers/package.json → apps/services/triggers/package.json

@@ -12,9 +12,9 @@
     "@plura/cache": "workspace:*",
     "@plura/db": "workspace:*",
     "@supabase/supabase-js": "^2.46.1",
-    "@trigger.dev/sdk": "3.3.7"
+    "@trigger.dev/sdk": "3.3.8"
   },
   "devDependencies": {
-    "@trigger.dev/build": "3.3.7"
+    "@trigger.dev/build": "3.3.8"
   }
 }

apps/api/triggers/src/contributors.ts → apps/services/triggers/src/contributors.ts

@@ -98,8 +98,12 @@ export const publishContributorsTask = schedules.task({
         });
       }
 
-      const finalContributors = Object.values(contributorsMap);
+      // Create final array sorted by contributions in descending order
+      const finalContributors = Object.values(contributorsMap).sort(
+        (a, b) => b.contributions - a.contributions,
+      );
 
+      // Clear Redis list and push sorted array as a list
       await cache.del(redisKey); // Clear previous data
       await cache.rpush(
         redisKey,

apps/status/package.json

@@ -19,7 +19,7 @@
     "clsx": "^2.1.1",
     "geist": "^1.3.1",
     "lucide-react": "^0.454.0",
-    "next": "15.1.3",
+    "next": "15.1.4",
     "next-themes": "^0.4.3",
     "react": "19.0.0-rc-66855b96-20241106",
     "react-dom": "19.0.0-rc-66855b96-20241106",

apps/www/package.json

@@ -44,7 +44,7 @@
     "geist": "^1.3.1",
     "lucide-react": "^0.454.0",
     "motion": "^11.13.1",
-    "next": "15.1.3",
+    "next": "15.1.4",
     "next-themes": "^0.4.3",
     "profanity-validator": "^1.3.6",
     "react": "19.0.0-rc-02c0e824-20241028",

package.json

@@ -46,7 +46,7 @@
     "eslint": "^8",
     "eslint-config-next": "15.0.2",
     "hono": "^4.6.9",
-    "next": "15.1.3",
+    "next": "15.1.4",
     "next-auth": "5.0.0-beta.25",
     "postcss": "^8",
     "posthog-js": "^1.184.1",

packages/db/package.json

@@ -6,8 +6,11 @@
     ".": "./src/index.ts"
   },
   "scripts": {
+    "db:studio": "prisma studio",
+    "db:validate": "prisma validate",
     "db:generate": "prisma generate --no-engine",
-    "db:push": "prisma db push --skip-generate"
+    "db:push": "prisma db push --skip-generate",
+    "db:migrate": "pnpm db:validate && prisma migrate dev"
   },
   "dependencies": {
     "@prisma/client": "^6.0.1",

packages/db/prisma/migrations/20250108190401_onboarding/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - Added the required column `userId` to the `Project` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Project" ADD COLUMN     "userId" TEXT NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Project" ADD CONSTRAINT "Project_userId_fkey" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/db/prisma/migrations/20250108192241_onboarding_fix/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `ownerId` on the `Project` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Project" DROP COLUMN "ownerId";

packages/db/prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
 # Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
+# It should be added in your version-control system (e.g., Git)
 provider = "postgresql"

packages/db/prisma/schema.prisma

@@ -21,6 +21,7 @@ model User {
   sessions      Session[]
   accounts      Account[]
   workspaces    Workspace[]
+  projects      Project[]
   role          String      @default("user")
 
   @@unique([email])
@@ -91,14 +92,13 @@ model Workspace {
 }
 
 model Project {
-  id         String       @id @default(uuid())
-  name String  
-  ownerId String
-  slug  String 
-  createdAt  DateTime   @default(now())
-  updatedAt  DateTime   @updatedAt
-  workspaceId String
-  workspace  Workspace   @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
-  user       User     @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-}
+  id           String   @id @default(uuid())
+  name         String  
+  slug         String 
+  createdAt    DateTime @default(now())
+  updatedAt    DateTime @updatedAt
+  workspaceId  String
+  workspace    Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
+  userId       String
+  user         User @relation(fields: [userId], references: [id], onDelete: Cascade)
+}