Merge branch 'next'

apps/api/src/prisma/schema.prisma

@@ -50,7 +50,11 @@ model User {
  createdAt DateTime @default(now())
  updatedAt DateTime @default(now())
  name String
+<<<<<<<< HEAD:apps/api/src/prisma/schema.prisma
  password String
+========
+ password String?
+>>>>>>>> next:packages/database/prisma/schema.prisma
  email String @unique
  image String?
  emailVerified Boolean?

apps/client/pages/_app.tsx

@@ -16,6 +16,7 @@ import { QueryClient, QueryClientProvider } from "react-query";
 import { SessionProvider, useUser } from "../store/session";
 
 import React from "react";
+
 import AdminLayout from "../layouts/adminLayout";
 import NewLayout from "../layouts/newLayout";
 import NoteBookLayout from "../layouts/notebook";

apps/client/prisma/prisma.js

@@ -0,0 +1,2 @@
+import { PrismaClient } from 'database';
+export const prisma = new PrismaClient();

apps/emails/package.json

@@ -0,0 +1,24 @@
+{
+ "name": "emails",
+ "version": "1.0.0",
+ "description": "",
+ "main": "server.js",
+ "scripts": {
+ "dev": "nodemon server.js"
+ },
+ "keywords": [],
+ "author": "",
+ "license": "ISC",
+ "dependencies": {
+ "dotenv": "^16.0.3",
+ "express": "^4.18.2",
+ "imap": "^0.8.19",
+ "mail-listener5": "^2.1.2",
+ "mailparser": "^3.6.3",
+ "database": "*"
+ },
+ "devDependencies": {
+ "concurrently": "^7.6.0",
+ "nodemon": "^2.0.20"
+ }
+}

packages/database/package.json

@@ -0,0 +1,46 @@
+{
+ "name": "database",
+ "version": "1.0.0",
+ "license": "MIT",
+ "main": "./dist/index.js",
+ "module": "./dist/index.mjs",
+ "types": "./dist/index.d.ts",
+ "files": [
+ "dist/**"
+ ],
+ "scripts": {
+ "build": "tsup",
+ "clean": "rimraf .turbo node_modules dist",
+ "db:migrate:deploy": "prisma migrate deploy",
+ "db:migrate:dev": "prisma migrate dev",
+ "db:push": "prisma db push",
+ "db:seed": "tsx src/prisma/seed.ts",
+ "dev": "tsup --watch",
+ "format": "prisma format",
+ "db:generate": "prisma generate",
+ "lint": "eslint \"src/**/*.ts\"",
+ "prebuild": "npm run generate",
+ "predev": "npm run generate",
+ "db:migrate:reset": "prisma migrate reset",
+ "generate": "prisma generate",
+ "studio": "prisma studio"
+ },
+ "dependencies": {
+ "@prisma/client": "^5.2.0"
+ },
+ "devDependencies": {
+ "@types/node": "latest",
+ "config": "*",
+ "eslint": "^8.12.0",
+ "prisma": "5.2.0",
+ "rimraf": "^3.0.2",
+ "tsconfig": "*",
+ "tsup": "^5.11.13",
+ "tsx": "^3.7.1",
+ "typescript": "^4.5.5"
+ },
+ "prisma": {
+ "schema": "./prisma/schema.prisma",
+ "seed": "node ./prisma/seed.js"
+ }
+}

packages/database/tsconfig.json

@@ -0,0 +1,5 @@
+{
+ "extends": "tsconfig/node16.json",
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "tsup.config.ts", "prisma/seed.js", "prisma/seed.js"],
+ "exclude": ["node_modules"]
+}

turbo.json

@@ -10,8 +10,11 @@
  "cache": false
  },
  "build": {
- "dependsOn": ["^db:generate"],
  "outputs": ["dist/**", ".next/**"]
+ },
+ "dev": {
+ "cache": false,
+ "persistent": true
  }
  }
 }